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 B2F4DC83F1A for ; Fri, 11 Jul 2025 19:47:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 517106B00C7; Fri, 11 Jul 2025 15:47:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C5D36B00C8; Fri, 11 Jul 2025 15:47:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 38E486B00C9; Fri, 11 Jul 2025 15:47:28 -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 1CECD6B00C7 for ; Fri, 11 Jul 2025 15:47:28 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E1B88C07F9 for ; Fri, 11 Jul 2025 19:47:27 +0000 (UTC) X-FDA: 83653018134.01.A0934DE Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf14.hostedemail.com (Postfix) with ESMTP id C4948100006 for ; Fri, 11 Jul 2025 19:47:25 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=M5YHS4vL; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.171 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=1752263245; 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=wpLyoJ1ezhvR/CSc9LCArL2cYjkaZ3pfjGPey00rFYA=; b=3Ympv1a135YSHaavVtDZ5Nj8G3sqjbzXaIKAgU03936hOM4c10m5jiWphkeQA8sFTmXgEO zb1q2tnJOqv/XP+erpmxpLIpyLGxmDM9f2sxrFW2MsCMZdfRMhfEArRX94NGG++LYTtJtV oaTHFKyzIUgpFWDvFhViDeeB0/4Z/SI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=M5YHS4vL; spf=pass (imf14.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752263245; a=rsa-sha256; cv=none; b=RVJCqfKEwEg2sA5XIcVBs3h5WIL6WmboIfR/FVjKIF32tcdtXhQdNPCZlOd62sn31IZtgb ZHSNKYF9lmOb68PzmERg0ydhDJjxLA+lUiDrJVGLRDd1DHHyWMVc0KCG/deXRP3cB+0gnH y/1mFbKWE3xz6m/WnAUdIVO+AJeIsBU= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-74b54af901bso1692080b3a.2 for ; Fri, 11 Jul 2025 12:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1752263245; x=1752868045; 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=wpLyoJ1ezhvR/CSc9LCArL2cYjkaZ3pfjGPey00rFYA=; b=M5YHS4vL8eXHs2mt2ggIBtRWt/uMvWcOvg/Qvvk8IwswolPX82AUdXCZSyEgqQa+m1 9bJi0EmkusD6UT/NCGsfXb4mGMeW8iVRxjFW+yajie6MVq3Gi3pYJ5pJgJa7/KwXUR4a x0ALMkqOswKYVtXJjlQGbivabWz/DVB2E9PsnABcpIeDWv2GybYgjIgK0E/KnDw55HHe jecF2PdoTa5+k2iYVmdysvtnf2syujOzjs0ybx/9tRcrJb/cIn+CPnfh6xcHpJyH8Bz0 vnN2PKH8Q7FiHK2efZc4oqdfABdvD/qgvDGrRGzGON2tqcbxkL3ArU3q7PKdmAbUG2lK fwTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752263245; x=1752868045; 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=wpLyoJ1ezhvR/CSc9LCArL2cYjkaZ3pfjGPey00rFYA=; b=U2rAzoKQQEAJ66ZhUo03KER6y5AjBAN8EH0CEY6w+uby4ag//Kh+pQkfOSEZxGOSPN hbrp/XwdoAojC+zJHUMjoiDMH5gJ+LX0Xsdbo22KwCkwD5fg7IK2B8PlJ+1KSkDE/gB9 z6uNoFNqDnR8l7/gTfVFBfuALYlwCyJjSCmHoFq2oq5srPxGvZpMoHQDLK3cOlz686jz kD9rk0mAjQAvjNTdHAp5CDi+c0BHZfJqOE+Uc1/WuWEANYLPr7FFUAzfolnlZ4eUM+gh 2Hx2aaw5RO7rLe8V+YvzM8zE6GDAQeCpSeOhcKWHRnG5bTsMskENWYRFWiBzcfoQLDcy xtyA== X-Forwarded-Encrypted: i=1; AJvYcCWue7imQL/L3WYo8mduQLCODOgjCTRKcfXendf9BHr7H1J4k+XuWkPwPv1Y7AuZCWdchPaPdWg65g==@kvack.org X-Gm-Message-State: AOJu0YzMoz49EsCCGDz7ieNtxF3VJTSRsSxVFZMjPXWnE9IyeWT3pUC0 wPAxga4OwDS5AOqdjZ8glJC5XcT/TH0VXnFVWNioO0N/2PPmWImF9JNASkaTwO2AuXY= X-Gm-Gg: ASbGnctNDL7u1mdrswVbzMXwdQ6znXxxDn43XQj4RVvbc4uk0v21xI0uAiP8bb1wcLI eSdqLcQ++GTcP9oXmIFMyKJLeV0bOa66xXpe4LA10imTgl0CyH2x44RubmEIv+HT2cHrMUT5vvx iDHtoEbqXHIL4aEjkeUeDjqv8JeWxCom0yP7DjCpViPxa6VM5qd4zHIsT/eqDo4zFy7xWYQEurH BkXFt1bAt3vM48KbP4C5RPKfvgx/jOfyj0DwIEhEX5xdnhHODSGdwrjKcEZl/R4SgmeChVeHbAr YotkxHtrmvsiU+n49LRanjliI5p2Y1BBpChqJuwANQaNFdsfIuyJxrOalV9e4Bvta33GSf2K+cl AY35XdSvZWHlXw7IpvurzAPZNsJ1aPKQC X-Google-Smtp-Source: AGHT+IFg5oRh2xLxUMPhwOTnG8qYP91hX5IaImXWl6aLzzHsNQPlitd9c9f0gvoYHch1LN/uOkmnOg== X-Received: by 2002:a05:6a00:1304:b0:73e:2d7a:8fc0 with SMTP id d2e1a72fcca58-74ee05abc06mr5972204b3a.1.1752263244378; Fri, 11 Jul 2025 12:47:24 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9e06995sm5840977b3a.38.2025.07.11.12.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 12:47:23 -0700 (PDT) From: Deepak Gupta Date: Fri, 11 Jul 2025 12:46:28 -0700 Subject: [PATCH v18 23/27] arch/riscv: compile vdso with landing pad and shadow stack note MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250711-v5_user_cfi_series-v18-23-a8ee62f9f38e@rivosinc.com> References: <20250711-v5_user_cfi_series-v18-0-a8ee62f9f38e@rivosinc.com> In-Reply-To: <20250711-v5_user_cfi_series-v18-0-a8ee62f9f38e@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?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Benno Lossin 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: rspam10 X-Rspamd-Queue-Id: C4948100006 X-Stat-Signature: my9c8eomgbnme4dkmkri5eg3o5oik6rq X-Rspam-User: X-HE-Tag: 1752263245-223380 X-HE-Meta: U2FsdGVkX19vo2VVdiA+8SXDe4TMD7oNdEaR1jyyLg9X4MZ/zOyJZQ6FuWYC+f/LXkbFrrS6To9NSKn3sWVXLh4x2B1fEOGFeDwYAyJ3Ad4zle43zxyPBKDao/cjNG2DZ1l5v6ky2cyUtVr6GdLb27QeWS3sXKI49NZ8XWp7bKfaajznrFw1Z68oK6xDKvSH49aMX8oT+vSqzF/2nUEFfjhzeI170Y+Vm8ELOI8Bx6k0CC7iEkL9L8RIpOm0C66zuQSNR4esadDtIbYIfwzX6XMKE6XncOXGuTC8gGFYqHugjjZCSaHKA5SdEZfDDocaOsJ8026WCUkovs/krOGC5+aL19hQKMDC/EqFw/rrDFOm7lyg2TDVNh27ZoaxDvX9h7oLbg+Tm1vS3335XeA4s2QkVNiRPYFJfxI9h9ifgyJX2zQhge/bS3A6XgqmB1zJ1V72Lsf5NOfVIqHQBfjBVbQ+XX+5FXYNDq4PGF7Yxjm0CYIkmku2fT5IOiNjVOHEIBLL/lP0X/7H21YDvE7R1yPLfBplhJUiB9ivHoIE/6CiAz4MJtoEw6pV2iAND+3xOT0eEdHODZ7pzvMOwfkqOaugYhIrHPQ3E5Y4U1yJD5QGV+KhA/KKxFOdgq+IEW+ib1/8g366b/2/xlFLoe0jk0dOlvqZqlcKK75Rgpe3N4GFzwW8ZqeqmrLB8MqSYfZV5C2BHrWC2bI//mMqD91MHElw8LhCsjNoCeJdSc19EZseTtJ2oSylpuzxAaJmk4ew+bFHhLczkmaT9Bp6fGiY2o1lP7d5dR7PMt9GX++1zoHJwZRv5H2GERn+ZbC4UiQR7K4Z9X9j2DOnA+6MRFNtlsaP4wbpN/2ABAFibWUWJV7p3WAa2YqHF4v/HE0Og0nq3ut5i4nDcaXCdCPlu0kjOSph6CSgZn0HSg1W0T1M1Y71Q46/RhO24DMj97iNNQEcMzhh4mASOFjlz0ZtL2W hE4VXo+q z0ClwnWDnFnwSukhvvo6wCs9iSOmmcDrCtbpitPCBEXYgBiTiKg/B/UE9bwu+myU6fDTKw0tQG3/L8t4ds1X/7L4jUY0NZX4ssecHjV3hbD6yTgbLFe3jnVKtkOqNtdsmE3ZEXTv8GcLuZAjRrU1B+qJTExuwb9iBcpgGbzW+ZS8lCsZOBBW4LYO+9UdS6R2/AP/gS1sCQspaxemS6ZYWIuaSoHSJEB+GM/5PZDrZX1nC+huNI3rG7WsYzuPs0SZ4FIGY1+S/Biswtisn18wnIBXeluiKQ7WuMIsPyOLrwn+AtjL0HrRLK+4Sndw0fKi6ozeqhNb0OS3WWg1BnxpGbNHtPONgXu07hGXa7i2dKBb/FokZgS8ycD3n8TiOyPdWj9b2ozBgBfPml65kKxS1hIu/37CS73mvr20JMJLECTltmG/Lq+JzV4JnfBn20FiWzo4IyuNPojG/gzB66yYoA4uQNuoC+Uw/fOZIqTIPI6HvFIQVpw0YRRjn60Lz5YhQuLtFpIAKR7hOkBM= 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 | 11 +++++++- 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 +++ arch/riscv/kernel/vdso/vgetrandom-chacha.S | 5 +++- 8 files changed, 78 insertions(+), 3 deletions(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index df57654a615e..7128df832b28 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..49f31ec7d29f 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 | GNU_PROPERTY_RISCV_FEATURE_1_ZICFISS) +#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 9ebb5e590f93..2b528d82fa7d 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -17,6 +17,11 @@ ifdef CONFIG_VDSO_GETRANDOM vdso-syms += getrandom endif +ifdef CONFIG_RISCV_USER_CFI +CFI_MARCH = _zicfilp_zicfiss +CFI_FULL = -fcf-protection=full +endif + # Files to link into the vdso obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o @@ -27,6 +32,10 @@ endif ccflags-y := -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING ccflags-y += -fno-builtin +ccflags-y += $(KBUILD_BASE_ISA)$(CFI_MARCH) +ccflags-y += $(CFI_FULL) +asflags-y += $(KBUILD_BASE_ISA)$(CFI_MARCH) +asflags-y += $(CFI_FULL) ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) @@ -79,7 +88,7 @@ include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE # The DSO images are built using a special linker script # Make sure only to export the intended __vdso_xxx symbol offsets. quiet_cmd_vdsold_and_check = VDSOLD $@ - cmd_vdsold_and_check = $(LD) $(ld_flags) -T $(filter-out FORCE,$^) -o $@.tmp && \ + cmd_vdsold_and_check = $(LD) $(CFI_FULL) $(ld_flags) -T $(filter-out FORCE,$^) -o $@.tmp && \ $(OBJCOPY) $(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp $@ && \ rm $@.tmp && \ $(cmd_vdso_check) 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 diff --git a/arch/riscv/kernel/vdso/vgetrandom-chacha.S b/arch/riscv/kernel/vdso/vgetrandom-chacha.S index 5f0dad8f2373..916ab30a88f7 100644 --- a/arch/riscv/kernel/vdso/vgetrandom-chacha.S +++ b/arch/riscv/kernel/vdso/vgetrandom-chacha.S @@ -7,6 +7,7 @@ #include #include +#include .text @@ -74,7 +75,7 @@ SYM_FUNC_START(__arch_chacha20_blocks_nostack) #define _20 20, 20, 20, 20 #define _24 24, 24, 24, 24 #define _25 25, 25, 25, 25 - + vdso_lpad /* * The ABI requires s0-s9 saved. * This does not violate the stack-less requirement: no sensitive data @@ -247,3 +248,5 @@ SYM_FUNC_START(__arch_chacha20_blocks_nostack) ret SYM_FUNC_END(__arch_chacha20_blocks_nostack) + +emit_riscv_feature_1_and -- 2.43.0