From patchwork Fri Mar 14 21:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017511 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 3362FC282EC for ; Fri, 14 Mar 2025 21:40:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2950B280029; Fri, 14 Mar 2025 17:40:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2250E28001D; Fri, 14 Mar 2025 17:40:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 021F6280029; Fri, 14 Mar 2025 17:40:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CFB8D28001D for ; Fri, 14 Mar 2025 17:40:32 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 121CBAA397 for ; Fri, 14 Mar 2025 21:40:34 +0000 (UTC) X-FDA: 83221475988.03.75F90BF Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf26.hostedemail.com (Postfix) with ESMTP id 1D705140008 for ; Fri, 14 Mar 2025 21:40:31 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LCV3WKXg; dmarc=none; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988432; a=rsa-sha256; cv=none; b=sBj9/Nvse03iXaFWawPMLuQ7ln0CND9F0okfJqjywMZ3KDjtX10T/S9mySocOyHzbt8v+9 vsv4IL10r9z9CSQSGIkE59smBEpPpEeJzLV9NZIIynjeK0NpZeupyvM7McZI4eylJ2L3xH jzRNo8FVbPBEklyssQbdxwtTxDFvy4A= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LCV3WKXg; dmarc=none; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1741988432; 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=m6UfP2exNMdeoKXUR2vjpjSCKDIb3uPINIMtTyZwoe4=; b=HVH04bMMbfWag+p7SNONn5UdS052Y1XYm8g3oflOnkQivYSmrG1D0vcKGSFhBgpmbNcp8C nZ4v21tr7hoIsNtU4anADmpDmg5CSFuFPQ109gYqJMbd93wTXoSEYEr/d15tFE4NOrcXH/ tat7r/tLMWUnpsMBOcFuPh4qYM1ZAd8= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-225a28a511eso45854785ad.1 for ; Fri, 14 Mar 2025 14:40:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988431; x=1742593231; 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=m6UfP2exNMdeoKXUR2vjpjSCKDIb3uPINIMtTyZwoe4=; b=LCV3WKXgji5tHj/xKxfd+yZBGQD2J+vy+/NbMuWI/b4Czjcf8F2uVHBYj8S3WNgW7c ANTO05utBPtQFl1oU1d2JY5zRS3s1/Jwx3AP3/EJzgvuebnrkomjhWW09yNgswvO9oEO VBcvBpVmLuto8awz38h7tt/ZgMbGQGhOxqVw2XjSNE9frak7kfpP1+t0M8G1fLvmt+6i TVkvrki/NIUwxCoCicUYzeohVOV+E7fXuNkhpcBMItC/vpwRTC6EajsZdDwVKUhyPfe+ 6b2Ej8klTWRzrlz0b0RgBtgNCGK2mTetU03MgUGy2gQuGgTIsUHXD7bpQFCP8T0n5v5n O6ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988431; x=1742593231; 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=m6UfP2exNMdeoKXUR2vjpjSCKDIb3uPINIMtTyZwoe4=; b=DbupFlbZF1fUxGnaV4S8Sqg97FbS3+X7ImQ4PXOHyz/Lq1JuzR+knVZn4G3V8Jmotn 7ASA2hTvO49b9vy7hQ6y0aEvfRs1l0MDDR3/OiYvMp6DVYvgEymjo986kho4AXHOjZQq Yelp2idFf3I5LAniuXg6S34K17oUdDe2wuLRJtICYeR8TNsmtLafyjG1v+6OwtWchQcJ +2LjLSahAoiAs//wBQdGPLSKM4HX2P6BtACZyHFpROCmM49t2r4bXiMkkHLPTFNVWGoo I4CasT+jo8kh4RVjL7lJfoCBC+I02kAmqjLjAfCdmc2VXkDAaKRxMGQBXacfYjC/n4Kw JQjw== X-Forwarded-Encrypted: i=1; AJvYcCWOfnBATwuVi2rxj9RZ9OadeLXar/DIK5XEwR+lvkHzbYeg/g93mJOOJnp0QFi/yyaQoNMF9O97hA==@kvack.org X-Gm-Message-State: AOJu0Yxy2f/YOLJRN8VnEFRixQwbYfzkGw5LaVCfNPNHjVYesjOf68Kt y5VnNlwyOl+FLQRZjmYBilEzJ040WSHjL4DRPcY9mBt6q83a3LFGhXFyNITBAgs= X-Gm-Gg: ASbGncumeLbkXjVUEbLgWlGzAkiXmUyvL6zRFN5+qvd8n77WEpX/aBq39637mMh7Pt6 lmGA6TR0UxKzSe/RoMtqjI39Bp7LQeE1811Tc4pILVJHbk7z7yhaP1yxq2rfE1cj9mWE1YYNl1C TO+St8tSiygsuokP5Y0hSJw+rHpmwsxndq4pTZOu1XWpZBP0J205TujU8iWZTN3d+Y2kPuxvG5K jeczwnDXwSM4hrMnWloCJvQxF2T+AtWbxJ43y/eNPSQu5R9YWbZM+YA0DIEZ4JJ4g/8AfpxMy02 gi6RCMoDwQoczu67K3wcBXiD6kp3luzz9cjkXbG+gytqwQsXzkOzbo0= X-Google-Smtp-Source: AGHT+IGRsLxN2WiToQ98rm3Kyv/RZmRX4iaBavru7/daCtC/YW0IPfGcg+wLCe+5mRJhPUTio+oyeg== X-Received: by 2002:a17:902:e5d2:b0:21f:ba77:c45e with SMTP id d9443c01a7336-225e0b194c2mr57083025ad.45.1741988430991; Fri, 14 Mar 2025 14:40:30 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:30 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:43 -0700 Subject: [PATCH v12 24/28] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-24-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 1D705140008 X-Stat-Signature: 555343fox7hdexfngnymimgw5f5ukr9e X-Rspamd-Server: rspam06 X-HE-Tag: 1741988431-824029 X-HE-Meta: U2FsdGVkX1/0uIAjYBHQcxvTIPKb+BVNKpk9ROtf2R/YQ+rjFwEqwySTUOJhRDt1U6cC89EUH1lR4U4vA8KR5W3a4FD6dlU2vq8wbhAC/wjjW9qH4ti1TtlismdFBMLSGC9soCEOqSprtEC/m8htTJDQTxsrPe7T38SHWdFb+H6/zxOj2Cv3gHQwTBZf7GAhH2HDyNRtAua9ciUTzFfutJryzRWryGWn+La9wOB5Ezqi3HNSmvRSzO8CdZX8PSLmcOGG4HjpASwhn9oL16oCGAFi4nmnzIr8YYadfS+D3szJWX47G4wj/YmZTrBvQzHAjOvUjQC0K2YtUtEdF05dJinkmDl8Z3QKMZX+1axFKxzhMwXgLypdZdURSCYYJfg3SGwT8JD2lZhemKm7r4ylMMZEyfRQuSocdlQkHdtQ9mDBbO5L9udJW0LOTbT7q3nssMB8+aQGmVjv6TDuMtKNMg566krx7oZitGJXiCk0G0xQhHbSYryJu137fD6ye61QrwpZQMeRAU7RP1P3LCSZAOBW8tSBcIDiUS86XJjgOO8bBqwM6JTS193seOaEktFwKhYViuFyrLjuost3dYshIMQ85fMuUJyPmaJzEY155EyE+oN/pfkgVoOLBqDtG0ZkKCDh7aoilxtK2BgxaEOvLPAiO1ME83qzNOrakbfzHJI7WFpTkldgYf4h4vrS3As5qb5F1cE8CExCXBQSw4vDgXXgdF4bWO2dGRXqx5OvKn2+JPoSGzM8KTtsJ+LHyRAdYyrhKHGijXlD5YaxSDX9bR3X7Ev58JGmdHtUQL+1eWXiq4UWUVXdyLkvhKdjvTSsSRD3enyQkfGfrhk1Aoztbw5EaD/2gBMa3+p0ffLe7oVH64p4qOEs/eDzo9eaPv3foaJSAt7PDBL9JGbHaNdO2s9zSIMLSqyGMTy0ZrnksRvZKaw9xjFlHffamI85M1pwhhDQxD9V4cRFDfIvVHK I9Fspa6x S+RcnxlmoRaau24+Ast6CxYC20flTdmWsCnMpBQZKDDUZAuY2f4KYBEgKgwQ5NaxsamEPlaDrtsLwjz5w+PtQGWMVRUSz0u9kKN6pkgVPQGl6ErgfYTOQ+LEaxPuw1ePo0auCLCSoU6rlAQZ4wP7OSAzc1zL6YZaFU0Yr6i3NacuOmAeSBESr94COJY/kTGoYdtOmD/WylTkwPUWBYAnGn/iCl9M55ybpgc8OQyjMYVMt2YQT/Oikejhn3hojJDWx0KSW15AUkcreoFn9B+ijFcQufmfkbuMlPFg3xYem2yGuPyKxIjhkW3h3kKc9eGZ83/6g7RoeX7uifGHiwQn3xRckGRyzQsC+DFFSt+dOGD7WMf2Pm6FCCe08tctM3kVyZH4uTVhWE1FKe2omgPhkrgfZkHyR5/jiNNca0FOYR43UOOev6Dm0L0qW9YXOieeebuJTcwgq1npYo9SIT/uNMJKQHxBSpjLbynBXmSm+UbveDzE6hbA5hVV9rYlTrPBfQ563m5sGtTgqwYU= 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 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 + # 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