From patchwork Mon Mar 10 14:52:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010213 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 0F10CC282EC for ; Mon, 10 Mar 2025 14:53:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3243E28001E; Mon, 10 Mar 2025 10:53:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 28B06280017; Mon, 10 Mar 2025 10:53:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B18D28001E; Mon, 10 Mar 2025 10:53:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DEF38280017 for ; Mon, 10 Mar 2025 10:53:31 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 60EDBB877E for ; Mon, 10 Mar 2025 14:53:32 +0000 (UTC) X-FDA: 83205935064.28.D28FA10 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf14.hostedemail.com (Postfix) with ESMTP id 23178100011 for ; Mon, 10 Mar 2025 14:53:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eUCri1oR; dmarc=none; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618410; a=rsa-sha256; cv=none; b=gAnzJqiW7WfQT/42LxhzaeJuY7OuAguD3n/wnPwTIz1FEypEWlQO2GhPxCSFgrTBrQ4oY6 WANQipHCagXjrFDE6iotdt1ndii1dd74kpxV6OXFWaNqerDsANtGIUubdKBBGleUdiOp6X TCnhqjBtz1tRI0nmj3ck6mOJRq+g9Pg= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eUCri1oR; dmarc=none; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1741618410; 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=U5ByeyW+YvFTHyUcGUYHAQSBVf/eKXKcnHA82UZlOkk=; b=BdhQ3yzekWC+Dk1tj1vhRSgENiBGmlFObda5PO7aQFCTeS+Bc6dXhzuZNekHzDYv0GIvkI spxzFH+OUMHw09z8fBZ8ANAIN6HaFV3N3yAkWJwhrvX1QZIBnA7EHtPKb55e5Va/UL5Tlt +HBmW70A+v51CtyFsIKrpFOcYY90B1c= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22337bc9ac3so82666305ad.1 for ; Mon, 10 Mar 2025 07:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618409; x=1742223209; 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=U5ByeyW+YvFTHyUcGUYHAQSBVf/eKXKcnHA82UZlOkk=; b=eUCri1oRlVQ2NWbGrWCAbEtlYKeIHciTmBjuQZSqipR8XmmTT2cSxxtDBSHA5tjwoU A6hRZ28HKmqWa4EW8D/p+4M6QRRgWVzOooiGa5A0rKifQhUaQPP7aVpIPoulS5+ezsT6 s4JcRfwmy/9cqmWEzueA0tWCfAYdc3VWlpoGsJ1fKoAkNWkEPUjQor9xAm5xhnSLPqjT 5YsyCMXWAX1UvH6PWX/evJLsCJ/z8oS/AIrug820L+dm5yyk/GC1Mhwkg/CtpkH5+1Bj HjeQskyET9HPCaikMr7dDxJFMEho+f7RE9AeUt0HBiJZPYDs8DdeqIRdboHi/GXeemr3 3c5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618409; x=1742223209; 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=U5ByeyW+YvFTHyUcGUYHAQSBVf/eKXKcnHA82UZlOkk=; b=XM1cMCw+LYS9sv1XLtawGqkPu53tJK/lUWpZ06aWXxYDs9/9Lxh5EYK79rXzLEzVOr ifDhRBxjWfiWK0EgHPGhwR+M99vwHKgnY8EQ52/1ox3MpIznKp+s17QuAicZEgz4x1/R eOMtWqWoNF69rYECGjlQKd8WkhHfs701Q4YqxqFA3eAtSaGcQTwQxDhAegXVOgqrK4lA XcunyfDZclpomIl4myiR8wuPq65e4+cu3JobgZV+nb5BKVN70Ps1+TZAxVIWiQFMLaPL nJXxxhHzuylSk0SPofE+dtOXZoNfxOGpVI8I9F4uEslx1mYBnrX/dxsMc/FmZ75Eezxy Y6eA== X-Forwarded-Encrypted: i=1; AJvYcCWn0p4vyn8XnsN8yOjUvHzh1dw/uQK2WITBKBodItCs8IiYhBb/RY2kk7cXYMSSgUXWWOO/9MtSHA==@kvack.org X-Gm-Message-State: AOJu0YwY3+ksYvlk3I0PWHwjrkcHzg2BUXu9xeCUjXbJHalH/9FZNS/s BCditgBdP3dtlf9MpNp5d4DOrbT6/GA0/VybPGBn4Qi1eJXexXah5ord6dIrqPI= X-Gm-Gg: ASbGnctkycU0I8ijwN//kdyOFftEIxcKUQSH3U2PMfGN83F/k92vBsUdZZzaYs5eFjc BHhDH3cFSrtRe4Kqs/2gnvYxqvS2t1SV7CqyVHY9F7hZIGtQ+C8LaqmV12yhMV8hmL1cl/MSO08 DYg5vgmH0NPdloPxCWTN/+/sBCrHVxznypl9k0ZcGnJJ8uGH8IY7SdVjh9U+5fsUFasdmDpk70n nyN+WJUDAhMn0sRw/spPKmXGDhsteuIGvUJ6+pyHfEKnkBCuBz5iMMePjEZdYSRYNEYMAqzCdIp F3IeQGBAz1TcGGi8wEXPb4zk0/V5M8BVnEGoAt/oy/So50IU43tsXQA= X-Google-Smtp-Source: AGHT+IGKXHgNMuKPuSz9mbzSVY6kbhzly1ukgPS10UZrRIAfMtlVXU0y2E7jj8WGEeH+e3hYVRFUmw== X-Received: by 2002:a05:6a00:10d5:b0:736:47a5:e268 with SMTP id d2e1a72fcca58-736eb7b363bmr272521b3a.1.1741618408950; Mon, 10 Mar 2025 07:53:28 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:28 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:45 -0700 Subject: [PATCH v11 23/27] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-23-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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: 23178100011 X-Stat-Signature: gd31x7hphxtwp4s3c6pwr3mckwuyotf3 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1741618409-562650 X-HE-Meta: U2FsdGVkX1+jOBofCrpu+H53mdlNg7C8eraIk4tlwZNgOQTJofd5FHi6f0gV4mTodCy4G+O8ZGGFaNybj3tXldADOdpc6M1i5vhZU9cCx46WJrk3l3kE9av3XummG9qmnOkguKXjqa9VjZadV+dPi7ej7HWAsuR+bSp7eZFqEWRDeoDc482mDgQcwRqmSU7NndzS5zjbuKWuXyDkuBexVWddtqaw1IbO2/l4lA7qfqZwGh2SEkS3Ulxt2iP7ps9yOz5FzO/96G/grHU7CM3UCOaveKMkDNy+Q1945tjZ1Wzkm04sKgI4x3xQTG5p5sWfVYDMuVmTkznt4fRNIEJ0pc8b7ms5EMPZsYkruj+nnnefUffiiqvScec2L9OCfavpXZofsG4BWvqeAZwA7+j+Rfih4X1C2TQTZipGp5/L8eY7MWwueYn7P/eZloMuFCiT1dKaOjax/wgOzm686VVOQcXzPZ41gO5qeFvXCmXqZsEDC1/60rrjTXNOzhK1vRvgChU+HoKTgK9R3+HqkeYqIOCmugl0SItZom92fRDD3J39chP979FFCR2n7W69AEhSeLBe9giLWAetWfT5jwO1yKkjWwvOCWQG2brEgM+CAf5Y2MCPDTB6IizgFWLIjkhWrj2bT2QMFfpoa/VPC/66F+A9TncZ1U3yJAbcllZuH2Ik1tSGNinYSzFdYCU0EUsHlcSI0DtG+ZwowbHuymj0+vTmSYUCrBONAjWbd+fg2B5IJQtMmnW83jIHzBWydNcgtHQGo4Mpb7HBXp71dZTJeRZx3yVFN5nuyQ16y4Czug+65cijAWWj5GR3MuSICH2Yi7XW6WulURlVeZYl+vjyzDkPDpnn1CrfOLumwqJpO6kPcRkcH3UmYTiv7UTWFQFZazGa5i41C3F7KVKdRtz6pGj7DSxw91JPYBiQCRSLkNfgogebKmVsJ3OW0xw3Ii14Ne9yL6Y32NjebVLg1Aq bFoWozb5 TasoF18SsqQCbdH4YPtip7ZZxrHWXFAXielcQOHhDxkwnmKsaWwI1LsNHkyLVVeKQvwZyAjhJ29RRXu1ujuyyfjR3RaVAlab26NMNENF7Haz+ZFpPG86bNyK4ph78Mh2bt3JgeDo8l0fWNfqn3G2ZkyMS5zZhyaqnx6EKQfwNWN4H2eQ7BCGFqE0YRiI7ZPRmyHoHjC6sRqa0aktQmKyAyWL5FDxnSa3Z+w6Ht42JqdRKSnv53tnwuUzNRugF3/K1rtV8QhQG0rtH1hMy6aKI4VlqJWGAc4wxBhWtDGnbnfgrWgWApUQiY9FTHKYEcmIhr/JVxUWbetMa62MECMEW7q5IRfkVMm9xiPkRf0sf2KB/c65JaB1lChR+U9EZa93lv63x0iR2pdNjLZLzL64LC5Ut2bnLombSdCVBzSR12lHZbWrdmMUXXSSMnaOz6wNESTo6vjH4cd3AdOITUzQk2HIWuXlX7wAc9T++zJoTNnGwKPQA/IQA0biz24uMULbdrJcwwrxykIHd8XQ= 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 | 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, 78 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..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