From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16B49C36002 for ; Wed, 9 Apr 2025 14:28:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C63E6B0006; Wed, 9 Apr 2025 10:28:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02048280086; Wed, 9 Apr 2025 10:28:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E29C5280088; Wed, 9 Apr 2025 10:28:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C29C0280086 for ; Wed, 9 Apr 2025 10:28:22 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0C55EC0C5A for ; Wed, 9 Apr 2025 14:28:24 +0000 (UTC) X-FDA: 83314735728.08.0F6BAC8 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf23.hostedemail.com (Postfix) with ESMTP id 22EC114000C for ; Wed, 9 Apr 2025 14:28:21 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=YmuzOI9j; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744208902; a=rsa-sha256; cv=none; b=Wu+5T+rKRHWjIN/jaSv/XywLV79NeltZI7Y3Fj7k2ovUGJ5wirPGdEKHlh9Tw5MqnY8GWH RYQ1M8jgWjb+CYjJ7Ymp8lfaBIcTBjVZ3VkQzk0f7im5vxQPoHP+V3lQLZEt9GpCfgHGvz 0fW6iNYRkrqPB8XzYQFixUcp7xhlfYU= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=YmuzOI9j; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744208902; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=iKdsZVjEB+ld4A+96BXpcZU7N3NQ0asG+U4PZDEXS+s=; b=GOdfltVAJpC/WmRHZyUDng9AEkr4+iektD1Slza2DKqTRJT3gkJq467KqAzmYVzGS0pZ4T E7W0I2Kecl/M5tX7lUlkrl5rmn0bEn3guUcwt4HABP2glwDZGXcaSyUC7un4YthSGjn3MV 6WHOVwi9GJ9ohzezJxqMgxHTjs+lA7M= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-226185948ffso72289055ad.0 for ; Wed, 09 Apr 2025 07:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1744208901; x=1744813701; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=iKdsZVjEB+ld4A+96BXpcZU7N3NQ0asG+U4PZDEXS+s=; b=YmuzOI9js8AHz2ngIicG8zaD0GhfMhgNcld7+CCYPZADbTzmZOAZjNtcnpUfA3MF7q cwxO3vNTsfmlbjiapKrgb2iPRoVN7fDabaZ76Ths3sT6tMbaDdXM5gG6jLVvPXEozvB+ 3sFqtcYGVAteULPpM84HyhwaKwZbaKsyHkXODd+l5KEM+US2NlnAwtebjQLOIAy/Uh3t KiPzxBpHPw4L0D8C9kSlzguY+WdThPkrP9jc6+urwpfNepsd20xF0XHyOCiM4nuZnS9J vducLj2ksJUR0uBYmFaRby+DiTEUXoiY4GX/FP6yZ+2EWPf7a1T3wEI3yfs64GrMn/F/ KNlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744208901; x=1744813701; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iKdsZVjEB+ld4A+96BXpcZU7N3NQ0asG+U4PZDEXS+s=; b=gfu+0Z+/CHUpl+Us0A4fsdbR1iGN/Ate0dRm4/o4zWrYvOUBnK9HV2SUrZUN6Kc7eZ uBiSbnc3xs4aCtCnzjH0nyuAb0gxb5Aj4m+JbdvhdAYAH+Cr1OWpAOlU/7JB1i20xGYO Q7Y9DFGU2Xpk+IBgqDhkc704sFy5jT3820x0CigSYyKVWY3FtAdqoh1yb/hqgCzIEdsW mOCH+T7kWLS+H3SIYF9RxJg03g+WhHva6brQIPAE1S32pG6zyJo8g8AeV026kyWjzFMK UZRZXY/ERbiY4mIvTZ6jnQKi1y0axSOYaMg2cmSNDoeFQu9bxIE0EdqUWQKwwnvxYFJK aRAA== X-Forwarded-Encrypted: i=1; AJvYcCUvqTnm98ISUjDnczJVtbEJcfCWXn/QhxqWI5IzWGM//C9CdkU2tMWZ7P3wvnBbJdGi0wJ4A3itcg==@kvack.org X-Gm-Message-State: AOJu0Yx7TWuU/DrsifHUpmuBemnDq/aT+mwuSNyyG06kBsTNNUBFNxQL Yrn/JJFrxz3PbGA5neRckc7R8tG7ePEYEOTDRkABgESHiEzwm+WI3wqs9YnRMQY= X-Gm-Gg: ASbGnctFo9a8XBMo8qMIwNxYvXPKYfuPhcfm3QU2HBuSYKnHI7+B4MFYEk+uWo0LTzE OrgILxgeNTMXQjzlotlIJlcfMu68KCmB8rksJTIa8LIEeGiXv8BBmSlaoECQKaiLq2WgR7+pNTI GYZd2vuXlSVF8uT88DlIPvV/mVqpD6AkSlb2pVrQmrsqqHIJByZFx3hMjsN4qIkZI5MyCQ1cUD/ waElg6Nyjcsdp9XP6Hn0iay5FBt0ci8wct6hzSU7r2BbAZxk/JqdmtxO2G4j9FDBr3aFA+jRLNk q/zuxA/EmQJg7jJaWn+/ALevyNMhfSzWsh8VXtTPOyu96915prwWv+mHg1LQ6A== X-Google-Smtp-Source: AGHT+IEZcb3DjiGcYzGFWX/udT1ybgSSFf/OKSBgPoOLDb9/c2yI1PJe1NZkwsT9h6HK1NAI3V+uKw== X-Received: by 2002:a17:903:1787:b0:224:1220:7f40 with SMTP id d9443c01a7336-22ac298441fmr44614275ad.3.1744208900819; Wed, 09 Apr 2025 07:28:20 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7cafdaasm12457775ad.165.2025.04.09.07.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:28:20 -0700 (PDT) Date: Wed, 9 Apr 2025 07:28:17 -0700 From: Deepak Gupta To: Alexandre Ghiti Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li Subject: Re: [PATCH v12 24/28] arch/riscv: compile vdso with landing pad Message-ID: References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> <20250314-v5_user_cfi_series-v12-24-e51202b53138@rivosinc.com> <4f6a0c65-7c3a-4457-8b0b-cd39f40931c8@ghiti.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <4f6a0c65-7c3a-4457-8b0b-cd39f40931c8@ghiti.fr> X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 22EC114000C X-Stat-Signature: 8yrqafc7rzmzd3wtg6amejfhq4fgagea X-Rspam-User: X-HE-Tag: 1744208901-327233 X-HE-Meta: U2FsdGVkX1/b3iyUCPYt1AqJlyf6N4UgTpn8Ue4tW5AEZiD6xpu/CiOpZ3fCWjOEfBy6OkfVqXONzwoEDNyyMqoK8Ui3k8Q2Q19RfRM/PVrGz0cUa9HMi3XJ/lgzdKv092cDTJAakB0u4Klhx5vDZpWzuOYCOTXtznKDWWxCLu2tXL77JlPebkOp4f+CPTsMYeY20gTohhHh6Zv9tF7mCg3+8u5n7RWsssMc1IM4abi+jrRt1Plk1DEDGSXmiSdycPv0jryrnwL8PunqMyls3sazAsZKh8KvklQwb/sRehlWLCxwmQsMbIXfOk8mrUuMVuZ7aBDxQrpeNKAYer1SZJjBh5YOYivwxFKoc56bjXwbRRrWHAxZSqWzm5RkNnnGrjmrmNPOe8lrscxl0Ifor2e9BUWdhAW4CcemIcshWuq7sz+6f7/8qRqKBaXS4gav2ouhZFEOmnb7hAQBgXk+eRVe4Q9DaHdn8UbHPfWAvdTI/tgkbdbli6ZLudkyJCd7gLUtLrUwPZSIhfht9ZbFWUjVrbssw4/JYXjV30iJvhWdEp6D6AhLY6SRJ2foRFjNH2jHLqKY8JGzLX7Vcw76pLbPO/h0WNbtphGTzw6yniQHna99KmYXyw41o7HL1bKRGh481Ua0kYUknKsDGoeR4g7jkE4w6Dg3AE2lpGMh1a847ApJeXQ7NGed+jPRUn8/d0kAltmqK8hF9if1ORZ1bUvWk9IN5c7QlzS2cuKLQHbL4rnDYq4/RqWDLqwaaw10uUrTl1f3WXq7gQoN33eVXMvZZCHcFc2QX4lF2jUQPn2fBTXDI01XROyRe4CTg+uDH7pW8hPL7deaBVSd0YNHXjOYp9y88G0wxvlVbukzUGaudX5ipl7mAZMB4sGq7ZSVWmkSrBjP83HKYjaVtNbKV1uBPXP8ISahxYldgoMo/8gxbTCuFVGlRmp6GDcv504NGbJ2wJ6yNAqMthG57pp 8EqTVeDp kIndJlZAVE6VfMLftBeMYAkDxAhaJ+FpRNVBZkL9hqCeHJTB9q7Ir8MV+sQu3qN0zu1frvUo6rt7E8A+acupppFKDnntvfT4fdLyzpmThYlg3vLkAjD7SzsUpdSibkRLHpdYCGYdX8+bHUwTRNZlraXgJFOoNt7TyxTWTEjPq6SdOAW2MQPvW/CR1j/LlUixgi22WGI7GTRsBhJtl9PgQi79hDKlPMERHJlgEdqTtQgPjBLXblvGoGbsqEQ98gM25ZdcBtMP0E7c/Heu+vsQWYgJU8WnMkVC6+nczQi6xqaVNo/tuMxE8TkH4yBnnvMrJ565O7Shk6hvd8XHEYp3wFoxC7H/Zg5+MiqJyWUJR4DRaS8iwjvlVWLxxLjlGylyzUMYf83XFntsvxn+w6YbOrLEBj6J4iKsh8gGV30G1hDql1IASpvoy3EtsfmQyv7GaQr5/1iZV/98wX/1qXJJvuhX0WYyn86pJVPoKcAcPQWfVfs4mMtO+XNLkCwi6/JPFXVlUZ3HEzypnfppEd0EDHdGoJ7E3P4vc7x0O0EgFKh47W+x8R/lsM7BQeL6aq1BHRRNphi89cavYcm8i9rEgcLqepMaWgXkOKq+P9+UEv5YAIWlQM1HJI++pBg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Tue, Apr 08, 2025 at 02:45:25PM +0200, Alexandre Ghiti wrote: > >On 14/03/2025 22:39, Deepak Gupta wrote: >>From: Jim Shu >> >>user mode tasks compiled with zicfilp may call indirectly into vdso (like >>hwprobe indirect calls). Add landing pad compile support in vdso. vdso >>with landing pad in it will be nop for tasks which have not enabled >>landing pad. >>This patch allows to run user mode tasks with cfi eanbled and do no harm. >> >>Future work can be done on this to do below >> - labeled landing pad on vdso functions (whenever labeling support shows >> up in gnu-toolchain) >> - emit shadow stack instructions only in vdso compiled objects as part of >> kernel compile. >> >>Signed-off-by: Jim Shu >>Reviewed-by: Zong Li >>Signed-off-by: Deepak Gupta >>--- >> arch/riscv/Makefile | 5 +++- >> arch/riscv/include/asm/assembler.h | 44 +++++++++++++++++++++++++++++++++++ >> arch/riscv/kernel/vdso/Makefile | 12 ++++++++++ >> arch/riscv/kernel/vdso/flush_icache.S | 4 ++++ >> arch/riscv/kernel/vdso/getcpu.S | 4 ++++ >> arch/riscv/kernel/vdso/rt_sigreturn.S | 4 ++++ >> arch/riscv/kernel/vdso/sys_hwprobe.S | 4 ++++ >> 7 files changed, 76 insertions(+), 1 deletion(-) >> >>diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile >>index 13fbc0f94238..eca94246cda6 100644 >>--- a/arch/riscv/Makefile >>+++ b/arch/riscv/Makefile >>@@ -88,9 +88,12 @@ riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZACAS) := $(riscv-march-y)_zacas >> # Check if the toolchain supports Zabha >> riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZABHA) := $(riscv-march-y)_zabha >>+KBUILD_BASE_ISA = -march=$(shell echo $(riscv-march-y) | sed -E 's/(rv32ima|rv64ima)fd([^v_]*)v?/\1\2/') >>+export KBUILD_BASE_ISA >>+ >> # Remove F,D,V from isa string for all. Keep extensions between "fd" and "v" by >> # matching non-v and non-multi-letter extensions out with the filter ([^v_]*) >>-KBUILD_CFLAGS += -march=$(shell echo $(riscv-march-y) | sed -E 's/(rv32ima|rv64ima)fd([^v_]*)v?/\1\2/') >>+KBUILD_CFLAGS += $(KBUILD_BASE_ISA) >> KBUILD_AFLAGS += -march=$(riscv-march-y) >>diff --git a/arch/riscv/include/asm/assembler.h b/arch/riscv/include/asm/assembler.h >>index 44b1457d3e95..a058ea5e9c58 100644 >>--- a/arch/riscv/include/asm/assembler.h >>+++ b/arch/riscv/include/asm/assembler.h >>@@ -80,3 +80,47 @@ >> .endm >> #endif /* __ASM_ASSEMBLER_H */ >>+ >>+#if defined(CONFIG_RISCV_USER_CFI) && (__riscv_xlen == 64) >>+.macro vdso_lpad >>+lpad 0 >>+.endm >>+#else >>+.macro vdso_lpad >>+.endm >>+#endif >>+ >>+/* >>+ * This macro emits a program property note section identifying >>+ * architecture features which require special handling, mainly for >>+ * use in assembly files included in the VDSO. >>+ */ >>+#define NT_GNU_PROPERTY_TYPE_0 5 >>+#define GNU_PROPERTY_RISCV_FEATURE_1_AND 0xc0000000 >>+ >>+#define GNU_PROPERTY_RISCV_FEATURE_1_ZICFILP (1U << 0) >>+#define GNU_PROPERTY_RISCV_FEATURE_1_ZICFISS (1U << 1) >>+ >>+#if defined(CONFIG_RISCV_USER_CFI) && (__riscv_xlen == 64) >>+#define GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT \ >>+ (GNU_PROPERTY_RISCV_FEATURE_1_ZICFILP) >>+#endif >>+ >>+#ifdef GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT >>+.macro emit_riscv_feature_1_and, feat = GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT >>+ .pushsection .note.gnu.property, "a" >>+ .p2align 3 >>+ .word 4 >>+ .word 16 >>+ .word NT_GNU_PROPERTY_TYPE_0 >>+ .asciz "GNU" >>+ .word GNU_PROPERTY_RISCV_FEATURE_1_AND >>+ .word 4 >>+ .word \feat >>+ .word 0 >>+ .popsection >>+.endm >>+#else >>+.macro emit_riscv_feature_1_and, feat = 0 >>+.endm >>+#endif >>diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile >>index 9a1b555e8733..daa10c2b0dd1 100644 >>--- a/arch/riscv/kernel/vdso/Makefile >>+++ b/arch/riscv/kernel/vdso/Makefile >>@@ -13,12 +13,18 @@ vdso-syms += flush_icache >> vdso-syms += hwprobe >> vdso-syms += sys_hwprobe >>+ifdef CONFIG_RISCV_USER_CFI >>+LPAD_MARCH = _zicfilp >>+endif >>+ >> # Files to link into the vdso >> obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o >> ccflags-y := -fno-stack-protector >> ccflags-y += -DDISABLE_BRANCH_PROFILING >> ccflags-y += -fno-builtin >>+ccflags-y += $(KBUILD_BASE_ISA)$(LPAD_MARCH) >>+asflags-y += $(KBUILD_BASE_ISA)$(LPAD_MARCH) >> ifneq ($(c-gettimeofday-y),) >> CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) >>@@ -40,6 +46,12 @@ endif >> CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) >> CFLAGS_REMOVE_hwprobe.o = $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) >>+# Disable profiling and instrumentation for VDSO code >>+GCOV_PROFILE := n >>+KCOV_INSTRUMENT := n >>+KASAN_SANITIZE := n >>+UBSAN_SANITIZE := n > > >So I looked into this and it seems it is not needed. All the profilers >above only add their corresponding "clags" if the object >"is-kernel-object" (https://elixir.bootlin.com/linux/v6.14-rc6/source/scripts/Makefile.lib#L147) >which is not the case for hwprobe.c since it is not added to obj-y. Noted. Will remove it. > > >>+ >> # Force dependency >> $(obj)/vdso.o: $(obj)/vdso.so >>diff --git a/arch/riscv/kernel/vdso/flush_icache.S b/arch/riscv/kernel/vdso/flush_icache.S >>index 8f884227e8bc..e4c56970905e 100644 >>--- a/arch/riscv/kernel/vdso/flush_icache.S >>+++ b/arch/riscv/kernel/vdso/flush_icache.S >>@@ -5,11 +5,13 @@ >> #include >> #include >>+#include >> .text >> /* int __vdso_flush_icache(void *start, void *end, unsigned long flags); */ >> SYM_FUNC_START(__vdso_flush_icache) >> .cfi_startproc >>+ vdso_lpad >> #ifdef CONFIG_SMP >> li a7, __NR_riscv_flush_icache >> ecall >>@@ -20,3 +22,5 @@ SYM_FUNC_START(__vdso_flush_icache) >> ret >> .cfi_endproc >> SYM_FUNC_END(__vdso_flush_icache) >>+ >>+emit_riscv_feature_1_and >>diff --git a/arch/riscv/kernel/vdso/getcpu.S b/arch/riscv/kernel/vdso/getcpu.S >>index 9c1bd531907f..5c1ecc4e1465 100644 >>--- a/arch/riscv/kernel/vdso/getcpu.S >>+++ b/arch/riscv/kernel/vdso/getcpu.S >>@@ -5,14 +5,18 @@ >> #include >> #include >>+#include >> .text >> /* int __vdso_getcpu(unsigned *cpu, unsigned *node, void *unused); */ >> SYM_FUNC_START(__vdso_getcpu) >> .cfi_startproc >>+ vdso_lpad >> /* For now, just do the syscall. */ >> li a7, __NR_getcpu >> ecall >> ret >> .cfi_endproc >> SYM_FUNC_END(__vdso_getcpu) >>+ >>+emit_riscv_feature_1_and >>diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S >>index 3dc022aa8931..e82987dc3739 100644 >>--- a/arch/riscv/kernel/vdso/rt_sigreturn.S >>+++ b/arch/riscv/kernel/vdso/rt_sigreturn.S >>@@ -5,12 +5,16 @@ >> #include >> #include >>+#include >> .text >> SYM_FUNC_START(__vdso_rt_sigreturn) >> .cfi_startproc >> .cfi_signal_frame >>+ vdso_lpad >> li a7, __NR_rt_sigreturn >> ecall >> .cfi_endproc >> SYM_FUNC_END(__vdso_rt_sigreturn) >>+ >>+emit_riscv_feature_1_and >>diff --git a/arch/riscv/kernel/vdso/sys_hwprobe.S b/arch/riscv/kernel/vdso/sys_hwprobe.S >>index 77e57f830521..f1694451a60c 100644 >>--- a/arch/riscv/kernel/vdso/sys_hwprobe.S >>+++ b/arch/riscv/kernel/vdso/sys_hwprobe.S >>@@ -3,13 +3,17 @@ >> #include >> #include >>+#include >> .text >> SYM_FUNC_START(riscv_hwprobe) >> .cfi_startproc >>+ vdso_lpad >> li a7, __NR_riscv_hwprobe >> ecall >> ret >> .cfi_endproc >> SYM_FUNC_END(riscv_hwprobe) >>+ >>+emit_riscv_feature_1_and >>