From: Joerg Roedel <[email protected]> Extend the RDTSC handler to also handle RDTSCP events.
Signed-off-by: Joerg Roedel <[email protected]> --- arch/x86/kernel/sev-es.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index 485f5a14c3b4..d5a14f277adb 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -272,19 +272,24 @@ static enum es_result handle_wbinvd(struct ghcb *ghcb, return ghcb_hv_call(ghcb, ctxt, SVM_EXIT_WBINVD, 0, 0); } -static enum es_result handle_rdtsc(struct ghcb *ghcb, struct es_em_ctxt *ctxt) +static enum es_result handle_rdtsc(struct ghcb *ghcb, struct es_em_ctxt *ctxt, + unsigned long exit_code) { + bool rdtscp = (exit_code == SVM_EXIT_RDTSCP); enum es_result ret; - ret = ghcb_hv_call(ghcb, ctxt, SVM_EXIT_RDTSC, 0, 0); + ret = ghcb_hv_call(ghcb, ctxt, exit_code, 0, 0); if (ret != ES_OK) return ret; - if (!(ghcb_is_valid_rax(ghcb) && ghcb_is_valid_rdx(ghcb))) + if (!(ghcb_is_valid_rax(ghcb) && ghcb_is_valid_rdx(ghcb) && + (!rdtscp || ghcb_is_valid_rcx(ghcb)))) return ES_VMM_ERROR; ctxt->regs->ax = ghcb->save.rax; ctxt->regs->dx = ghcb->save.rdx; + if (rdtscp) + ctxt->regs->cx = ghcb->save.rcx; return ES_OK; } @@ -328,7 +333,8 @@ static enum es_result handle_vc_exception(struct es_em_ctxt *ctxt, result = handle_dr7_write(ghcb, ctxt, early); break; case SVM_EXIT_RDTSC: - result = handle_rdtsc(ghcb, ctxt); + case SVM_EXIT_RDTSCP: + result = handle_rdtsc(ghcb, ctxt, exit_code); break; case SVM_EXIT_RDPMC: result = handle_rdpmc(ghcb, ctxt); -- 2.17.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
