From nobody Fri Oct 3 21:55:30 2025 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.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 8AFCB2E888B for ; Sat, 23 Aug 2025 16:00:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964809; cv=none; b=I1kH31pdz46qevoNXBkHG/FgALlZdyvx/lmpLIZ07yw++QXtzO5zTjzLo+0jaEq1ERM4TelmLR0R6k+Kl2NTvvJ/8j1iNoYiCTOzOB0szrDBa8TSPveWjg0a4N2SG4BF7vFVFgVroEaYNbKa5KyKtVf3+wfP06R+3+g49EjaEBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964809; c=relaxed/simple; bh=WUdBTM0dhD8Re3kqq0DQBL5Pq0pV3tt6HtHEsLxoxa4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PIwSEHGTzC9HfGmgXDjUlzWHB2AMpsX/a3oMkWXAdr3jak+J6PvJymaPdGkK+3YZX+OIEfe0kVvK+La4uSGH6v+6Q3RBZIqKGJUdK//85f0N6CXrxFr8ja1srLLj0b3uEYshU8gymJAZ3AaZsRT8KVgCk12PgPByKdJZwXms9ds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=A4x5nRlO; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="A4x5nRlO" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-b49cf21320aso607070a12.1 for ; Sat, 23 Aug 2025 09:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964807; x=1756569607; 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=QxIYjoD6qGJ2CFZvAXrDV0PDdB+JeyudOZZgvLWLYX8=; b=A4x5nRlOEs0eMEekwhHdrr94WOzBOwWUwfBsyfgg4mqWzenHJywiDuCnUiPpqra/Ef x8zYA63YhEWdTo5dP1KAAJi9X3DWKZNpJ4kOUBUEexCzTll6juuHvz40fZZXAmI/jByJ t2hYbKwQGjAI0YAHmZZFJACfkRHZlL+b+vIOvJxRvsgCVvyx/TvPGBH1fXfJ51xugZHC LJE5GZSMl74L7Bya/HDprTVzXxf6xuWkGVduToUWVxY5Yd8XB0kacfrCrAatvbz7nj/V ebyPe4gLXGLGHNBH3RRVHrpW6WxSrboKAeY/KTsEdch64028wAAZD7Q2MbtmDgerru7B JwXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964807; x=1756569607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QxIYjoD6qGJ2CFZvAXrDV0PDdB+JeyudOZZgvLWLYX8=; b=pWB5IF5yZCPSPBN2n8bXA186F6sY1KgqsBvFS/x5UD4JBBWeEBBF86gLYZKeVgSc9n WDB+IT6uCrIgJbh/zZyBptrlnSRu78tl4cK3HX1EjUp9hTzDKW8N6sctfWWVr3gMnfk1 BmeZJ24qLanTbmROTuOwONKhOuAOa0IUoIs6kIdA5sTb4KdyPSotUIMy8F+LpTHjv0Sr skx3cqQa06Tp4CtQv3mwmgtKw3gZS8H0tXUTvZ56GzpNXEaRV0bNeW0skDDLAQZUGH+G KJm4CHpIAgvpz5qxbN+G7wmvYsrpkDD94k8snWUC+QphqsgiXiH8ZEWNyPQAFeuC9mBX x+KQ== X-Forwarded-Encrypted: i=1; AJvYcCUCxA+XXjYfF4ytKCWJwlqNwvQC1vKlEwzVn20GnTOuxi4TN+6b6ntw7dK+ZWLTLVjpVV3Yd/fQsotYPlk=@vger.kernel.org X-Gm-Message-State: AOJu0YzE4FXaq+wOSzBU9YOUdMFQOc3qeHaTMW01y+zLocYFX4mC1QIw 7DyJUriseflc7yUwJbyukMnVmlzxXGboUT30K1hcTwoeANT+exnS6HkXY70LTgjiYH7mcj4Rvsi P3Hhe X-Gm-Gg: ASbGncvzcofbA2WnYVXs0NPRwdyKWDiGW8GXC+wwN7II+diav30ummDhVewE4Sm/inL FJBaaPL36HX8yJiWwaIqkB44IU/vm9HUYOndsnTKLheiGBkRreHSyuwr9vv74opvLtpQyix8/pJ N7DJG3SRkL6I4JGyuO15d7WSaMrRUyBIYdeAPWjc8H91iplKg47m/qcW+CdVdS3qkRqYFOhf0sJ 99PDgVeZ2txJUaPmcIMzVESd6oV+cfafqDtzR/H1CmMAoyiyAL8bANHfpS6wMtj5UHLNN3U6585 Y77WzLjHamofO6zDgP3xCwsUv+eJldcorTlu9obXsuFux63d1ha+TpRJwjcMW9ZfK04L17nHmFQ cALUlMKavxIgPOiUY2vnMfVWrFw8sxVYNT0DGDq7uKl/UnWNflRFg3tjEuGyvQGrQ/ACLeHsh X-Google-Smtp-Source: AGHT+IH5FZJLOyfrOllB8g78rtlC90yaqO9Xq93Uvux/rEMgW/lp4f5ouiM5epDFAdg0M4MxVn/lXQ== X-Received: by 2002:a05:6a20:1592:b0:23d:dd9b:b563 with SMTP id adf61e73a8af0-24340d15dcemr10004613637.39.1755964806710; Sat, 23 Aug 2025 09:00:06 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:06 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 1/6] RISC-V: KVM: Set initial value of hedeleg in kvm_arch_vcpu_create() Date: Sat, 23 Aug 2025 21:29:42 +0530 Message-ID: <20250823155947.1354229-2-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The hedeleg may be updated by ONE_REG interface before the VCPU is run at least once hence set the initial value of hedeleg in kvm_arch_vcpu_create() instead of kvm_riscv_vcpu_setup_config(). Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 3ebcfffaa978..47bcf190ccc5 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -133,6 +133,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) =20 /* Mark this VCPU never ran */ vcpu->arch.ran_atleast_once =3D false; + + vcpu->arch.cfg.hedeleg =3D KVM_HEDELEG_DEFAULT; vcpu->arch.mmu_page_cache.gfp_zero =3D __GFP_ZERO; bitmap_zero(vcpu->arch.isa, RISCV_ISA_EXT_MAX); =20 @@ -570,7 +572,6 @@ static void kvm_riscv_vcpu_setup_config(struct kvm_vcpu= *vcpu) cfg->hstateen0 |=3D SMSTATEEN0_SSTATEEN0; } =20 - cfg->hedeleg =3D KVM_HEDELEG_DEFAULT; if (vcpu->guest_debug) cfg->hedeleg &=3D ~BIT(EXC_BREAKPOINT); } --=20 2.43.0 From nobody Fri Oct 3 21:55:30 2025 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.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 A08571487E9 for ; Sat, 23 Aug 2025 16:00:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964815; cv=none; b=XmOu1diRb5OyPVKMn+CeG+FZcJMnpQPt398+tKjk1LgpTMBqDCxSGj4RFGiA3ukGzRaWIGIGcARJaapBI1UWNSyM2P+S+4nKR7PS4+gqjviKQInHHA76po9HOEE1eJH38OxSSpwhfb9OtzqLLm7FvKCFAtD1vApRxg70VXhfRas= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964815; c=relaxed/simple; bh=5HKxK+Boc/7ZdYflehjWFkppD0SyD2LOi7Sgi2n9lB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JS+HOnjPws/rz3qouCrrqqGDeKwyqkNl3N2gmWf51VOONDK1bJp3Sit3Hn2PjnHu0iwD1rCcS5s9gkvwRyL4COUG0JL4p1Iw71L6ykYStkya3GznHrJW7dtBTVmhpxOX1tPkFpey2aDEq6mwp2drUbqXos+1zhWgVk10sauVQzs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=f6i206te; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="f6i206te" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-76e2e60433eso2240411b3a.0 for ; Sat, 23 Aug 2025 09:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964813; x=1756569613; 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=Chrrw+dyIJSlBaNuFfzfLJBXunJM56lFjN13/1zM0cU=; b=f6i206teC4KTkOm51PMokSfnLmkQVaOtnQeRnmhRvNi2tM3P0G35BzRxPjpX9FixJ1 e4DkC4OSXlCh4YdOEJ/LgTOwEYrMXOKR6l4ShYgiLbz463OABkcUq9vYl3scvwQNBhaO lj8LhNs/q89aKtQ0kuBQ+k+DoaEn1Rwl1OQnb2VKAzfmvZbyjnuk3FAEpa0wrUWpt5yV xUvgKcpobKIGA+VFaf/pzkKcZc1ZntErnwLGYSSTrg7VpjreE1laXopxB84t4VQiJl46 oOPF02Gv2fBuC05ygpUoZ81+Ljrfsxjf2hv6YI5DOr73kbIjACE8RCmVjdZqNLgzaEuK /OKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964813; x=1756569613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Chrrw+dyIJSlBaNuFfzfLJBXunJM56lFjN13/1zM0cU=; b=r+AmuyhXLbz1znuf11M66SQz7h+4PcEE1KXS+vIyjJqY8/+3mcyZ8ghjBCFVTV3adA 5sBK2JJxF9SXy66Qc59QtqAODtvGwKdoPDuL1I2a2v+xArdYCdrfob87mnkm+A4Ai3bQ fs/vOYQlzPE7RcKIBzhnIE7YuAq6vyAiSxu9lB6Eo6nTbZD/vcJSUA16dr3fRDcCaKNl nmaS0ww1XPOt5REJix63B4oVFQJiPX5EbLufLYGAOTcxkyMGxk8beyr3HqEmSz3kiWsC gMvZCl+B6JofyjYYZoBA4fR+sfQvXWyYdYzE+24Fol6QKy1bvDQD7krN3Lt6kYmPi/W7 YyrA== X-Forwarded-Encrypted: i=1; AJvYcCWZlKYCt4VU8zYQLGGWXZLfv0vzGMWbtSSE9tv0X4wyCd14EwouGU9Yxo3ZgEr+srLI4+VJ+4+eJyhd3Mk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+7n3RjAJfvK1vGJtSFXBs15JRAW/cxnMSp9cUC9+mghfVlKno jY7zm+Uy405AZDr7qa/eJwBsh3Xt1PCpQTr1bLOLp6qM/7ziG9ovZILO+hTKA+id918= X-Gm-Gg: ASbGncsBRTbnskyWenQ4KR+j51YMZtc9fWv7kVqF4lA71PcwFZpcYcINoH0zOEBhXJg 13o4dJCA3+SOAPYktmioLWJprrIduzttG799R+1fx3keAMeXcysojhKupavVS+0VPDbb2OYAxrs MZk0vA/vaCcwkil0J2jmzEFHEyEGhgDjNO9AA39kLRNjzjgXaQlrsRUf/V5hwL+tjYkX10XhXjN Zb+Wet33OTKVyO2f1b49hJNUn5xrroafqpkn+aSfVJKXoW9bCWxNdPYUNXzHzJ4efGf5uMIq5Ea lFAn+jKrFGpKUk41EN5QIE0Ih1XpDBMVqf2/+RvPzVmcOipw/d+8LiTbIz95grhmeO8xQ+GWcjm iflPkO+FmDzHnFviDSRIuKXTqHd1awrBAp3BGcltn5eCFvAjiy9iLTgkN8gHJHg== X-Google-Smtp-Source: AGHT+IESNcTGvVN4k0EYaaXCdIDdf4qv1awjmTqd/O8lynLE/hwFMmWAV0QVQZM1K89/KGK7Pb4KXg== X-Received: by 2002:a05:6a00:2e96:b0:76e:885a:c33c with SMTP id d2e1a72fcca58-7702fad486emr8086610b3a.26.1755964812754; Sat, 23 Aug 2025 09:00:12 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:12 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 2/6] RISC-V: KVM: Introduce feature specific reset for SBI FWFT Date: Sat, 23 Aug 2025 21:29:43 +0530 Message-ID: <20250823155947.1354229-3-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The SBI FWFT feature values must be reset upon VCPU reset so introduce feature specific reset callback for this purpose. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu_sbi_fwft.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c index 164a01288b0a..5a3bad0f9330 100644 --- a/arch/riscv/kvm/vcpu_sbi_fwft.c +++ b/arch/riscv/kvm/vcpu_sbi_fwft.c @@ -30,6 +30,13 @@ struct kvm_sbi_fwft_feature { */ bool (*supported)(struct kvm_vcpu *vcpu); =20 + /** + * @reset: Reset the feature value irrespective whether feature is suppor= ted or not + * + * This callback is mandatory + */ + void (*reset)(struct kvm_vcpu *vcpu); + /** * @set: Set the feature value * @@ -75,6 +82,13 @@ static bool kvm_sbi_fwft_misaligned_delegation_supported= (struct kvm_vcpu *vcpu) return misaligned_traps_can_delegate(); } =20 +static void kvm_sbi_fwft_reset_misaligned_delegation(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_config *cfg =3D &vcpu->arch.cfg; + + cfg->hedeleg &=3D ~MIS_DELEG; +} + static long kvm_sbi_fwft_set_misaligned_delegation(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsigned long value) @@ -124,6 +138,11 @@ static bool kvm_sbi_fwft_pointer_masking_pmlen_support= ed(struct kvm_vcpu *vcpu) return fwft->have_vs_pmlen_7 || fwft->have_vs_pmlen_16; } =20 +static void kvm_sbi_fwft_reset_pointer_masking_pmlen(struct kvm_vcpu *vcpu) +{ + vcpu->arch.cfg.henvcfg &=3D ~ENVCFG_PMM; +} + static long kvm_sbi_fwft_set_pointer_masking_pmlen(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsigned long value) @@ -180,6 +199,7 @@ static const struct kvm_sbi_fwft_feature features[] =3D= { { .id =3D SBI_FWFT_MISALIGNED_EXC_DELEG, .supported =3D kvm_sbi_fwft_misaligned_delegation_supported, + .reset =3D kvm_sbi_fwft_reset_misaligned_delegation, .set =3D kvm_sbi_fwft_set_misaligned_delegation, .get =3D kvm_sbi_fwft_get_misaligned_delegation, }, @@ -187,6 +207,7 @@ static const struct kvm_sbi_fwft_feature features[] =3D= { { .id =3D SBI_FWFT_POINTER_MASKING_PMLEN, .supported =3D kvm_sbi_fwft_pointer_masking_pmlen_supported, + .reset =3D kvm_sbi_fwft_reset_pointer_masking_pmlen, .set =3D kvm_sbi_fwft_set_pointer_masking_pmlen, .get =3D kvm_sbi_fwft_get_pointer_masking_pmlen, }, @@ -321,11 +342,16 @@ static void kvm_sbi_ext_fwft_deinit(struct kvm_vcpu *= vcpu) =20 static void kvm_sbi_ext_fwft_reset(struct kvm_vcpu *vcpu) { - int i; struct kvm_sbi_fwft *fwft =3D vcpu_to_fwft(vcpu); + const struct kvm_sbi_fwft_feature *feature; + int i; =20 - for (i =3D 0; i < ARRAY_SIZE(features); i++) + for (i =3D 0; i < ARRAY_SIZE(features); i++) { fwft->configs[i].flags =3D 0; + feature =3D &features[i]; + if (feature->reset) + feature->reset(vcpu); + } } =20 const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft =3D { --=20 2.43.0 From nobody Fri Oct 3 21:55:30 2025 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 93E442E8E1E for ; Sat, 23 Aug 2025 16:00:20 +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=1755964822; cv=none; b=VySXN04Zby8X2Hn1AUG8rQAE5ELT31bK6Fx7ImJW4hhsdRDnPLATPCbDJWfxj7AfAjEkBiHAw6byXlPoLlXdOrmXWiytolD5KrYKVgbYVd52VxQLRcsyBXn2CyvwQ+khokctWb5po4MhyLZVuuxhtn3xhY2oYeHIuzyZKbiO36I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964822; c=relaxed/simple; bh=o+lw/BPht1P4REIUIPZhrZhnYd85zsmpnu1ym62NXik=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tvsqaVU9Jm5fsOq6cUDFh1db48Wh4mA94oCvdd4kl9B2qzdGSlIodX5few1iqvQ+MF0smhuo0/UkfcmWZeYP152f+6zafs6cCulm7BdH/Gr3r26JIOIx3doePB08tYEdbRRM+GHNFNEp05giuFguEQkWSkCQrFyI3cR3AD/ZXzQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=jq9nVlpc; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="jq9nVlpc" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-24626e06f04so16965565ad.2 for ; Sat, 23 Aug 2025 09:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964820; x=1756569620; 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=3PRrbFKlAPo0iY7cqmxQ4BlWrfq3AMnKEWra5f0Zz/M=; b=jq9nVlpcNak8JysE1lrHUUp729gx/U452hrMFXm9k4zpLxB9bb0LKOoPr+INmXRhRv 3SK8NehV2wpzTiXNZ7ryjOz74vy0XEAOFUeYdDqHXvF8g0zpjgLokACWoY7LaOW0Dbeq Z4vfk3V9u/xhL7k3HKOvFZEfmZOSd5owXa3WaDsb+VDf7vnDNCbutT4S4MbcD7C+GOC4 IqrayTpkSTCSPHf9AbHPPUHNWxPc9uqxe1fnkaDfOOVgKIrnxz1r2YKqxX+PJc7dsg0b S3lrfBwgpGvyKftkteDamajtfK+ZgqNuB4sKaMoSoMknf/8B7IhbZ2QC1aKVMmgWrZGa X6GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964820; x=1756569620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3PRrbFKlAPo0iY7cqmxQ4BlWrfq3AMnKEWra5f0Zz/M=; b=fnPUDPAP1QYhDeNAz8vWs0JQ2vdJDcTxIFpDJLjmSu6TdwII+0gRn8M2sg/QGfg3xj PW4C9kTQnmv5OtcPlChoy7dERL2ysubuQqLP2ATqqvGyRNkjR1I3gBB/TmGzEIQ3uGvw nVoB1KGNOOr5Cyw6oZ57RJbS9A0ax1V4Q3oEQrvfXdxIQqRT4uAeOtFFClEC1hK5wQtC YBo9lUFEAj21v2iYk23J3VHYV/JSVOxVUTGNuEW+7h0X1+6dRCSdJZk0ex8BR2mGmisb KvYOfQT/9CdHKesveIjFkFneQbmPOu0XQKgouIcsgLDpanaRKJpDybKU9Kv1UcPe5v0U cSyA== X-Forwarded-Encrypted: i=1; AJvYcCUI8L5UginvrwL5hI9uYufBFaT2VQuL1W/NBJ+haUiJ4BdjK9erE2GMGBVr7tcOmWxxxZx6Gbqz6j8Rkuo=@vger.kernel.org X-Gm-Message-State: AOJu0YwhT5Mxg7FTeX0O3/0B3lAAtZyaaSQ4Tonl8joyxaxBgSy0fldE 7AlDA4fz2NqHwvWOXijt52tUGbMziMazivmQ1MCEKnUgGTnf1Yo9sIPukvzjj+97dbM= X-Gm-Gg: ASbGncukZP9eo0WrY2NrxNPkn17j54bC4W81Y1L6HXVep+DNLCpu77CMKWZ4MuDq4fk qVZLzx2ARhMPSh96VuWYsiEzkNClBdqmIzSTPDS5PeSaFk9fIVQhYJQREYnGCTvRl0eT16gAnNM CNZdw5CzyVDcQusiK6pvjLHa4gV52RfhCzD6ZZJZ/abuiZgzTE62Tm8//xHrYGxtC2BXr2CGRDJ rp5FIaRS72llHTa7DAV3iDCSjHuP+NOOGR5y7b5RsOxsRXqzcnSa40OshvajrwTU3ea+Ljf4bZG TEXb+Sz8O4vfMoaFyHWywMQMuYxrYOB7SuMCTL0bFHKO5jfLZf1r+mV7NQy+hP6RiJtPRtS7DJS jy4WNkRdFC4wNOIzzahRmEGVe0onDRH7RW7voOlAOyR5imfzM+bpVghPWghZgcw== X-Google-Smtp-Source: AGHT+IEz4ib3v6xj9/9qK/OO/ow5kk9gKoERQ302DF3ti/lE2LTdNFMCaskrQTDrkadVI8PFAruV+Q== X-Received: by 2002:a17:903:1107:b0:242:a1ee:6c3f with SMTP id d9443c01a7336-2462ee246bfmr92516195ad.4.1755964819449; Sat, 23 Aug 2025 09:00:19 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:18 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 3/6] RISC-V: KVM: Introduce optional ONE_REG callbacks for SBI extensions Date: Sat, 23 Aug 2025 21:29:44 +0530 Message-ID: <20250823155947.1354229-4-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SBI extensions can have per-VCPU state which needs to be saved/restored through ONE_REG interface for Guest/VM migration. Introduce optional ONE_REG callbacks for SBI extensions so that ONE_REG implementation for an SBI extenion is part of the extension sources. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 20 ++-- arch/riscv/kvm/vcpu_onereg.c | 31 +----- arch/riscv/kvm/vcpu_sbi.c | 145 ++++++++++++++++++++++---- arch/riscv/kvm/vcpu_sbi_sta.c | 63 +++++++---- 4 files changed, 176 insertions(+), 83 deletions(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm= /kvm_vcpu_sbi.h index 766031e80960..8970cc7530c4 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -59,6 +59,14 @@ struct kvm_vcpu_sbi_extension { void (*deinit)(struct kvm_vcpu *vcpu); =20 void (*reset)(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); + int (*get_state_reg)(struct kvm_vcpu *vcpu, unsigned long reg_num, + unsigned long reg_size, void *reg_val); + int (*set_state_reg)(struct kvm_vcpu *vcpu, unsigned long reg_num, + unsigned long reg_size, const void *reg_val); }; =20 void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run= ); @@ -73,10 +81,9 @@ int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); int kvm_riscv_vcpu_get_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); -int kvm_riscv_vcpu_set_reg_sbi(struct kvm_vcpu *vcpu, - const struct kvm_one_reg *reg); -int kvm_riscv_vcpu_get_reg_sbi(struct kvm_vcpu *vcpu, - const struct kvm_one_reg *reg); +int kvm_riscv_vcpu_reg_indices_sbi(struct kvm_vcpu *vcpu, u64 __user *uind= ices); +int kvm_riscv_vcpu_set_reg_sbi(struct kvm_vcpu *vcpu, const struct kvm_one= _reg *reg); +int kvm_riscv_vcpu_get_reg_sbi(struct kvm_vcpu *vcpu, const struct kvm_one= _reg *reg); const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext( struct kvm_vcpu *vcpu, unsigned long extid); bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx); @@ -85,11 +92,6 @@ 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); =20 -int kvm_riscv_vcpu_get_reg_sbi_sta(struct kvm_vcpu *vcpu, unsigned long re= g_num, - unsigned long *reg_val); -int kvm_riscv_vcpu_set_reg_sbi_sta(struct kvm_vcpu *vcpu, unsigned long re= g_num, - unsigned long reg_val); - #ifdef CONFIG_RISCV_SBI_V01 extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01; #endif diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c index 9f8b196e7697..0f4e444e5e10 100644 --- a/arch/riscv/kvm/vcpu_onereg.c +++ b/arch/riscv/kvm/vcpu_onereg.c @@ -1112,36 +1112,9 @@ static unsigned long num_sbi_ext_regs(struct kvm_vcp= u *vcpu) return copy_sbi_ext_reg_indices(vcpu, NULL); } =20 -static int copy_sbi_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindice= s) -{ - struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; - int total =3D 0; - - if (scontext->ext_status[KVM_RISCV_SBI_EXT_STA] =3D=3D KVM_RISCV_SBI_EXT_= STATUS_ENABLED) { - u64 size =3D IS_ENABLED(CONFIG_32BIT) ? KVM_REG_SIZE_U32 : KVM_REG_SIZE_= U64; - int n =3D sizeof(struct kvm_riscv_sbi_sta) / sizeof(unsigned long); - - for (int i =3D 0; i < n; i++) { - u64 reg =3D KVM_REG_RISCV | size | - KVM_REG_RISCV_SBI_STATE | - KVM_REG_RISCV_SBI_STA | i; - - if (uindices) { - if (put_user(reg, uindices)) - return -EFAULT; - uindices++; - } - } - - total +=3D n; - } - - return total; -} - static inline unsigned long num_sbi_regs(struct kvm_vcpu *vcpu) { - return copy_sbi_reg_indices(vcpu, NULL); + return kvm_riscv_vcpu_reg_indices_sbi(vcpu, NULL); } =20 static inline unsigned long num_vector_regs(const struct kvm_vcpu *vcpu) @@ -1269,7 +1242,7 @@ int kvm_riscv_vcpu_copy_reg_indices(struct kvm_vcpu *= vcpu, return ret; uindices +=3D ret; =20 - ret =3D copy_sbi_reg_indices(vcpu, uindices); + ret =3D kvm_riscv_vcpu_reg_indices_sbi(vcpu, uindices); if (ret < 0) return ret; uindices +=3D ret; diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index 01a93f4fdb16..04903e5012d6 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -364,64 +364,163 @@ int kvm_riscv_vcpu_get_reg_sbi_ext(struct kvm_vcpu *= vcpu, return 0; } =20 -int kvm_riscv_vcpu_set_reg_sbi(struct kvm_vcpu *vcpu, - const struct kvm_one_reg *reg) +int kvm_riscv_vcpu_reg_indices_sbi(struct kvm_vcpu *vcpu, u64 __user *uind= ices) +{ + struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; + const struct kvm_riscv_sbi_extension_entry *entry; + const struct kvm_vcpu_sbi_extension *ext; + unsigned long state_reg_count; + int i, j, rc, count =3D 0; + u64 reg; + + for (i =3D 0; i < ARRAY_SIZE(sbi_ext); i++) { + entry =3D &sbi_ext[i]; + ext =3D entry->ext_ptr; + + if (!ext->get_state_reg_count || + scontext->ext_status[entry->ext_idx] !=3D KVM_RISCV_SBI_EXT_STATUS_E= NABLED) + continue; + + state_reg_count =3D ext->get_state_reg_count(vcpu); + if (!uindices) + goto skip_put_user; + + for (j =3D 0; j < state_reg_count; j++) { + if (ext->get_state_reg_id) { + rc =3D ext->get_state_reg_id(vcpu, j, ®); + if (rc) + return rc; + } else { + reg =3D KVM_REG_RISCV | + (IS_ENABLED(CONFIG_32BIT) ? + KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64) | + KVM_REG_RISCV_SBI_STATE | + ext->state_reg_subtype | j; + } + + if (put_user(reg, uindices)) + return -EFAULT; + uindices++; + } + +skip_put_user: + count +=3D state_reg_count; + } + + return count; +} + +static const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext_withstat= e(struct kvm_vcpu *vcpu, + unsigned long subtype) +{ + struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; + const struct kvm_riscv_sbi_extension_entry *entry; + const struct kvm_vcpu_sbi_extension *ext; + int i; + + for (i =3D 0; i < ARRAY_SIZE(sbi_ext); i++) { + entry =3D &sbi_ext[i]; + ext =3D entry->ext_ptr; + + if (ext->get_state_reg_count && + ext->state_reg_subtype =3D=3D subtype && + scontext->ext_status[entry->ext_idx] =3D=3D KVM_RISCV_SBI_EXT_STATUS= _ENABLED) + return ext; + } + + return NULL; +} + +int kvm_riscv_vcpu_set_reg_sbi(struct kvm_vcpu *vcpu, const struct kvm_one= _reg *reg) { unsigned long __user *uaddr =3D (unsigned long __user *)(unsigned long)reg->addr; unsigned long reg_num =3D reg->id & ~(KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_RISCV_SBI_STATE); - unsigned long reg_subtype, reg_val; - - if (KVM_REG_SIZE(reg->id) !=3D sizeof(unsigned long)) + const struct kvm_vcpu_sbi_extension *ext; + unsigned long reg_subtype; + void *reg_val; + u64 data64; + u32 data32; + u16 data16; + u8 data8; + + switch (KVM_REG_SIZE(reg->id)) { + case 1: + reg_val =3D &data8; + break; + case 2: + reg_val =3D &data16; + break; + case 4: + reg_val =3D &data32; + break; + case 8: + reg_val =3D &data64; + break; + default: return -EINVAL; + } =20 - if (copy_from_user(®_val, uaddr, KVM_REG_SIZE(reg->id))) + if (copy_from_user(reg_val, uaddr, KVM_REG_SIZE(reg->id))) return -EFAULT; =20 reg_subtype =3D reg_num & KVM_REG_RISCV_SUBTYPE_MASK; reg_num &=3D ~KVM_REG_RISCV_SUBTYPE_MASK; =20 - switch (reg_subtype) { - case KVM_REG_RISCV_SBI_STA: - return kvm_riscv_vcpu_set_reg_sbi_sta(vcpu, reg_num, reg_val); - default: + ext =3D kvm_vcpu_sbi_find_ext_withstate(vcpu, reg_subtype); + if (!ext || !ext->set_state_reg) return -EINVAL; - } =20 - return 0; + return ext->set_state_reg(vcpu, reg_num, KVM_REG_SIZE(reg->id), reg_val); } =20 -int kvm_riscv_vcpu_get_reg_sbi(struct kvm_vcpu *vcpu, - const struct kvm_one_reg *reg) +int kvm_riscv_vcpu_get_reg_sbi(struct kvm_vcpu *vcpu, const struct kvm_one= _reg *reg) { unsigned long __user *uaddr =3D (unsigned long __user *)(unsigned long)reg->addr; unsigned long reg_num =3D reg->id & ~(KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_RISCV_SBI_STATE); - unsigned long reg_subtype, reg_val; + const struct kvm_vcpu_sbi_extension *ext; + unsigned long reg_subtype; + void *reg_val; + u64 data64; + u32 data32; + u16 data16; + u8 data8; int ret; =20 - if (KVM_REG_SIZE(reg->id) !=3D sizeof(unsigned long)) + switch (KVM_REG_SIZE(reg->id)) { + case 1: + reg_val =3D &data8; + break; + case 2: + reg_val =3D &data16; + break; + case 4: + reg_val =3D &data32; + break; + case 8: + reg_val =3D &data64; + break; + default: return -EINVAL; + } =20 reg_subtype =3D reg_num & KVM_REG_RISCV_SUBTYPE_MASK; reg_num &=3D ~KVM_REG_RISCV_SUBTYPE_MASK; =20 - switch (reg_subtype) { - case KVM_REG_RISCV_SBI_STA: - ret =3D kvm_riscv_vcpu_get_reg_sbi_sta(vcpu, reg_num, ®_val); - break; - default: + ext =3D kvm_vcpu_sbi_find_ext_withstate(vcpu, reg_subtype); + if (!ext || !ext->get_state_reg) return -EINVAL; - } =20 + ret =3D ext->get_state_reg(vcpu, reg_num, KVM_REG_SIZE(reg->id), reg_val); if (ret) return ret; =20 - if (copy_to_user(uaddr, ®_val, KVM_REG_SIZE(reg->id))) + if (copy_to_user(uaddr, reg_val, KVM_REG_SIZE(reg->id))) return -EFAULT; =20 return 0; diff --git a/arch/riscv/kvm/vcpu_sbi_sta.c b/arch/riscv/kvm/vcpu_sbi_sta.c index cc6cb7c8f0e4..68486f90a61e 100644 --- a/arch/riscv/kvm/vcpu_sbi_sta.c +++ b/arch/riscv/kvm/vcpu_sbi_sta.c @@ -151,63 +151,82 @@ static unsigned long kvm_sbi_ext_sta_probe(struct kvm= _vcpu *vcpu) return !!sched_info_on(); } =20 -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_sta =3D { - .extid_start =3D SBI_EXT_STA, - .extid_end =3D SBI_EXT_STA, - .handler =3D kvm_sbi_ext_sta_handler, - .probe =3D kvm_sbi_ext_sta_probe, - .reset =3D kvm_riscv_vcpu_sbi_sta_reset, -}; +static unsigned long kvm_sbi_ext_sta_get_state_reg_count(struct kvm_vcpu *= vcpu) +{ + return sizeof(struct kvm_riscv_sbi_sta) / sizeof(unsigned long); +} =20 -int kvm_riscv_vcpu_get_reg_sbi_sta(struct kvm_vcpu *vcpu, - unsigned long reg_num, - unsigned long *reg_val) +static int kvm_sbi_ext_sta_get_reg(struct kvm_vcpu *vcpu, unsigned long re= g_num, + unsigned long reg_size, void *reg_val) { + unsigned long *value; + + if (reg_size !=3D sizeof(unsigned long)) + return -EINVAL; + value =3D reg_val; + switch (reg_num) { case KVM_REG_RISCV_SBI_STA_REG(shmem_lo): - *reg_val =3D (unsigned long)vcpu->arch.sta.shmem; + *value =3D (unsigned long)vcpu->arch.sta.shmem; break; case KVM_REG_RISCV_SBI_STA_REG(shmem_hi): if (IS_ENABLED(CONFIG_32BIT)) - *reg_val =3D upper_32_bits(vcpu->arch.sta.shmem); + *value =3D upper_32_bits(vcpu->arch.sta.shmem); else - *reg_val =3D 0; + *value =3D 0; break; default: - return -EINVAL; + return -ENOENT; } =20 return 0; } =20 -int kvm_riscv_vcpu_set_reg_sbi_sta(struct kvm_vcpu *vcpu, - unsigned long reg_num, - unsigned long reg_val) +static int kvm_sbi_ext_sta_set_reg(struct kvm_vcpu *vcpu, unsigned long re= g_num, + unsigned long reg_size, const void *reg_val) { + unsigned long value; + + if (reg_size !=3D sizeof(unsigned long)) + return -EINVAL; + value =3D *(const unsigned long *)reg_val; + switch (reg_num) { case KVM_REG_RISCV_SBI_STA_REG(shmem_lo): if (IS_ENABLED(CONFIG_32BIT)) { gpa_t hi =3D upper_32_bits(vcpu->arch.sta.shmem); =20 - vcpu->arch.sta.shmem =3D reg_val; + vcpu->arch.sta.shmem =3D value; vcpu->arch.sta.shmem |=3D hi << 32; } else { - vcpu->arch.sta.shmem =3D reg_val; + vcpu->arch.sta.shmem =3D value; } break; case KVM_REG_RISCV_SBI_STA_REG(shmem_hi): if (IS_ENABLED(CONFIG_32BIT)) { gpa_t lo =3D lower_32_bits(vcpu->arch.sta.shmem); =20 - vcpu->arch.sta.shmem =3D ((gpa_t)reg_val << 32); + vcpu->arch.sta.shmem =3D ((gpa_t)value << 32); vcpu->arch.sta.shmem |=3D lo; - } else if (reg_val !=3D 0) { + } else if (value !=3D 0) { return -EINVAL; } break; default: - return -EINVAL; + return -ENOENT; } =20 return 0; } + +const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_sta =3D { + .extid_start =3D SBI_EXT_STA, + .extid_end =3D SBI_EXT_STA, + .handler =3D kvm_sbi_ext_sta_handler, + .probe =3D kvm_sbi_ext_sta_probe, + .reset =3D kvm_riscv_vcpu_sbi_sta_reset, + .state_reg_subtype =3D KVM_REG_RISCV_SBI_STA, + .get_state_reg_count =3D kvm_sbi_ext_sta_get_state_reg_count, + .get_state_reg =3D kvm_sbi_ext_sta_get_reg, + .set_state_reg =3D kvm_sbi_ext_sta_set_reg, +}; --=20 2.43.0 From nobody Fri Oct 3 21:55:30 2025 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 8A1C62EA739 for ; Sat, 23 Aug 2025 16:00:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964828; cv=none; b=nsLK8Jf5CxB4TOFtHTy8GBUdpZIpZgc65T6gUXdtJ19FKHMSKrLjUPXdqmnAfblVKVcz0fJlGd/lblTBLe1y/8iucB//s1o97irPHmnert2VlwroPg8guyIyMLSmpHXlyZVDqMu56DiD8A8rovaeLOA2GuHfNedqW95zn1P+jf8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964828; c=relaxed/simple; bh=KVSzn4jAFjRZOnjj54GPJabMi5/vyN4OVJVrz5LsUW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hICgizG200FE4tBsAmUJLWjJUN4+2bN3n9JvPTm+inSKLB4cUixBRz+vwoFAXXNJuF3zBbrDJcgDApuCxW5LWKQ0ETGU+deA6WFQrTqfJAzVYXuogd3NeLn06Vid1zw7Kofh0QF3qOOx20B/s1e7tFZC080TJE0mwouy1o5G7AA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=A6WkRlKw; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="A6WkRlKw" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-76e2eb6d07bso2622509b3a.3 for ; Sat, 23 Aug 2025 09:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964826; x=1756569626; 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=+QNTGSl8W9jUKwX1Y5hiHFssIh4zzMlPaIQnsQ0pfko=; b=A6WkRlKwBgCMqncNCEJCWsNwGzcnkkWlBwHglbOchMyj4jH9ops8KgkRZFUa67ZF14 5cIe7k+wimeRnrrW59ZofqjCBpXfmzbsTivhn4ywVerfxlkQasWXCDbBHsDttfPgJrCv 6LeRUFrlQ7EKPXBIP6BFNOineqk2LvigJT5XteZbYYzVeErErNLY/W/HDmx+P1hVRoR6 XsNN0v1MdNoYf292JtsK1VUACxc3gMTliHXqK45PHH66Id5RvapW2+4Y7ELx2sJ4IFnA A4U4OoDgvihwtR1RIgagN3I/7n4c0pCAKkN+H/6nJvTLOmh0gjoE3NQOc28lVIvSk+Yw WJ3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964826; x=1756569626; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+QNTGSl8W9jUKwX1Y5hiHFssIh4zzMlPaIQnsQ0pfko=; b=pyQCYAONBqIZm4mH5aSOH1k3ehxaWF0CLnWiL+oExFI2FBtr3l+AhK40uqqCng4h7g b3Q1ZCHUDv66puFj7u0X4QzWv0wCU81NbCs7g3odLnWTl/JwJwk0DnlIXnkqhoQR33Ru u4O8o8Bw6rxvKvDNyJVu8AdIphErZQWoN8E659Rg0cdNiHvURGKoMyZVcZJFACVjHyJ2 vTO7L5w9iI3s/s66HCC3DGNJ55jw8QHXfykyzUmpKFvzuLcGATUyBTxfhAZCFkI2+pL3 CgojUd/EMimDAIZJwzNOpha04wDOWEBr6hGy7+CFKtvU5cJ5xWWkEn0T0aibOzXg4sRg JKqg== X-Forwarded-Encrypted: i=1; AJvYcCWUs57l+JLC7ggtdnGidy1f3PrXGRIQ87jca22sf+HxtytMekaWFDuKqSdCxZ92X68/WSJgHdNNpXOITWo=@vger.kernel.org X-Gm-Message-State: AOJu0YyLHyKYSVYkKZnj/3Kor5+s69g+5NCjhv+EXibmU+ESqjqL3WsP 6Y1fqRAm23l3ewPW7kIKJG64i3qDH/iGNoJO3MEOVq0mHACk4dwzJrc/rbU/C30JZtRdLq7G3BK vMQrU X-Gm-Gg: ASbGncvdZtLAZYnXi7LF9rhRTz1Job9XhZgwv7J0TrCFSwhwn5eScxCx/fDu78LzH5A y2QVJt/kGgsifP8qD9GKbkVDEnAOPmL0BmxhAJQazVXT0oIqolDvRLgzXO0jz5W3GfnyTlOpOSO AwCqSYcIs5tqC6smTB6qdamBBp91VYLqMQQBcNdPjwEUTTRrC2KCPlkSkTwPcU03HFnmlmMoSLc CCPQJ43QwneTAZG+xgdKlPy9zNBrrRfsyATAtTDS+vxjnouatsUy+Rs6QRIoqjZzKYQlTNUMSna 31v/8f0xFWOin8ta/sc4PzKykZSIld7qcTMyMmRb0FEwQZHwCBvdBXTbe8ORZd9n9JTSfLADwDX bzieW9byZWqxSdRpWkUgnds1G2R7eb6UhCcJqx38UbVrMTLzvao8mjjqgYo7+5VA91xGGiIoC X-Google-Smtp-Source: AGHT+IEo9oLIFiXAIQrZJ7Jw/lL5+vEVJj3YiBwiqokGLrQldRoOB9aEEhSOfywm+FIR5r1fQzfjXg== X-Received: by 2002:a05:6a00:9288:b0:76b:d67b:2ee0 with SMTP id d2e1a72fcca58-7702f9d7f70mr10308982b3a.6.1755964825622; Sat, 23 Aug 2025 09:00:25 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:25 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 4/6] RISC-V: KVM: Move copy_sbi_ext_reg_indices() to SBI implementation Date: Sat, 23 Aug 2025 21:29:45 +0530 Message-ID: <20250823155947.1354229-5-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ONE_REG handling of SBI extension enable/disable registers and SBI extension state registers is already under SBI implementation. On similar lines, let's move copy_sbi_ext_reg_indices() under SBI implementation. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 2 +- arch/riscv/kvm/vcpu_onereg.c | 29 ++------------------------- arch/riscv/kvm/vcpu_sbi.c | 27 ++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm= /kvm_vcpu_sbi.h index 8970cc7530c4..d75ca45c0152 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -77,6 +77,7 @@ void kvm_riscv_vcpu_sbi_request_reset(struct kvm_vcpu *vc= pu, unsigned long pc, unsigned long a1); void kvm_riscv_vcpu_sbi_load_reset_state(struct kvm_vcpu *vcpu); int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run); +int kvm_riscv_vcpu_reg_indices_sbi_ext(struct kvm_vcpu *vcpu, u64 __user *= uindices); int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); int kvm_riscv_vcpu_get_reg_sbi_ext(struct kvm_vcpu *vcpu, @@ -86,7 +87,6 @@ int kvm_riscv_vcpu_set_reg_sbi(struct kvm_vcpu *vcpu, con= st struct kvm_one_reg * int kvm_riscv_vcpu_get_reg_sbi(struct kvm_vcpu *vcpu, const struct kvm_one= _reg *reg); const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext( struct kvm_vcpu *vcpu, unsigned long extid); -bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx); 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); diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c index 0f4e444e5e10..865dae903aa0 100644 --- a/arch/riscv/kvm/vcpu_onereg.c +++ b/arch/riscv/kvm/vcpu_onereg.c @@ -1082,34 +1082,9 @@ static inline unsigned long num_isa_ext_regs(const s= truct kvm_vcpu *vcpu) return copy_isa_ext_reg_indices(vcpu, NULL); } =20 -static int copy_sbi_ext_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uin= dices) -{ - unsigned int n =3D 0; - - for (int i =3D 0; i < KVM_RISCV_SBI_EXT_MAX; i++) { - u64 size =3D IS_ENABLED(CONFIG_32BIT) ? - KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64; - u64 reg =3D KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT | - KVM_REG_RISCV_SBI_SINGLE | i; - - if (!riscv_vcpu_supports_sbi_ext(vcpu, i)) - continue; - - if (uindices) { - if (put_user(reg, uindices)) - return -EFAULT; - uindices++; - } - - n++; - } - - return n; -} - static unsigned long num_sbi_ext_regs(struct kvm_vcpu *vcpu) { - return copy_sbi_ext_reg_indices(vcpu, NULL); + return kvm_riscv_vcpu_reg_indices_sbi_ext(vcpu, NULL); } =20 static inline unsigned long num_sbi_regs(struct kvm_vcpu *vcpu) @@ -1237,7 +1212,7 @@ int kvm_riscv_vcpu_copy_reg_indices(struct kvm_vcpu *= vcpu, return ret; uindices +=3D ret; =20 - ret =3D copy_sbi_ext_reg_indices(vcpu, uindices); + ret =3D kvm_riscv_vcpu_reg_indices_sbi_ext(vcpu, uindices); if (ret < 0) return ret; uindices +=3D ret; diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index 04903e5012d6..1b13623380e1 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -110,7 +110,7 @@ riscv_vcpu_get_sbi_ext(struct kvm_vcpu *vcpu, unsigned = long idx) return sext; } =20 -bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx) +static bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx) { struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; const struct kvm_riscv_sbi_extension_entry *sext; @@ -288,6 +288,31 @@ static int riscv_vcpu_get_sbi_ext_multi(struct kvm_vcp= u *vcpu, return 0; } =20 +int kvm_riscv_vcpu_reg_indices_sbi_ext(struct kvm_vcpu *vcpu, u64 __user *= uindices) +{ + unsigned int n =3D 0; + + for (int i =3D 0; i < KVM_RISCV_SBI_EXT_MAX; i++) { + u64 size =3D IS_ENABLED(CONFIG_32BIT) ? + KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64; + u64 reg =3D KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT | + KVM_REG_RISCV_SBI_SINGLE | i; + + if (!riscv_vcpu_supports_sbi_ext(vcpu, i)) + continue; + + if (uindices) { + if (put_user(reg, uindices)) + return -EFAULT; + uindices++; + } + + n++; + } + + return n; +} + int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { --=20 2.43.0 From nobody Fri Oct 3 21:55:30 2025 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 D5D322EB5CF for ; Sat, 23 Aug 2025 16:00:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964834; cv=none; b=QUuYQbPto1n1+VndWjVWhioywbRgBbuaBstn4+SVRGm3QxNhwUD7ew6xoO8mEM3ftnuRGJR31RCmyuH02FIx64DdiR35vuNMMNnY+RORzUJ6A/xAwlmMnXlul2eCg/WkN69GcDhYch4V/oRVLhdV2o3yh67URVZP2UN35Di9HEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964834; c=relaxed/simple; bh=DiTJjQZCHFQSxTv++k7FIWpOJfn6nL2gPLa+N70C2/c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=shWkszqGHoRlXh7vHh38GWMr56+ZBtK6X5fUro2o2YFEaJUFh0+MZZ01P4FT8rhZrHAzE8G+JNp9pZtKVtuEFRtleIfowQ0/i39GXdk7VzxHtfmw8fSGN99tIqOui8U4GiUpODm1MSFPBc4eZ20wD1DWRkkJpq1zTZqkC+SC18A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=poJGvEz2; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="poJGvEz2" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-76e2eb4a171so3805025b3a.3 for ; Sat, 23 Aug 2025 09:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964832; x=1756569632; 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=TOBEpzpsJOm5NzKt44w6bKVXSAiqD9Y6Ko8TaaNwkww=; b=poJGvEz2+1uq5bIChn3j4/AcERj2IqsDZQaX1rBRDzu1vgYU1ATK33L6JJilbCdyJ1 z+t3mHs1Jyy7v/MDkHQiL1ErDaSpWWs7RSpS8qQ3ecWwcmvHoxjVZPiFIAelhHCq/geA VEHEOMCQ6HCL5NsbF0p4um2wHv5p/IOSFoASDZ2GjqfENSiyx6L012zsEEAiuy7sdNPI 9yqvgpKO+nx1HuQtXrBQipysOVbBT5cqwhV8zGrVQWSsAbJ35nxWGquPnBWM8u4lzFvH 39x8fPgFIqZqhntNVN7lf7sRko7eD7CWIkoh8fww14+Xuhphxxx0gkGh+xQrJHELP9T6 aGoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964832; x=1756569632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TOBEpzpsJOm5NzKt44w6bKVXSAiqD9Y6Ko8TaaNwkww=; b=QnnCxP9mhjjaklVdtFq2BpFxIGoRK16mstr0it0SsT1zTuLTv5egvDtQD4PXzXCwy5 gC3Eisz5iXMQAsU0iNt3SVzKgpPyJ3kYUtMYJBAf76HPQBg8ATdCiB2paAiRo0GEcsX4 3KV+X2G9/uqcVs5ZYnMiC+COB7HZG2KX6+kcg5jRUwDf/UVmrs1CjIbIF+asaZdAVIve dv8C6NmW4UzAZMdLxkDk2QfUGquEQ2dDcxYFK8BfRMWCInnsroWzh+X5assf4ONsJOdW 1tfbPCAFY8febBjIFJmcN+auQFWZbO/Jde2mbdap9oJJ6nlcAlM4zvVN35r4yHVDGCfm yeLw== X-Forwarded-Encrypted: i=1; AJvYcCWZ45xa1lhWTWSR10aebdw7vdBChtT0DSxtpXFsZEK/H44+YmLn1K2jyuBI83/csXG1WlefLwPo3v0VHCw=@vger.kernel.org X-Gm-Message-State: AOJu0YyPUDihTHBI6sKyvQ3Evjrz7GJ7IYqhrPJecGTv4NSnnTc29awi vfBeWTgqPsk4Uyi4Hqm/dPAO3r0zvATL9sdyxn72LtLcT3t4jm89Gds8nZdgNBTDPwg= X-Gm-Gg: ASbGnctWMCLWgEDRX8LRcF3QXzfyj14B316hsrI0QJ4HqOEQYcEAawza+bEmWVQaOSt ynm9aS79+jq3mjH/RQz5lLXnXXilYwEae3z0C4WtDR9br5huEYSD3YdC3v10IzcQVITM133jBbY 4PAa+et7OhVkLeS1JJ3lLep5hqXcFrqtGB82pSboqXTV7cp4B5JHfP6VyEtCAweNJBAlgBtvxml cb96e0K++72wch2y4GXYov6rirdd2/+Gw+nq6GtImB9W3NODSZKa4bOR1akWzkdEW0W68TYMC75 ZfBzyGMhHmXTPKzhl6oyQqR67VPACAV/d3+pNDtngsBcTsTbRdezl41ot248/YsZe+Mx5KAKDVw Rg7uYek9Y64LkBTbUSDw8ckWgVUOvsqmLlm9vCi8ZFTewBhkhvSr9Z+4Yh8kEGw== X-Google-Smtp-Source: AGHT+IE53BwXP6ryhSfjXi5EZJJmMqH5ezOmaRJWAx3BEmYaFaH4XaSvhu2sMiMiod7cJeFFLx3hpQ== X-Received: by 2002:a05:6a00:2991:b0:770:374c:6c60 with SMTP id d2e1a72fcca58-770375bb1b7mr6594396b3a.12.1755964831710; Sat, 23 Aug 2025 09:00:31 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:31 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 5/6] RISC-V: KVM: Implement ONE_REG interface for SBI FWFT state Date: Sat, 23 Aug 2025 21:29:46 +0530 Message-ID: <20250823155947.1354229-6-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The KVM user-space needs a way to save/restore the state of SBI FWFT features so implement SBI extension ONE_REG callbacks. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h | 1 + arch/riscv/include/uapi/asm/kvm.h | 15 ++ arch/riscv/kvm/vcpu_sbi_fwft.c | 197 +++++++++++++++++++-- 3 files changed, 200 insertions(+), 13 deletions(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h b/arch/riscv/includ= e/asm/kvm_vcpu_sbi_fwft.h index afb6305e46bb..5604cec79902 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h @@ -16,6 +16,7 @@ struct kvm_sbi_fwft_feature; struct kvm_sbi_fwft_config { const struct kvm_sbi_fwft_feature *feature; bool supported; + bool enabled; unsigned long flags; }; =20 diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/as= m/kvm.h index d2ebc4d0be4b..11fe4a89600c 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -220,6 +220,18 @@ struct kvm_riscv_sbi_sta { unsigned long shmem_hi; }; =20 +struct kvm_riscv_sbi_fwft_feature { + unsigned long enable; + unsigned long flags; + unsigned long value; +}; + +/* SBI FWFT extension registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ +struct kvm_riscv_sbi_fwft { + struct kvm_riscv_sbi_fwft_feature misaligned_deleg; + struct kvm_riscv_sbi_fwft_feature pointer_masking; +}; + /* Possible states for kvm_riscv_timer */ #define KVM_RISCV_TIMER_STATE_OFF 0 #define KVM_RISCV_TIMER_STATE_ON 1 @@ -303,6 +315,9 @@ struct kvm_riscv_sbi_sta { #define KVM_REG_RISCV_SBI_STA (0x0 << KVM_REG_RISCV_SUBTYPE_SHIFT) #define KVM_REG_RISCV_SBI_STA_REG(name) \ (offsetof(struct kvm_riscv_sbi_sta, name) / sizeof(unsigned long)) +#define KVM_REG_RISCV_SBI_FWFT (0x1 << KVM_REG_RISCV_SUBTYPE_SHIFT) +#define KVM_REG_RISCV_SBI_FWFT_REG(name) \ + (offsetof(struct kvm_riscv_sbi_fwft, name) / sizeof(unsigned long)) =20 /* Device Control API: RISC-V AIA */ #define KVM_DEV_RISCV_APLIC_ALIGN 0x1000 diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c index 5a3bad0f9330..cacb3d4410a5 100644 --- a/arch/riscv/kvm/vcpu_sbi_fwft.c +++ b/arch/riscv/kvm/vcpu_sbi_fwft.c @@ -22,6 +22,11 @@ struct kvm_sbi_fwft_feature { */ enum sbi_fwft_feature_t id; =20 + /** + * @first_reg_num: ONE_REG index of the first ONE_REG register + */ + unsigned long first_reg_num; + /** * @supported: Check if the feature is supported on the vcpu * @@ -44,7 +49,8 @@ struct kvm_sbi_fwft_feature { * * This callback is mandatory */ - long (*set)(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsi= gned long value); + long (*set)(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long value); =20 /** * @get: Get the feature current value @@ -53,7 +59,8 @@ struct kvm_sbi_fwft_feature { * * This callback is mandatory */ - long (*get)(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsi= gned long *value); + long (*get)(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long *value); }; =20 static const enum sbi_fwft_feature_t kvm_fwft_defined_features[] =3D { @@ -91,16 +98,18 @@ static void kvm_sbi_fwft_reset_misaligned_delegation(st= ruct kvm_vcpu *vcpu) =20 static long kvm_sbi_fwft_set_misaligned_delegation(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, - unsigned long value) + bool one_reg_access, unsigned long value) { struct kvm_vcpu_config *cfg =3D &vcpu->arch.cfg; =20 if (value =3D=3D 1) { cfg->hedeleg |=3D MIS_DELEG; - csr_set(CSR_HEDELEG, MIS_DELEG); + if (!one_reg_access) + csr_set(CSR_HEDELEG, MIS_DELEG); } else if (value =3D=3D 0) { cfg->hedeleg &=3D ~MIS_DELEG; - csr_clear(CSR_HEDELEG, MIS_DELEG); + if (!one_reg_access) + csr_clear(CSR_HEDELEG, MIS_DELEG); } else { return SBI_ERR_INVALID_PARAM; } @@ -110,10 +119,11 @@ static long kvm_sbi_fwft_set_misaligned_delegation(st= ruct kvm_vcpu *vcpu, =20 static long kvm_sbi_fwft_get_misaligned_delegation(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, - unsigned long *value) + bool one_reg_access, unsigned long *value) { - *value =3D (csr_read(CSR_HEDELEG) & MIS_DELEG) =3D=3D MIS_DELEG; + struct kvm_vcpu_config *cfg =3D &vcpu->arch.cfg; =20 + *value =3D (cfg->hedeleg & MIS_DELEG) =3D=3D MIS_DELEG; return SBI_SUCCESS; } =20 @@ -145,7 +155,7 @@ static void kvm_sbi_fwft_reset_pointer_masking_pmlen(st= ruct kvm_vcpu *vcpu) =20 static long kvm_sbi_fwft_set_pointer_masking_pmlen(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, - unsigned long value) + bool one_reg_access, unsigned long value) { struct kvm_sbi_fwft *fwft =3D vcpu_to_fwft(vcpu); unsigned long pmm; @@ -167,14 +177,15 @@ static long kvm_sbi_fwft_set_pointer_masking_pmlen(st= ruct kvm_vcpu *vcpu, * update here so that VCPU see's pointer masking mode change * immediately. */ - csr_write(CSR_HENVCFG, vcpu->arch.cfg.henvcfg); + if (!one_reg_access) + csr_write(CSR_HENVCFG, vcpu->arch.cfg.henvcfg); =20 return SBI_SUCCESS; } =20 static long kvm_sbi_fwft_get_pointer_masking_pmlen(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, - unsigned long *value) + bool one_reg_access, unsigned long *value) { switch (vcpu->arch.cfg.henvcfg & ENVCFG_PMM) { case ENVCFG_PMM_PMLEN_0: @@ -198,6 +209,8 @@ static long kvm_sbi_fwft_get_pointer_masking_pmlen(stru= ct kvm_vcpu *vcpu, static const struct kvm_sbi_fwft_feature features[] =3D { { .id =3D SBI_FWFT_MISALIGNED_EXC_DELEG, + .first_reg_num =3D offsetof(struct kvm_riscv_sbi_fwft, misaligned_deleg.= enable) / + sizeof(unsigned long), .supported =3D kvm_sbi_fwft_misaligned_delegation_supported, .reset =3D kvm_sbi_fwft_reset_misaligned_delegation, .set =3D kvm_sbi_fwft_set_misaligned_delegation, @@ -206,6 +219,8 @@ static const struct kvm_sbi_fwft_feature features[] =3D= { #ifndef CONFIG_32BIT { .id =3D SBI_FWFT_POINTER_MASKING_PMLEN, + .first_reg_num =3D offsetof(struct kvm_riscv_sbi_fwft, pointer_masking.e= nable) / + sizeof(unsigned long), .supported =3D kvm_sbi_fwft_pointer_masking_pmlen_supported, .reset =3D kvm_sbi_fwft_reset_pointer_masking_pmlen, .set =3D kvm_sbi_fwft_set_pointer_masking_pmlen, @@ -214,6 +229,20 @@ static const struct kvm_sbi_fwft_feature features[] = =3D { #endif }; =20 +static const struct kvm_sbi_fwft_feature *kvm_sbi_fwft_regnum_to_feature(u= nsigned long reg_num) +{ + const struct kvm_sbi_fwft_feature *feature; + int i; + + for (i =3D 0; i < ARRAY_SIZE(features); i++) { + feature =3D &features[i]; + if (feature->first_reg_num <=3D reg_num && reg_num < (feature->first_reg= _num + 3)) + return feature; + } + + return NULL; +} + static struct kvm_sbi_fwft_config * kvm_sbi_fwft_get_config(struct kvm_vcpu *vcpu, enum sbi_fwft_feature_t fea= ture) { @@ -241,7 +270,7 @@ static int kvm_fwft_get_feature(struct kvm_vcpu *vcpu, = u32 feature, return SBI_ERR_DENIED; } =20 - if (!tconf->supported) + if (!tconf->supported || !tconf->enabled) return SBI_ERR_NOT_SUPPORTED; =20 *conf =3D tconf; @@ -267,7 +296,7 @@ static int kvm_sbi_fwft_set(struct kvm_vcpu *vcpu, u32 = feature, =20 conf->flags =3D flags; =20 - return conf->feature->set(vcpu, conf, value); + return conf->feature->set(vcpu, conf, false, value); } =20 static int kvm_sbi_fwft_get(struct kvm_vcpu *vcpu, unsigned long feature, @@ -280,7 +309,7 @@ static int kvm_sbi_fwft_get(struct kvm_vcpu *vcpu, unsi= gned long feature, if (ret) return ret; =20 - return conf->feature->get(vcpu, conf, value); + return conf->feature->get(vcpu, conf, false, value); } =20 static int kvm_sbi_ext_fwft_handler(struct kvm_vcpu *vcpu, struct kvm_run = *run, @@ -327,6 +356,7 @@ static int kvm_sbi_ext_fwft_init(struct kvm_vcpu *vcpu) else conf->supported =3D true; =20 + conf->enabled =3D conf->supported; conf->feature =3D feature; } =20 @@ -354,6 +384,142 @@ static void kvm_sbi_ext_fwft_reset(struct kvm_vcpu *v= cpu) } } =20 +static unsigned long kvm_sbi_ext_fwft_get_reg_count(struct kvm_vcpu *vcpu) +{ + unsigned long max_reg_count =3D sizeof(struct kvm_riscv_sbi_fwft) / sizeo= f(unsigned long); + const struct kvm_sbi_fwft_feature *feature; + struct kvm_sbi_fwft_config *conf; + unsigned long reg, ret =3D 0; + + for (reg =3D 0; reg < max_reg_count; reg++) { + feature =3D kvm_sbi_fwft_regnum_to_feature(reg); + if (!feature) + continue; + + conf =3D kvm_sbi_fwft_get_config(vcpu, feature->id); + if (!conf || !conf->supported) + continue; + + ret++; + } + + return ret; +} + +static int kvm_sbi_ext_fwft_get_reg_id(struct kvm_vcpu *vcpu, int index, u= 64 *reg_id) +{ + int reg, max_reg_count =3D sizeof(struct kvm_riscv_sbi_fwft) / sizeof(uns= igned long); + const struct kvm_sbi_fwft_feature *feature; + struct kvm_sbi_fwft_config *conf; + int idx =3D 0; + + for (reg =3D 0; reg < max_reg_count; reg++) { + feature =3D kvm_sbi_fwft_regnum_to_feature(reg); + if (!feature) + continue; + + conf =3D kvm_sbi_fwft_get_config(vcpu, feature->id); + if (!conf || !conf->supported) + continue; + + if (index =3D=3D idx) { + *reg_id =3D KVM_REG_RISCV | + (IS_ENABLED(CONFIG_32BIT) ? + KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64) | + KVM_REG_RISCV_SBI_STATE | + KVM_REG_RISCV_SBI_FWFT | reg; + return 0; + } + + idx++; + } + + return -ENOENT; +} + +static int kvm_sbi_ext_fwft_get_reg(struct kvm_vcpu *vcpu, unsigned long r= eg_num, + unsigned long reg_size, void *reg_val) +{ + const struct kvm_sbi_fwft_feature *feature; + struct kvm_sbi_fwft_config *conf; + unsigned long *value; + int ret =3D 0; + + if (reg_size !=3D sizeof(unsigned long)) + return -EINVAL; + value =3D reg_val; + + feature =3D kvm_sbi_fwft_regnum_to_feature(reg_num); + if (!feature) + return -ENOENT; + + conf =3D kvm_sbi_fwft_get_config(vcpu, feature->id); + if (!conf || !conf->supported) + return -ENOENT; + + switch (reg_num - feature->first_reg_num) { + case 0: + *value =3D conf->enabled; + break; + case 1: + *value =3D conf->flags; + break; + case 2: + ret =3D conf->feature->get(vcpu, conf, true, value); + break; + default: + return -ENOENT; + } + + return sbi_err_map_linux_errno(ret); +} + +static int kvm_sbi_ext_fwft_set_reg(struct kvm_vcpu *vcpu, unsigned long r= eg_num, + unsigned long reg_size, const void *reg_val) +{ + const struct kvm_sbi_fwft_feature *feature; + struct kvm_sbi_fwft_config *conf; + unsigned long value; + int ret =3D 0; + + if (reg_size !=3D sizeof(unsigned long)) + return -EINVAL; + value =3D *(const unsigned long *)reg_val; + + feature =3D kvm_sbi_fwft_regnum_to_feature(reg_num); + if (!feature) + return -ENOENT; + + conf =3D kvm_sbi_fwft_get_config(vcpu, feature->id); + if (!conf || !conf->supported) + return -ENOENT; + + switch (reg_num - feature->first_reg_num) { + case 0: + switch (value) { + case 0: + conf->enabled =3D false; + break; + case 1: + conf->enabled =3D true; + break; + default: + return -EINVAL; + } + break; + case 1: + conf->flags =3D value & SBI_FWFT_SET_FLAG_LOCK; + break; + case 2: + ret =3D conf->feature->set(vcpu, conf, true, value); + break; + default: + return -ENOENT; + } + + return sbi_err_map_linux_errno(ret); +} + const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft =3D { .extid_start =3D SBI_EXT_FWFT, .extid_end =3D SBI_EXT_FWFT, @@ -361,4 +527,9 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft = =3D { .init =3D kvm_sbi_ext_fwft_init, .deinit =3D kvm_sbi_ext_fwft_deinit, .reset =3D kvm_sbi_ext_fwft_reset, + .state_reg_subtype =3D KVM_REG_RISCV_SBI_FWFT, + .get_state_reg_count =3D kvm_sbi_ext_fwft_get_reg_count, + .get_state_reg_id =3D kvm_sbi_ext_fwft_get_reg_id, + .get_state_reg =3D kvm_sbi_ext_fwft_get_reg, + .set_state_reg =3D kvm_sbi_ext_fwft_set_reg, }; --=20 2.43.0 From nobody Fri Oct 3 21:55:30 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 E42D12EBDD6 for ; Sat, 23 Aug 2025 16:00:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964840; cv=none; b=SzZCVu8cAA7yVSEusMyrNEvNx+nbBQhUX3Al6C8FeOwboqeoHIVetxcbZ4SGyQARFx9unINtWTNPQIBNM7yNGtP7QtzG3m0fddz1XsHe3sKiLkfcvBw92B2KbXvMWMw/heMcEMsIH0LUuP9UEwPX4OTR9Lo1VB8WlO12th8Y0js= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755964840; c=relaxed/simple; bh=IOHDAmGMxm381khKNgntV4mSN6PoSOfSod9gcS5L2q4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ikr0vuYUcU3tAbNYKCEjy7tvdplrUNFDaoiVJ07wRLPE74YVkpUuKvjJAOJLLMLL1JdcxoMOrvbNDRRQtSOm14X7AtHCPT8vqju0UdafZBsCfemKFGLTRYR4CEmKUp41OlTDN5ggSCSH94zSf4NFhexqYJAZ+0FW8jOtYxnwNao= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=iErhGixq; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="iErhGixq" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-76e1fc69f86so3126883b3a.0 for ; Sat, 23 Aug 2025 09:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964838; x=1756569638; 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=T0xPrnmX6+2RsTiExCa2v2uPE7DfF6VVPGIu9AltgG0=; b=iErhGixqKlX0QNpUrKoDoAwB/HtRNF71ZWP27qClcIk20kLeKufP+L4KvgqmczMU2M kpkA3TPENghX8ZnxAciN9gdUauqCPKqqQFZerlyqFtQ43CWPD83u30vAGecVQLn+8uBY brWfAyjCVOednip7JS3N792NmotYScHKolQfm5dC4qs1CQyNUwMg4CI7czZq3qEI1W01 RCQPrIoS1CBT8p5n/rGX/hZ2k/7oYzMtli2kxCuhbBoej1NKHy71Z126ZfoUtYUrJ3Qi vnrSsAxZ0kKlSVUVBUhW9LZOpKTFO446qsCU7BC1/mw38a7oUjbgWWolSlAc27FO+ZdX rFUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964838; x=1756569638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T0xPrnmX6+2RsTiExCa2v2uPE7DfF6VVPGIu9AltgG0=; b=PeKCl8iSze1YYR10rnz7FqdHql3KseB9OlTjROoXGIbccI3XpXuMqu07Uad/kRgMMi 0k2UcoXirSKU2cjcG/BL8XTejl4mRxNhTPk1qsMFzwAkNudhv2ut9wpa+DGgQZRSV+x2 5zn7W6+qRpnj+rX3qcJDgWSrI0xO5mjwF/l0TM1mokit10tDeb3rNXkezyKLYR5Z8gXN J6HHAMx8VsJY3d75PtW9yuUZ+tY/H32s+Q7FNRAj1Gz09Ng0DIRZkSzpkbfX3qAVTBq1 WDcxDjhpwV1kZB5mivVeCSUOy5xg1a4uUrPP859Jvpy2IcFFW6Lq+2E/qRnpyoZEf1VD a7og== X-Forwarded-Encrypted: i=1; AJvYcCWyKSDSOpXZWJz/VtFyYD6fY22YzWxmz0v27EFUxr+JJ22IYLLjStQCoQeriMNj/kg9lVchINS/Qkp4mSU=@vger.kernel.org X-Gm-Message-State: AOJu0YyV9MGGEU7HEQNVjluZLW4+REb/iO3t5eRtPcckTeSBP5mmunkQ BJGLRaZVxx6ASxoaMwZgn7iPOrCNYSf8GLjC2HTv8gZ2ZoBCKp/VvlrL7FrAzs/ttds= X-Gm-Gg: ASbGncv7nJiLG4H1piS0Han9FASS8xgsCMFjrliWq8SMeWd0Xkbff+VxnSsEN733Yk6 UQsA9Gkn9STCIjRlFIwOIUqWXB6/1n4jhMRrsUXjcXACubm47pKUzc5Rap5OvJ+7HZttZ1jgQDn O/WVtvt/35/o1xci9NrdOHdu2dwFJR2gczWt10lZ47SrhOG4hbT3EF6Z9r7AFAtIXnJRvhuXPH8 0WkHRaSJLLu1jOvZT1EXkduf1fQsTCHfahpJ/91KxX0km71Ticy1vhKqoQK9jrR3gpdNW6JxTdR 028+9Ckad9wUXXZJERlVCk1V2/6rb6SAr/X6K0K1rIpbsEPbK74WlXm1+t1faKVUFOAtrY7XUp3 hvDAqoa6mTpYurUobS70tRyde764W3SLUH2ocuA1LmG7AU24j0i985VSXlblOrw== X-Google-Smtp-Source: AGHT+IH9mKQKRpTK3LLajQ4vwhqlhidY8LOQ/odhBzLI9lEp+MRXqzPETW2FWn9n7jmiaNJ6zP2jsg== X-Received: by 2002:a05:6a20:430f:b0:220:898b:2ca1 with SMTP id adf61e73a8af0-24340ddec04mr9054802637.21.1755964837962; Sat, 23 Aug 2025 09:00:37 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:37 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 6/6] KVM: riscv: selftests: Add SBI FWFT to get-reg-list test Date: Sat, 23 Aug 2025 21:29:47 +0530 Message-ID: <20250823155947.1354229-7-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" KVM RISC-V now supports SBI FWFT, so add it to the get-reg-list test. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- .../selftests/kvm/riscv/get-reg-list.c | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/testing/selftests/kvm/riscv/get-reg-list.c b/tools/testi= ng/selftests/kvm/riscv/get-reg-list.c index 34456e8cba02..705ab3d7778b 100644 --- a/tools/testing/selftests/kvm/riscv/get-reg-list.c +++ b/tools/testing/selftests/kvm/riscv/get-reg-list.c @@ -132,6 +132,7 @@ bool filter_reg(__u64 reg) case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT= _DBCN: case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT= _SUSP: case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT= _STA: + case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT= _FWFT: case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT= _EXPERIMENTAL: case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT= _VENDOR: return true; @@ -637,6 +638,7 @@ static const char *sbi_ext_single_id_to_str(__u64 reg_o= ff) KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_DBCN), KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_SUSP), KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_STA), + KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_FWFT), KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_EXPERIMENTAL), KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_VENDOR), }; @@ -693,6 +695,19 @@ static const char *sbi_sta_id_to_str(__u64 reg_off) return strdup_printf("KVM_REG_RISCV_SBI_STA | %lld /* UNKNOWN */", reg_of= f); } =20 +static const char *sbi_fwft_id_to_str(__u64 reg_off) +{ + switch (reg_off) { + case 0: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misal= igned_deleg.enable)"; + case 1: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misal= igned_deleg.flags)"; + case 2: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misal= igned_deleg.value)"; + case 3: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(point= er_masking.enable)"; + case 4: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(point= er_masking.flags)"; + case 5: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(point= er_masking.value)"; + } + return strdup_printf("KVM_REG_RISCV_SBI_FWFT | %lld /* UNKNOWN */", reg_o= ff); +} + static const char *sbi_id_to_str(const char *prefix, __u64 id) { __u64 reg_off =3D id & ~(REG_MASK | KVM_REG_RISCV_SBI_STATE); @@ -705,6 +720,8 @@ static const char *sbi_id_to_str(const char *prefix, __= u64 id) switch (reg_subtype) { case KVM_REG_RISCV_SBI_STA: return sbi_sta_id_to_str(reg_off); + case KVM_REG_RISCV_SBI_FWFT: + return sbi_fwft_id_to_str(reg_off); } =20 return strdup_printf("%lld | %lld /* UNKNOWN */", reg_subtype, reg_off); @@ -872,6 +889,16 @@ static __u64 sbi_sta_regs[] =3D { KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_STA | KVM_REG_RISCV_SBI_STA_REG(shmem_hi), }; =20 +static __u64 sbi_fwft_regs[] =3D { + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISC= V_SBI_SINGLE | KVM_RISCV_SBI_EXT_FWFT, + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.enable), + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.flags), + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.value), + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.enable), + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.flags), + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RI= SCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.value), +}; + static __u64 zicbom_regs[] =3D { KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV= _CONFIG_REG(zicbom_block_size), KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISC= V_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOM, @@ -1028,6 +1055,9 @@ static __u64 vector_regs[] =3D { #define SUBLIST_SBI_STA \ {"sbi-sta", .feature_type =3D VCPU_FEATURE_SBI_EXT, .feature =3D KVM_RISC= V_SBI_EXT_STA, \ .regs =3D sbi_sta_regs, .regs_n =3D ARRAY_SIZE(sbi_sta_regs),} +#define SUBLIST_SBI_FWFT \ + {"sbi-fwft", .feature_type =3D VCPU_FEATURE_SBI_EXT, .feature =3D KVM_RIS= CV_SBI_EXT_FWFT, \ + .regs =3D sbi_fwft_regs, .regs_n =3D ARRAY_SIZE(sbi_fwft_regs),} #define SUBLIST_ZICBOM \ {"zicbom", .feature =3D KVM_RISCV_ISA_EXT_ZICBOM, .regs =3D zicbom_regs, = .regs_n =3D ARRAY_SIZE(zicbom_regs),} #define SUBLIST_ZICBOP \ @@ -1112,6 +1142,7 @@ KVM_SBI_EXT_SUBLIST_CONFIG(sta, STA); KVM_SBI_EXT_SIMPLE_CONFIG(pmu, PMU); KVM_SBI_EXT_SIMPLE_CONFIG(dbcn, DBCN); KVM_SBI_EXT_SIMPLE_CONFIG(susp, SUSP); +KVM_SBI_EXT_SUBLIST_CONFIG(fwft, FWFT); =20 KVM_ISA_EXT_SUBLIST_CONFIG(aia, AIA); KVM_ISA_EXT_SUBLIST_CONFIG(fp_f, FP_F); @@ -1191,6 +1222,7 @@ struct vcpu_reg_list *vcpu_configs[] =3D { &config_sbi_pmu, &config_sbi_dbcn, &config_sbi_susp, + &config_sbi_fwft, &config_aia, &config_fp_f, &config_fp_d, --=20 2.43.0