From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120])
 by mx.groups.io with SMTP id smtpd.web10.3128.1591864426097076016
 for <devel@edk2.groups.io>;
 Thu, 11 Jun 2020 01:33:46 -0700
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iO9R3B8Y;
 spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1591864425;
	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=JUZIO5tAKEl786TPVqWi8piy+uh1tCpAKqtk9uaoulo=;
	b=iO9R3B8YgkZ6L2f5aXMRe97fCOQwVUbbKIdWb5NaPzoutbi/coWDxuL73xCG/BFxIdRwYD
	ia36V0vtSL/aNGfU59aO7Zk3nnQrU+mSOqDynMWzpxSqyeWolC/mxJPRRRZC0OcW0Yvdrq
	TfDMdc+0doPnJuXPMUCV72lN0JXVHRs=
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-391-7L3p3u4BMAu-Yf_1YcxJsA-1; Thu, 11 Jun 2020 04:33:41 -0400
X-MC-Unique: 7L3p3u4BMAu-Yf_1YcxJsA-1
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 988B81005513;
	Thu, 11 Jun 2020 08:33:39 +0000 (UTC)
Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-21.ams2.redhat.com [10.36.114.21])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7BDC92B4DD;
	Thu, 11 Jun 2020 08:33:37 +0000 (UTC)
Subject: Re: [PATCH v9 18/46] OvmfPkg/VmgExitLib: Add support for WBINVD NAE events
To: Tom Lendacky <thomas.lendacky@amd.com>, devel@edk2.groups.io
Cc: Brijesh Singh <brijesh.singh@amd.com>,
 Ard Biesheuvel <ard.biesheuvel@arm.com>, Eric Dong <eric.dong@intel.com>,
 Jordan Justen <jordan.l.justen@intel.com>, Liming Gao
 <liming.gao@intel.com>, Michael D Kinney <michael.d.kinney@intel.com>,
 Ray Ni <ray.ni@intel.com>
References: <cover.1591363657.git.thomas.lendacky@amd.com>
 <5a415a00fdb8c1f7e40f64de4e54027c368ecf22.1591363657.git.thomas.lendacky@amd.com>
From: "Laszlo Ersek" <lersek@redhat.com>
Message-ID: <81418aa6-815c-a4b7-827f-5a996bec6861@redhat.com>
Date: Thu, 11 Jun 2020 10:33:36 +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: <5a415a00fdb8c1f7e40f64de4e54027c368ecf22.1591363657.git.thomas.lendacky@amd.com>
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
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 06/05/20 15:27, Tom Lendacky wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198
> 
> Under SEV-ES, a WBINVD intercept generates a #VC exception. VMGEXIT must be
> used to allow the hypervisor to handle this intercept.
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Acked-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
> ---
>  OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c | 29 ++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
> index c2646d45506a..37c15c4f6240 100644
> --- a/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
> +++ b/OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
> @@ -854,6 +854,31 @@ MmioExit (
>    return Status;
>  }
>  
> +/**
> +  Handle a WBINVD event.
> +
> +  Use the VMGEXIT instruction to handle a WBINVD 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
> +
> +  @return 0                        Event handled successfully
> +  @return Others                   New exception value to propagate
> +
> +**/
> +STATIC
> +UINT64
> +WbinvdExit (
> +  IN OUT GHCB                     *Ghcb,
> +  IN OUT EFI_SYSTEM_CONTEXT_X64   *Regs,
> +  IN     SEV_ES_INSTRUCTION_DATA  *InstructionData
> +  )
> +{
> +  return VmgExit (Ghcb, SVM_EXIT_WBINVD, 0, 0);
> +}
> +
>  /**
>    Handle an MSR event.
>  
> @@ -1250,6 +1275,10 @@ VmgExitHandleVc (
>      NaeExit = MsrExit;
>      break;
>  
> +  case SVM_EXIT_WBINVD:
> +    NaeExit = WbinvdExit;
> +    break;
> +
>    case SVM_EXIT_NPF:
>      NaeExit = MmioExit;
>      break;
> 

Looks good, thanks!