From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 776AB7803E5 for ; Tue, 20 Feb 2024 09:06:54 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=/2XWRA3SPbZFbAmQwHP7+X2xbRfwy9Bo/szyv41Tre8=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1708420013; v=1; b=c/kjMu0x4gp/i+JA1qK6eDPihctjxOG68pHGWnPY4DieeaN0JyRhmRXJ7D2Q3O7hq+Dx0aWD ZnBomMXx0VmTDZrgDA2i0tDfNVnnz2vHKek3Nx2MVjKyCZJ3YFE81dBP1sVv7wO87ngA+EpwO9H JWUdLdAFdWuZ0qI3x2qelVqA= X-Received: by 127.0.0.2 with SMTP id ptQZYY7687511xLnOMSB6UDh; Tue, 20 Feb 2024 01:06:53 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.9486.1708420010293592176 for ; Tue, 20 Feb 2024 01:06:50 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-3-BKpDnrNTmd_-DuwPRZWg-1; Tue, 20 Feb 2024 04:06:45 -0500 X-MC-Unique: 3-BKpDnrNTmd_-DuwPRZWg-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7487A185A78E; Tue, 20 Feb 2024 09:06:44 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.175]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1646A40CD14A; Tue, 20 Feb 2024 09:06:44 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0ED5818017F4; Tue, 20 Feb 2024 10:06:40 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Liming Gao , Michael Roth , Oliver Steffen , Erdem Aktas , Tom Lendacky , Laszlo Ersek , Min Xu , Ard Biesheuvel , Jiewen Yao , Gerd Hoffmann Subject: [edk2-devel] [PATCH v3 4/6] OvmfPkg/ResetVector: SEV: keep #vc handler installed longer Date: Tue, 20 Feb 2024 10:06:37 +0100 Message-ID: <20240220090639.472222-5-kraxel@redhat.com> In-Reply-To: <20240220090639.472222-1-kraxel@redhat.com> References: <20240220090639.472222-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 5b5fyjYVHNTUzSI5jgcrUnCjx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="c/kjMu0x"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io When running in SEV mode do not uninstall the #vc handler in CheckSevFeatures. Keep it active and uninstall it later in SevClearPageEncMaskForGhcbPage. This allows using the cpuid instruction in SetCr3ForPageTables64, which is needed to check for la57 & 1G page support. Signed-off-by: Gerd Hoffmann --- OvmfPkg/ResetVector/Ia32/AmdSev.asm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/ResetVector/Ia32/AmdSev.asm b/OvmfPkg/ResetVector/Ia32/AmdSev.asm index 043c88a7abbe..02f287f1d934 100644 --- a/OvmfPkg/ResetVector/Ia32/AmdSev.asm +++ b/OvmfPkg/ResetVector/Ia32/AmdSev.asm @@ -158,6 +158,11 @@ SevClearPageEncMaskForGhcbPage: cmp byte[WORK_AREA_GUEST_TYPE], 1 jnz SevClearPageEncMaskForGhcbPageExit + ; Clear exception handlers and stack + mov eax, ADDR_OF(IdtrClear) + lidt [cs:eax] + mov esp, 0 + ; Check if SEV-ES is enabled mov ecx, 1 bt [SEV_ES_WORK_AREA_STATUS_MSR], ecx @@ -332,7 +337,6 @@ NoSevEsVcHlt: NoSevPass: xor eax, eax -SevExit: ; ; Clear exception handlers and stack ; @@ -342,6 +346,7 @@ SevExit: pop eax mov esp, 0 +SevExit: OneTimeCallRet CheckSevFeatures ; Start of #VC exception handling routines -- 2.43.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115648): https://edk2.groups.io/g/devel/message/115648 Mute This Topic: https://groups.io/mt/104464311/7686176 Mute #vc:https://edk2.groups.io/g/devel/mutehashtag/vc Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-