From:   Anup Patel <anup.patel@wdc.com>
To:     Paolo Bonzini <pbonzini@redhat.com>, Shuah Khan <shuah@kernel.org>,
        Atish Patra <atishp@atishpatra.org>
Cc:     Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Anup Patel <anup@brainfault.org>, 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 <anup.patel@wdc.com>
Subject: [PATCH v2 2/4] RISC-V: KVM: Add VM capability to allow userspace get GPA bits
Date:   Mon, 29 Nov 2021 13:24:49 +0530
Message-Id: <20211129075451.418122-3-anup.patel@wdc.com>
In-Reply-To: <20211129075451.418122-1-anup.patel@wdc.com>
References: <20211129075451.418122-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
WDCIPOUTBOUND: EOP-TRUE
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2wMb294k72vQ+84Ktv81Y3Pv1uP+DrXDfnm7tfbPLfu626PRMqLSLPulR7eG?=
 =?us-ascii?Q?hGIz7uAx5iVWKDp5tvKkddGCuG6JFABYh0tKJM3XEUGOremkNr/olmTYlvbH?=
 =?us-ascii?Q?EVb8mybZbSGfJpGwn311A24X0wJL2WpVwtaM613SksUK0iuDnwjXxOK5T0ji?=
 =?us-ascii?Q?qXAPWEW8OJxXQZbwX/xElfXjjqXLcu4OPju0cAv36uRzIWHhHRMhzioiRmhg?=
 =?us-ascii?Q?Nq8Askclh+pFlWpf/+4UXFBUUuCw7kz5LJbcVdDElLL8HTArYRfOr2HIpXGh?=
 =?us-ascii?Q?uVoQDIN8roeBFhbEEoclHsaLlKfD/XTx/b7EIKn8k4BUeKRZ+YVy3d8BOEqc?=
 =?us-ascii?Q?/Rm10VAnSyuti/WGUuYwXnwdwhMa9PysSPuh0ZNHjSd49EwBCXvb5HPlNvvU?=
 =?us-ascii?Q?T4lEXg2swfluINvOj9Dyag+MTFh2VqgFrNNJADLZONEgXIUSInCwMN++oOIh?=
 =?us-ascii?Q?nWoJW0a4TjXOgNkIrnRgb2PEMfFuTw+0bAozv6R4bBvqiCCD4Lr0DFdnKbxK?=
 =?us-ascii?Q?2jaJC/Vlfe+gKg/8+yQvzFTYT0PILdbhUmLnQRKy5elosyNn2d0bXpDY5Z4T?=
 =?us-ascii?Q?G44OwPsBlfseueEBT8pGuo92J8BtbkOWEpur4a7Hn1cxAfjEhJyKSVZoatbj?=
 =?us-ascii?Q?9ma1tQw+FodgY5DzrQLgzthK2QAotXy5z3/ehXnQr49Hf5NwICLkHkHq0oP6?=
 =?us-ascii?Q?S92e4srwoFZzCioWzwTDJ1FyQXDwwfPg1Svw5m5lkZfAfyH9Wn1NletcajoX?=
 =?us-ascii?Q?iqapeA24m4RubpRrK6C4Rl9hOJvkxvw8F4ceE4yfUEanVvBMmcK3Whp6qwIN?=
 =?us-ascii?Q?Wu+Lk6B58CTZ94i8HVfMfv11aN6mYupLGHDd2DMrcg9QZB8iLK3cq4NeZIHw?=
 =?us-ascii?Q?b9wiAJf2JpJ3zV7XuWDVaRC8Y2X83J+M8zsx7Eg8wELZB7vRnLOsOaTQSQGM?=
 =?us-ascii?Q?RZzwciFMprzCUZDEZsr19Y55MpBvMHPqoE1U8Q+YGrOG6NU7CzbELWEgJ9fC?=
 =?us-ascii?Q?9Dr7srwu4fXij36RyIrAYgOXQfwBXPIawJnmvsX+KLLk7yI+HsZRLVHY3j4w?=
 =?us-ascii?Q?b/jPNRZk5gPnHAJU2uOlL7Vsc3mCs29BzdJj7RGDIZwYrMPLOw0EkCgkyQY/?=
 =?us-ascii?Q?JukD+A2jdKagAx4hSgQS5H93/XbKesweTheToeojGkZL4R9rGhvuoEzK+VQF?=
 =?us-ascii?Q?2c1tanYaHcPs5ZXkZpN0EXdwOWuWIhoHzZJB0zHWCOWhOsherpWrMwS3yQMj?=
 =?us-ascii?Q?a9Trr+i2MEcc+52oSvgWxbBl3OTB2rjCXhuFq4vPqwZCRBzoqwoL4pJoYkbs?=
 =?us-ascii?Q?HJlUwY1gJbVYDUf9SEBDnHInyAr8UtEcDu9l2fhVxlETCJCl7VAy8ySbWReL?=
 =?us-ascii?Q?O/7fOtizcnugrOn+OpPHojeaTu8O3RKA9N/ihtqDEtujNfVdlfO3j4JEO7cw?=
 =?us-ascii?Q?IwwUousvDVQz8mBfHpiG/+4mHRoatwBrjFIWWu+X6c/u/9rbCI1xC4W7RXg7?=
 =?us-ascii?Q?vcf+mGM4XWCRg/RVeUEOvEIXc4xlABLfVVqOWw5r78Xf7v+606x/MZ+FQQYh?=
 =?us-ascii?Q?d1qrZzHJ+bpnzBGnWkuDjb3K1ZFQajZ+gn5pKFgFQNX40ynYPmIAbgKkakeu?=
 =?us-ascii?Q?0PDGRXA99kdtOJdLbih6d8M=3D?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 16035733-035a-49c5-f27a-08d9b30faa42
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2021 08:10:11.3295
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LHFiFx5XFd6aTTflaQWdCqhrAp6VlNlWfYC9CF9LlWB15DBhuInxp5eIDlyQMGoAAnX+Hc0QhBhkZRuTTdkDmA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7796
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The number of GPA bits supported for a RISC-V Guest/VM is based on the
MMU mode used by the G-stage translation. The KVM RISC-V will detect and
use the best possible MMU mode for the G-stage in kvm_arch_init().

