From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 943DF1FBE8B for ; Fri, 25 Jul 2025 14:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753453426; cv=none; b=tH1b8R8xQp+ay32od8424C9vO/pQNc+C6fi0xnqSNIUF1ho9G8Xs67rwvqejjsVEfZYbS2bTxfyFTwrQ5g3E6qjGdW0+zwixmWgU+4zSsd2XefK1AMyfmUDkoddZTnV2HFxnPX3gSrIwSbFat9R0Ap63Vtz7mn+0YS/tM3y7e/8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753453426; c=relaxed/simple; bh=jkFPROj39Gfs7ADWXQKZaWodssEllSDMoBNzseIfGr8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=V0zZgaIL4DyuR+2tDo1NiOZ5mpu6YWIGTPXqk5r0GN6kHGJjMmHtzQvGQkHIQLEFcFotjPJwMLHTpyFD8PHcvy2fw0Sc1QUXkMB73d+i5Jg1f1BpwslgEJdO7cgIvSGIUYCS2Y38377Eth20HPA9hRwfe2VcjGeYAgFyHfa3U+I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=UiZK0K7r; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="UiZK0K7r" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-236377f00a1so19738615ad.3 for ; Fri, 25 Jul 2025 07:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1753453423; x=1754058223; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=gskfuFSjcZ1f9NqzVyfbU+2SXj6gH6Vy4UjfTOJinxk=; b=UiZK0K7rwmWij3TIsldbg2RU0jaELX0ks0TsuWi9XoT1NTwaEyJXXcWWDZgzkZdUTV EEnimWIq3tCc+AudrMT/jjnirmNTlxn2plWyAtNz3a7AQAVkj1hXBT/ML3yuDHjpqfQL OLxUQ0JfxkfyzzAVHfUUYxADZnbEGacPKdlXP7wcQLQZkhrH3vlS4Z5c0xbuESvdiYnL otexsbr5oQqm2tqN2tmnCSGidKXf5K55/wYthZAHApzUc8yigF9NQul5SKQ/gSDdprIV G3mP2TkiyqAzGDNPcedg0KrtcZB3zR1pnG7NWEdcz5NRznUBZpbDseObWOTvAtdLpVaN AB2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753453423; x=1754058223; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gskfuFSjcZ1f9NqzVyfbU+2SXj6gH6Vy4UjfTOJinxk=; b=EIYCcEXz76CRE25nDZjlXNYJE1nujeXVFwlIIaEXlpgL34Qmc04Pq36sthWvLx8QnE S1yW0kCHpxjkiMPL/bu10KpCRRrZlQb9XAdHHXffy8oDSBHjqJD45QAleTwmt9HqPiB4 0IvJB0jC2hZq13c2b8QOFRGtHR3hbVd6Qhbz6uGl912k9Fxny5WBFWisZlB7tV9kUR0K /POPosR/Dw/2YqbfEdq8VGar5Bp2bOdGdpr6nQgMEcSomzOinc27H3e71OADXjyFipkp iP6u+s/9SuOOjdFlkqhS7rsxYO1KZ+OxsMWeuRtxp1SIBTSiWg/fwrTTqr0/10YYotCO t4lg== X-Forwarded-Encrypted: i=1; AJvYcCXwZVbkzuMaPp1cIo1xgSorYi1wxW+cfmIdsr6g9hZoMUfDmxUFBKiqdBfm9s4SFxnzqVU832UVMA5T58o=@vger.kernel.org X-Gm-Message-State: AOJu0Ywi8xgoy4sl5NseUOWWIKOw+1nBz/sAKojaIA+qRLk1FusjWuhO Fea8ncHcNTXus36ynjCVALs/fdF8dJDOe1UBbsAcQ0hp1fZhdi0d4NafDGMUhEHvbII= X-Gm-Gg: ASbGncus5xZu3EzRwjQtaQXAzlsVFKqusnKigX8ks2+M06W7i+HaL5Pin4ZuszgmBpH BQRGHyCeHeFBI9px22hhT2PHiINjLB8j/J79SRBLq1cXE/H5Z9vy0MBBu77WK37r+tnihqSVn3I zIVeBBb6VFPguFIF/Sv/C4CdkuMcKs/3jsfSaSVGRws4HzBymFofTG5ikqhTVsLDWaJ7SMkrYo7 qvTaCnFDnqVQROsYfpMtWXeBQMwUj+DI9IN6DOyObKkEDssoQmzDg1TEIApLT4TjIlrysHk35l/ 6Ti289S8X5e0cy60akVxTSxWD2ELLA3Osk/aXYfQqSOzjy4kLn7LgDvpUV4QDCpDEL3GdfaVoFU Hfq+PfoBMDpYIjiPhJADvcgARpKZkBPDh X-Google-Smtp-Source: AGHT+IHRz5CbRE8i2UjdGDZpkxqOW3JD/QQJLFQFs49c4cRaClHO120ReCkQeIjI0YUgC/xMTK32oQ== X-Received: by 2002:a17:902:f252:b0:234:ed31:fc94 with SMTP id d9443c01a7336-23fb30bb5edmr15941955ad.26.1753453422841; Fri, 25 Jul 2025 07:23:42 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23fb3f2a5a8sm13203045ad.94.2025.07.25.07.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 07:23:42 -0700 (PDT) Date: Fri, 25 Jul 2025 07:23:38 -0700 From: Deepak Gupta To: Heinrich Schuchardt Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, rick.p.edgecombe@intel.com, broonie@kernel.org, cleger@rivosinc.com, samitolvanen@google.com, apatel@ventanamicro.com, ajones@ventanamicro.com, conor.dooley@microchip.com, charlie@rivosinc.com, samuel.holland@sifive.com, bjorn@rivosinc.com, fweimer@redhat.com, jeffreyalaw@gmail.com, andrew@sifive.com, ved@rivosinc.com, Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Nick Desaulniers , Bill Wendling , Monk Chiang , Kito Cheng , Justin Stitt Subject: Re: [PATCH 11/11] riscv: Kconfig & Makefile for riscv kernel control flow integrity Message-ID: References: <20250724-riscv_kcfi-v1-0-04b8fa44c98c@rivosinc.com> <20250724-riscv_kcfi-v1-11-04b8fa44c98c@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: On Fri, Jul 25, 2025 at 01:26:44PM +0200, Heinrich Schuchardt wrote: >On 25.07.25 01:37, Deepak Gupta wrote: >>Defines `CONFIG_RISCV_KERNEL_CFI` and selects SHADOW_CALL_STACK >>and ARCH_HAS_KERNEL_SHADOW_STACK both so that zicfiss can be wired up. >> >>Makefile checks if CONFIG_RISCV_KERNEL_CFI is enabled, then light >>up zicfiss and zicfilp compiler flags. CONFIG_RISCV_KERNEL_CFI is >>dependent on CONFIG_RISCV_USER_CFI. There is no reason for user to >>not select support for user cfi while enabling for kernel. >> >>compat vdso don't need fcf-protection (toolchain lacks support). >> >>Signed-off-by: Deepak Gupta >>--- >> arch/riscv/Kconfig | 37 +++++++++++++++++++++++++++++++++- >> arch/riscv/Makefile | 8 ++++++++ >> arch/riscv/kernel/compat_vdso/Makefile | 2 +- >> arch/riscv/kernel/vdso/Makefile | 2 +- >> 4 files changed, 46 insertions(+), 3 deletions(-) >> >>diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >>index 385c3d93e378..305ba5787f74 100644 >>--- a/arch/riscv/Kconfig >>+++ b/arch/riscv/Kconfig >>@@ -245,7 +245,7 @@ config GCC_SUPPORTS_DYNAMIC_FTRACE >> depends on CC_HAS_MIN_FUNCTION_ALIGNMENT || !RISCV_ISA_C >> config HAVE_SHADOW_CALL_STACK >>- def_bool $(cc-option,-fsanitize=shadow-call-stack) >>+ def_bool $(cc-option,-fsanitize=shadow-call-stack) || $(cc-option,-mabi=lp64 -march=rv64ima_zicfilp_zicfiss) >> # https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a484e843e6eeb51f0cb7b8819e50da6d2444d769 >> depends on $(ld-option,--no-relax-gp) >>@@ -864,6 +864,16 @@ config RISCV_ISA_ZICBOP >> If you don't know what to do here, say Y. >>+config TOOLCHAIN_HAS_ZICFILP >>+ bool >>+ default y >>+ depends on 64BIT && $(cc-option,-mabi=lp64 -march=rv64ima_zicfilp) >>+ >>+config TOOLCHAIN_HAS_ZICFISS >>+ bool >>+ default y >>+ depends on 64BIT && $(cc-option,-mabi=lp64 -march=rv64ima_zicfiss) >>+ >> config TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI >> def_bool y >> # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=aed44286efa8ae8717a77d94b51ac3614e2ca6dc >>@@ -1182,6 +1192,31 @@ config RISCV_USER_CFI >> space does not get protection "for free". >> default n. >>+config RISCV_KERNEL_CFI >>+ def_bool n >>+ bool "hw assisted riscv kernel control flow integrity (kcfi)" >>+ depends on 64BIT && $(cc-option,-mabi=lp64 -march=rv64ima_zicfilp_zicfiss) >>+ depends on RISCV_USER_CFI >>+ select ARCH_SUPPORTS_SHADOW_CALL_STACK >>+ select SHADOW_CALL_STACK >>+ select ARCH_HAS_KERNEL_SHADOW_STACK >>+ help >>+ Provides CPU assisted control flow integrity to for riscv kernel. >>+ Control flow integrity is provided by implementing shadow stack for >>+ backward edge and indirect branch tracking for forward edge. Shadow >>+ stack protection is a hardware feature that detects function return >>+ address corruption. This helps mitigate ROP attacks. RISCV_KERNEL_CFI >>+ selects CONFIG_SHADOW_CALL_STACK which uses software based shadow >>+ stack but is unprotected against stray writes. Selecting RISCV_KERNEL_CFI >>+ will select CONFIG_DYNAMIC_SCS and will enable hardware assisted shadow >>+ stack protection against stray writes. > >Please, consider adding a blank line for better readability. Noted. Will do. > >>+ Indirect branch tracking enforces that all indirect branches must land >>+ on a landing pad instruction else CPU will fault. This enables forward >>+ control flow (call/jmp) protection in kernel and restricts all indirect >>+ call or jump in kernel to a landing pad instruction which mostly likely >>+ will be start of the function. >>+ default n > >For Linux distributions it is important that the same kernel can run >both on hardware both with and without CFI support. The description >provided does not help to understand if RISCV_KERNEL_CFI=y will result >in such a kernel. Please, enumerate the minimum set of extensions >needed for supporting a kernel built with RISCV_KERNEL_CFI=y. I guess >this will at least include Zimop. Yes, it is expected anyone selecting this config is going to take this kernel to a RVA23 hardware. RVA23 mandates zimop and thus shouldn't be an issue on such a hardware. Anyone selecting this config and trying to run this kernel on hardware prior to RVA23 will run into issues. I can add a comment here to highlight that. I assume you wanted that awareness and goal is not maintain compat of same kernel between RVA20 and RVA23 hardware, right? > >Best regards > >Heinrich > >>+ >> endmenu # "Kernel features" >> menu "Boot options" >>diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile >>index 7128df832b28..6ef30a3d2bc4 100644 >>--- a/arch/riscv/Makefile >>+++ b/arch/riscv/Makefile >>@@ -61,8 +61,10 @@ else ifeq ($(CONFIG_LTO_CLANG),y) >> endif >> ifeq ($(CONFIG_SHADOW_CALL_STACK),y) >>+ifndef CONFIG_ARCH_HAS_KERNEL_SHADOW_STACK >> KBUILD_LDFLAGS += --no-relax-gp >> endif >>+endif >> # ISA string setting >> riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima >>@@ -91,6 +93,12 @@ 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 >>+ifeq ($(CONFIG_RISCV_KERNEL_CFI),y) >>+riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZICFILP) := $(riscv-march-y)_zicfilp >>+riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZICFISS) := $(riscv-march-y)_zicfiss >>+KBUILD_CFLAGS += -fcf-protection=full >>+KBUILD_AFLAGS += -fcf-protection=full >>+endif >> # 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 += $(KBUILD_BASE_ISA) >>diff --git a/arch/riscv/kernel/compat_vdso/Makefile b/arch/riscv/kernel/compat_vdso/Makefile >>index 24e37d1ef7ec..552131bc34d7 100644 >>--- a/arch/riscv/kernel/compat_vdso/Makefile >>+++ b/arch/riscv/kernel/compat_vdso/Makefile >>@@ -69,4 +69,4 @@ quiet_cmd_compat_vdsold = VDSOLD $@ >> # actual build commands >> quiet_cmd_compat_vdsoas = VDSOAS $@ >>- cmd_compat_vdsoas = $(COMPAT_CC) $(a_flags) $(COMPAT_CC_FLAGS) -c -o $@ $< >>+ cmd_compat_vdsoas = $(COMPAT_CC) $(filter-out -fcf-protection=full, $(a_flags)) $(COMPAT_CC_FLAGS) -c -o $@ $< >>diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile >>index 2b528d82fa7d..7b1446b63ebc 100644 >>--- a/arch/riscv/kernel/vdso/Makefile >>+++ b/arch/riscv/kernel/vdso/Makefile >>@@ -17,7 +17,7 @@ ifdef CONFIG_VDSO_GETRANDOM >> vdso-syms += getrandom >> endif >>-ifdef CONFIG_RISCV_USER_CFI >>+ifneq ($(CONFIG_RISCV_USER_CFI), $(CONFIG_RISCV_KERNEL_CFI)) >> CFI_MARCH = _zicfilp_zicfiss >> CFI_FULL = -fcf-protection=full >> endif >> >