From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web11.14500.1590159328807430706 for ; Fri, 22 May 2020 07:55:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Py7lyHru; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590159328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z6734QE9sX8Xli+LVv5X9K+eSzngSLqoi0hY/qfzD6o=; b=Py7lyHruwXHAdOHrBK5YEK4tXdnkEgD+vrSa2O0KMXsp8/qRCT8+aaf9+rgttf3HNQZOa7 MRgVSKdKz9/LdLPH8hcniNP8dq+BST/qRJRYdpnf1w7mGWHlard97Gzgm8/d4ZmjGUzsN/ yAnuX9wVGrBA1ebHawESbdwsuXSegIc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-123-UmO-PqCUMt60PSy2uvEOyg-1; Fri, 22 May 2020 10:55:26 -0400 X-MC-Unique: UmO-PqCUMt60PSy2uvEOyg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4108D107ACF2; Fri, 22 May 2020 14:55:24 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-112-40.ams2.redhat.com [10.36.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 171A060C20; Fri, 22 May 2020 14:55:21 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v8 24/46] OvmfPkg/VmgExitLib: Add support for MONITOR/MONITORX NAE events To: devel@edk2.groups.io, thomas.lendacky@amd.com Cc: Jordan Justen , Ard Biesheuvel , Michael D Kinney , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh , Ard Biesheuvel References: <9d7a3e2445c91d65b508049a96f4461594fe4ba4.1589925074.git.thomas.lendacky@amd.com> From: "Laszlo Ersek" Message-ID: <4a352a81-88e7-142f-d826-22b1e18f783b@redhat.com> Date: Fri, 22 May 2020 16:55:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <9d7a3e2445c91d65b508049a96f4461594fe4ba4.1589925074.git.thomas.lendacky@amd.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 05/19/20 23:50, Lendacky, Thomas wrote: > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 > > Under SEV-ES, a MONITOR/MONITORX intercept generates a #VC exception. > VMGEXIT must be used to allow the hypervisor to handle this intercept. > > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Signed-off-by: Tom Lendacky > --- > .../Library/VmgExitLib/X64/VmgExitVcHandler.c | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > > diff --git a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c > index 716f21a9ee0e..9b7639069276 100644 > --- a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c > +++ b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c > @@ -843,6 +843,47 @@ MmioExit ( > return Status; > } > > +/** > + Handle a MONITOR event. > + > + Use the VMGEXIT instruction to handle a MONITOR event. > + > + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication > + Block > + @param[in, out] Regs x64 processor context > + @param[in] InstructionData Instruction parsing context > + > + @retval 0 Event handled successfully > + @retval Others New exception value to propagate > + > +**/ > +STATIC > +UINT64 > +MonitorExit ( > + IN OUT GHCB *Ghcb, > + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, > + IN SEV_ES_INSTRUCTION_DATA *InstructionData > + ) > +{ > + UINT64 Status; > + > + DecodeModRm (Regs, InstructionData); > + > + Ghcb->SaveArea.Rax = Regs->Rax; // Identity mapped, so VA = PA > + GhcbSetRegValid (Ghcb, GhcbRax); > + Ghcb->SaveArea.Rcx = Regs->Rcx; > + GhcbSetRegValid (Ghcb, GhcbRcx); > + Ghcb->SaveArea.Rdx = Regs->Rdx; > + GhcbSetRegValid (Ghcb, GhcbRdx); > + > + Status = VmgExit (Ghcb, SVM_EXIT_MONITOR, 0, 0); > + if (Status) { > + return Status; > + } > + > + return 0; > +} > + (1) Please see my feedback under: [PATCH v8 18/46] OvmfPkg/VmgExitLib: Add support for WBINVD NAE events and pick the same approach here that you prefer there. With that: Acked-by: Laszlo Ersek Thanks Laszlo > /** > Handle a WBINVD event. > > @@ -1494,6 +1535,10 @@ VmgExitHandleVc ( > NaeExit = WbinvdExit; > break; > > + case SVM_EXIT_MONITOR: > + NaeExit = MonitorExit; > + break; > + > case SVM_EXIT_NPF: > NaeExit = MmioExit; > break; >