public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: devel@edk2.groups.io, lersek@redhat.com
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Jordan Justen <jordan.l.justen@intel.com>
Subject: Re: [edk2-devel] [PATCH 4/4] OvmfPkg/PlatformPei: fix MTRR for low-RAM sizes that have many bits clear
Date: Wed, 8 May 2019 09:33:42 +0200	[thread overview]
Message-ID: <46dccf0d-6ab6-11e6-d473-187cf8ce7114@redhat.com> (raw)
In-Reply-To: <20190504000716.7525-5-lersek@redhat.com>

On 5/4/19 2:07 AM, Laszlo Ersek wrote:
> Assume that we boot OVMF in a QEMU guest with 1025 MB of RAM. The
> following assertion will fire:
> 
>> ASSERT_EFI_ERROR (Status = Out of Resources)
>> ASSERT OvmfPkg/PlatformPei/MemDetect.c(696): !EFI_ERROR (Status)
> 
> That's because the range [1025 MB, 4 GB) that we try to mark as
> uncacheable with MTRRs has size 3071 MB:
> 
>    0x1_0000_0000
>   -0x0_4010_0000
>   --------------
>    0x0_BFF0_0000
> 
> The integer that stands for the uncacheable area size has 11 (eleven) bits
> set to 1. As a result, covering this size requires 11 variable MTRRs (each
> MTRR must cover a naturally aligned, power-of-two sized area). But, if we
> need more variable MTRRs than the CPU can muster (such as 8), then
> MtrrSetMemoryAttribute() fails, and we refuse to continue booting (which
> is justified, in itself).
> 
> Unfortunately, this is not difficult to trigger, and the error message is
> well-hidden from end-users, in the OVMF debug log. The following
> mitigation is inspired by SeaBIOS:
> 
> Truncate the uncacheable area size to a power-of-two, while keeping the
> end fixed at 4 GB. Such an interval can be covered by just one variable
> MTRR.
> 
> This may leave such an MMIO gap, between the end of low-RAM and the start
> of the uncacheable area, that is marked as WB (through the MTRR default).
> Raise the base of the 32-bit PCI MMIO aperture accordingly -- the gap will
> not be used for anything.

I had to draw it to be sure I understood correctly:

+-------------+               +-------------+  <-- 4GB
|             |               |             |
|             |               |             |
|             |               |  PCI MMIO   |
|             |               |             |
|             |               | uncacheable |
| uncacheable |               |             |
|             |               |             |
|             |       ---->   +-------------+  <-- mQemuUc32Base
|             |      |        |             |      (pow2 aligned)
|             |      |        |     GAP     |
|             |      |        | (cacheable) |
+-------------+  ----         +-------------+  <-- TopOfLowRam
|             |               |             |    (not pow2 aligned)
|             |               |             |
|             |               |             |
|             |               |             |
| LowerMemory |               | LowerMemory |
| (cacheable) |               | (cacheable) |
|             |               |             |
|             |               |             |
|             |               |             |
+-------------+               +-------------+

