diff --git a/emulators/xen-kernel/Makefile b/emulators/xen-kernel/Makefile index e86397813da8..cb81823d89d6 100644 --- a/emulators/xen-kernel/Makefile +++ b/emulators/xen-kernel/Makefile @@ -1,56 +1,59 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel -DISTVERSION= 4.18.0.20231212 +DISTVERSION= 4.18.0.20240201 CATEGORIES= emulators USE_GITLAB= yes GL_ACCOUNT= xen-project -GL_TAGNAME= 1792d1723b7fb45a20b145d2de4d233913b22c09 +GL_TAGNAME= b1fdd7d0e47e0831ac7a99d0417385fc10d3068c MAINTAINER= royger@FreeBSD.org COMMENT= Hypervisor using a microkernel design WWW= https://www.xenproject.org/ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 USES= cpe gmake python:build bison # Ports build environment has ARCH=amd64 set which disables Xen automatic arch # detection, but amd64 is not a valid arch for Xen. Hardcode x86_64 on the # command line in order to overwrite the one from the environment. MAKE_ARGS= clang=y PYTHON=${PYTHON_CMD} ARCH=x86_64 NO_MTREE= yes STRIP= # PLIST_FILES= /boot/xen \ /boot/xen-debug \ lib/debug/boot/xen.debug \ lib/debug/boot/xen-debug.debug +# Workaround clang code generation bug. +EXTRA_PATCHES+= ${PATCHDIR}/v2-0001-x86-altcall-use-an-union-as-register-type-for-fun.patch:-p1 + .include .if ${OPSYS} != FreeBSD IGNORE= only supported on FreeBSD .endif # The ports native 'build' target cannot be used because it sets # CFLAGS, and that breaks the Xen build system. # # Build both a production and a debug hypervisor. do-build: ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} build-xen ${MAKE_ARGS} debug=y cp ${WRKSRC}/xen/xen ${WRKSRC}/xen/xen-debug cp ${WRKSRC}/xen/xen-syms ${WRKSRC}/xen/xen-debug-syms ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} clean-xen ${MAKE_ARGS} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} build-xen ${MAKE_ARGS} do-install: ${MKDIR} ${STAGEDIR}/boot ${MKDIR} ${STAGEDIR}${PREFIX}/lib/debug/boot/ ${INSTALL_PROGRAM} ${WRKSRC}/xen/xen ${STAGEDIR}/boot ${INSTALL_DATA} ${WRKSRC}/xen/xen-syms ${STAGEDIR}${PREFIX}/lib/debug/boot/xen.debug ${INSTALL_PROGRAM} ${WRKSRC}/xen/xen-debug ${STAGEDIR}/boot ${INSTALL_DATA} ${WRKSRC}/xen/xen-debug-syms ${STAGEDIR}${PREFIX}/lib/debug/boot/xen-debug.debug .include diff --git a/emulators/xen-kernel/distinfo b/emulators/xen-kernel/distinfo index b769fc627058..629e0923053c 100644 --- a/emulators/xen-kernel/distinfo +++ b/emulators/xen-kernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702977481 -SHA256 (xen-project-xen-1792d1723b7fb45a20b145d2de4d233913b22c09_GL0.tar.gz) = cd999c5c715190cffa80e51d2099423039aca535d478d0090c31bacdf33a3401 -SIZE (xen-project-xen-1792d1723b7fb45a20b145d2de4d233913b22c09_GL0.tar.gz) = 6825501 +TIMESTAMP = 1708622887 +SHA256 (xen-project-xen-b1fdd7d0e47e0831ac7a99d0417385fc10d3068c_GL0.tar.gz) = 4cb7ef37b51d9d1ff58272fafebfa91d48aadacdb5cc4ee6f046488234be8c1b +SIZE (xen-project-xen-b1fdd7d0e47e0831ac7a99d0417385fc10d3068c_GL0.tar.gz) = 6826601 diff --git a/emulators/xen-kernel/files/v2-0001-x86-altcall-use-an-union-as-register-type-for-fun.patch b/emulators/xen-kernel/files/v2-0001-x86-altcall-use-an-union-as-register-type-for-fun.patch new file mode 100644 index 000000000000..ec00a478cb23 --- /dev/null +++ b/emulators/xen-kernel/files/v2-0001-x86-altcall-use-an-union-as-register-type-for-fun.patch @@ -0,0 +1,137 @@ +From e0d563ca60b16dfab45956f60a6c1b7b1e218ba4 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +To: xen-devel@lists.xenproject.org +Cc: Jan Beulich +Cc: Andrew Cooper +Cc: "Roger Pau Monné" +Cc: Wei Liu +Date: Wed, 21 Feb 2024 16:55:12 +0100 +Subject: [PATCH v2] x86/altcall: use an union as register type for function + parameters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The current code for alternative calls uses the caller parameter types as the +types for the register variables that serve as function parameters: + +uint8_t foo; +[...] +alternative_call(myfunc, foo); + +Would expand roughly into: + +register unint8_t a1_ asm("rdi") = foo; +register unsigned long a2_ asm("rsi"); +[...] +asm volatile ("call *%c[addr](%%rip)"...); + +However under certain circumstances clang >= 16.0.0 with -O2 can generate +incorrect code, given the following example: + +unsigned int func(uint8_t t) +{ + return t; +} + +static void bar(uint8_t b) +{ + int ret_; + register uint8_t di asm("rdi") = b; + register unsigned long si asm("rsi"); + register unsigned long dx asm("rdx"); + register unsigned long cx asm("rcx"); + register unsigned long r8 asm("r8"); + register unsigned long r9 asm("r9"); + register unsigned long r10 asm("r10"); + register unsigned long r11 asm("r11"); + + asm volatile ( "call %c[addr]" + : "+r" (di), "=r" (si), "=r" (dx), + "=r" (cx), "=r" (r8), "=r" (r9), + "=r" (r10), "=r" (r11), "=a" (ret_) + : [addr] "i" (&(func)), "g" (func) + : "memory" ); +} + +void foo(unsigned int a) +{ + bar(a); +} + +Clang generates the following code: + +func: # @func + movl %edi, %eax + retq +foo: # @foo + callq func + retq + +Note the truncation of the unsigned int parameter 'a' of foo() to uint8_t when +passed into bar() is lost. + +The above can be worked around by using an union when defining the register +variables, so that `di` becomes: + +register union { + uint8_t e; + unsigned long r; +} di asm("rdi") = { .e = b }; + +Which results in following code generated for `foo()`: + +foo: # @foo + movzbl %dil, %edi + callq func + retq + +So the truncation is not longer lost. Apply such workaround only when built +with clang. + +Reported-by: Matthew Grooms +Link: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277200 +Link: https://github.com/llvm/llvm-project/issues/82598 +Signed-off-by: Roger Pau Monné +--- +Changes since v1: + - Only apply the union workaround with clang. + +Seems like all gitlab build tests are OK with this approach. +--- + xen/arch/x86/include/asm/alternative.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/asm/alternative.h +index a1cd6a9fe5b8..3fe27ea791bf 100644 +--- a/xen/arch/x86/include/asm/alternative.h ++++ b/xen/arch/x86/include/asm/alternative.h +@@ -167,9 +167,25 @@ extern void alternative_branches(void); + #define ALT_CALL_arg5 "r8" + #define ALT_CALL_arg6 "r9" + ++#ifdef CONFIG_CC_IS_CLANG ++/* ++ * Use an union with an unsigned long in order to prevent clang from skipping a ++ * possible truncation of the value. By using the union any truncation is ++ * carried before the call instruction. ++ * https://github.com/llvm/llvm-project/issues/82598 ++ */ ++#define ALT_CALL_ARG(arg, n) \ ++ register union { \ ++ typeof(arg) e; \ ++ unsigned long r; \ ++ } a ## n ## _ asm ( ALT_CALL_arg ## n ) = { \ ++ .e = ({ BUILD_BUG_ON(sizeof(arg) > sizeof(void *)); (arg); }) \ ++ } ++#else + #define ALT_CALL_ARG(arg, n) \ + register typeof(arg) a ## n ## _ asm ( ALT_CALL_arg ## n ) = \ + ({ BUILD_BUG_ON(sizeof(arg) > sizeof(void *)); (arg); }) ++#endif + #define ALT_CALL_NO_ARG(n) \ + register unsigned long a ## n ## _ asm ( ALT_CALL_arg ## n ) + +-- +2.43.0 + diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index d44e36e0deeb..a38f0c4d4ffa 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -1,110 +1,110 @@ PORTNAME= xen PKGNAMESUFFIX= -tools -DISTVERSION= 4.18.0.20231212 +DISTVERSION= 4.18.0.20240201 PORTREVISION= 1 CATEGORIES= sysutils emulators USE_GITLAB= yes GL_ACCOUNT= xen-project -GL_TAGNAME= 1792d1723b7fb45a20b145d2de4d233913b22c09 +GL_TAGNAME= b1fdd7d0e47e0831ac7a99d0417385fc10d3068c GL_TUPLE= qemu-project:qemu:v8.0.4:qemu \ qemu-project:dtc:b6910bec:dtc \ qemu-project:meson:3a9b285a:meson \ qemu-project:keycodemapdb:f5772a62:keycodemapdb \ qemu-project:berkeley-testfloat-3:40619cbb:testfloat \ qemu-project:berkeley-softfloat-3:b64af41c:softfloat MAINTAINER= royger@FreeBSD.org COMMENT= Xen Hypervisor management tools WWW= https://www.xenproject.org/ LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi LIB_DEPENDS= libyajl.so:devel/yajl \ liblzo2.so:archivers/lzo2 \ libpixman-1.so:x11/pixman \ libargp.so:devel/argp-standalone \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= seabios>0:misc/seabios \ ${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64 \ bash>0:shells/bash RUN_DEPENDS= seabios>0:misc/seabios \ ${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64 OPTIONS_DEFINE= DOCS SPICE OPTIONS_DEFAULT= DOCS OPTIONS_SUB= yes SPICE_DESC= Enable SPICE protocol for QEMU SPICE_CONFIGURE_WITH= extra-qemuu-configure-args="--enable-spice" SPICE_BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol SPICE_LIB_DEPENDS= libspice-server.so:devel/libspice-server ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64 USES= cpe gettext gmake gnome libtool localbase:ldflags perl5 \ pkgconfig python shebangfix iconv bison ninja:build USE_GNOME= glib20 USE_LDCONFIG= yes USE_PYTHON= py3kplist HAS_CONFIGURE= yes # Set ARCH=x86_64 in order to overwrite the environment ARCH=amd64 MAKE_ARGS= clang=y ARCH=x86_64 BINARY_ALIAS= python3=${PYTHON_CMD} CONFIGURE_ARGS+= --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \ --with-system-ovmf=${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd \ --mandir=${PREFIX}/share/man \ --disable-golang SHEBANG_FILES= tools/misc/xencov_split \ tools/python/scripts/convert-legacy-stream \ tools/python/scripts/verify-stream-v2 \ tools/xenmon/xenmon.py ALL_TARGET= tools DOCS_ALL_TARGET= docs INSTALL_TARGET= install-tools DOCS_INSTALL_TARGET= install-docs .include .if ${OPSYS} != FreeBSD IGNORE= only supported on FreeBSD .endif post-extract: ${MV} ${WRKSRC_qemu} ${WRKSRC}/tools/qemu-xen ${RM} -rf ${WRKSRC}/tools/qemu-xen/dtc ${MV} ${WRKSRC_dtc} ${WRKSRC}/tools/qemu-xen/dtc ${RM} -rf ${WRKSRC}/tools/qemu-xen/meson ${MV} ${WRKSRC_meson} ${WRKSRC}/tools/qemu-xen/meson ${RM} -rf ${WRKSRC}/tools/qemu-xen/ui/keycodemapdb ${MV} ${WRKSRC_keycodemapdb} ${WRKSRC}/tools/qemu-xen/ui/keycodemapdb ${RM} -rf ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-testfloat-3 ${MV} ${WRKSRC_testfloat} ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-testfloat-3 ${RM} -rf ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-softfloat-3 ${MV} ${WRKSRC_softfloat} ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-softfloat-3 post-patch: @for p in `ls ${FILESDIR}/*qemuu*.patch 2>/dev/null`; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ done # The ports native 'build' target cannot be used because it sets CFLAGS, and # that breaks the Xen kernel build system that's used by the tools in order to # build the pv-shim. do-build: ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} ${MAKE_ARGS} ${ALL_TARGET} do-install: ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} ${MAKE_ARGS} ${INSTALL_TARGET} post-install: ${MKDIR} ${STAGEDIR}/var/run/xen .include diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-tools/distinfo index 7ca93c276af3..97bbb13a4006 100644 --- a/sysutils/xen-tools/distinfo +++ b/sysutils/xen-tools/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1702977532 -SHA256 (xen-project-xen-1792d1723b7fb45a20b145d2de4d233913b22c09_GL0.tar.gz) = cd999c5c715190cffa80e51d2099423039aca535d478d0090c31bacdf33a3401 -SIZE (xen-project-xen-1792d1723b7fb45a20b145d2de4d233913b22c09_GL0.tar.gz) = 6825501 +TIMESTAMP = 1708623243 +SHA256 (xen-project-xen-b1fdd7d0e47e0831ac7a99d0417385fc10d3068c_GL0.tar.gz) = 4cb7ef37b51d9d1ff58272fafebfa91d48aadacdb5cc4ee6f046488234be8c1b +SIZE (xen-project-xen-b1fdd7d0e47e0831ac7a99d0417385fc10d3068c_GL0.tar.gz) = 6826601 SHA256 (qemu-v8.0.4.tar.bz2) = 958eae6b32046bb512b5b968f66e896258fa8c4ec5c7fdf2d780fd206c677774 SIZE (qemu-v8.0.4.tar.bz2) = 31468222 SHA256 (dtc-b6910bec.tar.bz2) = f180420b105bdd35cfee9977d6ee2ee5d6601aa2a84693c048a985a604bd2c1c SIZE (dtc-b6910bec.tar.bz2) = 163044 SHA256 (meson-3a9b285a.tar.bz2) = 2ab212e390b5d5458cee0c0217160f9e390aa95cf366e7327876a1019aaf006b SIZE (meson-3a9b285a.tar.bz2) = 4054688 SHA256 (keycodemapdb-f5772a62.tar.bz2) = d349b02f0c95b5fb4bf8aa25d64395b04e8d5d98025c3e6e6ac8fe6f54005681 SIZE (keycodemapdb-f5772a62.tar.bz2) = 27905 SHA256 (berkeley-testfloat-3-40619cbb.tar.bz2) = 371e2a9c62ef020891bd03eef1a4caed3f34e9736732e6a11deb3acde6f9b07c SIZE (berkeley-testfloat-3-40619cbb.tar.bz2) = 90086 SHA256 (berkeley-softfloat-3-b64af41c.tar.bz2) = d56b54c557485f6126838391088e3a3d3d41c80d68099b0d90bcc09f533f2e9e SIZE (berkeley-softfloat-3-b64af41c.tar.bz2) = 83736