[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220524205646.1798325-3-vannapurve@google.com>
Date: Tue, 24 May 2022 20:56:45 +0000
From: Vishal Annapurve <vannapurve@...gle.com>
To: x86@...nel.org, kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-kselftest@...r.kernel.org
Cc: pbonzini@...hat.com, vkuznets@...hat.com, wanpengli@...cent.com,
jmattson@...gle.com, joro@...tes.org, tglx@...utronix.de,
mingo@...hat.com, bp@...en8.de, dave.hansen@...ux.intel.com,
hpa@...or.com, shuah@...nel.org, yang.zhong@...el.com,
drjones@...hat.com, ricarkol@...gle.com, aaronlewis@...gle.com,
wei.w.wang@...el.com, kirill.shutemov@...ux.intel.com,
corbet@....net, hughd@...gle.com, jlayton@...nel.org,
bfields@...ldses.org, akpm@...ux-foundation.org,
chao.p.peng@...ux.intel.com, yu.c.zhang@...ux.intel.com,
jun.nakajima@...el.com, dave.hansen@...el.com,
michael.roth@....com, qperret@...gle.com, steven.price@....com,
ak@...ux.intel.com, david@...hat.com, luto@...nel.org,
vbabka@...e.cz, marcorr@...gle.com, erdemaktas@...gle.com,
pgonda@...gle.com, nikunj@....com, seanjc@...gle.com,
diviness@...gle.com, maz@...nel.org, dmatlack@...gle.com,
axelrasmussen@...gle.com, maciej.szmigiero@...cle.com,
mizhang@...gle.com, bgardon@...gle.com,
Vishal Annapurve <vannapurve@...gle.com>
Subject: [RFC V1 PATCH 2/3] selftests: kvm: sev: Handle hypercall exit
Add support for forwarding hypercalls to vmm from
VC handler.
Signed-off-by: Vishal Annapurve <vannapurve@...gle.com>
---
.../selftests/kvm/lib/x86_64/sev_exitlib.c | 39 ++++++++++++++++---
1 file changed, 34 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/kvm/lib/x86_64/sev_exitlib.c b/tools/testing/selftests/kvm/lib/x86_64/sev_exitlib.c
index b3f7b0297e5b..749b9264f90d 100644
--- a/tools/testing/selftests/kvm/lib/x86_64/sev_exitlib.c
+++ b/tools/testing/selftests/kvm/lib/x86_64/sev_exitlib.c
@@ -199,6 +199,31 @@ static int handle_vc_cpuid(struct ghcb *ghcb, u64 ghcb_gpa, struct ex_regs *regs
return 0;
}
+static int handle_vc_vmmcall(struct ghcb *ghcb, u64 ghcb_gpa, struct ex_regs *regs)
+{
+ int ret;
+
+ ghcb_set_rax(ghcb, regs->rax);
+ ghcb_set_rbx(ghcb, regs->rbx);
+ ghcb_set_rcx(ghcb, regs->rcx);
+ ghcb_set_rdx(ghcb, regs->rdx);
+ ghcb_set_rsi(ghcb, regs->rsi);
+ ghcb_set_cpl(ghcb, 0);
+
+ ret = sev_es_ghcb_hv_call(ghcb, ghcb_gpa, SVM_EXIT_VMMCALL);
+ if (ret)
+ return ret;
+
+ if (!ghcb_rax_is_valid(ghcb))
+ return 1;
+
+ regs->rax = ghcb->save.rax;
+
+ regs->rip += 3;
+
+ return 0;
+}
+
static int handle_msr_vc_cpuid(struct ex_regs *regs)
{
uint32_t fn = regs->rax & 0xFFFFFFFF;
@@ -239,11 +264,15 @@ static int handle_msr_vc_cpuid(struct ex_regs *regs)
int sev_es_handle_vc(void *ghcb, u64 ghcb_gpa, struct ex_regs *regs)
{
- if (regs->error_code != SVM_EXIT_CPUID)
- return 1;
+ if (regs->error_code == SVM_EXIT_CPUID) {
+ if (!ghcb)
+ return handle_msr_vc_cpuid(regs);
+
+ return handle_vc_cpuid(ghcb, ghcb_gpa, regs);
+ }
- if (!ghcb)
- return handle_msr_vc_cpuid(regs);
+ if (regs->error_code == SVM_EXIT_VMMCALL)
+ return handle_vc_vmmcall(ghcb, ghcb_gpa, regs);
- return handle_vc_cpuid(ghcb, ghcb_gpa, regs);
+ return 1;
}
--
2.36.1.124.g0e6072fb45-goog
Powered by blists - more mailing lists