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 2/4] RISC-V: KVM: Add VM capability to allow userspace get GPA size
Date:   Fri, 26 Nov 2021 21:10:18 +0530
Message-Id: <20211126154020.342924-3-anup.patel@wdc.com>
In-Reply-To: <20211126154020.342924-1-anup.patel@wdc.com>
References: <20211126154020.342924-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?2iVhKPFs4g3NfSwX5xUciiTT7T8KPLb8Zo8TRPaCZ1oAuI0QKLLyiIESo/0p?=
 =?us-ascii?Q?o01nXff0jX+eECAwyc56Jtj3AwFNeuLsGkOnGDZv4LIieNrpkUOPHZBkE402?=
 =?us-ascii?Q?8F8LjIwzPnZ+BWGNMfi1swzU9tJdSI1vvF+XHw0FSTDe4yz9zImbQoqRFBDV?=
 =?us-ascii?Q?ACEY6z4pS24CLICm5V9tDj0aBdsLwUZkc2w28EyrlnyQzLUfwruDxuDxDzxb?=
 =?us-ascii?Q?ivn4dbSnxuF+P2EJXPzDl3+DjMQfuOSWQfEINNjytRSV1E7M1pth8n8WRgDQ?=
 =?us-ascii?Q?8sp2lB6zeyK830/xR1nK5UY5fJcU9L5X7npGe4HmqDjSJsB+wsOpOjHqNTui?=
 =?us-ascii?Q?LsaiOSfe9UMfbBcpGv29pF0ioeNEPavv+QrJ9E05uEKCcfBrV0ChJFlnKi/W?=
 =?us-ascii?Q?qTywDY6QMOHs2nMd3CXAWejJ7e5FMBw8kk20ZokOgDHVrKH56NrHwTbFadTU?=
 =?us-ascii?Q?yskZ8ffcziPvN2p83dj63wsq1DkF7pM7wzomx3MDrMctObwWvNlkaXb5hyb4?=
 =?us-ascii?Q?XurKsaU/ztwuEzg66IwpidupWHOIh5mMV4KjqfBGlZVZRqJ98U3omSz2dg5M?=
 =?us-ascii?Q?n40xxTb+qaYGOtjibPD9pUHulbCayLnuRkNijS5injTyFfzxvvjDPmVuzgtw?=
 =?us-ascii?Q?0r5egxCvG27iHXvJBOsUJXaMO8kgFV6unRgcdUSkqoQ0C82XFh0V1r3TZPtB?=
 =?us-ascii?Q?94/pAra+UFDTVj48/hOwZ3hJHoEwScpLkiD+yTkjY9oRbvthhDFMJBnB4DGW?=
 =?us-ascii?Q?W1LMEaKNmE9LlaNIhLDlOYsQk7bXQeZ56dJTwTYho+yU6g/t7BMnVs2x6Cjn?=
 =?us-ascii?Q?SXDrGJNt5MN8FXSfZQOsQD7hTaQESZbdKfafnWGKFEYhMRATSg1JQR9qzpPy?=
 =?us-ascii?Q?5zKH/nt6Z07RnnukB8fzx1l980sLMP7Fk1M9G2Zaw27m021KjIf+wB0+9tXg?=
 =?us-ascii?Q?SsCZfomcfRMcuxO5GVOgQFnzM7nMuM/kJ4DEN3Eqc0xpHwekcnaDsLVrdWf5?=
 =?us-ascii?Q?ungveuvkLaKZyCfSofu7r8jbGAQ651fISP4nyOJAv79Zox1udCBYDHG1pilg?=
 =?us-ascii?Q?0wb3BP7TIwKfFU3iQvVRGbtM6KrH/b8g9HBp9N49Ft2w50uprmLrA18IjCxJ?=
 =?us-ascii?Q?6hYhIRbktmPYLlIhR0+VBxIuDr1VN8gAlXNwTFZ+BXjpIeKuvJLW5qOhWB/D?=
 =?us-ascii?Q?c2+PrYfn0Ej5cK6Z/l9Hl97WShf04Y/T2HPpq+nXYIK4Z//c5R/pafjymQ3w?=
 =?us-ascii?Q?St24cMfgY75H8HmkDthvF5pfn4tJNVLMT9vYXtrxunVeq2XyAfWza49H6Gpp?=
 =?us-ascii?Q?A0tjd2ODd64rAq5Bmtt+vv2ymowGtm7vtblbJHdeI5+iittchwjUI6f7x29m?=
 =?us-ascii?Q?JtFCuyoEfQUNRfJIn/zdFkP1r5daDyBq62b+LcO7zu9reYPsUbZPKE2HfLZz?=
 =?us-ascii?Q?8g4oOyrvDMrsNCKyAdYJIxlw2C49Rh3Lc7itc6sV6q3Qskf87bHKqjen28M4?=
 =?us-ascii?Q?havhNqxtwLS0rJKPZL3Df1aCD8d5A/VHZ4EDB4oL98+OQfghoa0QHs1x7tnA?=
 =?us-ascii?Q?XVllWAZqygxOkCGFNxr7X0D9shXYAc4v8T1t9hCv/3MkmcsyyjtDqUS9HWeZ?=
 =?us-ascii?Q?swZlR/64tq0p+sR4E4TPriw=3D?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 095abe3d-d703-41dc-5f2f-08d9b0f3235a
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2021 15:40:56.9677
 (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: x0QGzurF1kkvDAI3JxTYM1eqRQN9S9B2+ddKcWrbd/cD0fVt+6VpHJm1BKabQ1Uya/+vr0DYY1uT+H8W9aDkGA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB8330
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The GPA size supported for a RISC-V Guest/VM is based on the MMU mode
used by 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 RISC-V specific VM capability KVM_CAP_RISCV_VM_GPA_SIZE which
can be used by KVM userspace to get guest physical address (GPA) size
(i.e. number of GPA 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..ae97f6929897 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_RISCV_VM_GPA_SIZE:
+		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..dac98df3101d 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_RISCV_VM_GPA_SIZE 207
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
-- 
2.25.1