From patchwork Mon Feb 10 20:26:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968616 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 3DA6FC0219E for ; Mon, 10 Feb 2025 20:27:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17339280027; Mon, 10 Feb 2025 15:27:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F8CA28001E; Mon, 10 Feb 2025 15:27:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6580280027; Mon, 10 Feb 2025 15:27:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C90E928001E for ; Mon, 10 Feb 2025 15:27:42 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8212B1605AB for ; Mon, 10 Feb 2025 20:27:42 +0000 (UTC) X-FDA: 83105170764.15.028C01D Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf23.hostedemail.com (Postfix) with ESMTP id 7CD90140006 for ; Mon, 10 Feb 2025 20:27:40 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=amTC22oi; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219260; a=rsa-sha256; cv=none; b=Mju0pYkej6yrd47TvSQ6bKvTXqYYVF7dE9B/kRdcHjcUxvaxPgpaxP67PrAVhr6Cf9HD5+ qT1Ej2B8AF+jx9PTaT5tMweXz9e/kvlhBpYv7uz0gD2MY7ar4tSFZSV4ap/keOn37omHRE pZZlDB8nAp6SDApolSvaibsmW6Q5F2c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=amTC22oi; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739219260; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=r7taaI3D184cw5jK643mXVB9VjzO+GYqeON7OFr07g0=; b=OV6o3PoS4MzImuQPqCzSpymt5sI6sR55935jCAR+4Y2JEZM6ctMkOYKHqmrK/ev5+Zn6N0 TGnHLhVoWd6uZKPTWIoxU//1QPp7uFEYobtRk7OM7bnOegLoRLjpShEv1wSPWW9hfKUrgn vATy6VMVAV3oIVRtoaqXuH4ZVemPkhw= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-21f6d2642faso58721275ad.1 for ; Mon, 10 Feb 2025 12:27:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219259; x=1739824059; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=r7taaI3D184cw5jK643mXVB9VjzO+GYqeON7OFr07g0=; b=amTC22oiewf8WbseGnzhsKpzlSEAuJq1lxK8w8CYpD7t/essRYKwtAPiunC8AQK1G9 xuPsREpxSzxNxU97f7eqvvY5EBMYfhoV0jdE80iJ1ZxF2X8qDA5+r5L9zq0qKHEgLik/ kfqyBKgCkSXlJD+qdCe2ZS3Tynb8XzZv6kFORwA2BtdV7K9P2wv2R9ngvcehGE14D0LX KaJwNHGaz4VVJ3tzIL0zqO/wcvWHN6qJpcnfoSW8E7557joA9qWF2U8i5Owl4n0sJg6F JB2P72PIBYZHlMux96ev6CrwVU4ST4YsHhClaUPv0hLTd/UaFvU1FqN9djSutW3VBbMX DRRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219259; x=1739824059; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r7taaI3D184cw5jK643mXVB9VjzO+GYqeON7OFr07g0=; b=pUWewbue7fRJd6aNo+N1BBaYHreyeS+15UkGVFvyFo1jfowYxGbf+DmJ6SIHt320bU f0/+Zl8wq/I3l2oGg4vpICmlL0TVmbwPg8X+pV26qgHMGujWQepmbE/zguRMfmrqE7oF JbiJ3GdTXHtO13MJCR+Bs/3cRWT7F76Ttta9ci4Kp538YKdFniQqgRxKjtlPeT08F8Bf eLXJDsMpHI2HQcj1IkN7dQ7bwaeZp8nJ0wFzTeHrCMXSoxW9xrnkDFdhyoFIIeRojBi6 xSN/HB4K3aFFcPsR1gePgdglm83V/eYcxSXyJkUmBE8Btu9/GHFa7+n5eTBaE4Mseemx z74w== X-Forwarded-Encrypted: i=1; AJvYcCXuDJ+xns4NOMuYWUp5mFodEaDT2+YOt3MdvrocEzZMiO8s4t9GLPvw2RkBI2yCYuFCSBM/opvBoA==@kvack.org X-Gm-Message-State: AOJu0YyNJ7qkZ9Ua1j80KK7SaKpV6HaCvFojlkOVLj3RQNtVtiDhadyA s164qVJcZ+FL10g0ypXjMw+OED0FgG1Pa3uJfrkMTl/ZvOZTU7WTHCytlHMyvro= X-Gm-Gg: ASbGnctWvqkTTaWWhavzOZrNYKqzNdtgaVUQUgGtFEB1Wz60caYM2hR7ojD3lNxGs8s aRFb6kDsHI8Rcgvy3GaHVX7xmg07L8d/DS/gLVS+FeKvIx4qp2DgpX2LuhSQmdVw5uW42CZ/RNH htuHNqdlQ+ZO3APLe/16vRCIW4CrE4b6mzjx87pea/LYHMgD+U01COGkOO4XK1kVCmElacDh+5U zHxsrhXTk7fRc6B0t/OD/6BcHWCYrJGSfghgEcvOhUJsz1mV+g7Cb7H6DejHS4y3T3N2domsnKP Qdyznb4aw6Oe6Hn8ysgY1ATp1w== X-Google-Smtp-Source: AGHT+IG7kVqNapt/vUbJRwHXJK1nO6NkoyLZ2LO+pf9PsrB4j+p9Vq3YwvD6dU3hxfVAOMr3upzlgA== X-Received: by 2002:a17:902:e548:b0:21f:5df6:b259 with SMTP id d9443c01a7336-21f5df6b45bmr209610785ad.21.1739219259424; Mon, 10 Feb 2025 12:27:39 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:39 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:56 -0800 Subject: [PATCH v10 23/27] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-23-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> To: 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 Cc: 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, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspamd-Queue-Id: 7CD90140006 X-Stat-Signature: tcjcdat5jdiierzyg4qfj3xxi8qub59o X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739219260-36432 X-HE-Meta: U2FsdGVkX1+6EqB51MkR5XC93kA3CBL0AAf1CnPjd4LNidCwcxJ6F/4OMPfk/Fyse4/8J9FHqpm3+8PKjFD3x4qU5g+d6XHpwuDvXnoEU56dwa9B4iUPZEYqxNGyddkzocMez3cFFbF+3XPH35UiwZYkOJh5QLWiUm9fHjIup92CJGOD63SJ89fRB3b7w/l2CGYPVhxFdTmY1HD94UqCxYlFHgXG4IBqzbBL2+AXnWuVUMQ9O3skgDKDQAkPmU5etIMY86wKCxM7RUSQhKLdILgM8ipkvjsInbeixzEDwB2vX+ksP0kHCD8TnD6sDbDo1GFw/L0Au5OcNFc6pY15RSzYWkQGGeB7eMLjhA9EOzRK7K/nbOwKUUch8Jc4H3VB1ROwgvXse6TcGcoaHO7kR4VE/NM4rujJmJLeTgxwJu5g1n4UJ9A8ZwFq6rCbr/FNj4QtLa8NrPNMMTQSuVj1b6lJ2EJjYV+h00qoIzL7HTBqUs3CL9MIIsy3Afeu6J5Zt2QhaS4gpXDluziZXaNAfKnb6zW7m0FF2xQKZjzMiz9PHC079qDJjTkwBJ5OOBBAirSMl5sZLnr9FXVuj3x7P1xojEBiotrSh0PZf3LG/+SvttkVtz/AEqYFdu/lZn+mIt6tPm0bDmmXfDM4juHnECWNR7hsuHLkUmOCZPkGOtVu5jKoDKE/4w5Ut93VUDDGShLn72dgx0HVtNoLcD4s6necYAvmKJJMz3QJtZydhvTKhYk/kJIC7yp1sjetPnQNQp1cUxVFM0k26pg1sDFzYX+LIvGWYjdE1Cuqdirsp5/kZeBnYcmqE8ioIvGbAnpMAs4N0hH8szkTTtgc5gXe2ReoubnxHF95PH5X0cu81K+elW7oj5vzA3aHqlJeGToDNScUxWKXo73e1BfJ7vduN+iaWJzlmcTISPp9ivw70pADeE4AMsd+keypAVPvZ16klpC0e8wO435K3LW6g9a CFU72ANg qYBBF8TNMlJ69lCDSGfu+rDwIvwaMCRPgHeEO8O5phIrSXgU5vLAmbgNp+51hEzh6JzwlHB9aWT7Dchv6H7kiyRJwrMHBplFXOVqg42rQF9KtXl6efiCIjIpzb4/Xkhzz6+HNAwBXqHhuPeuWsSGIcc8/FBWVFL424Nv0L5+Hlk8r89tX33UkbcOZMrfNTVzuavQAETqhO5o/JxoB1K3P0olVxOa14XSTXjD0GQlnEMjX+UnxsoPCDOEQL1Cn76r9DjFiclh9APdCIVsdXPi0FodAAVaymYbgJ4YTSv3hvjTNzR0AmI1Ws7WbkDGMjnWRKd2RZrrlmEdDn4YGzs1jEC5zcBvzV2M4JUV8Bu7AVeaktPtB+QFsEVF+1haaT75O/Cal3GBHzTCOVjwSCtNPvx3njLIeZDlwrMpIwwEAcYqDwUfOqgak8gUq7xomYM7wovPjyrCSYhTcgDkj7/sfsqnscQd0G6PIkmST1pfEi+H3OODY9MjQotgdbu72iqwr+QC8TDpa7E2JuZ0= 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: 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 Signed-off-by: Deepak Gupta --- arch/riscv/Makefile | 7 +++++- arch/riscv/include/asm/assembler.h | 44 +++++++++++++++++++++++++++++++++++ arch/riscv/kernel/vdso/Makefile | 8 +++++++ 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, 74 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 13fbc0f94238..ea9468af2cb4 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -87,10 +87,15 @@ 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 +# Check if the toolchain supports Zihintpause extension +riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE) := $(riscv-march-y)_zihintpause + +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..edbe86d0b4f7 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 1 +.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..93c134f0afb1 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -19,6 +19,8 @@ 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)_zicfilp +asflags-y += $(KBUILD_BASE_ISA)_zicfilp ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) @@ -40,6 +42,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 + # 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