From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 2122E36A34D for ; Wed, 1 Jul 2026 02:08:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782871715; cv=none; b=TZn9TRpV+vOMWy6KatkyHg3IQzLtTRdcyuJkvEzR+hf7WU3XuBwDCbTzEwthuf4xbqvc0XP6ZEQ9oGWtRndNWsjv8a/NnDKQhjgOUHd3KEr/cbxOCX/nNC58NdGf0nYFrvNZp23fhRqZS81oEseNwUJSn0Z0kNemTpS/RC+uduU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782871715; c=relaxed/simple; bh=Snq43EZiqkG/pdRD1SOZH5YvHYsezwtyIDqRKqEgFtk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mGUUBLgs/vOu34tN0axLmAx9U0yhn0TnY8Gc48/zFR+ubKwYvCRg6KwO7XsrZfuhwNxrP3mrQ2du89RZAbFicPPZOW3VR4VcOAQlgd/WiACYRunkR3XX2cbdpZkOIrChaw4WpFO/gp6wDnG9s4xRuj/WKkPD0Wh8zl8GrjDyxiI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q2+Qj1Dv; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q2+Qj1Dv" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2c74383c93cso931185ad.1 for ; Tue, 30 Jun 2026 19:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782871713; x=1783476513; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xNDnGLVvnD4tmjeYRO+s6FPAGzn4En+qXlh/M6ZOC2c=; b=Q2+Qj1DvLw7DQQ58cXouM5IdvhpgvmjYsx27kNpys89v//YajOzpenpSjw4T5B5+ra GmsoUVHyNVoslDcLOhPcPMVcGgpDCB7ECZq1dML7AWrjO+blG2p+Ofv/jVfFo98EnXO+ AWLKSeRJtCo5S0vzaQzqhY+9AqDdgw8aqeKzYyJ7Z7VNcJNdWH1fV40LUZhj0THFXi6L FY0jlDHv1E0SMo0zr3dmha/JGVaVld2WIoqduJ+YVdNzPjQbLHwP+wVQ1o7JIYEdl/Pv D7ooL1RpiCyXHzMsm/UwspxWKRtNqbOQrPmBf9W2Z5vywnogaUlC6bteWm42sSgKPymZ BD/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782871713; x=1783476513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xNDnGLVvnD4tmjeYRO+s6FPAGzn4En+qXlh/M6ZOC2c=; b=GQnrkKWdcBWjYQU8OaNV0DpV4GPL5Vugj0uNzfGSBICpTZhqnO04g/AFONFnfjZCxE iRS/fLnocnhzJuQtnNpzNHVmwPJZPM/XCf4SVTvq2lDXFgS75DjbVQeJxn/Wsh8hlZ7S CTDHlsZcTerUiirlIvh0XpRdUXTL69engY1Hia56sC5/PFjjm0Mdl3PRNPbj4dXJ/ble M9dM8hlHpNWH75DHdREPVw+qGMsuU5ng2v+yTjQ6c5F+yNFwvDBWzDJFB+m6uEJOVH99 Xfh6bWUYe6PZwOxpp0GkxfgTQrYTkDEdY70tq/or8lQu7fBGWdLM4D1tkfS1OMQW6+C1 8gqg== X-Forwarded-Encrypted: i=1; AFNElJ/j2hjosNmSWVSx1EvKO3pUyKvrJeREw2ngI7OrszDPavaMRD+ekZBzWVBW9bAH5sjf0mby/b1OdWZHNmo=@vger.kernel.org X-Gm-Message-State: AOJu0Ywz4FXMNvkX4uL+KSBMAQ8QMYbc+59gaGgEqHg+W3D4xEETwGDA usun+qH2AKkWPPMl1VGUttWE5kzTK2rVr/n3v6LXQnEIG6te8+59L7ub X-Gm-Gg: AfdE7cl1zsvAhy0DfgT0D8Rjqlr8wU307gd0nZYQcP+ttOTSs9xKs18NI2Stvroe555 fxSZGQoLClJrxtt9iIxG9ymeqRCMa8AC/gagf/0uJX9STpCe3kL5aJvHAPXvU4DFp6/AoiEqx6X WraJcUGgxOJB3FWBVA/x5i1MLTJJWwakWDcJtxgH/3KMB5DF4VPZ9cky8N5AvQqAxR9fZnAbkoW rRGFYBuTgmF7bLA0+Q9oyBV312iAqd/wLgR3+27LYYnoQP1vRV9ycsOZPQ98GGk2fGTRKVIuUVD 2Iaj3So66/LAhKuuDXqHKsZqo+SVBgUNLeynSQe5yklfcHOXKOHwVIbM2u9U/WKcX7z+1nPu9Qe AFjCdAxfuBEZea3Fv3I6tAYbkNfL2IAgFg8jjWXfnSvPSY6S8ETsSGRwA0aanurxrWRCc04n6mF gaPQGry2qeU/HraWs/4J5D3Q== X-Received: by 2002:a17:902:e806:b0:2c9:ff29:3f91 with SMTP id d9443c01a7336-2ca5a55b720mr28253325ad.6.1782871713354; Tue, 30 Jun 2026 19:08:33 -0700 (PDT) Received: from localhost ([2001:19f0:8000:3e6e:5400:6ff:fe38:3d01]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ca382a3863sm22650065ad.57.2026.06.30.19.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 19:08:33 -0700 (PDT) From: Inochi Amaoto To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Anup Patel , Atish Patra , Paolo Bonzini , Shuah Khan , Thomas Huth , Sergey Matyukevich , Inochi Amaoto , Andy Chiu , Deepak Gupta Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, Yixun Lan , Longbin Li , Quan Zhou Subject: [PATCH v4 7/8] RISC-V: KVM: Add support for control-flow integrity FWFT features Date: Wed, 1 Jul 2026 10:07:44 +0800 Message-ID: <20260701020746.170157-8-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260701020746.170157-1-inochiama@gmail.com> References: <20260701020746.170157-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Control-flow integrity is controlled through a WARL field in henvcfg. Expose the feature only if the Zicfilp/Zicfiss is supported for VS-mode. Allow the VMM to block access to the feature by disabling the ISA extension in the guest. Assisted-by: YuanSheng:claude-4.7-opus Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Signed-off-by: Inochi Amaoto --- arch/riscv/include/uapi/asm/kvm.h | 2 + arch/riscv/kvm/vcpu_sbi_fwft.c | 107 ++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index fd4c81697617..20d9959ca44f 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -248,6 +248,8 @@ struct kvm_riscv_sbi_fwft { struct kvm_riscv_sbi_fwft_feature misaligned_deleg; struct kvm_riscv_sbi_fwft_feature pointer_masking; struct kvm_riscv_sbi_fwft_feature pte_ad_hw_updating; + struct kvm_riscv_sbi_fwft_feature landing_pad; + struct kvm_riscv_sbi_fwft_feature shadow_stack; }; /* If you need to interpret the index values, here is the key: */ diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c index 7192c229a19e..cb9b9721ec88 100644 --- a/arch/riscv/kvm/vcpu_sbi_fwft.c +++ b/arch/riscv/kvm/vcpu_sbi_fwft.c @@ -176,6 +176,95 @@ static long kvm_sbi_fwft_get_misaligned_delegation(struct kvm_vcpu *vcpu, return SBI_SUCCESS; } +static long kvm_sbi_fwft_set_cfi(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long value, + u64 flag) +{ + struct kvm_vcpu_config *cfg = &vcpu->arch.cfg; + + if (value == 0) + cfg->henvcfg &= ~flag; + else if (value == 1) + cfg->henvcfg |= flag; + else + return SBI_ERR_INVALID_PARAM; + + if (cfg->henvcfg & (ENVCFG_LPE | ENVCFG_SSE)) + cfg->hedeleg |= EXC_SOFTWARE_CHECK; + else + cfg->hedeleg &= ~EXC_SOFTWARE_CHECK; + + if (!one_reg_access) { + csr_write(CSR_HEDELEG, cfg->hedeleg); + /* + * Both Bit LPE and SSE are in the lower part, so it is safe + * to only write the henvcfg + */ + csr_write(CSR_HENVCFG, vcpu->arch.cfg.henvcfg); + } + + return SBI_SUCCESS; +} + +static bool kvm_sbi_fwft_landing_pad_supported(struct kvm_vcpu *vcpu) +{ + return riscv_isa_extension_available(vcpu->arch.isa, ZICFILP); +} + +static void kvm_sbi_fwft_reset_landing_pad(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_config *cfg = &vcpu->arch.cfg; + + kvm_sbi_fwft_env_flag_reset_helper(vcpu, ENVCFG_LPE); + if ((cfg->henvcfg & (ENVCFG_LPE | ENVCFG_SSE)) == 0) + cfg->hedeleg &= ~EXC_SOFTWARE_CHECK; +} + +static long kvm_sbi_fwft_set_landing_pad(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long value) +{ + return kvm_sbi_fwft_set_cfi(vcpu, conf, one_reg_access, value, ENVCFG_LPE); +} + +static long kvm_sbi_fwft_get_landing_pad(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long *value) +{ + return kvm_sbi_fwft_env_flag_get_helper(vcpu, conf, one_reg_access, + value, ENVCFG_LPE); +} + +static bool kvm_sbi_fwft_shadow_stack_supported(struct kvm_vcpu *vcpu) +{ + return riscv_isa_extension_available(vcpu->arch.isa, ZICFISS); +} + +static void kvm_sbi_fwft_reset_shadow_stack(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_config *cfg = &vcpu->arch.cfg; + + kvm_sbi_fwft_env_flag_reset_helper(vcpu, ENVCFG_SSE); + if ((cfg->henvcfg & (ENVCFG_LPE | ENVCFG_SSE)) == 0) + cfg->hedeleg &= ~EXC_SOFTWARE_CHECK; +} + +static long kvm_sbi_fwft_set_shadow_stack(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long value) +{ + return kvm_sbi_fwft_set_cfi(vcpu, conf, one_reg_access, value, ENVCFG_SSE); +} + +static long kvm_sbi_fwft_get_shadow_stack(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long *value) +{ + return kvm_sbi_fwft_env_flag_get_helper(vcpu, conf, one_reg_access, + value, ENVCFG_SSE); +} + static bool kvm_sbi_fwft_pte_ad_hw_updating_supported(struct kvm_vcpu *vcpu) { return riscv_isa_extension_available(vcpu->arch.isa, SVADU) && @@ -312,6 +401,24 @@ static const struct kvm_sbi_fwft_feature features[] = { .set = kvm_sbi_fwft_set_misaligned_delegation, .get = kvm_sbi_fwft_get_misaligned_delegation, }, + { + .id = SBI_FWFT_LANDING_PAD, + .first_reg_num = offsetof(struct kvm_riscv_sbi_fwft, landing_pad.enable) / + sizeof(unsigned long), + .supported = kvm_sbi_fwft_landing_pad_supported, + .reset = kvm_sbi_fwft_reset_landing_pad, + .set = kvm_sbi_fwft_set_landing_pad, + .get = kvm_sbi_fwft_get_landing_pad, + }, + { + .id = SBI_FWFT_SHADOW_STACK, + .first_reg_num = offsetof(struct kvm_riscv_sbi_fwft, shadow_stack.enable) / + sizeof(unsigned long), + .supported = kvm_sbi_fwft_shadow_stack_supported, + .reset = kvm_sbi_fwft_reset_shadow_stack, + .set = kvm_sbi_fwft_set_shadow_stack, + .get = kvm_sbi_fwft_get_shadow_stack, + }, { .id = SBI_FWFT_PTE_AD_HW_UPDATING, .first_reg_num = offsetof(struct kvm_riscv_sbi_fwft, pte_ad_hw_updating.enable) / -- 2.55.0