From: Joerg Roedel <[email protected]> Re-use the handlers for CPUID and IOIO caused #VC exceptions in the early boot handler.
Signed-off-by: Joerg Roedel <[email protected]> --- arch/x86/kernel/sev-es-shared.c | 9 +++------ arch/x86/kernel/sev-es.c | 9 +++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/sev-es-shared.c b/arch/x86/kernel/sev-es-shared.c index 57c29c91fe87..14693eff9614 100644 --- a/arch/x86/kernel/sev-es-shared.c +++ b/arch/x86/kernel/sev-es-shared.c @@ -358,8 +358,7 @@ static enum es_result ioio_exitinfo(struct es_em_ctxt *ctxt, u64 *exitinfo) return ES_OK; } -static enum es_result __maybe_unused -handle_ioio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) +static enum es_result handle_ioio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) { struct pt_regs *regs = ctxt->regs; u64 exit_info_1, exit_info_2; @@ -451,8 +450,7 @@ handle_ioio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) return ret; } -static enum es_result __maybe_unused -handle_cpuid(struct ghcb *ghcb, struct es_em_ctxt *ctxt) +static enum es_result handle_cpuid(struct ghcb *ghcb, struct es_em_ctxt *ctxt) { struct pt_regs *regs = ctxt->regs; u32 cr4 = native_read_cr4(); @@ -658,8 +656,7 @@ static enum es_result handle_mmio_twobyte_ops(struct ghcb *ghcb, return ret; } -static enum es_result __maybe_unused -handle_mmio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) +static enum es_result handle_mmio(struct ghcb *ghcb, struct es_em_ctxt *ctxt) { struct insn *insn = &ctxt->insn; unsigned int bytes = 0; diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index 1fb7128ff386..2a801919e7c0 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -174,6 +174,15 @@ static enum es_result handle_vc_exception(struct es_em_ctxt *ctxt, enum es_result result; switch (exit_code) { + case SVM_EXIT_CPUID: + result = handle_cpuid(ghcb, ctxt); + break; + case SVM_EXIT_IOIO: + result = handle_ioio(ghcb, ctxt); + break; + case SVM_EXIT_NPF: + result = handle_mmio(ghcb, ctxt); + break; default: /* * Unexpected #VC exception -- 2.17.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
