From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: citrix.com, ip: 216.71.155.175, mailfrom: anthony.perard@citrix.com) Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by groups.io with SMTP; Thu, 04 Jul 2019 07:57:41 -0700 Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: fJJUhAOoCUsMpMizzWuuMpYmMFYFm9VeW56p+wnwfeqS4vD738PVFX1hMf16CxRl9Tpy24Rx7o ZDr5CuHCQKk4ulBYmVHjdvUZtMZqQFCbHAoKL72lvyS4mjZNKmRt5MiHqNMdV8dyZinmvQ2WIC eHPPnBFNKvmbGqe3F5pPIYDUCjCxyA0IjxTdOWZfOw6eWo3hKAzzqMkaBF+XpocmruKXbWco8O rp6bcAJg0jZPOb5GntddJWpRyTdg7DDZdyjMDfFqDrKZqB8f3G78jOJmwBSuznilp21P12AhWb nso= X-SBRS: 2.7 X-MesageID: 2626044 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,451,1557201600"; d="scan'208";a="2626044" From: "Anthony PERARD" To: CC: , Ard Biesheuvel , Jordan Justen , Laszlo Ersek , Julien Grall , Anthony PERARD , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v3 24/35] OvmfPkg/XenPlatformPei: Rework memory detection Date: Thu, 4 Jul 2019 15:42:22 +0100 Message-ID: <20190704144233.27968-25-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704144233.27968-1-anthony.perard@citrix.com> References: <20190704144233.27968-1-anthony.perard@citrix.com> MIME-Version: 1.0 Return-Path: anthony.perard@citrix.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain When running as a Xen PVH guest, there is no CMOS to read the memory size from. Rework GetSystemMemorySize(Below|Above)4gb() so they can works without CMOS by reading the e820 table. Rework XenPublishRamRegions for PVH, handle the Reserve type and explain about the ACPI type. MTRR settings aren't modified anymore, on HVM, it's already done by hvmloader, on PVH it is supposed to have sane default. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD Acked-by: Laszlo Ersek --- Notes: Comment for Xen people: About MTRR, should we redo the setting in OVMF? Even if in both case of PVH and HVM, something would have setup the default type to write back and handle a few other ranges like PCI hole, hvmloader for HVM or and libxc I think for PVH. =20=20=20=20 (For PVH, it's in the spec as well https://xenbits.xenproject.org/docs/unstable/misc/pvh.html#mtrr ) OvmfPkg/XenPlatformPei/Platform.h | 6 +++ OvmfPkg/XenPlatformPei/MemDetect.c | 71 ++++++++++++++++++++++++++++++ OvmfPkg/XenPlatformPei/Xen.c | 47 ++++++++++++++------ 3 files changed, 111 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/XenPlatformPei/Platform.h b/OvmfPkg/XenPlatformPei/Pla= tform.h index db9a62572f..e8e0b835a5 100644 --- a/OvmfPkg/XenPlatformPei/Platform.h +++ b/OvmfPkg/XenPlatformPei/Platform.h @@ -114,6 +114,12 @@ XenPublishRamRegions ( VOID=0D );=0D =0D +EFI_STATUS=0D +XenGetE820Map (=0D + EFI_E820_ENTRY64 **Entries,=0D + UINT32 *Count=0D + );=0D +=0D extern EFI_BOOT_MODE mBootMode;=0D =0D extern UINT8 mPhysMemAddressWidth;=0D diff --git a/OvmfPkg/XenPlatformPei/MemDetect.c b/OvmfPkg/XenPlatformPei/Me= mDetect.c index cb7dd93ad6..3e33e7f414 100644 --- a/OvmfPkg/XenPlatformPei/MemDetect.c +++ b/OvmfPkg/XenPlatformPei/MemDetect.c @@ -96,6 +96,47 @@ Q35TsegMbytesInitialization ( mQ35TsegMbytes =3D ExtendedTsegMbytes;=0D }=0D =0D +STATIC=0D +UINT64=0D +GetHighestSystemMemoryAddress (=0D + BOOLEAN Below4gb=0D + )=0D +{=0D + EFI_E820_ENTRY64 *E820Map;=0D + UINT32 E820EntriesCount;=0D + EFI_E820_ENTRY64 *Entry;=0D + EFI_STATUS Status;=0D + UINT32 Loop;=0D + UINT64 HighestAddress;=0D + UINT64 EntryEnd;=0D +=0D + HighestAddress =3D 0;=0D +=0D + Status =3D XenGetE820Map (&E820Map, &E820EntriesCount);=0D + ASSERT_EFI_ERROR (Status);=0D +=0D + for (Loop =3D 0; Loop < E820EntriesCount; Loop++) {=0D + Entry =3D E820Map + Loop;=0D + EntryEnd =3D Entry->BaseAddr + Entry->Length;=0D +=0D + if (Entry->Type =3D=3D EfiAcpiAddressRangeMemory &&=0D + EntryEnd > HighestAddress) {=0D +=0D + if (Below4gb && (EntryEnd <=3D BASE_4GB)) {=0D + HighestAddress =3D EntryEnd;=0D + } else if (!Below4gb && (EntryEnd >=3D BASE_4GB)) {=0D + HighestAddress =3D EntryEnd;=0D + }=0D + }=0D + }=0D +=0D + //=0D + // Round down the end address.=0D + //=0D + HighestAddress &=3D ~(UINT64)EFI_PAGE_MASK;=0D +=0D + return HighestAddress;=0D +}=0D =0D UINT32=0D GetSystemMemorySizeBelow4gb (=0D @@ -105,6 +146,19 @@ GetSystemMemorySizeBelow4gb ( UINT8 Cmos0x34;=0D UINT8 Cmos0x35;=0D =0D + //=0D + // In PVH case, there is no CMOS, we have to calculate the memory size=0D + // from parsing the E820=0D + //=0D + if (XenPvhDetected ()) {=0D + UINT64 HighestAddress;=0D +=0D + HighestAddress =3D GetHighestSystemMemoryAddress (TRUE);=0D + ASSERT (HighestAddress > 0 && HighestAddress <=3D BASE_4GB);=0D +=0D + return HighestAddress;=0D + }=0D +=0D //=0D // CMOS 0x34/0x35 specifies the system memory above 16 MB.=0D // * CMOS(0x35) is the high byte=0D @@ -129,6 +183,23 @@ GetSystemMemorySizeAbove4gb ( UINT32 Size;=0D UINTN CmosIndex;=0D =0D + //=0D + // In PVH case, there is no CMOS, we have to calculate the memory size=0D + // from parsing the E820=0D + //=0D + if (XenPvhDetected ()) {=0D + UINT64 HighestAddress;=0D +=0D + HighestAddress =3D GetHighestSystemMemoryAddress (FALSE);=0D + ASSERT (HighestAddress =3D=3D 0 || HighestAddress >=3D BASE_4GB);=0D +=0D + if (HighestAddress >=3D BASE_4GB) {=0D + HighestAddress -=3D BASE_4GB;=0D + }=0D +=0D + return HighestAddress;=0D + }=0D +=0D //=0D // CMOS 0x5b-0x5d specifies the system memory above 4GB MB.=0D // * CMOS(0x5d) is the most significant size byte=0D diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index cbfd8058fc..62a2c3ed93 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -279,6 +279,8 @@ XenPublishRamRegions ( EFI_E820_ENTRY64 *E820Map;=0D UINT32 E820EntriesCount;=0D EFI_STATUS Status;=0D + EFI_E820_ENTRY64 *Entry;=0D + UINTN Index;=0D =0D DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));=0D =0D @@ -287,26 +289,45 @@ XenPublishRamRegions ( //=0D E820EntriesCount =3D 0;=0D Status =3D XenGetE820Map (&E820Map, &E820EntriesCount);=0D -=0D ASSERT_EFI_ERROR (Status);=0D =0D - if (E820EntriesCount > 0) {=0D - EFI_E820_ENTRY64 *Entry;=0D - UINT32 Loop;=0D + for (Index =3D 0; Index < E820EntriesCount; Index++) {=0D + UINT64 Base;=0D + UINT64 End;=0D =0D - for (Loop =3D 0; Loop < E820EntriesCount; Loop++) {=0D - Entry =3D E820Map + Loop;=0D + Entry =3D &E820Map[Index];=0D =0D +=0D + //=0D + // Round up the start address, and round down the end address.=0D + //=0D + Base =3D ALIGN_VALUE (Entry->BaseAddr, (UINT64)EFI_PAGE_SIZE);=0D + End =3D (Entry->BaseAddr + Entry->Length) & ~(UINT64)EFI_PAGE_MASK;=0D +=0D + switch (Entry->Type) {=0D + case EfiAcpiAddressRangeMemory:=0D + AddMemoryRangeHob (Base, End);=0D + break;=0D + case EfiAcpiAddressRangeACPI:=0D + //=0D + // Ignore, OVMF should read the ACPI tables and provide them to linu= x=0D + // from a different location.=0D + //=0D + break;=0D + case EfiAcpiAddressRangeReserved:=0D //=0D - // Only care about RAM=0D + // Avoid ranges marked as reserved in the e820 table provided by=0D + // hvmloader as it conflicts with an other aperture.=0D + // error message: CpuDxe: IntersectMemoryDescriptor:=0D + // desc [FC000000, 100000000) type 1 cap 8700000000026001=0D + // conflicts with aperture [FEE00000, FEE01000) cap 1=0D //=0D - if (Entry->Type !=3D EfiAcpiAddressRangeMemory) {=0D - continue;=0D + if (!XenHvmloaderDetected ()) {=0D + AddReservedMemoryBaseSizeHob (Base, End - Base, FALSE);=0D }=0D -=0D - AddMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);=0D -=0D - MtrrSetMemoryAttribute (Entry->BaseAddr, Entry->Length, CacheWriteBa= ck);=0D + break;=0D + default:=0D + break;=0D }=0D }=0D }=0D --=20 Anthony PERARD