From mboxrd@z Thu Jan 1 00:00:00 1970 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.web10.5076.1682506894005676613 for ; Wed, 26 Apr 2023 04:01:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Bd47ckwe; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682506892; 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: in-reply-to:in-reply-to:references:references; bh=SLa1mGyhbgLpSt7r/q2PAY4lqU9FZjGBKhg42Nlrtjo=; b=Bd47ckweUikA3vjFkJml+FIXg20yjJstumkiozqnukZU6K+RSW3Oe2wQZK+FvqbXCRErkL HDqOUqtO04RicHkYSBh9RtTs1uRnrq7o8hklt2a1qXt82YWEDcBvViGaE4qxhAkKTpEjGA o4Tfg/Vo2KaawZjfRBzMJDWlAURTbf4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-PIFugku2NQ6GCGzMiUZZ-A-1; Wed, 26 Apr 2023 07:01:27 -0400 X-MC-Unique: PIFugku2NQ6GCGzMiUZZ-A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF9761C0514C; Wed, 26 Apr 2023 11:01:26 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.1]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DD1B40C2064; Wed, 26 Apr 2023 11:01:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B58701800632; Wed, 26 Apr 2023 13:01:24 +0200 (CEST) Date: Wed, 26 Apr 2023 13:01:24 +0200 From: "Gerd Hoffmann" To: Abdul Lateef Attar Cc: devel@edk2.groups.io, Abdul Lateef Attar , Paul Grimes , Garrett Kirkendall , Abner Chang , Eric Dong , Ray Ni , Rahul Kumar , Ard Biesheuvel , Jiewen Yao , Jordan Justen Subject: Re: [PATCH v9 7/9] UefiCpuPkg: Implements MmSaveStateLib for Ovmf Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Apr 26, 2023 at 12:52:25PM +0530, Abdul Lateef Attar wrote: > From: Abdul Lateef Attar > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4182 > > Implements MmSaveStateLib library interfaces > to read and write save state > registers for Ovmf/Qemu. You can drop this patch and use the AMD version. Additionally QemuSmramSaveStateMap.h can be removed and likewise the AMD version used. See patch below. Feel free to include it in your patch series. take care, Gerd ----------------------- cut here --------------------- >>From fbc0c8000588b6f7104de1007242177448b38141 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 26 Apr 2023 11:38:41 +0200 Subject: [PATCH 1/1] [testing] drop QemuSmramSaveStateMap.h, use Amd/SmramSaveStateMap.h instead --- .../Include/Register/QemuSmramSaveStateMap.h | 178 ------------------ .../PeiDxeMemEncryptSevLibInternal.c | 4 +- .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 21 +-- 3 files changed, 12 insertions(+), 191 deletions(-) delete mode 100644 OvmfPkg/Include/Register/QemuSmramSaveStateMap.h diff --git a/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h b/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h deleted file mode 100644 index 8ffde0548c4c..000000000000 --- a/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h +++ /dev/null @@ -1,178 +0,0 @@ -/** @file -SMRAM Save State Map Definitions. - -SMRAM Save State Map definitions based on contents of the -Intel(R) 64 and IA-32 Architectures Software Developer's Manual - Volume 3C, Section 34.4 SMRAM - Volume 3C, Section 34.5 SMI Handler Execution Environment - Volume 3C, Section 34.7 Managing Synchronous and Asynchronous SMIs - -and the AMD64 Architecture Programmer's Manual - Volume 2, Section 10.2 SMM Resources - -Copyright (c) 2015, Intel Corporation. All rights reserved.
-Copyright (c) 2015, Red Hat, Inc.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __QEMU_SMRAM_SAVE_STATE_MAP_H__ -#define __QEMU_SMRAM_SAVE_STATE_MAP_H__ - -#pragma pack (1) - -/// -/// 32-bit SMRAM Save State Map -/// -typedef struct { - UINT8 Reserved0[0x200]; // 7c00h - UINT8 Reserved1[0xf8]; // 7e00h - UINT32 SMBASE; // 7ef8h - UINT32 SMMRevId; // 7efch - UINT16 IORestart; // 7f00h - UINT16 AutoHALTRestart; // 7f02h - UINT8 Reserved2[0x9C]; // 7f08h - UINT32 IOMemAddr; // 7fa0h - UINT32 IOMisc; // 7fa4h - UINT32 _ES; // 7fa8h - UINT32 _CS; // 7fach - UINT32 _SS; // 7fb0h - UINT32 _DS; // 7fb4h - UINT32 _FS; // 7fb8h - UINT32 _GS; // 7fbch - UINT32 Reserved3; // 7fc0h - UINT32 _TR; // 7fc4h - UINT32 _DR7; // 7fc8h - UINT32 _DR6; // 7fcch - UINT32 _EAX; // 7fd0h - UINT32 _ECX; // 7fd4h - UINT32 _EDX; // 7fd8h - UINT32 _EBX; // 7fdch - UINT32 _ESP; // 7fe0h - UINT32 _EBP; // 7fe4h - UINT32 _ESI; // 7fe8h - UINT32 _EDI; // 7fech - UINT32 _EIP; // 7ff0h - UINT32 _EFLAGS; // 7ff4h - UINT32 _CR3; // 7ff8h - UINT32 _CR0; // 7ffch -} QEMU_SMRAM_SAVE_STATE_MAP32; - -/// -/// 64-bit SMRAM Save State Map -/// -typedef struct { - UINT8 Reserved0[0x200]; // 7c00h - - UINT16 _ES; // 7e00h - UINT16 _ESAccessRights; // 7e02h - UINT32 _ESLimit; // 7e04h - UINT64 _ESBase; // 7e08h - - UINT16 _CS; // 7e10h - UINT16 _CSAccessRights; // 7e12h - UINT32 _CSLimit; // 7e14h - UINT64 _CSBase; // 7e18h - - UINT16 _SS; // 7e20h - UINT16 _SSAccessRights; // 7e22h - UINT32 _SSLimit; // 7e24h - UINT64 _SSBase; // 7e28h - - UINT16 _DS; // 7e30h - UINT16 _DSAccessRights; // 7e32h - UINT32 _DSLimit; // 7e34h - UINT64 _DSBase; // 7e38h - - UINT16 _FS; // 7e40h - UINT16 _FSAccessRights; // 7e42h - UINT32 _FSLimit; // 7e44h - UINT64 _FSBase; // 7e48h - - UINT16 _GS; // 7e50h - UINT16 _GSAccessRights; // 7e52h - UINT32 _GSLimit; // 7e54h - UINT64 _GSBase; // 7e58h - - UINT32 _GDTRReserved1; // 7e60h - UINT16 _GDTRLimit; // 7e64h - UINT16 _GDTRReserved2; // 7e66h - UINT64 _GDTRBase; // 7e68h - - UINT16 _LDTR; // 7e70h - UINT16 _LDTRAccessRights; // 7e72h - UINT32 _LDTRLimit; // 7e74h - UINT64 _LDTRBase; // 7e78h - - UINT32 _IDTRReserved1; // 7e80h - UINT16 _IDTRLimit; // 7e84h - UINT16 _IDTRReserved2; // 7e86h - UINT64 _IDTRBase; // 7e88h - - UINT16 _TR; // 7e90h - UINT16 _TRAccessRights; // 7e92h - UINT32 _TRLimit; // 7e94h - UINT64 _TRBase; // 7e98h - - UINT64 IO_RIP; // 7ea0h - UINT64 IO_RCX; // 7ea8h - UINT64 IO_RSI; // 7eb0h - UINT64 IO_RDI; // 7eb8h - UINT32 IO_DWord; // 7ec0h - UINT8 Reserved1[0x04]; // 7ec4h - UINT8 IORestart; // 7ec8h - UINT8 AutoHALTRestart; // 7ec9h - UINT8 Reserved2[0x06]; // 7ecah - - UINT64 IA32_EFER; // 7ed0h - UINT64 SVM_Guest; // 7ed8h - UINT64 SVM_GuestVMCB; // 7ee0h - UINT64 SVM_GuestVIntr; // 7ee8h - UINT8 Reserved3[0x0c]; // 7ef0h - - UINT32 SMMRevId; // 7efch - UINT32 SMBASE; // 7f00h - - UINT8 Reserved4[0x1c]; // 7f04h - UINT64 SVM_GuestPAT; // 7f20h - UINT64 SVM_HostIA32_EFER; // 7f28h - UINT64 SVM_HostCR4; // 7f30h - UINT64 SVM_HostCR3; // 7f38h - UINT64 SVM_HostCR0; // 7f40h - - UINT64 _CR4; // 7f48h - UINT64 _CR3; // 7f50h - UINT64 _CR0; // 7f58h - UINT64 _DR7; // 7f60h - UINT64 _DR6; // 7f68h - UINT64 _RFLAGS; // 7f70h - UINT64 _RIP; // 7f78h - UINT64 _R15; // 7f80h - UINT64 _R14; // 7f88h - UINT64 _R13; // 7f90h - UINT64 _R12; // 7f98h - UINT64 _R11; // 7fa0h - UINT64 _R10; // 7fa8h - UINT64 _R9; // 7fb0h - UINT64 _R8; // 7fb8h - UINT64 _RDI; // 7fc0h - UINT64 _RSI; // 7fc8h - UINT64 _RBP; // 7fd0h - UINT64 _RSP; // 7fd8h - UINT64 _RBX; // 7fe0h - UINT64 _RDX; // 7fe8h - UINT64 _RCX; // 7ff0h - UINT64 _RAX; // 7ff8h -} QEMU_SMRAM_SAVE_STATE_MAP64; - -/// -/// Union of 32-bit and 64-bit SMRAM Save State Maps -/// -typedef union { - QEMU_SMRAM_SAVE_STATE_MAP32 x86; - QEMU_SMRAM_SAVE_STATE_MAP64 x64; -} QEMU_SMRAM_SAVE_STATE_MAP; - -#pragma pack () - -#endif diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiDxeMemEncryptSevLibInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiDxeMemEncryptSevLibInternal.c index 78ea16ae06ff..43a2a3e3b7e3 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiDxeMemEncryptSevLibInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiDxeMemEncryptSevLibInternal.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -49,7 +49,7 @@ MemEncryptSevLocateInitialSmramSaveStateMapPages ( } MapStart = SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET; - MapEnd = MapStart + sizeof (QEMU_SMRAM_SAVE_STATE_MAP); + MapEnd = MapStart + sizeof (AMD_SMRAM_SAVE_STATE_MAP); MapPagesStart = MapStart & ~(UINTN)EFI_PAGE_MASK; MapPagesEnd = ALIGN_VALUE (MapEnd, EFI_PAGE_SIZE); MapPagesSize = MapPagesEnd - MapPagesStart; diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index 4c354bafe42f..63822b126e3d 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -20,8 +20,7 @@ #include #include #include -#include -#include +#include #include // @@ -90,15 +89,15 @@ SmmCpuFeaturesInitializeProcessor ( IN CPU_HOT_PLUG_DATA *CpuHotPlugData ) { - QEMU_SMRAM_SAVE_STATE_MAP *CpuState; + AMD_SMRAM_SAVE_STATE_MAP *CpuState; // // Configure SMBASE. // - CpuState = (QEMU_SMRAM_SAVE_STATE_MAP *)(UINTN)( - SMM_DEFAULT_SMBASE + - SMRAM_SAVE_STATE_MAP_OFFSET - ); + CpuState = (AMD_SMRAM_SAVE_STATE_MAP *)(UINTN)( + SMM_DEFAULT_SMBASE + + SMRAM_SAVE_STATE_MAP_OFFSET + ); if ((CpuState->x86.SMMRevId & 0xFFFF) == 0) { CpuState->x86.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex]; } else { @@ -150,10 +149,10 @@ SmmCpuFeaturesHookReturnFromSmm ( IN UINT64 NewInstructionPointer ) { - UINT64 OriginalInstructionPointer; - QEMU_SMRAM_SAVE_STATE_MAP *CpuSaveState; + UINT64 OriginalInstructionPointer; + AMD_SMRAM_SAVE_STATE_MAP *CpuSaveState; - CpuSaveState = (QEMU_SMRAM_SAVE_STATE_MAP *)CpuState; + CpuSaveState = (AMD_SMRAM_SAVE_STATE_MAP *)CpuState; if ((CpuSaveState->x86.SMMRevId & 0xFFFF) == 0) { OriginalInstructionPointer = (UINT64)CpuSaveState->x86._EIP; CpuSaveState->x86._EIP = (UINT32)NewInstructionPointer; @@ -166,7 +165,7 @@ SmmCpuFeaturesHookReturnFromSmm ( } } else { OriginalInstructionPointer = CpuSaveState->x64._RIP; - if ((CpuSaveState->x64.IA32_EFER & LMA) == 0) { + if ((CpuSaveState->x64.EFER & LMA) == 0) { CpuSaveState->x64._RIP = (UINT32)NewInstructionPointer32; } else { CpuSaveState->x64._RIP = (UINT32)NewInstructionPointer; -- 2.40.0