We add a generic VM capability KVM_CAP_VM_GPA_BITS which can be used by
the KVM userspace to get the number of GPA (guest physical address) bits
supported for a Guest/VM.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 arch/riscv/include/asm/kvm_host.h | 1 +
 arch/riscv/kvm/mmu.c              | 5 +++++
 arch/riscv/kvm/vm.c               | 3 +++
 include/uapi/linux/kvm.h          | 1 +
 4 files changed, 10 insertions(+)

diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h
index 37589b953bcb..ae5d238607fe 100644
--- a/arch/riscv/include/asm/kvm_host.h
+++ b/arch/riscv/include/asm/kvm_host.h
@@ -221,6 +221,7 @@ void kvm_riscv_stage2_free_pgd(struct kvm *kvm);
 void kvm_riscv_stage2_update_hgatp(struct kvm_vcpu *vcpu);
 void kvm_riscv_stage2_mode_detect(void);
 unsigned long kvm_riscv_stage2_mode(void);
+int kvm_riscv_stage2_gpa_size(void);
 
 void kvm_riscv_stage2_vmid_detect(void);
 unsigned long kvm_riscv_stage2_vmid_bits(void);
diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c
index 9ffd0255af43..9b6d6465094f 100644
--- a/arch/riscv/kvm/mmu.c
+++ b/arch/riscv/kvm/mmu.c
@@ -760,3 +760,8 @@ unsigned long kvm_riscv_stage2_mode(void)
 {
 	return stage2_mode >> HGATP_MODE_SHIFT;
 }
+
+int kvm_riscv_stage2_gpa_size(void)
+{
+	return stage2_gpa_bits;
+}
diff --git a/arch/riscv/kvm/vm.c b/arch/riscv/kvm/vm.c
index fb18af34a4b5..6f959639ec45 100644
--- a/arch/riscv/kvm/vm.c
+++ b/arch/riscv/kvm/vm.c
@@ -82,6 +82,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	case KVM_CAP_NR_MEMSLOTS:
 		r = KVM_USER_MEM_SLOTS;
 		break;
+	case KVM_CAP_VM_GPA_BITS:
+		r = kvm_riscv_stage2_gpa_size();
+		break;
 	default:
 		r = 0;
 		break;
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 1daa45268de2..469f05d69c8d 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1131,6 +1131,7 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204
 #define KVM_CAP_ARM_MTE 205
 #define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
+#define KVM_CAP_VM_GPA_BITS 207
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
-- 
2.25.1