From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 C35603FD96E for ; Wed, 1 Jul 2026 09:48:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782899285; cv=none; b=S1irlhFAgtTmek1Qvnyp/6HWJc+5l3cnc13ySqmvC71z0krYvJLCzsjPqegSEFCwlTKH4atRMn5g/SicBzaQTNV74tdz5nrseVuktq0gdXf03nt6QMbg0kMcCwpgluEWsTVMKQwB8axZn1WxuLOYUpwIRAHHzzo7Jk3ZnUPutcE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782899285; c=relaxed/simple; bh=U9DQGPROwJOnRQToob0nRWEH2RGcqydB6+hnMh20fUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YKhVCjidd89J6C+sAccqcJahCVFyqK/fLMKA/7x9kpfiMHghzeYbRO+hw4GG29qR5hdaI8H4YGrHJB8ynSF3mfPISGHhvrpzbxWNlTH0PTNkCqIT+R7GcBPfFU8CQZd9GAQVUQagTXMd20j2dH943jqK+v8m6zF+VVlNb+TtOYY= 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=nwkMTj87; arc=none smtp.client-ip=209.85.214.169 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="nwkMTj87" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2c6b67d5fa1so2791305ad.2 for ; Wed, 01 Jul 2026 02:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782899283; x=1783504083; 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=/YsyBUeISRtTsmCW0fRgq5oh/PaolZ1FgVZ4dpWHLHI=; b=nwkMTj87bJ68wdNs035uO/zCZwLGArAqcD4apejyOIHd2NBYyzfAVh/TB4Y0a6VOkx rsXO0M3ar3zByVbPi/Xof0/Ki9Iqtt4wso55tPb2O1Dbvb0gr2FIQq42KSlb5AXAXZbz TaPFnOz4iomRrqXETluyO60V5tOU9VJyPnQrykZGpdJvvf5IIYtt6HSVDroOJmWPmKNE 6L4/9RMFgzEl8QdvpwWAOH868L1b33lV6p9AxpLx0mbqWbFs0kDeLySFAu755meDkVqA SaREOckCHzdFWrkffcc1R5MhU30gxgnD+iWKOC4U4ltPabvnez/O21SkK0M8O7Aiw+6y Qztw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782899283; x=1783504083; 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=/YsyBUeISRtTsmCW0fRgq5oh/PaolZ1FgVZ4dpWHLHI=; b=qqO5yY/bilBWPRzmY4q7v4Wh/jzOAHw69us6QScuBdXti37cqfxUUSSoqVzrlBMVub Wt6tNP9m49GpLFeociYTN+dK41s0IJ/BBSrbRmsWhJKLbH2Cye8V1uFUHwOzCLXk+WRi m+3xQMRAPqJMDU4asdMfPCTIAA+UJkVPH9rK6X1mmKYDOJ8t0JqMbz3afU72nyDlqEuV w/6iXFe8Rx5TiZguvtOzqlBrz+BAvJMKM7KBBWYFw2EiSih9UueFvtpXLA85vKCHCpHf mB4BU+EImnheBuNyNIoYNLXc702hhIeWCOtwfEeAtkaKc30EE9ve5npUqNgsSJIT5CEu xEzQ== X-Forwarded-Encrypted: i=1; AHgh+Rpi8WXVOdzG48TMH/3BkCYILFVItv7JhlY9eTCnCfG305vnzIJSRsGsc0NZmqWj0NOffcdwF/GlNYg9IE8=@vger.kernel.org X-Gm-Message-State: AOJu0YxanZj4jeisRxI9ve8QyvI5a2f/aFzEfiEBTEbSR4t6uMD2t9HD 5o8hYhI6yepyGm8oIqNBFGKph7WwDGFdsIdMiWEsl/rVQMxoNEaRakkw X-Gm-Gg: AfdE7clYIudk1Bf6VIcZ43PoCiKJgt9+q5Q++PsanSH42dUjJwXk6t6yPfIl/DfWYr3 hnpe/ERgQCrxlhtCs2OTljQnnYpY1TLlYd8NZxSyeHSMfH6pvjbWZGrG6QCudNpXTDtGthWwhJB 2wV5CFkWY6F75SLIg8hTmcmGwF0EM58jBzZEQseWKzoaw6oPwouJ4CAbA9DYDKYZDw6fCeWjI/9 daiAjDTImIwHitZQpf4XKvBMWH7TMzcf4JELmuQuYTzBLkbbTP6QllaGZaPE6zpzTWEGTqt5Wxv 49bnKHoaqWV1y8XMv+6zvwzeM6DfyWaNfpfw6LGIQkYsX5F8ZVMDsp5pu1IiIMfzhJKkrrcAVGL a4HYoSfwq5RjJlMBegKNxCydxazFRcVQdmgeproKE1GYOE7qbUIcivU8w+uBZFI7VrWkTtDXerh 3XO3xhcYsfWeY= X-Received: by 2002:a17:902:e5c3:b0:2c9:c18f:7446 with SMTP id d9443c01a7336-2ca7e8dbc1amr9889895ad.27.1782899282902; Wed, 01 Jul 2026 02:48:02 -0700 (PDT) Received: from localhost ([2001:19f0:8000:3e6e:5400:6ff:fe38:3d01]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ca4f2a71a9sm21530155ad.44.2026.07.01.02.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 02:48:02 -0700 (PDT) From: Inochi Amaoto To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti Cc: Inochi Amaoto , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Yixun Lan , Longbin Li Subject: [PATCH 1/3] RISC-V: KVM: Add SBI extension validate callback Date: Wed, 1 Jul 2026 17:47:28 +0800 Message-ID: <20260701094731.1022163-2-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260701094731.1022163-1-inochiama@gmail.com> References: <20260701094731.1022163-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 When user disable FWFT extension after setting any value of the FWFT feature, the state of vCPU will be broken since the value of disable FWFT feature is still functional. Add the generic SBI extension validate callback so the FWFT extension can fix its parameters before the first run. Signed-off-by: Inochi Amaoto --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 4 ++++ arch/riscv/kvm/vcpu_config.c | 2 ++ arch/riscv/kvm/vcpu_sbi.c | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h index c1a7e3b40d9c..f01a2860c751 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -60,6 +60,9 @@ struct kvm_vcpu_sbi_extension { void (*reset)(struct kvm_vcpu *vcpu); + /* Allow the extension to correct its parameters before the first run */ + void (*validate)(struct kvm_vcpu *vcpu); + unsigned long state_reg_subtype; unsigned long (*get_state_reg_count)(struct kvm_vcpu *vcpu); int (*get_state_reg_id)(struct kvm_vcpu *vcpu, int index, u64 *reg_id); @@ -93,6 +96,7 @@ int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu); void kvm_riscv_vcpu_sbi_deinit(struct kvm_vcpu *vcpu); void kvm_riscv_vcpu_sbi_reset(struct kvm_vcpu *vcpu); +void kvm_riscv_vcpu_sbi_validate(struct kvm_vcpu *vcpu); #ifdef CONFIG_RISCV_SBI_V01 extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01; diff --git a/arch/riscv/kvm/vcpu_config.c b/arch/riscv/kvm/vcpu_config.c index 238418fed2b9..b68aa830aaf5 100644 --- a/arch/riscv/kvm/vcpu_config.c +++ b/arch/riscv/kvm/vcpu_config.c @@ -69,6 +69,8 @@ void kvm_riscv_vcpu_config_ran_once(struct kvm_vcpu *vcpu) if (vcpu->guest_debug) cfg->hedeleg &= ~BIT(EXC_BREAKPOINT); + + kvm_riscv_vcpu_sbi_validate(vcpu); } void kvm_riscv_vcpu_config_load(struct kvm_vcpu *vcpu) diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index 46ab7b989432..b737e9a7a12a 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -723,3 +723,26 @@ void kvm_riscv_vcpu_sbi_reset(struct kvm_vcpu *vcpu) ext->reset(vcpu); } } + +void kvm_riscv_vcpu_sbi_validate(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_sbi_context *scontext = &vcpu->arch.sbi_context; + const struct kvm_riscv_sbi_extension_entry *entry; + const struct kvm_vcpu_sbi_extension *ext; + int idx, i; + + for (i = 0; i < ARRAY_SIZE(sbi_ext); i++) { + entry = &sbi_ext[i]; + ext = entry->ext_ptr; + idx = entry->ext_idx; + + if (idx < 0 || idx >= ARRAY_SIZE(scontext->ext_status)) + continue; + + if (scontext->ext_status[idx] != KVM_RISCV_SBI_EXT_STATUS_ENABLED || + !ext->validate) + continue; + + ext->validate(vcpu); + } +} -- 2.55.0