From 503104f0d9e32a29eeed1d0f0b9902ec49230a34 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 12 Apr 2023 12:24:57 -0400 Subject: xen: update to 4.17-tip Bumping xen to version RELEASE-4.17.0-89-ge4a5fb9227, which comprises the following commits: e4a5fb9227 CI: Remove llvm-8 from the Debian Stretch container 435a1e5e8f automation: Remove non-debug x86_32 build jobs 8c414bab30 automation: Remove CentOS 7.2 containers and builds e3b23da4a1 automation: Switch arm32 cross builds to run on arm64 4c0d792675 CI: Drop automation/configs/ 7758cd57e0 ns16550: correct name/value pair parsing for PCI port/bridge 85100ed78c vpci/msix: handle accesses adjacent to the MSI-X table 3506935824 include: don't mention stub headers more than once in a make rule 7f55774489 x86/ucode: Fix error paths control_thread_fn() f6a3e93b37 x86/vmx: Don't spuriously crash the domain when INIT is received 11c8ef59b9 x86/shadow: Fix build with no PG_log_dirty 00aa5c93d1 x86/nospec: Fix evaluate_nospec() code generation under Clang 6f2d89d681 x86/shadow: fix and improve sh_page_has_multiple_shadows() 33b1c8cd86 VT-d: fix iommu=no-igfx if the IOMMU scope contains fake device(s) 3c85fb7b65 AMD/IOMMU: without XT, x2APIC needs to be forced into physical mode 3eac216e6e libacpi: fix PCI hotplug AML 7082d656ae bunzip: work around gcc13 warning f971f5c531 VT-d: constrain IGD check d84612ecab x86/altp2m: help gcc13 to avoid it emitting a warning b5409f4e4d core-parking: fix build with gcc12 and NR_CPUS=1 b4dad09bb2 x86/spec-ctrl: Add BHI controls to userspace components 244d39fb13 tools/xenmon: Fix xenmon.py for with python3.x 651ffe2c78 tools/python: change 's#' size type for Python >= 3.10 b745ff3011 x86/vmx: implement Notify VM Exit 27abea1ba6 x86/vmx: introduce helper to set VMX_INTR_SHADOW_NMI 83f12e4eaf x86/vmx: implement VMExit based guest Bus Lock detection a730e4d119 x86/spec-ctrl: Defer CR4_PV32_RESTORE on the cstar_enter path a2a915b396 x86/HVM: serialize pinned cache attribute list manipulation d0cb66d59a x86/HVM: bound number of pinned cache attribute regions f8f8f07880 x86/shadow: account for log-dirty mode when pre-allocating ec5b058d2a x86/ucode/AMD: late load the patch on every logical thread fa8250f192 libs/guest: Fix leak on realloc failure in backup_ptes() 01f85d835b libs/guest: Fix resource leaks in xc_core_arch_map_p2m_tree_rw() 53bd16bcc0 tools: Use PKG_CONFIG_FILE instead of PKG_CONFIG variable b10cf1561a xen: Fix Clang -Wunicode diagnostic when building asm-macros 837bdc6eb2 xen: Work around Clang-IAS macro \@ expansion bug e8f28e129d x86: perform mem_sharing teardown before paging teardown e9a7942f6c x86/ucode/AMD: apply the patch early on every logical thread 46c104cce0 build: make FILE symbol paths consistent 74b76704fd credit2: respect credit2_runqueue=all when arranging runqueues 8202b9cf84 x86/shskt: Disable CET-SS on parts susceptible to fractured updates cdc23d47ad x86/cpuid: Infrastructure for leaves 7:1{ecx,edx} c622b8ace9 libs/util: Fix parallel build between flex/bison and CC rules aaf74a532c automation: Remove clang-8 from Debian unstable container 3685e754e6 x86/spec-ctrl: Mitigate Cross-Thread Return Address Predictions 587823eca1 tools/ocaml/libs: Fix memory/resource leaks with caml_alloc_custom() bf935b1ff7 tools/ocaml/xc: Don't reference Abstract_Tag objects with the GC lock released afdcc10856 tools/ocaml/xc: Fix binding for xc_domain_assign_device() 021b82cc0c tools/ocaml/evtchn: Don't reference Custom objects with the GC lock released 5797b798a5 tools/ocaml/libs: Allocate the correct amount of memory for Abstract_tag 2c21e1bee6 tools/ocaml/libs: Don't declare stubs as taking void e74d868b48 tools/oxenstored: validate config file before live update f0e653fb4a tools/ocaml/xb: Drop Xs_ring.write 7d516fc876 tools/ocaml/xb,mmap: Use Data_abstract_val wrapper 5d8f9cfa16 tools/ocaml/xenctrl: Use larger chunksize in domain_getinfolist 03f545b6cf tools/ocaml/xenctrl: Make domain_getinfolist tail recursive 3dae50283d libxl: fix guest kexec - skip cpuid policy d012788137 ns16550: fix an incorrect assignment to uart->io_size 819a5d4ed8 build: fix building flask headers before descending in flask/ss/ 2d74e7035b x86/shadow: fix PAE check for top-level table unshadowing e904d8ae01 x86/vmx: Support for CPUs without model-specific LBR 5e3250258a x86/vmx: Calculate model-specific LBRs once at start of day c871e05e13 include/compat: produce stubs for headers not otherwise generated 1d7a388e7b tools: Fix build with recent QEMU, use "--enable-trace-backends" a470a83c36 x86/S3: Restore Xen's MSR_PAT value on S3 resume 2f8851c37f Revert "tools/xenstore: simplify loop handling connection I/O" c4972a4272 tools/oxenstored: Render backtraces more nicely in Syslog 91a9ac6e9b tools/oxenstored/syslog: Avoid potential NULL dereference e13a9a2146 tools/oxenstored: Set uncaught exception handler 991b512f5f tools/oxenstored: Log live update issues at warning level f02171b663 tools/oxenstored: Keep /dev/xen/evtchn open across live update 4b418768ef tools/oxenstored: Rework Domain evtchn handling to use port_pair a20daa7ffd tools/oxenstored: Implement Domain.rebind_evtchn fd0d9b0597 tools/oxenstored: Rename some 'port' variables to 'remote_port' bc5cc00868 tools/oxenstored: Bind the DOM_EXC VIRQ in in Event.init() 0929960173 tools/oxenstored: Style fixes to Domain c7cf603836 tools/ocaml/evtchn: Extend the init() binding with a cloexec flag 24d9dc2ae2 tools/ocaml/evtchn: Add binding for xenevtchn_fdopen() d11528a993 tools/ocaml/evtchn: OCaml 5 support, fix potential resource leak 2e8d7a08bc tools/oxenstored: Fix incorrect scope after an if statement a7a26da0b5 x86/time: prevent overflow with high frequency TSCs 1dcc9b6dfe EFI: relocate the ESRT when booting via multiboot2 c3e37c60fb ioreq_broadcast(): accept partial broadcast success 26f39b3d70 x86/HVM: don't mark evtchn upcall vector as pending when vLAPIC is disabled 5810edc049 x86/Viridian: don't mark IRQ vectors as pending when vLAPIC is disabled 54bb56e128 x86/HVM: don't mark external IRQs as pending when vLAPIC is disabled b7b34bd66a x86/pvh: do not forward MADT Local APIC NMI structures to dom0 9cbc04a95f x86/irq: do not release irq until all cleanup is done 0b999fa2ea update Xen version to 4.17.1-pre 11560248ff Use EfiACPIReclaimMemory for ESRT Signed-off-by: Bruce Ashfield --- .../xen/files/xen-flask-race-fix.patch | 54 ---------------------- recipes-extended/xen/xen-tools_4.17.bb | 2 +- recipes-extended/xen/xen_4.17.bb | 3 +- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 recipes-extended/xen/files/xen-flask-race-fix.patch diff --git a/recipes-extended/xen/files/xen-flask-race-fix.patch b/recipes-extended/xen/files/xen-flask-race-fix.patch deleted file mode 100644 index e4b0e9df..00000000 --- a/recipes-extended/xen/files/xen-flask-race-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From mboxrd@z Thu Jan 1 00:00:00 1970 -From: Anthony PERARD -Subject: [XEN PATCH] build: fix building flask headers before descending in flask/ss/ -Date: Fri, 20 Jan 2023 13:36:26 +0000 -Message-ID: <20230120133626.55680-1-anthony.perard@citrix.com> -X-Mailer: git-send-email 2.30.2 -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Content-Type: text/plain - -Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't -work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk. -So, make is allow to try to build objects in "xsm/flask/ss/" before -generating the headers. - -Adding a prerequisite on "$(obj)/ss" instead will fix the issue has -that the target used to run make in this subdirectory. - -Unfortunatly, that target is also used when running `make clean`, so -we need to ignore it in this case. $(MAKECMDGOALS) can't be used in -this case as it is empty, but we can guess which operation is done by -looking at the list of loaded makefiles. - -Upstream-Status: Backport [https://lore.kernel.org/xen-devel/20230120133626.55680-1-anthony.perard@citrix.com/T/#u] - -Fixes: 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir") -Reported-by: "Daniel P. Smith" -Signed-off-by: Anthony PERARD ---- - xen/xsm/flask/Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile -index d25312f4fa..2d24346ee3 100644 ---- a/xen/xsm/flask/Makefile -+++ b/xen/xsm/flask/Makefile -@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h - AV_H_FILES := av_perm_to_string.h av_permissions.h - ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES)) - --$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES)) -+# Adding prerequisite to descending into ss/ folder only when not running `make -+# clean`. -+ifeq ($(filter %/Makefile.clean,$(MAKEFILE_LIST)),) -+$(addprefix $(obj)/,$(obj-y)) $(obj)/ss: $(addprefix $(obj)/,$(ALL_H_FILES)) -+endif - extra-y += $(ALL_H_FILES) - - mkflask := $(srcdir)/policy/mkflask.sh --- -Anthony PERARD - - - diff --git a/recipes-extended/xen/xen-tools_4.17.bb b/recipes-extended/xen/xen-tools_4.17.bb index 0f323cb3..39cf8793 100644 --- a/recipes-extended/xen/xen-tools_4.17.bb +++ b/recipes-extended/xen/xen-tools_4.17.bb @@ -1,5 +1,5 @@ # xen 4.17.0 release sha -SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3" +SRCREV ?= "e4a5fb9227889bec99ab212b839680f4d5b51e60" XEN_REL ?= "4.17" XEN_BRANCH ?= "stable-${XEN_REL}" diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb index cec184f9..fca9979b 100644 --- a/recipes-extended/xen/xen_4.17.bb +++ b/recipes-extended/xen/xen_4.17.bb @@ -1,5 +1,5 @@ # xen 4.17.0 release sha -SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3" +SRCREV ?= "e4a5fb9227889bec99ab212b839680f4d5b51e60" XEN_REL ?= "4.17" XEN_BRANCH ?= "stable-${XEN_REL}" @@ -7,7 +7,6 @@ XEN_BRANCH ?= "stable-${XEN_REL}" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ - file://xen-flask-race-fix.patch \ " LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9" -- cgit v1.2.3-54-g00ecf