From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 DEF832C9A for ; Tue, 11 Feb 2025 05:57:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739253427; cv=none; b=K2WvZElQayvkdVXJPhoPTyJLNIaXXlYxZY6mczjRuZy6zp5yfH3one9CNIsadVFlMhywgTiRjnJeji6Q++LtVUDvmxDpEo9piFj1wPVFhCr8JGjg2d6SB5W0k7QhjE7ysCSR7RPhYZff4gWYfFZTY/FB/M7LIv021dQ8dNVq01k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739253427; c=relaxed/simple; bh=+nbqPmbMF4jgueQlkoNLtrphKKIkh/Fm5nsFDK7ILUo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=pJX3v6dJu4OCpqlLJfhITlJUJvsMOGYD8QY4/kCVQl7SMb+r1JzL/APDMxRF5WDkqS1sBvX7Pfa9VAn5R8UsbPbozmBdkxMUDl+Jhcw4GkcR22zVFWHggZ+RYPI/yHD4plZuSjnplicZlqmLWhd/pV2Nu8tv5oS8MtAxNH2Gr1A= 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=kvsngtux; arc=none smtp.client-ip=209.85.216.46 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="kvsngtux" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2f9f6a2fa8dso7111192a91.1 for ; Mon, 10 Feb 2025 21:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739253425; x=1739858225; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=HJZy2jyvTOLzFCUYeWaduV9MqEWJwar6HvmOT6bl6Aw=; b=kvsngtuxEusYb625FVRfs8WHAmg1bi7OBT1WVs+eHERiuMTYMo9JCqOBHZhXXJYkUl XSRS+mJPQCVf2hlPYpQOJL8YgKOq96NDRrYDc3thBJERynCwBJlqALU/nlX5Iq5USSG0 NdKdNVYg9mBwZQp9Wfvl7wBLnfn3k+jZmKh/1refGqGvs0qlOZQE6VNVKMXhJjF6SvTD 9E4uDnPA1uPP9P4fCv1bfcTKpX5C9fgCYsdeMtwy03mAK076p2OH/qWbOg8mGgPMXPzW kW26CYxpDqfxHYdz/K5QWuZ0mwRhuLl0y9+jRr4WO5nu85DLt5PIMSISyaTqNt6kKK2n lNag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739253425; x=1739858225; h=in-reply-to:content-transfer-encoding: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=HJZy2jyvTOLzFCUYeWaduV9MqEWJwar6HvmOT6bl6Aw=; b=KycJ0is2CRIUnnTRt9Z9Ban6lQ0LISxaz1hs3zRhE9YgWjO46Si4GZ9DjP9vb/kW9/ lTDSUuRKcahW9UDTu08RsDWiOyX5Ozm/LaEzk5YgO6ZNXs6IJT7HsDO0MjmXR8GQgJg/ QF/yV5lKsheoO3/XaDZgtRWBBp0jE0KQ7LnPKtnhuODJvL2Hrr/bJQANvgdK3uwxNO1Y NFBmlkcRQeQJSluPJL78Z8ZD4G75zoS3+RS026STBGKUnnill4NpACVtEqH+Il0MJVfN oZyXj/LkZ0V564fOmvFx1v9934jQpKmhll7TcEiSuvJE7hk7mWaJHPSlx64GR5tiKwD8 xSIw== X-Forwarded-Encrypted: i=1; AJvYcCX0D9WKE/gLSgvR4FXrRMTJh/4X4TlbHeW42VDVeiYxh/rMD/NHNbSIvWxai4TY+tTP6MA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxm43ZqyhMySBz4jk6ZvIhHrr84yDpuyCcLr3iNub6N2gfP7p1b 1J/FbGuAVkaDJ4I/Z4A7jgQK+Pc7tJw8FXJSKynk5HcyMCwCeXJj8+KYlne1tCE= X-Gm-Gg: ASbGnctUqNPDiw+OoLM2AXtBS6L/4tLgVq06qObapY2tpP17KW7wyoSu00ingrqC6eF RoZw6kBmUnAEzlU2PGzSCNBr+0MjMDSJKagEpLF1XSSSGZrQHoDfPlmQfV/BlcfZzoNARQ+AM/R ap7KHgKmhRwd89QXe7dVpP1SLVkJUyIbz1H3BSuvtiwbWesJ/bmkCbGvlcRceIe45BNNoYPoHgZ aDOENlb5yGZsinJ741CU2wWiJ++tCslu6Qy/RI/5yzgFCSJMOZ26tM2hNIVmi2eQrfsdUB5YWJX r01UiLVLrQPzOW1Fq1N4JvfPiw== X-Google-Smtp-Source: AGHT+IGPV3VBh9FyPjCZf26VkPF75SNsz19I9tg0lKaJmNEHjjQrpfrlMc7NQxLWrWHUBES1C/WSbg== X-Received: by 2002:a05:6a00:3492:b0:730:87b2:e839 with SMTP id d2e1a72fcca58-73087b2f0a3mr15775608b3a.21.1739253425110; Mon, 10 Feb 2025 21:57:05 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730840e842bsm3878466b3a.88.2025.02.10.21.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 21:57:04 -0800 (PST) Date: Mon, 10 Feb 2025 21:57:02 -0800 From: Deepak Gupta To: =?iso-8859-1?Q?Cl=E9ment_L=E9ger?= Cc: Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Shuah Khan , Jonathan Corbet , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, Samuel Holland Subject: Re: [PATCH v2 14/15] RISC-V: KVM: add support for FWFT SBI extension Message-ID: References: <20250210213549.1867704-1-cleger@rivosinc.com> <20250210213549.1867704-15-cleger@rivosinc.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250210213549.1867704-15-cleger@rivosinc.com> On Mon, Feb 10, 2025 at 10:35:47PM +0100, Clément Léger wrote: >Add basic infrastructure to support the FWFT extension in KVM. > >Signed-off-by: Clément Léger >--- > arch/riscv/include/asm/kvm_host.h | 4 + > arch/riscv/include/asm/kvm_vcpu_sbi.h | 1 + > arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h | 37 ++++ > arch/riscv/include/uapi/asm/kvm.h | 1 + > arch/riscv/kvm/Makefile | 1 + > arch/riscv/kvm/vcpu_sbi.c | 4 + > arch/riscv/kvm/vcpu_sbi_fwft.c | 187 +++++++++++++++++++++ > 7 files changed, 235 insertions(+) > create mode 100644 arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h > create mode 100644 arch/riscv/kvm/vcpu_sbi_fwft.c > >diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h >index bb93d2995ea2..c0db61ba691a 100644 >--- a/arch/riscv/include/asm/kvm_host.h >+++ b/arch/riscv/include/asm/kvm_host.h >@@ -19,6 +19,7 @@ > #include > #include > #include >+#include > #include > #include > >@@ -281,6 +282,9 @@ struct kvm_vcpu_arch { > /* Performance monitoring context */ > struct kvm_pmu pmu_context; > >+ /* Firmware feature SBI extension context */ >+ struct kvm_sbi_fwft fwft_context; >+ > /* 'static' configurations which are set only once */ > struct kvm_vcpu_config cfg; > >diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h >index cb68b3a57c8f..ffd03fed0c06 100644 >--- a/arch/riscv/include/asm/kvm_vcpu_sbi.h >+++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h >@@ -98,6 +98,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm; > extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn; > extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_susp; > extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_sta; >+extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft; > extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental; > extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor; > >diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h b/arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h >new file mode 100644 >index 000000000000..5782517f6e08 >--- /dev/null >+++ b/arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h >@@ -0,0 +1,37 @@ >+/* SPDX-License-Identifier: GPL-2.0-only */ >+/* >+ * Copyright (c) 2025 Rivos Inc. >+ * >+ * Authors: >+ * Clément Léger >+ */ >+ >+#ifndef __KVM_VCPU_RISCV_FWFT_H >+#define __KVM_VCPU_RISCV_FWFT_H >+ >+#include >+ >+struct kvm_sbi_fwft_config; >+struct kvm_vcpu; >+ Can we add some comments here for future fwft providers along below lines? Reason being, patch defaults to `conf->supported = true` if `supported` fn pointer in `kvm_sbi_fwft_feature` was NULL. Although `kvm_sbi_fwft_set/get` does get/set fn pointers (it would happen even if `supported` fn pointer was NULL). >+struct kvm_sbi_fwft_feature { >+ enum sbi_fwft_feature_t id; /* If function not provided, KVM will default assume to be true */ >+ bool (*supported)(struct kvm_vcpu *vcpu); /* Must always provide function pointers for get/set */ >+ int (*set)(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsigned long value); >+ int (*get)(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsigned long *value); >+}; >+ >+struct kvm_sbi_fwft_config { >+ const struct kvm_sbi_fwft_feature *feature; >+ bool supported; >+ unsigned long flags; >+}; >+ >+/* FWFT data structure per vcpu */ >+struct kvm_sbi_fwft { >+ struct kvm_sbi_fwft_config *configs; >+}; >+ >+#define vcpu_to_fwft(vcpu) (&(vcpu)->arch.fwft_context) >+ >+#endif /* !__KVM_VCPU_RISCV_FWFT_H */ >diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h >index f06bc5efcd79..fa6eee1caf41 100644 >--- a/arch/riscv/include/uapi/asm/kvm.h >+++ b/arch/riscv/include/uapi/asm/kvm.h >@@ -202,6 +202,7 @@ enum KVM_RISCV_SBI_EXT_ID { > KVM_RISCV_SBI_EXT_DBCN, > KVM_RISCV_SBI_EXT_STA, > KVM_RISCV_SBI_EXT_SUSP, >+ KVM_RISCV_SBI_EXT_FWFT, > KVM_RISCV_SBI_EXT_MAX, > }; > >diff --git a/arch/riscv/kvm/Makefile b/arch/riscv/kvm/Makefile >index 4e0bba91d284..06e2d52a9b88 100644 >--- a/arch/riscv/kvm/Makefile >+++ b/arch/riscv/kvm/Makefile >@@ -26,6 +26,7 @@ kvm-y += vcpu_onereg.o > kvm-$(CONFIG_RISCV_PMU_SBI) += vcpu_pmu.o > kvm-y += vcpu_sbi.o > kvm-y += vcpu_sbi_base.o >+kvm-y += vcpu_sbi_fwft.o > kvm-y += vcpu_sbi_hsm.o > kvm-$(CONFIG_RISCV_PMU_SBI) += vcpu_sbi_pmu.o > kvm-y += vcpu_sbi_replace.o >diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c >index f81f06f82650..3b37deaed4e7 100644 >--- a/arch/riscv/kvm/vcpu_sbi.c >+++ b/arch/riscv/kvm/vcpu_sbi.c >@@ -78,6 +78,10 @@ static const struct kvm_riscv_sbi_extension_entry sbi_ext[] = { > .ext_idx = KVM_RISCV_SBI_EXT_STA, > .ext_ptr = &vcpu_sbi_ext_sta, > }, >+ { >+ .ext_idx = KVM_RISCV_SBI_EXT_FWFT, >+ .ext_ptr = &vcpu_sbi_ext_fwft, >+ }, > { > .ext_idx = KVM_RISCV_SBI_EXT_EXPERIMENTAL, > .ext_ptr = &vcpu_sbi_ext_experimental, >diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c >new file mode 100644 >index 000000000000..fe608bf16558 >--- /dev/null >+++ b/arch/riscv/kvm/vcpu_sbi_fwft.c >@@ -0,0 +1,187 @@ >+// SPDX-License-Identifier: GPL-2.0 >+/* >+ * Copyright (c) 2025 Rivos Inc. >+ * >+ * Authors: >+ * Clément Léger >+ */ >+ >+#include >+#include >+#include >+#include >+#include >+#include >+#include >+ >+static const enum sbi_fwft_feature_t kvm_fwft_defined_features[] = { >+ SBI_FWFT_MISALIGNED_EXC_DELEG, >+ SBI_FWFT_LANDING_PAD, >+ SBI_FWFT_SHADOW_STACK, >+ SBI_FWFT_DOUBLE_TRAP, >+ SBI_FWFT_PTE_AD_HW_UPDATING, >+ SBI_FWFT_POINTER_MASKING_PMLEN, >+}; >+ >+static bool kvm_fwft_is_defined_feature(enum sbi_fwft_feature_t feature) >+{ >+ int i; >+ >+ for (i = 0; i < ARRAY_SIZE(kvm_fwft_defined_features); i++) { >+ if (kvm_fwft_defined_features[i] == feature) >+ return true; >+ } >+ >+ return false; >+} >+ >+static const struct kvm_sbi_fwft_feature features[] = { >+}; >+ >+static struct kvm_sbi_fwft_config * >+kvm_sbi_fwft_get_config(struct kvm_vcpu *vcpu, enum sbi_fwft_feature_t feature) >+{ >+ int i = 0; >+ struct kvm_sbi_fwft *fwft = vcpu_to_fwft(vcpu); >+ >+ for (i = 0; i < ARRAY_SIZE(features); i++) { >+ if (fwft->configs[i].feature->id == feature) >+ return &fwft->configs[i]; >+ } >+ >+ return NULL; >+} >+ >+static int kvm_fwft_get_feature(struct kvm_vcpu *vcpu, unsigned long feature, >+ struct kvm_sbi_fwft_config **conf) >+{ >+ struct kvm_sbi_fwft_config *tconf; >+ >+ /* Feature are defined as 32 bits identifiers */ >+ if (feature & ~(BIT_ULL(32) - 1)) >+ return SBI_ERR_INVALID_PARAM; >+ >+ tconf = kvm_sbi_fwft_get_config(vcpu, feature); >+ if (!tconf) { >+ if (kvm_fwft_is_defined_feature(feature)) >+ return SBI_ERR_NOT_SUPPORTED; >+ >+ return SBI_ERR_DENIED; >+ } >+ >+ if (!tconf->supported) >+ return SBI_ERR_NOT_SUPPORTED; >+ >+ *conf = tconf; >+ >+ return SBI_SUCCESS; >+} >+ >+static int kvm_sbi_fwft_set(struct kvm_vcpu *vcpu, unsigned long feature, >+ unsigned long value, unsigned long flags) >+{ >+ int ret; >+ struct kvm_sbi_fwft_config *conf; >+ >+ ret = kvm_fwft_get_feature(vcpu, feature, &conf); >+ if (ret) >+ return ret; >+ >+ if ((flags & ~SBI_FWFT_SET_FLAG_LOCK) != 0) >+ return SBI_ERR_INVALID_PARAM; >+ >+ if (conf->flags & SBI_FWFT_SET_FLAG_LOCK) >+ return SBI_ERR_DENIED_LOCKED; >+ >+ conf->flags = flags; >+ >+ return conf->feature->set(vcpu, conf, value); >+} >+ >+static int kvm_sbi_fwft_get(struct kvm_vcpu *vcpu, unsigned long feature, >+ unsigned long *value) >+{ >+ int ret; >+ struct kvm_sbi_fwft_config *conf; >+ >+ ret = kvm_fwft_get_feature(vcpu, feature, &conf); >+ if (ret) >+ return ret; >+ >+ return conf->feature->get(vcpu, conf, value); >+} >+ >+static int kvm_sbi_ext_fwft_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, >+ struct kvm_vcpu_sbi_return *retdata) >+{ >+ int ret = 0; >+ struct kvm_cpu_context *cp = &vcpu->arch.guest_context; >+ unsigned long funcid = cp->a6; >+ >+ switch (funcid) { >+ case SBI_EXT_FWFT_SET: >+ ret = kvm_sbi_fwft_set(vcpu, cp->a0, cp->a1, cp->a2); >+ break; >+ case SBI_EXT_FWFT_GET: >+ ret = kvm_sbi_fwft_get(vcpu, cp->a0, &retdata->out_val); >+ break; >+ default: >+ ret = SBI_ERR_NOT_SUPPORTED; >+ break; >+ } >+ >+ retdata->err_val = ret; >+ >+ return 0; >+} >+ >+static int kvm_sbi_ext_fwft_init(struct kvm_vcpu *vcpu) >+{ >+ struct kvm_sbi_fwft *fwft = vcpu_to_fwft(vcpu); >+ const struct kvm_sbi_fwft_feature *feature; >+ struct kvm_sbi_fwft_config *conf; >+ int i; >+ >+ fwft->configs = kcalloc(ARRAY_SIZE(features), sizeof(struct kvm_sbi_fwft_config), >+ GFP_KERNEL); >+ if (!fwft->configs) >+ return -ENOMEM; >+ >+ for (i = 0; i < ARRAY_SIZE(features); i++) { >+ feature = &features[i]; >+ conf = &fwft->configs[i]; >+ if (feature->supported) >+ conf->supported = feature->supported(vcpu); >+ else >+ conf->supported = true; >+ >+ conf->feature = feature; >+ } >+ >+ return 0; >+} >+ >+static void kvm_sbi_ext_fwft_deinit(struct kvm_vcpu *vcpu) >+{ >+ struct kvm_sbi_fwft *fwft = vcpu_to_fwft(vcpu); >+ >+ kfree(fwft->configs); >+} >+ >+static void kvm_sbi_ext_fwft_reset(struct kvm_vcpu *vcpu) >+{ >+ int i = 0; >+ struct kvm_sbi_fwft *fwft = vcpu_to_fwft(vcpu); >+ >+ for (i = 0; i < ARRAY_SIZE(features); i++) >+ fwft->configs[i].flags = 0; >+} >+ >+const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft = { >+ .extid_start = SBI_EXT_FWFT, >+ .extid_end = SBI_EXT_FWFT, >+ .handler = kvm_sbi_ext_fwft_handler, >+ .init = kvm_sbi_ext_fwft_init, >+ .deinit = kvm_sbi_ext_fwft_deinit, >+ .reset = kvm_sbi_ext_fwft_reset, >+}; >-- >2.47.2 > >