> On Q35, the minimal 32-bit PCI MMIO aperture (triggered by RAM size 2815
> MB) shrinks from
> 
>   0xE000_0000 - 0xAFF0_0000 = 769 MB
> 
> to
> 
>   0xE000_0000 - 0xC000_0000 = 512 MB
> 
> On i440fx, the minimal 32-bit PCI MMIO aperture (triggered by RAM size
> 3583 MB) shrinks from
> 
>   0xFC00_0000 - 0xDFF0_0000 = 449 MB
> 
> to
> 
>   0xFC00_0000 - 0xE000_0000 = 448 MB
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1666941
> Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1701710
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  OvmfPkg/PlatformPei/Platform.h  |  2 ++
>  OvmfPkg/PlatformPei/MemDetect.c | 23 +++++++++++++++++---
>  OvmfPkg/PlatformPei/Platform.c  |  4 +---
>  3 files changed, 23 insertions(+), 6 deletions(-)
> 
> diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h
> index 81af8b71480f..4476ddd871cd 100644
> --- a/OvmfPkg/PlatformPei/Platform.h
> +++ b/OvmfPkg/PlatformPei/Platform.h
> @@ -114,4 +114,6 @@ extern UINT32 mMaxCpuCount;
>  
>  extern UINT16 mHostBridgeDevId;
>  
> +extern UINT32 mQemuUc32Base;
> +
>  #endif // _PLATFORM_PEI_H_INCLUDED_
> diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
> index e890e36408a6..ae73c63d27d5 100644
> --- a/OvmfPkg/PlatformPei/MemDetect.c
> +++ b/OvmfPkg/PlatformPei/MemDetect.c
> @@ -42,6 +42,8 @@ STATIC UINT32 mS3AcpiReservedMemorySize;
>  
>  STATIC UINT16 mQ35TsegMbytes;
>  
> +UINT32 mQemuUc32Base;
> +
>  VOID
>  Q35TsegMbytesInitialization (
>    VOID
> @@ -663,6 +665,8 @@ QemuInitializeRam (
>    // cover it exactly.
>    //
>    if (IsMtrrSupported ()) {
> +    UINT32 Uc32Size;
> +
>      MtrrGetAllMtrrs (&MtrrSettings);
>  
>      //
> @@ -689,11 +693,24 @@ QemuInitializeRam (
>  
>      //
>      // Set memory range from the "top of lower RAM" (RAM below 4GB) to 4GB as
> -    // uncacheable
> +    // uncacheable. Make sure one variable MTRR suffices by truncating the size
> +    // to a whole power of two. This will round the base *up*, and a gap (not
> +    // used for either RAM or MMIO) may stay in the middle, marked as
> +    // cacheable-by-default.
>      //
> -    Status = MtrrSetMemoryAttribute (LowerMemorySize,
> -               SIZE_4GB - LowerMemorySize, CacheUncacheable);
> +    Uc32Size = GetPowerOfTwo32 ((UINT32)(SIZE_4GB - LowerMemorySize));
> +    mQemuUc32Base = (UINT32)(SIZE_4GB - Uc32Size);
> +    if (mQemuUc32Base != LowerMemorySize) {
> +      DEBUG ((DEBUG_VERBOSE, "%a: rounded UC32 base from 0x%x up to 0x%x, for "
> +        "an UC32 size of 0x%x\n", __FUNCTION__, (UINT32)LowerMemorySize,
> +        mQemuUc32Base, Uc32Size));
> +    }
> +
> +    Status = MtrrSetMemoryAttribute (mQemuUc32Base, Uc32Size,
> +               CacheUncacheable);
>      ASSERT_EFI_ERROR (Status);
> +  } else {
> +    mQemuUc32Base = (UINT32)LowerMemorySize;
>    }
>  }
>  
> diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
> index fd8eccaf3e50..c064b4ed9b8f 100644
> --- a/OvmfPkg/PlatformPei/Platform.c
> +++ b/OvmfPkg/PlatformPei/Platform.c
> @@ -174,14 +174,12 @@ MemMapInitialization (
>    AddIoMemoryRangeHob (0x0A0000, BASE_1MB);
>  
>    if (!mXen) {
> -    UINT32  TopOfLowRam;
>      UINT64  PciExBarBase;
>      UINT32  PciBase;
>      UINT32  PciSize;
>  
> -    TopOfLowRam = GetSystemMemorySizeBelow4gb ();
>      PciExBarBase = 0;
> -    PciBase = (TopOfLowRam < BASE_2GB) ? BASE_2GB : TopOfLowRam;
> +    PciBase = (mQemuUc32Base < BASE_2GB) ? BASE_2GB : mQemuUc32Base;
>      if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
>        //
>        // The 32-bit PCI host aperture is expected to fall between the top of
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

  reply	other threads:[~2019-05-08  7:33 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-04  0:07 [PATCH 0/4] OvmfPkg/PlatformPei: fix two assertion failures with weird RAM sizes Laszlo Ersek
2019-05-04  0:07 ` [PATCH 1/4] OvmfPkg/PlatformPei: assign PciSize on both i440fx/q35 branches explicitly Laszlo Ersek
2019-05-06 11:06   ` [edk2-devel] " Philippe Mathieu-Daudé
2019-05-06 12:04     ` Laszlo Ersek
2019-05-16  7:52   ` Ard Biesheuvel
2019-05-04  0:07 ` [PATCH 2/4] OvmfPkg/PlatformPei: hoist PciBase assignment above the i440fx/q35 branching Laszlo Ersek
2019-05-06 11:08   ` [edk2-devel] " Philippe Mathieu-Daudé
2019-05-16  7:53   ` Ard Biesheuvel
2019-05-04  0:07 ` [PATCH 3/4] OvmfPkg/PlatformPei: reorder the 32-bit PCI hole vs. the PCIEXBAR on q35 Laszlo Ersek
2019-05-16  8:00   ` [edk2-devel] " Ard Biesheuvel
2019-05-16 12:18     ` Laszlo Ersek
2019-05-16 12:24       ` Philippe Mathieu-Daudé
2019-05-16 19:15         ` Laszlo Ersek
2019-05-04  0:07 ` [PATCH 4/4] OvmfPkg/PlatformPei: fix MTRR for low-RAM sizes that have many bits clear Laszlo Ersek
2019-05-08  7:33   ` Philippe Mathieu-Daudé [this message]
2019-05-08  9:10     ` [edk2-devel] " Laszlo Ersek
2019-05-16  8:05   ` Ard Biesheuvel
2019-05-15 10:36 ` [edk2-devel] [PATCH 0/4] OvmfPkg/PlatformPei: fix two assertion failures with weird RAM sizes Laszlo Ersek
2019-05-15 11:56   ` Leif Lindholm
2019-05-15 12:44     ` Laszlo Ersek
2019-05-15 16:42     ` Michael D Kinney
2019-05-16 19:33 ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=46dccf0d-6ab6-11e6-d473-187cf8ce7114@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox