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 9187FC54ED0 for ; Fri, 23 May 2025 05:32:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F3796B00BC; Fri, 23 May 2025 01:32:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A46D6B00BE; Fri, 23 May 2025 01:32:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16C546B00BF; Fri, 23 May 2025 01:32:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E88AD6B00BC for ; Fri, 23 May 2025 01:32:32 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A25CB1D4832 for ; Fri, 23 May 2025 05:32:32 +0000 (UTC) X-FDA: 83473052544.23.7447860 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf24.hostedemail.com (Postfix) with ESMTP id A25E518000F for ; Fri, 23 May 2025 05:32:30 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=EabZfbM9; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.170 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=1747978350; 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=H0Lpssa4FFZpcPHQwOt7vFOEiyyUWWrWhSwc1jf+7uw=; b=M+QfD4KETEh4AcEM8Qa7dalG5n2CLnmxD/mYx6NYDIZjT30QTo2RaeAp3NFAWYyr3eOFbs ROQZ6Ni+ykEdDWA632yCiBHvlE7ljPFGKuwS9aFw08WTSGMxhDig/OSmnto3BALiGN6ZTX dHEkUjT3UkqGdu73reITZqlQpyGWCEU= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=EabZfbM9; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978350; a=rsa-sha256; cv=none; b=n7K+dIRilJTJHWI9Q0Dk/hp6E82iGJFYMdvhzqt5tRoLy/S9cHIWshCbH02LnIszK0naxO ldMDei5vqJcJdWAC7RwawprEO3tH9RODv0AUmX2/nOYNSj/ZkP/6UQYknieMKZ5vJjS6fg 7ZUaNNRyeE232OV0TDZrEPs39VZqIUU= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-73972a54919so8011436b3a.3 for ; Thu, 22 May 2025 22:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978349; x=1748583149; 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=H0Lpssa4FFZpcPHQwOt7vFOEiyyUWWrWhSwc1jf+7uw=; b=EabZfbM91SVXlU9OkIYjDm6gCu5vQ3IbWzOd5SKY03y8dFgmSLfRZiufHBj/wX93Ew DLykcLjEZSx5pXNH2d7pP9NGy1uSbYFZz2W78Cp4L2zx4Pes8rbjoVVml9/wuxdeKEat fpuK7UXzG4PlD9bBvKXksSqkmE6iy2+3kWWn39trnrl6y23fcE79QHSspNmSTNWCyxn/ IZdUvLuFEDZT08Z9VVYZMmDAOVGenkcnK+gTKKHi0kDOBwu2MWVzSqSg3W1bM7G/rDxL /XYwH7ts8V1e5lmja0bzjvMGjjAcDHYpqIUYwVBQRNz2U7v2hXi5f6A8Uc4/Gt5W5paq SUhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978349; x=1748583149; 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=H0Lpssa4FFZpcPHQwOt7vFOEiyyUWWrWhSwc1jf+7uw=; b=e2DCWzobLKGfBuvKdnQEqjDyadqXaCSU+xUR/Q+Nh/H/7VZYr7MzVL33ltfkf1IPij +teKywytlJuJ7QRCmB8Yu6gMPyr0b+AlEOQonhTbdgh83vZ3WeiERhLudiISH1k0xTEe cyYOlATFN+kTE02zu4qfb/zVcNOE6Bm9M5UqbRKAKeOKOK8yfyu4w7PeVjIYPWTNszd4 5SELnXEll1lIss0E4zzife4UZIpAZJLDnahQtvzs1DD68ild9qYnyY5v6G2EwjSJtEKs mnrGF1q9KARExQ3koVzT2u3qFjiGvkgtaTbjfedN1jyAFxiuePY6PWAtpDh3YJK1Y1SG kShg== X-Forwarded-Encrypted: i=1; AJvYcCXHIvqdHOm2KjvGcQATw0dieJTOR0SMAZq5X8jiepT4z1SXbbXx4Ib8g2LTqO7KBflumHHnXM8JLA==@kvack.org X-Gm-Message-State: AOJu0Yyo+vhu8Fpv5xfchyFFbpT7x7HASO+TSZNqIwd+dZaxqh8OvJvO PTMt4KLwASvKw1Xiw1SwOBTDjtqT95VUPrNmnV29BOhyDqjeo2okPHLtsZz/plJkHoY= X-Gm-Gg: ASbGnctPMZutMkrDBlBZtiIfbNObejY9+0GqI7cS3Q4cQ14VGgDUx98YigqTfc5h5PA wkBDDz15gJ2jGl0CfdfxAVfcoZA+5SqvEIGa1Thw3Z5zJw0wRrhKG4X3TZomwtdOAieyvdZlU0Y bagl2gED6RqAX9mqd27t+hvTtvBhFcGYEmm8sLt2TlEK/OPh8W+tRMzskxpNz/CkQiqO+1CG4H6 iu04xP3rpwgBIq1Rpr0+oH+53TA0XyRdSpOqwGdpN/WFw0JZnYMjjQogCGK50B9uxa0MqFIyW5o UWsFw14JrAn7O3ZsrcLIh3nS288QlWciK4X5VsX2YM0M4VqpnmAABpqYzOrkRw33blXIn/lJ X-Google-Smtp-Source: AGHT+IECoHDXYdQ0ue3ImyrjoVbgaVlkOl3y0LwH+jgGS3NGJOWZ9OB51L0mYitXB0Ak/bfoWSju1Q== X-Received: by 2002:a05:6a00:c82:b0:742:a0c8:b5cd with SMTP id d2e1a72fcca58-745ed8f5ab8mr2519611b3a.19.1747978349392; Thu, 22 May 2025 22:32:29 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a982a0a4sm12474336b3a.101.2025.05.22.22.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:32:29 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:26 -0700 Subject: [PATCH v16 23/27] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250522-v5_user_cfi_series-v16-23-64f61a35eee7@rivosinc.com> References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> In-Reply-To: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@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 , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross 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, rust-for-linux@vger.kernel.org, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: A25E518000F X-Stat-Signature: ijjz6w9g8c4a1z7bppx6qhprboefpxbx X-Rspam-User: X-HE-Tag: 1747978350-990412 X-HE-Meta: U2FsdGVkX1/tjRn9Up9fwlDw4Ijz+y5K/coTSieIW1qYcVbayVRorPOSG1jC7xA3rHqKp2GBAVTZJN1xACMFnmjmL0rWqVxdEoiTpNeqWukjeO1OcvttAxpg7qDxBVdps3GRsZD8cCILxTdSoRIPwnP8rGpxmAfGM3dw5deyf0RBh6z+6+vUoay9HAEEglICNm4w79SRybUsVzLOPtPpX8HGERK4KVaoUN4p3rA1igTz7jBLywEyMpssYmXV5RR74rfnT7edgd62TNYJ7XxjwW4qOiIFOdo/+u4jiiy3CoVXrjfoTpyOa5jMp1EcQMUqwNogsl9obhZr6ovggZ/8YPG8rq9ZHJIMmlSyXVlGLK/EX2Z4DAM5+HSWthKm7BlxcdxgdlZDa/5tGIZEQsCgYSf22gl+xbf2FXfkoquSdWCZlrHiJE0GS648kENPN+8tZqwrIz2X4sHMqGdK/PkF1keGuAguzl595ATPrLFFaYeMsh98H/IAFOJkB1hvxoz2g7va9MsGj830E9RBwlDFSQf7l6eq3JER88w8rs8uHJbK1igjNOsaiiLv0MEkSmmNZAG8S8HOSEiTR22DyYcUcKzC7tS918KORQPLBjzXYKUC3zL8ne8+zb5oKM73igIaiGgn/InqwCnPitA+WCmpMK1cIC5wSshlAiwjpp+7W3o1cQoeVBFPzLziHkLYDiVu1c+LHAFkqegVnAQzo2XdT/v97UGg9L1Xx1Ia7+O5xDOgYr+DT2CbDnaC0U+f1cgQNiKmVdeEutrom28xeRUXpK1mUXofpGUTmvb43JyQVhjzHl2nUs09q+xCAiYSaIlyFNmV94cfaC7nXlj2aIl3FvrvLKbdSkAFL5or0O1gYJwlrv0QeXkcMof3y6EHXOd5NicIpwLY8I1jbGE8ZGXMHe6Pu9nqBVdCppaNYkKPTNKteWeo/MkAXaShoGPwFx1+46JwtpKIlb6hR2hH2sN 8AOf5Lsk oOUqzxbldnJwXH/pUwQSAEYZ4fb2RgmtPk3fFJm/z19vq3bNNj+43EVHv79xWz7ImLAu0zxyEexZhUIe0zbmoPifbSoawF5hgdVuB7W1KyVMX1z7LD6vyGb1EgCtu+6bzXxLVT3I0KZggrR8PCsO1ggwD1ZWhZRkroTRMTFPk+f0pqhNJjMy14FEENcIz4rZBszFC7ooDK8kWj2a23oWN15iiYoUxxmCx01nNQwYYerVDYc4TAkst/swnXjw8O6RvzN/06J3Pof9gZoTh26v1MDWf7MJhtGMdN/gY76zTF6kEcU97iKQHDIeu4MLvHQNe8ZH0tiAJAQA7W/vHONSRZ7je8VgCYIQGNbiy9jLz87Vaw5ue7t0pwqYVIOvOqxbha4HSi26+WSzpfgd5iMjmPRqrnGmp+/brLwdg6MIEPKREN25fa5fu/mH+UjvYfTFIo0Skb2RjtZ95LjtBiSAa+b3wa8k0U29bKrYKZrTMOk742czcyqYiBA/JJjPhahwhGTJAIg+nCMtD6H4= 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 | 6 +++++ 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, 70 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 539d2aef5cab..c2dd09bb9db3 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 ad73607abc28..441c5431d27e 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_zicfiss -fcf-protection=full +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) 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 -- 2.43.0