[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Revert "tools/firmware/ovmf: Use OvmfXen platform file is exist"

  • To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Tue, 22 Jun 2021 16:39:30 +0100
  • Authentication-results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, George Dunlap <George.Dunlap@xxxxxxxxxxxxx>, "Ian Jackson" <iwj@xxxxxxxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, "Stefano Stabellini" <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Julien Grall <julien@xxxxxxx>
  • Delivery-date: Tue, 22 Jun 2021 15:46:53 +0000
  • Ironport-hdrordr: A9a23:Q7SWZKDJaP+TEmPlHemk55DYdb4zR+YMi2TC1yhKKCC9E/bo8f xG885rtiMc5Ax/ZJhCo6HmBEDjewK/yXcd2+B4Vt3OMDUO0FHYSL2KhrGD/9SPIUPDH5ZmpM JdT5Q=
  • Ironport-sdr: eNmThEQKZny8qB64yJOq+VxeJj3STEFLbmwZmPQ2UqEWbtE7tYBLNGx4SHUPRw+4Aef2lqngQV lwglRSved37GQRP80mi21SAVDCi26elUVB3UVDo1Zx9bsv+nbkVnSYvjI76dqg95bdxbLgb3Jf Zp4XcBxZtO8xdXeDUGHCJNhXAmqPtLc8NEG96jOlNQ6PlJljIx8Q4agTAu7mIppgOoBYjSfnOc 7hg3P/8sSRGPTvm8w1Xl/rQNg6D4sncRBxAESyLxOJRenY/6snKbOoKKcACyLY/9bvNPLoe7n5 xBQ=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

This reverts commit aad7b5c11d51d57659978e04702ac970906894e8.

The change from OvmfX64 to OvmfXen causes a change in behaviour, whereby
OvmfXen maps its shared info page at the top of address space.  When trying to
migrate such a domain, XENMEM_maximum_gpfn returns a very large value.  This
has uncovered multiple issues:

 1) The userspace hypercall wrappers truncate all return values to int on
    Linux and Solaris.  This needs fixing in Xen.
 2) 32bit toolstacks can't migrate any domain with RAM above the 2^40 mark,
    because of virtual address constraints.  This needs fixing in OVMF.

Fixes for both of these aren't completely trivial.  Revert the change to
unblock staging in the meantime.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CC: Anthony PERARD <anthony.perard@xxxxxxxxxx>
CC: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
CC: Ian Jackson <iwj@xxxxxxxxxxxxxx>
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Julien Grall <julien@xxxxxxx>
 tools/firmware/ovmf-makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 637ee509c3..55f9992145 100644
--- a/tools/firmware/ovmf-makefile
+++ b/tools/firmware/ovmf-makefile
@@ -17,14 +17,8 @@ all: build
 .PHONY: build
        if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
-       set -ex; \
-       if test -e OvmfPkg/OvmfXen.dsc; then \
-         OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4 -p OvmfPkg/OvmfXen.dsc; \
-         cp Build/OvmfXen/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin; \
-       else \
-         OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4; \
-         cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin; \
-       fi
+       OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4
+       cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin
 .PHONY: clean



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.