From xen-changelog-bounces@lists.xenproject.org Fri Aug 01 12:11:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 12:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067208.1432133 (Exim 4.92) (envelope-from ) id 1uhobH-0001dI-Om; Fri, 01 Aug 2025 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067208.1432133; Fri, 01 Aug 2025 12:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhobH-0001dA-M7; Fri, 01 Aug 2025 12:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1067208; Fri, 01 Aug 2025 12:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhobG-0001d2-GY for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 12:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhobG-00DZp7-14 for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 12:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhobG-001Ufs-0u for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 12:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uNhPOZvj7hcQCSA6Tkq0UYJziYg5BXFLxEtKzHGwuyQ=; b=TSNT0hlA0f2a5PHMEilRpfZiXV ewZn/pXj50cfp4OVBgJDIln45URpdJW/YMh9QWewLkl7hxGPm73ljAoYdkJ8tOCXU9rXGJnk+mCWp wt6wBREZPUJ7he8aSv0GjUDsljw2MRjSH8JesYejCzoQ5OZczghlpy8AVfrzbS/AYKIs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Add and use ccache in build-each-commit job Message-Id: Date: Fri, 01 Aug 2025 12:11:02 +0000 commit ca04a92ec1ba98e99babf4135c3a865da6b5a5f6 Author: Anthony PERARD AuthorDate: Thu Jul 24 10:37:20 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Aug 1 13:47:18 2025 +0200 CI: Add and use ccache in build-each-commit job Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini Signed-off-by: Anthony PERARD --- automation/build/debian/12-x86_64.dockerfile | 3 +++ automation/gitlab-ci/build-each-commit.sh | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile index 6e0a403f64..e26a19079e 100644 --- a/automation/build/debian/12-x86_64.dockerfile +++ b/automation/build/debian/12-x86_64.dockerfile @@ -54,6 +54,9 @@ RUN < Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 13:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067250.1432149 (Exim 4.92) (envelope-from ) id 1uhpXM-0000S6-2g; Fri, 01 Aug 2025 13:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067250.1432149; Fri, 01 Aug 2025 13:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhpXL-0000Rw-Up; Fri, 01 Aug 2025 13:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1067250; Fri, 01 Aug 2025 13:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhpXK-0000Rq-IR for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 13:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhpXK-00DavW-0L for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 13:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhpXK-001XEk-0D for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 13:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HzbpB4tfqZEPMN4tZBDxp+6MFYtu0sXXGdnHwsXfRz0=; b=WaPwquwZujfUd8ItVJIDJzhbCy Q0Jzy5NdtD20xRFjgyZJk0zarDF4LS52y7kJ7T/qPDrvDRHvEIgIXxQLHD6p0qzUnTZUp2yydjVC6 /Xks/l1y7XftLLgspz/xqXlz93HG5CA2FkP1SiE1MgMcI5qsuAGKzMoUoCqs9KCEwd6M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Add and use ccache in build-each-commit job Message-Id: Date: Fri, 01 Aug 2025 13:11:02 +0000 commit ca04a92ec1ba98e99babf4135c3a865da6b5a5f6 Author: Anthony PERARD AuthorDate: Thu Jul 24 10:37:20 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Aug 1 13:47:18 2025 +0200 CI: Add and use ccache in build-each-commit job Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini Signed-off-by: Anthony PERARD --- automation/build/debian/12-x86_64.dockerfile | 3 +++ automation/gitlab-ci/build-each-commit.sh | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile index 6e0a403f64..e26a19079e 100644 --- a/automation/build/debian/12-x86_64.dockerfile +++ b/automation/build/debian/12-x86_64.dockerfile @@ -54,6 +54,9 @@ RUN < Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 16:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067360.1432162 (Exim 4.92) (envelope-from ) id 1uhsgp-0007R6-Nm; Fri, 01 Aug 2025 16:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067360.1432162; Fri, 01 Aug 2025 16:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhsgp-0007Qx-Kj; Fri, 01 Aug 2025 16:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1067360; Fri, 01 Aug 2025 16:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhsgo-0007Qr-2H for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhsgn-00DfSP-2Q for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhsgn-001gdu-2I for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0xg05Qg4GaIcW+umD3mYrCIcNPpzQ5e8m4J0PKNyFuY=; b=fYOZWcQWd4LCSADp4ErtVgTayO /uLckx19THRGDdmwL7r5mdCn2KwsyDl/TaEETacyrUrGyz2csdzi9GDvCsj/Y6tyk+x+OfUhMU9Bb x1lFCyPv9ZvvgToz1cq1BdyZjcjKbBlQOuE3kbQ0JUP/J2T4tSpMAncrxp8d8Ol2EV4o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: allow to run non-HVM guest without any device model being available Message-Id: Date: Fri, 01 Aug 2025 16:33:01 +0000 commit 3c8fccd30d7e8f96b1f4f95b87a2e25b0eb9fe81 Author: Juergen Gross AuthorDate: Fri Jul 11 11:19:44 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Aug 1 15:19:50 2025 +0200 libxl: allow to run non-HVM guest without any device model being available When removing qemu-trad support, libxl__domain_build_info_setdefault() was modified to only allow qemu-xen as a device model. This change resulted in an error at domain creation when qemu-xen isn't there. As this is a perfectly fine situation for PV and PVH guests without any qemu based backends, handle this case gracefully. Fixes: 19ab8356abe4 ("tools: remove support for running a guest with qemu-traditional") Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 4042ae1a89..85c5b26ec0 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -105,8 +105,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, dm = libxl__domain_device_model(gc, b_info); rc = access(dm, X_OK); if (rc < 0) { - LOGE(ERROR, "qemu-xen access error"); - return ERROR_FAIL; + LOGE(INFO, "qemu-xen is unavailable"); + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_UNKNOWN; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 01 16:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 16:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067361.1432165 (Exim 4.92) (envelope-from ) id 1uhsgz-0007T9-Ow; Fri, 01 Aug 2025 16:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067361.1432165; Fri, 01 Aug 2025 16:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhsgz-0007Sx-MG; Fri, 01 Aug 2025 16:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1067361; Fri, 01 Aug 2025 16:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhsgx-0007Sl-UH for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhsgx-00DfSr-2k for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhsgx-001geG-2d for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6gsVl6ylbyG6tORQykeYa6G/6s2f6/lv0NFVg0ZGT/Y=; b=SQTjOtDeofImaCbDUg3WdCeYjz os9e1THD8mtnKwcvkj9nLywJx6JNN9oHnj9IiYDaG10qXwMWMLh9ML0bQBazd+449Vcg759umLYzN TXf3ct7QrKQ2+klRT11zFLaMfo3/VsXQNGHgHGmFHcJcFsP4gxwXqeMHyPvjvMYC7hYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] systemd: Add hooks to stop/start xen-watchdog on suspend/resume Message-Id: Date: Fri, 01 Aug 2025 16:33:11 +0000 commit e54a6cd6a1f3802274cd3a58b07df5f012342192 Author: Mykola Kvach AuthorDate: Thu Jul 17 23:16:58 2025 +0300 Commit: Anthony PERARD CommitDate: Fri Aug 1 15:36:02 2025 +0200 systemd: Add hooks to stop/start xen-watchdog on suspend/resume This patch adds a systemd sleep hook script to stop the xen-watchdog service before system suspend and start it again after resume. Stopping the watchdog before a system suspend operation may look unsafe. Let's imagine the following situation: 'systemctl suspend' does not interact with the running service at all. In such a case, the Xen watchdog daemon freezes just before suspend. If this happens, for example, right before sending a ping, and Xen has not yet marked the domain as suspended (is_shutting_down), the Xen watchdog timer may trigger a false alert. This is an almost impossible situation, because typically: ping time = watchdog timeout / 2 and the watchdog timeout is usually set to a relatively large value (dozens of seconds). Still, this is more likely with very short watchdog timeouts. It may happen in the following scenarios: * Significant delays occur between freezing Linux tasks and triggering the ACPI or PSCI sleep request or handler. * Long delays happen inside Xen between the entrance to the sleep trigger and the actual forwarding of the sleep request further. A similar situation may occur on resume with short timeouts. During the resume operation, Xen restores timers and the domain context. The Xen watchdog timer also resumes. If it schedules the domain right before the watchdog timeout expires, and the daemon responsible for pinging is not yet running, a timeout might occur. Both scenarios are rare and typically require very small watchdog timeouts combined with significant delays in Xen or the Linux kernel during suspend/resume flows. Conceptually, however, if activating and pinging the Xen watchdog is the responsibility of the domain and its services, then the domain should also manage the watchdog service/daemon lifecycle. This is similar to what is already done by the Xen watchdog driver inside the Linux kernel. Signed-off-by: Mykola Kvach Reviewed-by: Denis Mukhin Reviewed-by: Anthony PERARD --- config/Tools.mk.in | 1 + m4/systemd.m4 | 14 ++++++ tools/configure | 58 ++++++++++++++++++++++- tools/hotplug/Linux/systemd/Makefile | 8 +++- tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh | 34 +++++++++++++ 5 files changed, 113 insertions(+), 2 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 463ab75965..e47ac23d11 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -53,6 +53,7 @@ CONFIG_LIBFSIMAGE := @libfsimage@ CONFIG_SYSTEMD := @systemd@ XEN_SYSTEMD_DIR := @SYSTEMD_DIR@ XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@ +XEN_SYSTEMD_SLEEP_DIR := @SYSTEMD_SLEEP_DIR@ CONFIG_9PFS := @ninepfs@ LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@ diff --git a/m4/systemd.m4 b/m4/systemd.m4 index ab12ea313d..c47a25ef93 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -28,6 +28,12 @@ AC_DEFUN([AX_SYSTEMD_OPTIONS], [ [set directory for systemd modules load files [PREFIX/lib/modules-load.d/]]), [SYSTEMD_MODULES_LOAD="$withval"], [SYSTEMD_MODULES_LOAD=""]) AC_SUBST(SYSTEMD_MODULES_LOAD) + + AC_ARG_WITH(systemd-sleep, + AS_HELP_STRING([--with-systemd-sleep=DIR], + [set directory for systemd sleep script files [PREFIX/lib/systemd/system-sleep/]]), + [SYSTEMD_SLEEP_DIR="$withval"], [SYSTEMD_SLEEP_DIR=""]) + AC_SUBST(SYSTEMD_SLEEP_DIR) ]) AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [ @@ -69,6 +75,14 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ AS_IF([test "x$SYSTEMD_MODULES_LOAD" = x], [ AC_MSG_ERROR([SYSTEMD_MODULES_LOAD is unset]) ], []) + + AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ + PKG_CHECK_VAR([SYSTEMD_SLEEP_DIR], [systemd], [systemdsleepdir]) + ], []) + + AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ + AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset]) + ], []) ]) AC_DEFUN([AX_CHECK_SYSTEMD], [ diff --git a/tools/configure b/tools/configure index 27ae7c52fb..5abd44e21e 100755 --- a/tools/configure +++ b/tools/configure @@ -652,6 +652,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS pvshim ninepfs +SYSTEMD_SLEEP_DIR SYSTEMD_MODULES_LOAD SYSTEMD_DIR systemd @@ -847,6 +848,7 @@ with_xenstored enable_systemd with_systemd with_systemd_modules_load +with_systemd_sleep enable_9pfs enable_pvshim ' @@ -881,7 +883,8 @@ pixman_LIBS libzstd_CFLAGS libzstd_LIBS LIBNL3_CFLAGS -LIBNL3_LIBS' +LIBNL3_LIBS +SYSTEMD_SLEEP_DIR' # Initialize some variables set by options. @@ -1589,6 +1592,9 @@ Optional Packages: --with-systemd-modules-load=DIR set directory for systemd modules load files [PREFIX/lib/modules-load.d/] + --with-systemd-sleep=DIR + set directory for systemd sleep script files + [PREFIX/lib/systemd/system-sleep/] Some influential environment variables: CC C compiler command @@ -1630,6 +1636,8 @@ Some influential environment variables: LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config + SYSTEMD_SLEEP_DIR + value of systemdsleepdir for systemd, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -10138,6 +10146,17 @@ fi +# Check whether --with-systemd-sleep was given. +if test ${with_systemd_sleep+y} +then : + withval=$with_systemd_sleep; SYSTEMD_SLEEP_DIR="$withval" +else $as_nop + SYSTEMD_SLEEP_DIR="" +fi + + + + if test "x$enable_systemd" != "xno" then : @@ -10176,6 +10195,43 @@ then : as_fn_error $? "SYSTEMD_MODULES_LOAD is unset" "$LINENO" 5 +fi + + if test "x$SYSTEMD_SLEEP_DIR" = x +then : + + +if test -n "$SYSTEMD_SLEEP_DIR"; then + pkg_cv_SYSTEMD_SLEEP_DIR="$SYSTEMD_SLEEP_DIR" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_SLEEP_DIR=`$PKG_CONFIG --variable="systemdsleepdir" "systemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +SYSTEMD_SLEEP_DIR=$pkg_cv_SYSTEMD_SLEEP_DIR + +if test "x$SYSTEMD_SLEEP_DIR" = x"" +then : + +fi + +fi + + if test "x$SYSTEMD_SLEEP_DIR" = x +then : + + as_fn_error $? "SYSTEMD_SLEEP_DIR is unset" "$LINENO" 5 + fi diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile index e29889156d..579ef9d87d 100644 --- a/tools/hotplug/Linux/systemd/Makefile +++ b/tools/hotplug/Linux/systemd/Makefile @@ -5,6 +5,8 @@ XEN_SYSTEMD_MODULES := xen.conf XEN_SYSTEMD_MOUNT := proc-xen.mount +XEN_SYSTEMD_SLEEP_SCRIPT := xen-watchdog-sleep.sh + XEN_SYSTEMD_SERVICE := xenstored.service XEN_SYSTEMD_SERVICE += xenconsoled.service XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service @@ -15,7 +17,8 @@ XEN_SYSTEMD_SERVICE += xendriverdomain.service ALL_XEN_SYSTEMD := $(XEN_SYSTEMD_MODULES) \ $(XEN_SYSTEMD_MOUNT) \ - $(XEN_SYSTEMD_SERVICE) + $(XEN_SYSTEMD_SERVICE) \ + $(XEN_SYSTEMD_SLEEP_SCRIPT) .PHONY: all all: $(ALL_XEN_SYSTEMD) @@ -31,15 +34,18 @@ distclean: clean install: $(ALL_XEN_SYSTEMD) $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_SLEEP_DIR) $(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_PROG) $(XEN_SYSTEMD_SLEEP_SCRIPT) $(DESTDIR)$(XEN_SYSTEMD_SLEEP_DIR) .PHONY: uninstall uninstall: rm -f $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)/*.conf rm -f $(DESTDIR)$(XEN_SYSTEMD_DIR)/*.mount rm -f $(DESTDIR)$(XEN_SYSTEMD_DIR)/*.service + rm -f $(DESTDIR)$(XEN_SYSTEMD_SLEEP_DIR)/$(XEN_SYSTEMD_SLEEP_SCRIPT) $(XEN_SYSTEMD_MODULES): rm -f $@.tmp diff --git a/tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh b/tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh new file mode 100644 index 0000000000..e9bdadc8fa --- /dev/null +++ b/tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +# The first argument ($1) is: +# "pre" or "post" +# The second argument ($2) is: +# "suspend", "hibernate", "hybrid-sleep", or "suspend-then-hibernate" + +. /etc/xen/scripts/hotplugpath.sh + +SERVICE_NAME="xen-watchdog.service" +STATE_FILE="${XEN_RUN_DIR}/xen-watchdog-sleep-flag" + +case "$1" in +pre) + if systemctl is-active --quiet "${SERVICE_NAME}"; then + touch "${STATE_FILE}" + echo "Stopping ${SERVICE_NAME} before $2." + systemctl stop "${SERVICE_NAME}" + fi + ;; +post) + if [ -f "${STATE_FILE}" ]; then + echo "Starting ${SERVICE_NAME} after $2." + systemctl start "${SERVICE_NAME}" + rm "${STATE_FILE}" + fi + ;; +*) + echo "Script called with unknown action '$1'. Arguments: '$@'" + exit 1 + ;; +esac + +exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 01 16:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 16:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067362.1432170 (Exim 4.92) (envelope-from ) id 1uhsh9-0007Ve-Qq; Fri, 01 Aug 2025 16:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067362.1432170; Fri, 01 Aug 2025 16:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhsh9-0007VV-Ns; Fri, 01 Aug 2025 16:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1067362; Fri, 01 Aug 2025 16:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhsh8-0007VL-3R for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhsh8-00DfSv-04 for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhsh7-001gec-30 for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 16:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Tr0j8srjtzljW5X1jeQnbuEP0rfuA/QUTsxJg0tYlIk=; b=zMAZmyxoPfASqdWJ+o5N+Hh6KF xsaDQxOZlYvCOcRI7A0lxS5OCvDDPNTs7hEFoJk8XYs7XFGrYYC95RKVFC/jNTxCp4I/9LBcEzEo7 WrYEzIeSdYBYrwiYERS2qdaTGW2gErrtuduuB2VwgNI1g5/mI28MRY7W6QxxTo4mHsWQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: allow to limit xenstore features via guest config Message-Id: Date: Fri, 01 Aug 2025 16:33:21 +0000 commit f6c990ac3cddc2d1965a7ab09324d821b05e4b6c Author: Juergen Gross AuthorDate: Thu Jul 31 10:42:54 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Aug 1 16:00:13 2025 +0200 tools: allow to limit xenstore features via guest config Add a guest config parameter "xenstore_feature_mask" allowing to limit the Xenstore features the guest can see and use. This can be needed in order to allow migrating a guest to a host running a Xenstore version providing less features than the source host. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Acked-by: Nick Rosbrook # tools/golang Reviewed-by: Anthony PERARD --- docs/man/xl.cfg.5.pod.in | 36 ++++++++++++++++++++++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl_dom.c | 17 ++++++++++++++++- tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 3 +++ 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 5362fb0e9a..f0c920b39d 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -714,6 +714,42 @@ If this option is not specified then it will default to B. =back +=head3 Xenstore related settings + +=over 4 + +=item B + +Specify which Xenstore features are visible for the guest. + +This might be needed when a guest should be able to be migrated to a host +running a Xenstore implementation with less features than the one the guest +is created on. + +The visible features are specified via a binary or of the following +values: + +=over 4 + +=item B<0x00000001> + +Xenstore is capable to reconnect to a guest. + +=item B<0x00000002> + +Xenstore will present an error value in case it disconnects due to an error +condition. + +=back + +The features supported by the running Xenstore instance can be retrieved +via the B command in dom0. + +The default value is B<0xffffffff>, meaning that all possible Xenstore +features are visible by the guest. + +=back + =head2 Devices The following options define the paravirtual, emulated and physical diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index b43aad7d00..667030cbd7 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1175,6 +1175,7 @@ return fmt.Errorf("converting field Vpmu: %v", err) if err := x.TrapUnmappedAccesses.fromC(&xc.trap_unmapped_accesses);err != nil { return fmt.Errorf("converting field TrapUnmappedAccesses: %v", err) } +x.XenstoreFeatureMask = uint32(xc.xenstore_feature_mask) return nil} @@ -1710,6 +1711,7 @@ return fmt.Errorf("converting field Vpmu: %v", err) if err := x.TrapUnmappedAccesses.toC(&xc.trap_unmapped_accesses); err != nil { return fmt.Errorf("converting field TrapUnmappedAccesses: %v", err) } +xc.xenstore_feature_mask = C.uint32_t(x.XenstoreFeatureMask) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 4777f528b5..e26b3cdfc7 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -608,6 +608,7 @@ Altp2MCount uint32 VmtraceBufKb int Vpmu Defbool TrapUnmappedAccesses Defbool +XenstoreFeatureMask uint32 } type DomainBuildInfoTypeUnion interface { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index d6b6e5d2dd..185f74d8a8 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -654,6 +654,12 @@ */ #define LIBXL_HAVE_DT_OVERLAY_DOMAIN 1 +/* + * LIBXL_HAVE_XENSTORE_FEATURE_MASK indicates the presence of + * xenstore_feature_mask in struct libxl_domain_build_info. + */ +#define LIBXL_HAVE_XENSTORE_FEATURE_MASK 1 + /* * libxl memory management * diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index a61085ca3b..05ebc69534 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -494,9 +494,24 @@ retry_transaction: if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; + + if (info->xenstore_feature_mask != ~0U) { + unsigned int features; + + if (xs_get_features_supported(ctx->xsh, &features) && + !xs_set_features_domain(ctx->xsh, domid, + features & info->xenstore_feature_mask)) { + LOGED(ERROR, domid, "Failed to set Xenstore features"); + rc = ERROR_FAIL; + goto out; + } + } + xs_introduce_domain(ctx->xsh, domid, state->store_mfn, state->store_port); + + out: free(vm_path); - return 0; + return rc; } static int set_vnuma_info(libxl__gc *gc, uint32_t domid, diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index fe251649f3..a6030a2dbd 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -739,6 +739,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vpmu", libxl_defbool), ("trap_unmapped_accesses", libxl_defbool), + ("xenstore_feature_mask", uint32, {'init_val': '~0U'}), ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 28cdbf07c2..90c9386f5b 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1409,6 +1409,9 @@ void parse_config_data(const char *config_source, if (!xlu_cfg_get_string (config, "pool", &buf, 0)) xlu_cfg_replace_string(config, "pool", &c_info->pool_name, 0); + if (!xlu_cfg_get_long (config, "xenstore_feature_mask", &l, 0)) + b_info->xenstore_feature_mask = l; + libxl_domain_build_info_init_type(b_info, c_info->type); if (b_info->type == LIBXL_DOMAIN_TYPE_PVH) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 01 17:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 17:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067405.1432174 (Exim 4.92) (envelope-from ) id 1uhtSG-0004bg-2i; Fri, 01 Aug 2025 17:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067405.1432174; Fri, 01 Aug 2025 17:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhtSG-0004bY-06; Fri, 01 Aug 2025 17:22:04 +0000 Received: by outflank-mailman (input) for mailman id 1067405; Fri, 01 Aug 2025 17:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhtSE-0004bS-K9 for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhtSE-00DgQm-0y for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhtSE-001ocA-0g for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0HjCEOMWgZuSZY+XEX08eA8t54I3bJYBLE4ITUo6OYA=; b=AlIkgHjUsFJio2U387f8Kh8hT0 K7UqMaTlNhkjIYfcypCFVmx+DVol3pZ1dw7L2H6YZFk4nyE/x5YFxuoo07etGfVIZW68CagVCJoLn TLp9YM7Xke/TYIGd+50wiCxTtOcn50HRv2kLrZysjGJ28mC7D7Fj0eDQxwe+ru+TEJ7g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: allow to run non-HVM guest without any device model being available Message-Id: Date: Fri, 01 Aug 2025 17:22:02 +0000 commit 3c8fccd30d7e8f96b1f4f95b87a2e25b0eb9fe81 Author: Juergen Gross AuthorDate: Fri Jul 11 11:19:44 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Aug 1 15:19:50 2025 +0200 libxl: allow to run non-HVM guest without any device model being available When removing qemu-trad support, libxl__domain_build_info_setdefault() was modified to only allow qemu-xen as a device model. This change resulted in an error at domain creation when qemu-xen isn't there. As this is a perfectly fine situation for PV and PVH guests without any qemu based backends, handle this case gracefully. Fixes: 19ab8356abe4 ("tools: remove support for running a guest with qemu-traditional") Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 4042ae1a89..85c5b26ec0 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -105,8 +105,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, dm = libxl__domain_device_model(gc, b_info); rc = access(dm, X_OK); if (rc < 0) { - LOGE(ERROR, "qemu-xen access error"); - return ERROR_FAIL; + LOGE(INFO, "qemu-xen is unavailable"); + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_UNKNOWN; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 01 17:22:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 17:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067406.1432178 (Exim 4.92) (envelope-from ) id 1uhtSQ-0004d8-4C; Fri, 01 Aug 2025 17:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067406.1432178; Fri, 01 Aug 2025 17:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhtSQ-0004d0-1V; Fri, 01 Aug 2025 17:22:14 +0000 Received: by outflank-mailman (input) for mailman id 1067406; Fri, 01 Aug 2025 17:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhtSO-0004cq-FR for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhtSO-00DgRA-1M for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhtSO-001ocs-1C for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2QNEMDYK1snkNiVl6NF5uOJG1uhkenCyo6ce/448SlY=; b=e2eFnlVY8HANfghgnqHgeZJjIG TmjygFcoPfpMsCHPThYVB+U8cy8nnql8SY0YckM61hHn0ueLVm9gBCv62RysNrzWEaUbPhRugNYHd b479mFwULtSh8TdB7ZzrSNfSZxM+pPOjAfdVIHLJV3NK93yjJCBWwxRY4aW5tSxZQy3s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] systemd: Add hooks to stop/start xen-watchdog on suspend/resume Message-Id: Date: Fri, 01 Aug 2025 17:22:12 +0000 commit e54a6cd6a1f3802274cd3a58b07df5f012342192 Author: Mykola Kvach AuthorDate: Thu Jul 17 23:16:58 2025 +0300 Commit: Anthony PERARD CommitDate: Fri Aug 1 15:36:02 2025 +0200 systemd: Add hooks to stop/start xen-watchdog on suspend/resume This patch adds a systemd sleep hook script to stop the xen-watchdog service before system suspend and start it again after resume. Stopping the watchdog before a system suspend operation may look unsafe. Let's imagine the following situation: 'systemctl suspend' does not interact with the running service at all. In such a case, the Xen watchdog daemon freezes just before suspend. If this happens, for example, right before sending a ping, and Xen has not yet marked the domain as suspended (is_shutting_down), the Xen watchdog timer may trigger a false alert. This is an almost impossible situation, because typically: ping time = watchdog timeout / 2 and the watchdog timeout is usually set to a relatively large value (dozens of seconds). Still, this is more likely with very short watchdog timeouts. It may happen in the following scenarios: * Significant delays occur between freezing Linux tasks and triggering the ACPI or PSCI sleep request or handler. * Long delays happen inside Xen between the entrance to the sleep trigger and the actual forwarding of the sleep request further. A similar situation may occur on resume with short timeouts. During the resume operation, Xen restores timers and the domain context. The Xen watchdog timer also resumes. If it schedules the domain right before the watchdog timeout expires, and the daemon responsible for pinging is not yet running, a timeout might occur. Both scenarios are rare and typically require very small watchdog timeouts combined with significant delays in Xen or the Linux kernel during suspend/resume flows. Conceptually, however, if activating and pinging the Xen watchdog is the responsibility of the domain and its services, then the domain should also manage the watchdog service/daemon lifecycle. This is similar to what is already done by the Xen watchdog driver inside the Linux kernel. Signed-off-by: Mykola Kvach Reviewed-by: Denis Mukhin Reviewed-by: Anthony PERARD --- config/Tools.mk.in | 1 + m4/systemd.m4 | 14 ++++++ tools/configure | 58 ++++++++++++++++++++++- tools/hotplug/Linux/systemd/Makefile | 8 +++- tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh | 34 +++++++++++++ 5 files changed, 113 insertions(+), 2 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 463ab75965..e47ac23d11 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -53,6 +53,7 @@ CONFIG_LIBFSIMAGE := @libfsimage@ CONFIG_SYSTEMD := @systemd@ XEN_SYSTEMD_DIR := @SYSTEMD_DIR@ XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@ +XEN_SYSTEMD_SLEEP_DIR := @SYSTEMD_SLEEP_DIR@ CONFIG_9PFS := @ninepfs@ LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@ diff --git a/m4/systemd.m4 b/m4/systemd.m4 index ab12ea313d..c47a25ef93 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -28,6 +28,12 @@ AC_DEFUN([AX_SYSTEMD_OPTIONS], [ [set directory for systemd modules load files [PREFIX/lib/modules-load.d/]]), [SYSTEMD_MODULES_LOAD="$withval"], [SYSTEMD_MODULES_LOAD=""]) AC_SUBST(SYSTEMD_MODULES_LOAD) + + AC_ARG_WITH(systemd-sleep, + AS_HELP_STRING([--with-systemd-sleep=DIR], + [set directory for systemd sleep script files [PREFIX/lib/systemd/system-sleep/]]), + [SYSTEMD_SLEEP_DIR="$withval"], [SYSTEMD_SLEEP_DIR=""]) + AC_SUBST(SYSTEMD_SLEEP_DIR) ]) AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [ @@ -69,6 +75,14 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ AS_IF([test "x$SYSTEMD_MODULES_LOAD" = x], [ AC_MSG_ERROR([SYSTEMD_MODULES_LOAD is unset]) ], []) + + AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ + PKG_CHECK_VAR([SYSTEMD_SLEEP_DIR], [systemd], [systemdsleepdir]) + ], []) + + AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ + AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset]) + ], []) ]) AC_DEFUN([AX_CHECK_SYSTEMD], [ diff --git a/tools/configure b/tools/configure index 27ae7c52fb..5abd44e21e 100755 --- a/tools/configure +++ b/tools/configure @@ -652,6 +652,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS pvshim ninepfs +SYSTEMD_SLEEP_DIR SYSTEMD_MODULES_LOAD SYSTEMD_DIR systemd @@ -847,6 +848,7 @@ with_xenstored enable_systemd with_systemd with_systemd_modules_load +with_systemd_sleep enable_9pfs enable_pvshim ' @@ -881,7 +883,8 @@ pixman_LIBS libzstd_CFLAGS libzstd_LIBS LIBNL3_CFLAGS -LIBNL3_LIBS' +LIBNL3_LIBS +SYSTEMD_SLEEP_DIR' # Initialize some variables set by options. @@ -1589,6 +1592,9 @@ Optional Packages: --with-systemd-modules-load=DIR set directory for systemd modules load files [PREFIX/lib/modules-load.d/] + --with-systemd-sleep=DIR + set directory for systemd sleep script files + [PREFIX/lib/systemd/system-sleep/] Some influential environment variables: CC C compiler command @@ -1630,6 +1636,8 @@ Some influential environment variables: LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config + SYSTEMD_SLEEP_DIR + value of systemdsleepdir for systemd, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -10138,6 +10146,17 @@ fi +# Check whether --with-systemd-sleep was given. +if test ${with_systemd_sleep+y} +then : + withval=$with_systemd_sleep; SYSTEMD_SLEEP_DIR="$withval" +else $as_nop + SYSTEMD_SLEEP_DIR="" +fi + + + + if test "x$enable_systemd" != "xno" then : @@ -10176,6 +10195,43 @@ then : as_fn_error $? "SYSTEMD_MODULES_LOAD is unset" "$LINENO" 5 +fi + + if test "x$SYSTEMD_SLEEP_DIR" = x +then : + + +if test -n "$SYSTEMD_SLEEP_DIR"; then + pkg_cv_SYSTEMD_SLEEP_DIR="$SYSTEMD_SLEEP_DIR" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_SLEEP_DIR=`$PKG_CONFIG --variable="systemdsleepdir" "systemd" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +SYSTEMD_SLEEP_DIR=$pkg_cv_SYSTEMD_SLEEP_DIR + +if test "x$SYSTEMD_SLEEP_DIR" = x"" +then : + +fi + +fi + + if test "x$SYSTEMD_SLEEP_DIR" = x +then : + + as_fn_error $? "SYSTEMD_SLEEP_DIR is unset" "$LINENO" 5 + fi diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile index e29889156d..579ef9d87d 100644 --- a/tools/hotplug/Linux/systemd/Makefile +++ b/tools/hotplug/Linux/systemd/Makefile @@ -5,6 +5,8 @@ XEN_SYSTEMD_MODULES := xen.conf XEN_SYSTEMD_MOUNT := proc-xen.mount +XEN_SYSTEMD_SLEEP_SCRIPT := xen-watchdog-sleep.sh + XEN_SYSTEMD_SERVICE := xenstored.service XEN_SYSTEMD_SERVICE += xenconsoled.service XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service @@ -15,7 +17,8 @@ XEN_SYSTEMD_SERVICE += xendriverdomain.service ALL_XEN_SYSTEMD := $(XEN_SYSTEMD_MODULES) \ $(XEN_SYSTEMD_MOUNT) \ - $(XEN_SYSTEMD_SERVICE) + $(XEN_SYSTEMD_SERVICE) \ + $(XEN_SYSTEMD_SLEEP_SCRIPT) .PHONY: all all: $(ALL_XEN_SYSTEMD) @@ -31,15 +34,18 @@ distclean: clean install: $(ALL_XEN_SYSTEMD) $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_SLEEP_DIR) $(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_PROG) $(XEN_SYSTEMD_SLEEP_SCRIPT) $(DESTDIR)$(XEN_SYSTEMD_SLEEP_DIR) .PHONY: uninstall uninstall: rm -f $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)/*.conf rm -f $(DESTDIR)$(XEN_SYSTEMD_DIR)/*.mount rm -f $(DESTDIR)$(XEN_SYSTEMD_DIR)/*.service + rm -f $(DESTDIR)$(XEN_SYSTEMD_SLEEP_DIR)/$(XEN_SYSTEMD_SLEEP_SCRIPT) $(XEN_SYSTEMD_MODULES): rm -f $@.tmp diff --git a/tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh b/tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh new file mode 100644 index 0000000000..e9bdadc8fa --- /dev/null +++ b/tools/hotplug/Linux/systemd/xen-watchdog-sleep.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +# The first argument ($1) is: +# "pre" or "post" +# The second argument ($2) is: +# "suspend", "hibernate", "hybrid-sleep", or "suspend-then-hibernate" + +. /etc/xen/scripts/hotplugpath.sh + +SERVICE_NAME="xen-watchdog.service" +STATE_FILE="${XEN_RUN_DIR}/xen-watchdog-sleep-flag" + +case "$1" in +pre) + if systemctl is-active --quiet "${SERVICE_NAME}"; then + touch "${STATE_FILE}" + echo "Stopping ${SERVICE_NAME} before $2." + systemctl stop "${SERVICE_NAME}" + fi + ;; +post) + if [ -f "${STATE_FILE}" ]; then + echo "Starting ${SERVICE_NAME} after $2." + systemctl start "${SERVICE_NAME}" + rm "${STATE_FILE}" + fi + ;; +*) + echo "Script called with unknown action '$1'. Arguments: '$@'" + exit 1 + ;; +esac + +exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 01 17:22:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Aug 2025 17:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1067407.1432182 (Exim 4.92) (envelope-from ) id 1uhtSa-0004f8-5Z; Fri, 01 Aug 2025 17:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1067407.1432182; Fri, 01 Aug 2025 17:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhtSa-0004f0-2x; Fri, 01 Aug 2025 17:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1067407; Fri, 01 Aug 2025 17:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uhtSY-0004es-IE for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uhtSY-00DgRI-1i for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uhtSY-001odv-1b for xen-changelog@lists.xenproject.org; Fri, 01 Aug 2025 17:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bkQGVG66eYa/3FQDJUSVmCjxZVa4HO8TTfnh+98Vww4=; b=7H3xC/PUTnG8uxyyTb/Lxena3w 0gk148WXAnRf6kJ5dpCxS1XvqR8GEDecIAVWFm9R/iyqC4F2oshwJo91etl5rD5wFr2nSFG1KWMTu Jv4EYW4ML5uD4s6sLQ/KDW2ihq1SFXoRcolrKYpQKsfKygd8MnEOmIbqPOup1TxYW210=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: allow to limit xenstore features via guest config Message-Id: Date: Fri, 01 Aug 2025 17:22:22 +0000 commit f6c990ac3cddc2d1965a7ab09324d821b05e4b6c Author: Juergen Gross AuthorDate: Thu Jul 31 10:42:54 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Aug 1 16:00:13 2025 +0200 tools: allow to limit xenstore features via guest config Add a guest config parameter "xenstore_feature_mask" allowing to limit the Xenstore features the guest can see and use. This can be needed in order to allow migrating a guest to a host running a Xenstore version providing less features than the source host. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Acked-by: Nick Rosbrook # tools/golang Reviewed-by: Anthony PERARD --- docs/man/xl.cfg.5.pod.in | 36 ++++++++++++++++++++++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl_dom.c | 17 ++++++++++++++++- tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 3 +++ 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 5362fb0e9a..f0c920b39d 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -714,6 +714,42 @@ If this option is not specified then it will default to B. =back +=head3 Xenstore related settings + +=over 4 + +=item B + +Specify which Xenstore features are visible for the guest. + +This might be needed when a guest should be able to be migrated to a host +running a Xenstore implementation with less features than the one the guest +is created on. + +The visible features are specified via a binary or of the following +values: + +=over 4 + +=item B<0x00000001> + +Xenstore is capable to reconnect to a guest. + +=item B<0x00000002> + +Xenstore will present an error value in case it disconnects due to an error +condition. + +=back + +The features supported by the running Xenstore instance can be retrieved +via the B command in dom0. + +The default value is B<0xffffffff>, meaning that all possible Xenstore +features are visible by the guest. + +=back + =head2 Devices The following options define the paravirtual, emulated and physical diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index b43aad7d00..667030cbd7 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1175,6 +1175,7 @@ return fmt.Errorf("converting field Vpmu: %v", err) if err := x.TrapUnmappedAccesses.fromC(&xc.trap_unmapped_accesses);err != nil { return fmt.Errorf("converting field TrapUnmappedAccesses: %v", err) } +x.XenstoreFeatureMask = uint32(xc.xenstore_feature_mask) return nil} @@ -1710,6 +1711,7 @@ return fmt.Errorf("converting field Vpmu: %v", err) if err := x.TrapUnmappedAccesses.toC(&xc.trap_unmapped_accesses); err != nil { return fmt.Errorf("converting field TrapUnmappedAccesses: %v", err) } +xc.xenstore_feature_mask = C.uint32_t(x.XenstoreFeatureMask) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 4777f528b5..e26b3cdfc7 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -608,6 +608,7 @@ Altp2MCount uint32 VmtraceBufKb int Vpmu Defbool TrapUnmappedAccesses Defbool +XenstoreFeatureMask uint32 } type DomainBuildInfoTypeUnion interface { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index d6b6e5d2dd..185f74d8a8 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -654,6 +654,12 @@ */ #define LIBXL_HAVE_DT_OVERLAY_DOMAIN 1 +/* + * LIBXL_HAVE_XENSTORE_FEATURE_MASK indicates the presence of + * xenstore_feature_mask in struct libxl_domain_build_info. + */ +#define LIBXL_HAVE_XENSTORE_FEATURE_MASK 1 + /* * libxl memory management * diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index a61085ca3b..05ebc69534 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -494,9 +494,24 @@ retry_transaction: if (!xs_transaction_end(ctx->xsh, t, 0)) if (errno == EAGAIN) goto retry_transaction; + + if (info->xenstore_feature_mask != ~0U) { + unsigned int features; + + if (xs_get_features_supported(ctx->xsh, &features) && + !xs_set_features_domain(ctx->xsh, domid, + features & info->xenstore_feature_mask)) { + LOGED(ERROR, domid, "Failed to set Xenstore features"); + rc = ERROR_FAIL; + goto out; + } + } + xs_introduce_domain(ctx->xsh, domid, state->store_mfn, state->store_port); + + out: free(vm_path); - return 0; + return rc; } static int set_vnuma_info(libxl__gc *gc, uint32_t domid, diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index fe251649f3..a6030a2dbd 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -739,6 +739,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vpmu", libxl_defbool), ("trap_unmapped_accesses", libxl_defbool), + ("xenstore_feature_mask", uint32, {'init_val': '~0U'}), ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 28cdbf07c2..90c9386f5b 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1409,6 +1409,9 @@ void parse_config_data(const char *config_source, if (!xlu_cfg_get_string (config, "pool", &buf, 0)) xlu_cfg_replace_string(config, "pool", &c_info->pool_name, 0); + if (!xlu_cfg_get_long (config, "xenstore_feature_mask", &l, 0)) + b_info->xenstore_feature_mask = l; + libxl_domain_build_info_init_type(b_info, c_info->type); if (b_info->type == LIBXL_DOMAIN_TYPE_PVH) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 13:33:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 13:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069397.1433236 (Exim 4.92) (envelope-from ) id 1uivJH-0006mz-4X; Mon, 04 Aug 2025 13:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069397.1433236; Mon, 04 Aug 2025 13:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivJH-0006mr-1q; Mon, 04 Aug 2025 13:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1069397; Mon, 04 Aug 2025 13:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivJF-0006l8-Kk for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uivJF-00140i-1d for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uivJF-004dKF-1W for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+W7DsTxqUq2K1EPH9iFW5sB546dyughfpQjre2iO54Y=; b=3ctCdFCnVLD6Q1NSa9NJo5eLJG iaV0g0uZS7lhLaMbDYLeSW1rkSjs8+gxjmD91r1d4a8Mi1nlWTKT7ZXRJMHq2s6UmvXRcs1lLUnB5 7fA7TeQ8YVhlR4TWx16MffXxMWgoIuxImmPJBl0XVS+qPpdiu5Ls9GMlPNPlWu/U9G+o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] tools/xl: don't crash on NULL command line Message-Id: Date: Mon, 04 Aug 2025 13:33:01 +0000 commit 7cda6b65098f790e6573f555c5ef170d3f373c6e Author: Marek Marczykowski-Górecki AuthorDate: Mon Aug 4 15:22:13 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 15:22:13 2025 +0200 tools/xl: don't crash on NULL command line When running xl in a domU, it doesn't have access to the Xen command line. Before the non-truncating xc_xenver_cmdline(), it was always set with strdup, possibly of an empty string. Now it's NULL. Treat it the same as empty cmdline, as it was before. Autoballoon isn't relevant for xl devd in a domU anyway. Fixes: 75f91607621c ("tools: Introduce a non-truncating xc_xenver_cmdline()") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD master commit: a4988c4177be81f225af1516e1bbb9ec14f76388 master date: 2025-07-31 14:44:02 +0200 --- tools/xl/xl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/xl.c b/tools/xl/xl.c index ec72ca60c3..b3abc91b60 100644 --- a/tools/xl/xl.c +++ b/tools/xl/xl.c @@ -79,7 +79,7 @@ static int auto_autoballoon(void) int ret; info = libxl_get_version_info(ctx); - if (!info) + if (!info || !info->commandline) return 1; /* default to on */ #define SIZE_PATTERN "-?[0-9]+[bBkKmMgGtT]?" -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 13:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 13:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069398.1433239 (Exim 4.92) (envelope-from ) id 1uivJR-0006pl-60; Mon, 04 Aug 2025 13:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069398.1433239; Mon, 04 Aug 2025 13:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivJR-0006pd-3F; Mon, 04 Aug 2025 13:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1069398; Mon, 04 Aug 2025 13:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivJP-0006pT-Kz for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uivJP-00140q-20 for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uivJP-004dKd-1r for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XQvVmB+C76msog6ggrEVL6HPPrh27nxTrN/dW5+bHEc=; b=IdsxnoegPRG21AuaRF1gUOgKeM 6QzoIyfmW7GIHzAzpcuvBDPh5w4nVYuPfbWTaTrJipjHT6Ca5tGT4BhBJWKGMQz57nQzjfBidWUgV Y6ei0Z8QKojNrfHZZEZsP/onwq4RqvzF0D7zFUOvekWGZBFlcYe5wizP6y7HFq2rbv8Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xenalyze: correct symbol name length fscanf() specifier Message-Id: Date: Mon, 04 Aug 2025 13:33:11 +0000 commit ea5025554e982bd377f85b899b6d151e5ef33d1e Author: Jan Beulich AuthorDate: Mon Aug 4 15:22:34 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 15:22:34 2025 +0200 xenalyze: correct symbol name length fscanf() specifier SYMBOL_NAME_SIZE is 124, not 128. Use the symbolic name there as well, to avoid any disconnect. While there correct indentation on the following line as well. Coverity ID: 1659391 Signed-off-by: Jan Beulich Reviewed-by: Alejandro Vallejo Acked-by: Anthony PERARD master commit: dfabb3fee36756d6ceab58bc7f28f330640c78dc master date: 2025-07-31 14:44:02 +0200 --- tools/firmware/hvmloader/util.h | 3 --- tools/include/xen-tools/common-macros.h | 3 +++ tools/xentrace/xenalyze.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 17ed3783f2..644450c51c 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -21,9 +21,6 @@ enum { /* Cause xs_wire.h to give us xsd_errors[]. */ #define EINVAL EINVAL -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) - /* GDT selector values. */ #define SEL_CODE16 0x0008 #define SEL_DATA16 0x0010 diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 60912225cb..0088208c2e 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -88,6 +88,9 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + #define __AC(X, Y) (X ## Y) #define _AC(X, Y) __AC(X, Y) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 1c13682aaa..876d59d42c 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -321,11 +321,10 @@ void parse_symbol_file(char *fn) { (*p)->next=NULL; } - /* FIXME -- use SYMBOL_NAME_SIZE */ /* FIXME -- use regexp. This won't work for symbols with spaces (yes they exist) */ (*p)->symbols[(*p)->count].addr = 0xDEADBEEF; - if ( fscanf(symbol_file, "%llx %128s", - &(*p)->symbols[(*p)->count].addr, + if ( fscanf(symbol_file, "%llx %" STR(SYMBOL_NAME_SIZE) "s", + &(*p)->symbols[(*p)->count].addr, (*p)->symbols[(*p)->count].name) == 0 ) break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 13:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 13:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069399.1433244 (Exim 4.92) (envelope-from ) id 1uivJb-0006uz-88; Mon, 04 Aug 2025 13:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069399.1433244; Mon, 04 Aug 2025 13:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivJb-0006uq-4b; Mon, 04 Aug 2025 13:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1069399; Mon, 04 Aug 2025 13:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivJZ-0006u7-Tr for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uivJZ-00140u-2q for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uivJZ-004dLo-2k for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 13:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e4THDu4BfTHaxDVZjC+i9G/XPOLWssHf66nqtx1BhG0=; b=sMfJ5QoM8VU95uIaV2wNOKsJKx OTlr/fXY8lJ8PrHw2JsSirX2z7+M+LzFSaHpsGgh76i9C197ANduP6oHN1ND0YGP0FbYqhqd4/WG/ /fCpx8xGovi+qwykoHL0d1f/Wis7sWc8FPjlM9kge5M0ZrG5ifQ4eeVKe26ttWNRsTPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xenalyze: correct symbol name length fscanf() specifier Message-Id: Date: Mon, 04 Aug 2025 13:33:21 +0000 commit a592800e5ee350c41e06db2a5b986cbf76ea6adc Author: Jan Beulich AuthorDate: Mon Aug 4 15:22:58 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 15:22:58 2025 +0200 xenalyze: correct symbol name length fscanf() specifier SYMBOL_NAME_SIZE is 124, not 128. Use the symbolic name there as well, to avoid any disconnect. While there correct indentation on the following line as well. Coverity ID: 1659391 Signed-off-by: Jan Beulich Reviewed-by: Alejandro Vallejo Acked-by: Anthony PERARD master commit: dfabb3fee36756d6ceab58bc7f28f330640c78dc master date: 2025-07-31 14:44:02 +0200 --- tools/firmware/hvmloader/util.h | 3 --- tools/include/xen-tools/common-macros.h | 3 +++ tools/xentrace/xenalyze.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index deb823a892..7206c793ed 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -21,9 +21,6 @@ enum { /* Cause xs_wire.h to give us xsd_errors[]. */ #define EINVAL EINVAL -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) - /* GDT selector values. */ #define SEL_CODE16 0x0008 #define SEL_DATA16 0x0010 diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 60912225cb..0088208c2e 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -88,6 +88,9 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + #define __AC(X, Y) (X ## Y) #define _AC(X, Y) __AC(X, Y) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 1c13682aaa..876d59d42c 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -321,11 +321,10 @@ void parse_symbol_file(char *fn) { (*p)->next=NULL; } - /* FIXME -- use SYMBOL_NAME_SIZE */ /* FIXME -- use regexp. This won't work for symbols with spaces (yes they exist) */ (*p)->symbols[(*p)->count].addr = 0xDEADBEEF; - if ( fscanf(symbol_file, "%llx %128s", - &(*p)->symbols[(*p)->count].addr, + if ( fscanf(symbol_file, "%llx %" STR(SYMBOL_NAME_SIZE) "s", + &(*p)->symbols[(*p)->count].addr, (*p)->symbols[(*p)->count].name) == 0 ) break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 14:11:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 14:11:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069474.1433318 (Exim 4.92) (envelope-from ) id 1uivu2-0004pH-JC; Mon, 04 Aug 2025 14:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069474.1433318; Mon, 04 Aug 2025 14:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivu2-0004p9-GL; Mon, 04 Aug 2025 14:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1069474; Mon, 04 Aug 2025 14:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivu1-0004p3-Kf for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uivu1-0014s1-1c for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uivu1-004fW2-1V for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jVzQABjH2yK5cBAawbIRoqz/KXc51VuJAT4ibweVQ7U=; b=o+hkJN7Ds18CyhFWsnxZ91zQd2 dLT9kROT9uxW5IBRVL0A+dv1qVAji98U+QhiFQXN8vOg1Gzm7evSyBOJUW4dWZVziQl4aNPk6Qr/W ECo8bHvvPWFM3ZpllaLqnxrkqATHZTFLF8T3KTq57NRhGH1BKfA7zj0nHuHSWQCUjo7c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] tools/xl: don't crash on NULL command line Message-Id: Date: Mon, 04 Aug 2025 14:11:01 +0000 commit 7cda6b65098f790e6573f555c5ef170d3f373c6e Author: Marek Marczykowski-Górecki AuthorDate: Mon Aug 4 15:22:13 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 15:22:13 2025 +0200 tools/xl: don't crash on NULL command line When running xl in a domU, it doesn't have access to the Xen command line. Before the non-truncating xc_xenver_cmdline(), it was always set with strdup, possibly of an empty string. Now it's NULL. Treat it the same as empty cmdline, as it was before. Autoballoon isn't relevant for xl devd in a domU anyway. Fixes: 75f91607621c ("tools: Introduce a non-truncating xc_xenver_cmdline()") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD master commit: a4988c4177be81f225af1516e1bbb9ec14f76388 master date: 2025-07-31 14:44:02 +0200 --- tools/xl/xl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/xl.c b/tools/xl/xl.c index ec72ca60c3..b3abc91b60 100644 --- a/tools/xl/xl.c +++ b/tools/xl/xl.c @@ -79,7 +79,7 @@ static int auto_autoballoon(void) int ret; info = libxl_get_version_info(ctx); - if (!info) + if (!info || !info->commandline) return 1; /* default to on */ #define SIZE_PATTERN "-?[0-9]+[bBkKmMgGtT]?" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 14:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 14:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069475.1433322 (Exim 4.92) (envelope-from ) id 1uivuC-0004v9-KU; Mon, 04 Aug 2025 14:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069475.1433322; Mon, 04 Aug 2025 14:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivuC-0004v1-Hv; Mon, 04 Aug 2025 14:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1069475; Mon, 04 Aug 2025 14:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uivuB-0004ut-L0 for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uivuB-0014sW-20 for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uivuB-004fWd-1q for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MzQpRELg/zQfvSZjRkPzVDv6/G+PzD5qMv4njEdKQIc=; b=O/qxf6LMsDd0xoDDkJ6hsXnOqa 7Y4yTAbbVzVGw7MYR9P+VRdo+SfkcfEXizkNWVLXg6lPZhGLpN7k3BZQBschhz/wUc6xWwEqgLLfD fEB4o+W5invnI0FXT52z00eAggfzb0GtJKn4/Gg2t9Z2BRY4Chi/CGEoC3bHG5ue0S2A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xenalyze: correct symbol name length fscanf() specifier Message-Id: Date: Mon, 04 Aug 2025 14:11:11 +0000 commit ea5025554e982bd377f85b899b6d151e5ef33d1e Author: Jan Beulich AuthorDate: Mon Aug 4 15:22:34 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 15:22:34 2025 +0200 xenalyze: correct symbol name length fscanf() specifier SYMBOL_NAME_SIZE is 124, not 128. Use the symbolic name there as well, to avoid any disconnect. While there correct indentation on the following line as well. Coverity ID: 1659391 Signed-off-by: Jan Beulich Reviewed-by: Alejandro Vallejo Acked-by: Anthony PERARD master commit: dfabb3fee36756d6ceab58bc7f28f330640c78dc master date: 2025-07-31 14:44:02 +0200 --- tools/firmware/hvmloader/util.h | 3 --- tools/include/xen-tools/common-macros.h | 3 +++ tools/xentrace/xenalyze.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 17ed3783f2..644450c51c 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -21,9 +21,6 @@ enum { /* Cause xs_wire.h to give us xsd_errors[]. */ #define EINVAL EINVAL -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) - /* GDT selector values. */ #define SEL_CODE16 0x0008 #define SEL_DATA16 0x0010 diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 60912225cb..0088208c2e 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -88,6 +88,9 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + #define __AC(X, Y) (X ## Y) #define _AC(X, Y) __AC(X, Y) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 1c13682aaa..876d59d42c 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -321,11 +321,10 @@ void parse_symbol_file(char *fn) { (*p)->next=NULL; } - /* FIXME -- use SYMBOL_NAME_SIZE */ /* FIXME -- use regexp. This won't work for symbols with spaces (yes they exist) */ (*p)->symbols[(*p)->count].addr = 0xDEADBEEF; - if ( fscanf(symbol_file, "%llx %128s", - &(*p)->symbols[(*p)->count].addr, + if ( fscanf(symbol_file, "%llx %" STR(SYMBOL_NAME_SIZE) "s", + &(*p)->symbols[(*p)->count].addr, (*p)->symbols[(*p)->count].name) == 0 ) break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 14:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 14:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069500.1433347 (Exim 4.92) (envelope-from ) id 1uiwac-0001tf-Td; Mon, 04 Aug 2025 14:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069500.1433347; Mon, 04 Aug 2025 14:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uiwac-0001tX-Qa; Mon, 04 Aug 2025 14:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1069500; Mon, 04 Aug 2025 14:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uiwab-0001tR-H9 for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uiwab-0015fY-10 for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uiwab-004hSK-0r for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 14:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iZuopVJzxPv3kTH4wcdlrqY8QM6013ASaYm7qIVgJf4=; b=dYrqtYFAEI+gaSvZRH/wZUmiC2 xynYGTiWGQMdMnladg4t1IIIZQ1gt4XlwAt8SARFnjh7B2YCKBBLjHy7g+tuNAbDuth03sT+3/Zpf UkKtgNnlXx5d6OuuS/5cCotrNKzu2lX+pGEGenKQ9twnpAO1qMsqtdV8wQjzOHHi2boA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xenalyze: correct symbol name length fscanf() specifier Message-Id: Date: Mon, 04 Aug 2025 14:55:01 +0000 commit a592800e5ee350c41e06db2a5b986cbf76ea6adc Author: Jan Beulich AuthorDate: Mon Aug 4 15:22:58 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 15:22:58 2025 +0200 xenalyze: correct symbol name length fscanf() specifier SYMBOL_NAME_SIZE is 124, not 128. Use the symbolic name there as well, to avoid any disconnect. While there correct indentation on the following line as well. Coverity ID: 1659391 Signed-off-by: Jan Beulich Reviewed-by: Alejandro Vallejo Acked-by: Anthony PERARD master commit: dfabb3fee36756d6ceab58bc7f28f330640c78dc master date: 2025-07-31 14:44:02 +0200 --- tools/firmware/hvmloader/util.h | 3 --- tools/include/xen-tools/common-macros.h | 3 +++ tools/xentrace/xenalyze.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index deb823a892..7206c793ed 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -21,9 +21,6 @@ enum { /* Cause xs_wire.h to give us xsd_errors[]. */ #define EINVAL EINVAL -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) - /* GDT selector values. */ #define SEL_CODE16 0x0008 #define SEL_DATA16 0x0010 diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 60912225cb..0088208c2e 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -88,6 +88,9 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + #define __AC(X, Y) (X ## Y) #define _AC(X, Y) __AC(X, Y) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 1c13682aaa..876d59d42c 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -321,11 +321,10 @@ void parse_symbol_file(char *fn) { (*p)->next=NULL; } - /* FIXME -- use SYMBOL_NAME_SIZE */ /* FIXME -- use regexp. This won't work for symbols with spaces (yes they exist) */ (*p)->symbols[(*p)->count].addr = 0xDEADBEEF; - if ( fscanf(symbol_file, "%llx %128s", - &(*p)->symbols[(*p)->count].addr, + if ( fscanf(symbol_file, "%llx %" STR(SYMBOL_NAME_SIZE) "s", + &(*p)->symbols[(*p)->count].addr, (*p)->symbols[(*p)->count].name) == 0 ) break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 15:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 15:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069548.1433400 (Exim 4.92) (envelope-from ) id 1uixBP-0005wM-IE; Mon, 04 Aug 2025 15:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069548.1433400; Mon, 04 Aug 2025 15:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uixBP-0005wE-FR; Mon, 04 Aug 2025 15:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1069548; Mon, 04 Aug 2025 15:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uixBO-0005te-9m for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 15:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uixBO-0016QD-0L for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 15:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uixBO-004j9u-0D for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 15:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=C0Jd+5QCByaVbjx7XWYZTWTnE7M8GFEZAJnnrYgCV3c=; b=e0BsUz8UU40FBD70us5yqLOo+B dzdrBGigU/emku2oR4g5GZGPwHyAgC6DQOGi5i/tY4457ulKU2eA8MpfxkkaTA8mFtQT4UJC5tiaq k1gKVVHbLXvxUlldgA5yynkQ3tnOKiTgbYMaHKpjluzbibuv+1EsgdNMccNTYAau3LxQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] update Xen version to 4.19.3 Message-Id: Date: Mon, 04 Aug 2025 15:33:02 +0000 commit 077419f04a3125c58dcf9724c954f98d1e927392 Author: Jan Beulich AuthorDate: Mon Aug 4 17:20:48 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 17:20:48 2025 +0200 update Xen version to 4.19.3 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 3c3110bada..df5319fdee 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 19 -export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Mon Aug 04 22:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2025 22:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1069843.1433532 (Exim 4.92) (envelope-from ) id 1uj3jq-0004nI-UC; Mon, 04 Aug 2025 22:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1069843.1433532; Mon, 04 Aug 2025 22:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uj3jq-0004nA-RH; Mon, 04 Aug 2025 22:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1069843; Mon, 04 Aug 2025 22:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uj3jp-0004n4-OQ for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 22:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uj3jp-001Fkd-1d for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 22:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uj3jp-0057A9-1I for xen-changelog@lists.xenproject.org; Mon, 04 Aug 2025 22:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=F2BoiZzK062XtOG21KgM0KLnUglWgI+TwAFOLI0Rm98=; b=MtX82QPtEsLQoRbdWc+ASj3Se+ qD7r6LiFREUJCql98eBaGLWUuYK0mM63YjtFd6H4rL5c6IcZY7eFm48KAJwyzWnZs0ZGHVElluVCS RBWycz+D+WDSc6c+t5h+Um7q3n6AtJ2IVsLwam8iKt0eOhOZMy2Kge/0rWI+RONKSt2I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] update Xen version to 4.19.3 Message-Id: Date: Mon, 04 Aug 2025 22:33:01 +0000 commit 077419f04a3125c58dcf9724c954f98d1e927392 Author: Jan Beulich AuthorDate: Mon Aug 4 17:20:48 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 17:20:48 2025 +0200 update Xen version to 4.19.3 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 3c3110bada..df5319fdee 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 19 -export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 13:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 13:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1070498.1434099 (Exim 4.92) (envelope-from ) id 1ujI87-0002sG-0F; Tue, 05 Aug 2025 13:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1070498.1434099; Tue, 05 Aug 2025 13:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujI86-0002s7-TL; Tue, 05 Aug 2025 13:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1070498; Tue, 05 Aug 2025 13:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujI85-0002s1-Pe for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujI85-002l5y-1j for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujI85-005kLQ-1b for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=76DUH8t1lGHFnLKPCgp2bi6w78EBenAfq3wEJ/IuVfo=; b=I8+uMGaOpEFPXq6G80UWZe1DbN MT7bf8oNnDQaLViBSVz6xHepLdWTqktHqmZm40iJYZB08IeCdhHM6ReiEglNKJV7oJeRg329ujvDD 8o9k550J66/wXz/Nyeq9FRbTKcIV+X1SfYM7IWq2EXeQSqPH32TzYXF82/V7/h14tTkg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/CPU: correct reset_cpuinfo() comment Message-Id: Date: Tue, 05 Aug 2025 13:55:01 +0000 commit ad5ae7c6ba5209eb583361776acf4ccf2ef2a59d Author: Jan Beulich AuthorDate: Tue Aug 5 14:03:05 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 14:03:05 2025 +0200 x86/CPU: correct reset_cpuinfo() comment Part of it stated the opposite of what actual behavior is. Fixes: 7126b7f806d5 ("x86/CPU: re-work populating of cpu_data[]") Reported-by: Juergen Gross Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/include/asm/cpufeature.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index f398e89759..441a7ecc49 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -91,8 +91,8 @@ struct cpuinfo_x86 { /* * @keep_basic set to true retains data firmly assumed to be symmetric - * across all CPUs. With it set to false only CPU_DATA_INIT() will be - * invoked on the passed structure. + * across all CPUs. Only CPU_DATA_INIT() will be invoked in that case + * on the passed structure. */ void reset_cpuinfo(struct cpuinfo_x86 *c, bool keep_basic); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 13:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 13:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1070499.1434102 (Exim 4.92) (envelope-from ) id 1ujI8H-0002tq-19; Tue, 05 Aug 2025 13:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1070499.1434102; Tue, 05 Aug 2025 13:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujI8G-0002ti-Uj; Tue, 05 Aug 2025 13:55:12 +0000 Received: by outflank-mailman (input) for mailman id 1070499; Tue, 05 Aug 2025 13:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujI8F-0002tW-LC for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujI8F-002l6B-21 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujI8F-005kMJ-1u for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vDsXbKfh0H7u8snrwCrJqdU0+Z9LsqA2xsGZKRvvQAk=; b=VnqaUphi9Dz8HOT5MP/fyrCJ+Y 4brbkYrVJAkrquPq+fyrQuIid6Z1Hu8z+M9vvDCTON0N4ZbPLpvdv1HJIddvO6SCTcR2zoIhnPTZx r3srp/rGH5eqmhN8ok1VUJnTsSmYyVLViUPcvmDy5V4e/Y1XIeJ7zqe6qsYbI7t1nOkY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] misra: deviate intentionally unreachable code Message-Id: Date: Tue, 05 Aug 2025 13:55:11 +0000 commit 276b7f73f26cb5cc28f5c2605268a67e41d5cd44 Author: Nicola Vetrini AuthorDate: Tue Aug 5 14:03:30 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 14:03:30 2025 +0200 misra: deviate intentionally unreachable code MISRA C Rule 2.1 states: "A project shall not contain unreachable code". Functions that are non-returning and are not explicitly annotated with the `noreturn' attribute are considered a violation of this rule. In certain cases, some functions might be non-returning in specific build configurations (when assertions are enabled, i.e., when `NDEBUG' is not defined). This is due to calls to `__builtin_unreachable()' in the expansion of the macro `ASSERT_UNREACHABLE()'. Conversely, in builds where `NDEBUG' is defined (assertions are disabled), the macro `ASSERT_UNREACHABLE()' expands to an empty construct (`do { } while (0)'), which does not affect the execution flow. This allows such functions to return normally in such builds, avoiding unreachable code. To account for that in specific builds, the `noreturn` property of `__builtin_unreachable()` is overridden in the ECLAIR configuration to deviate these violations. Signed-off-by: Nicola Vetrini Signed-off-by: Dmytro Prokopchuk Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/deviations.ecl | 5 +++++ docs/misra/deviations.rst | 11 +++++++++++ docs/misra/rules.rst | 9 +++++++++ 3 files changed, 25 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 483507e7b9..ceecd0093b 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -36,6 +36,11 @@ not executable, and therefore it is safe for them to be unreachable." -config=MC3A2.R2.1,reports+={deliberate, "any_area(any_loc(file(C_runtime_failures)))"} -doc_end +-doc_begin="Calls to function `__builtin_unreachable()' in the expansion of macro +`ASSERT_UNREACHABLE()' are not considered to have the `noreturn' property." +-call_properties+={"name(__builtin_unreachable)&&stmt(begin(any_exp(macro(name(ASSERT_UNREACHABLE)))))", {"noreturn(false)"}} +-doc_end + -doc_begin="Proving compliance with respect to Rule 2.2 is generally impossible: see https://arxiv.org/abs/2212.13933 for details. Moreover, peer review gives us confidence that no evidence of errors in the program's logic has been missed due diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index e78179fcb8..af7a17f96c 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -86,6 +86,17 @@ Deviations related to MISRA C:2012 Rules: generate definitions for asm modules. - Tagged as `deliberate` for ECLAIR. + * - R2.1 + - Calls to the `__builtin_unreachable()` function inside the expansion of + the `ASSERT_UNREACHABLE()` macro may cause a function to be marked as + non-returning. This behavior occurs only in configurations where + assertions are enabled. To address this, the `noreturn` property for + `__builtin_unreachable()` is overridden in these contexts, resulting in + the absence of reports that do not have an impact on safety, despite + being true positives. + Xen expects developers to ensure code remains safe and reliable in builds, + even when debug-only assertions like `ASSERT_UNREACHABLE() are removed. + * - R2.2 - Proving compliance with respect to Rule 2.2 is generally impossible: see ``_ for details. Moreover, peer diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 3e014a6298..d9fd92160b 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -124,6 +124,15 @@ maintainers if you want to suggest a change. they are used to generate definitions for asm modules - Declarations without initializer are safe, as they are not executed + - Functions that are no-return due to calls to the `ASSERT_UNREACHABLE()' + macro in debug build configurations are not considered violations:: + + static inline bool + arch_vcpu_ioreq_completion(enum vio_completion completion) + { + ASSERT_UNREACHABLE(); + return false; + } * - `Rule 2.6 `_ - Advisory -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 13:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 13:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1070500.1434106 (Exim 4.92) (envelope-from ) id 1ujI8R-0002w8-2h; Tue, 05 Aug 2025 13:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1070500.1434106; Tue, 05 Aug 2025 13:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujI8R-0002w0-01; Tue, 05 Aug 2025 13:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1070500; Tue, 05 Aug 2025 13:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujI8P-0002vq-SA for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujI8P-002l6J-2i for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujI8P-005kN8-2E for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 13:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PbAT5BvWBkWeEOrVBwqa8IDeZwnD4D0bMDq4EHWkX5E=; b=V9BFD1Y8GXu+BcLAD+9ZTZs42x SLwal9nCZd8mu0IgOtrMNG3kx9GuHxMFwGQAojpg/Io306aLvYXJf1m+yPEhuUtl9ve1NqoyWkWHs 19fse1wFnnqCbzjf2AtSA+9MPV+ptKXPSDSVQUEahvyskO7zE1bZcaTxuz3CnmpeDh7E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] misra: allow discarding 'noreturn' during conversions Message-Id: Date: Tue, 05 Aug 2025 13:55:21 +0000 commit b5497ad4a4a2b9a97100ca002cc82b573b198071 Author: Dmytro Prokopchuk AuthorDate: Tue Aug 5 14:04:34 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 14:04:34 2025 +0200 misra: allow discarding 'noreturn' during conversions The conversion from a function pointer with the 'noreturn' attribute ('void noreturn (*)(...)') to a function pointer type ('void (*)(...)' causes type incompatibility according to MISRA C Rule 11.1, which forbids conversions between incompatible function pointer types. The violation occurs at the call site: smp_call_function(halt_this_cpu, NULL, 0); where 'halt_this_cpu' with type 'void noreturn (*)(void *)' is passed to 'smp_call_function' expecting function pointer of type 'void (*)(void *)'. The 'noreturn' attribute does not change the function calling convention or parameter handling at runtime, making the conversion safe. For now, configure Eclair to just treat implicit conversions that lose the "noreturn" attribute on a function 'void (*)(void*)' as safe. Signed-off-by: Dmytro Prokopchuk Acked-by: Jan Beulich # docs Reviewed-by: Nicola Vetrini # ECLAIR --- automation/eclair_analysis/ECLAIR/deviations.ecl | 7 +++++++ docs/misra/deviations.rst | 7 +++++++ docs/misra/rules.rst | 9 +++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index ceecd0093b..ebce1ceab9 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -372,6 +372,13 @@ constant expressions are required.\"" } -doc_end +-doc_begin="The conversion from 'void noreturn (*)(void *)' to 'void (*)(void *)' is safe +because the semantics of the 'noreturn' attribute do not alter the calling convention or behavior of the resulting code." +-config=MC3A2.R11.1,casts+={safe, + "kind(bitcast)&&to(type(pointer(inner(return(builtin(void))&&all_param(1, pointer(builtin(void)))))))&&from(expr(skip(!syntactic(), + ref(property(noreturn)))))"} +-doc_end + -doc_begin="The conversion from a pointer to an incomplete type to unsigned long does not lose any information, provided that the target type has enough bits to store it." -config=MC3A2.R11.2,casts+={safe, "from(type(any())) diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index af7a17f96c..3c46a1e47a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -353,6 +353,13 @@ Deviations related to MISRA C:2012 Rules: semantics that do not lead to unexpected behaviour. - Tagged as `safe` for ECLAIR. + * - R11.1 + - The conversion from 'void noreturn (*)(...)' to 'void (*)(...)' is safe + because the semantics of the 'noreturn' attribute do not alter the calling + convention or behavior of the resulting code, parameters handling remain + consistent. + - Tagged as `safe` for ECLAIR. + * - R11.2 - The conversion from a pointer to an incomplete type to unsigned long does not lose any information, provided that the target type has enough diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index d9fd92160b..6812eb7e8a 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -409,11 +409,12 @@ maintainers if you want to suggest a change. * - `Rule 11.1 `_ - Required - - Conversions shall not be performed between a pointer to a - function and any other type + - Conversions shall not be performed between a pointer to a function + and any other type - All conversions to integer types are permitted if the destination - type has enough bits to hold the entire value. Conversions to - bool and void* are permitted. + type has enough bits to hold the entire value. Conversions to bool + and void* are permitted. Conversions from 'void noreturn (*)(...)' + to 'void (*)(...)' are permitted. * - `Rule 11.2 `_ - Required -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 15:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 15:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1070682.1434300 (Exim 4.92) (envelope-from ) id 1ujJew-00008u-R5; Tue, 05 Aug 2025 15:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1070682.1434300; Tue, 05 Aug 2025 15:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujJew-00008m-OK; Tue, 05 Aug 2025 15:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1070682; Tue, 05 Aug 2025 15:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujJev-00008g-Tn for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujJev-002n8K-29 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujJev-005oB0-23 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BIZeXfk//OHJ9mLiqNqzhBIVIEkU6Iq2sjiYaP22w4k=; b=GEifgQrkhVbLB3PLS/MqCiSrJY 6CO3EyxqxP7jlAieoxly+OcoTGKRuXsQFiB5UR3HCIAglfYyTk26jzlxYFhUytf+bdFJzpXm/VMbv NJkoI4Svbc90pdw225uewsLz/R2p+1Zca6GNZRJ7RdqOtT82zRi3IYa30X/aLNVfawxQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/CPU: correct reset_cpuinfo() comment Message-Id: Date: Tue, 05 Aug 2025 15:33:01 +0000 commit ad5ae7c6ba5209eb583361776acf4ccf2ef2a59d Author: Jan Beulich AuthorDate: Tue Aug 5 14:03:05 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 14:03:05 2025 +0200 x86/CPU: correct reset_cpuinfo() comment Part of it stated the opposite of what actual behavior is. Fixes: 7126b7f806d5 ("x86/CPU: re-work populating of cpu_data[]") Reported-by: Juergen Gross Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/include/asm/cpufeature.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index f398e89759..441a7ecc49 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -91,8 +91,8 @@ struct cpuinfo_x86 { /* * @keep_basic set to true retains data firmly assumed to be symmetric - * across all CPUs. With it set to false only CPU_DATA_INIT() will be - * invoked on the passed structure. + * across all CPUs. Only CPU_DATA_INIT() will be invoked in that case + * on the passed structure. */ void reset_cpuinfo(struct cpuinfo_x86 *c, bool keep_basic); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 15:33:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 15:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1070683.1434305 (Exim 4.92) (envelope-from ) id 1ujJf6-0000B4-TY; Tue, 05 Aug 2025 15:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1070683.1434305; Tue, 05 Aug 2025 15:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujJf6-0000Aw-Pn; Tue, 05 Aug 2025 15:33:12 +0000 Received: by outflank-mailman (input) for mailman id 1070683; Tue, 05 Aug 2025 15:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujJf5-0000Ai-PO for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujJf5-002n8Q-2R for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujJf5-005oBl-2K for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zy9jsnYuOXYVHSnKDmyxqKS5mZQXGIMGpn3kP8W+IN0=; b=gtxibVA4Kof+wLK3ChE+JzEWDL uYZaQDG9O7AMlXTO2VgxtnKZqBSclnZmka0rZt7Smxn4GwlVfwStvnu/nfx17wzFBpyp85aLsG5MQ OEpro+U05G9eeOgw/h4qmc2UFuiZMsI06eLqGg/t1tYeRs5HmtMMNCqwi+yNDApD3ZZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] misra: deviate intentionally unreachable code Message-Id: Date: Tue, 05 Aug 2025 15:33:11 +0000 commit 276b7f73f26cb5cc28f5c2605268a67e41d5cd44 Author: Nicola Vetrini AuthorDate: Tue Aug 5 14:03:30 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 14:03:30 2025 +0200 misra: deviate intentionally unreachable code MISRA C Rule 2.1 states: "A project shall not contain unreachable code". Functions that are non-returning and are not explicitly annotated with the `noreturn' attribute are considered a violation of this rule. In certain cases, some functions might be non-returning in specific build configurations (when assertions are enabled, i.e., when `NDEBUG' is not defined). This is due to calls to `__builtin_unreachable()' in the expansion of the macro `ASSERT_UNREACHABLE()'. Conversely, in builds where `NDEBUG' is defined (assertions are disabled), the macro `ASSERT_UNREACHABLE()' expands to an empty construct (`do { } while (0)'), which does not affect the execution flow. This allows such functions to return normally in such builds, avoiding unreachable code. To account for that in specific builds, the `noreturn` property of `__builtin_unreachable()` is overridden in the ECLAIR configuration to deviate these violations. Signed-off-by: Nicola Vetrini Signed-off-by: Dmytro Prokopchuk Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/deviations.ecl | 5 +++++ docs/misra/deviations.rst | 11 +++++++++++ docs/misra/rules.rst | 9 +++++++++ 3 files changed, 25 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 483507e7b9..ceecd0093b 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -36,6 +36,11 @@ not executable, and therefore it is safe for them to be unreachable." -config=MC3A2.R2.1,reports+={deliberate, "any_area(any_loc(file(C_runtime_failures)))"} -doc_end +-doc_begin="Calls to function `__builtin_unreachable()' in the expansion of macro +`ASSERT_UNREACHABLE()' are not considered to have the `noreturn' property." +-call_properties+={"name(__builtin_unreachable)&&stmt(begin(any_exp(macro(name(ASSERT_UNREACHABLE)))))", {"noreturn(false)"}} +-doc_end + -doc_begin="Proving compliance with respect to Rule 2.2 is generally impossible: see https://arxiv.org/abs/2212.13933 for details. Moreover, peer review gives us confidence that no evidence of errors in the program's logic has been missed due diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index e78179fcb8..af7a17f96c 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -86,6 +86,17 @@ Deviations related to MISRA C:2012 Rules: generate definitions for asm modules. - Tagged as `deliberate` for ECLAIR. + * - R2.1 + - Calls to the `__builtin_unreachable()` function inside the expansion of + the `ASSERT_UNREACHABLE()` macro may cause a function to be marked as + non-returning. This behavior occurs only in configurations where + assertions are enabled. To address this, the `noreturn` property for + `__builtin_unreachable()` is overridden in these contexts, resulting in + the absence of reports that do not have an impact on safety, despite + being true positives. + Xen expects developers to ensure code remains safe and reliable in builds, + even when debug-only assertions like `ASSERT_UNREACHABLE() are removed. + * - R2.2 - Proving compliance with respect to Rule 2.2 is generally impossible: see ``_ for details. Moreover, peer diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 3e014a6298..d9fd92160b 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -124,6 +124,15 @@ maintainers if you want to suggest a change. they are used to generate definitions for asm modules - Declarations without initializer are safe, as they are not executed + - Functions that are no-return due to calls to the `ASSERT_UNREACHABLE()' + macro in debug build configurations are not considered violations:: + + static inline bool + arch_vcpu_ioreq_completion(enum vio_completion completion) + { + ASSERT_UNREACHABLE(); + return false; + } * - `Rule 2.6 `_ - Advisory -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 15:33:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 15:33:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1070684.1434308 (Exim 4.92) (envelope-from ) id 1ujJfG-0000EO-Tz; Tue, 05 Aug 2025 15:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1070684.1434308; Tue, 05 Aug 2025 15:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujJfG-0000EG-RA; Tue, 05 Aug 2025 15:33:22 +0000 Received: by outflank-mailman (input) for mailman id 1070684; Tue, 05 Aug 2025 15:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujJfF-0000E2-SR for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujJfF-002n8W-2j for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujJfF-005oC7-2d for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 15:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OI21UXBgoGySpPzD3cg2EkK+IvLnvfQlgXF/6KZfwdE=; b=EAwf0JkOgBN2162EQ9KeFL6dmd pJrEH/XeSKOE5vGPcDgO5mx9mP4j7xXTUwquB9/qCIQA6VcEEQ+JzVNAapqWbzAfme4IiOGp4j6xv InOX3a2rJsyW8t4KxauBcd5/U1mQDYycRsYRMV60SMFXakpGcQteOhIttUZ4BsLyMP2A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] misra: allow discarding 'noreturn' during conversions Message-Id: Date: Tue, 05 Aug 2025 15:33:21 +0000 commit b5497ad4a4a2b9a97100ca002cc82b573b198071 Author: Dmytro Prokopchuk AuthorDate: Tue Aug 5 14:04:34 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 14:04:34 2025 +0200 misra: allow discarding 'noreturn' during conversions The conversion from a function pointer with the 'noreturn' attribute ('void noreturn (*)(...)') to a function pointer type ('void (*)(...)' causes type incompatibility according to MISRA C Rule 11.1, which forbids conversions between incompatible function pointer types. The violation occurs at the call site: smp_call_function(halt_this_cpu, NULL, 0); where 'halt_this_cpu' with type 'void noreturn (*)(void *)' is passed to 'smp_call_function' expecting function pointer of type 'void (*)(void *)'. The 'noreturn' attribute does not change the function calling convention or parameter handling at runtime, making the conversion safe. For now, configure Eclair to just treat implicit conversions that lose the "noreturn" attribute on a function 'void (*)(void*)' as safe. Signed-off-by: Dmytro Prokopchuk Acked-by: Jan Beulich # docs Reviewed-by: Nicola Vetrini # ECLAIR --- automation/eclair_analysis/ECLAIR/deviations.ecl | 7 +++++++ docs/misra/deviations.rst | 7 +++++++ docs/misra/rules.rst | 9 +++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index ceecd0093b..ebce1ceab9 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -372,6 +372,13 @@ constant expressions are required.\"" } -doc_end +-doc_begin="The conversion from 'void noreturn (*)(void *)' to 'void (*)(void *)' is safe +because the semantics of the 'noreturn' attribute do not alter the calling convention or behavior of the resulting code." +-config=MC3A2.R11.1,casts+={safe, + "kind(bitcast)&&to(type(pointer(inner(return(builtin(void))&&all_param(1, pointer(builtin(void)))))))&&from(expr(skip(!syntactic(), + ref(property(noreturn)))))"} +-doc_end + -doc_begin="The conversion from a pointer to an incomplete type to unsigned long does not lose any information, provided that the target type has enough bits to store it." -config=MC3A2.R11.2,casts+={safe, "from(type(any())) diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index af7a17f96c..3c46a1e47a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -353,6 +353,13 @@ Deviations related to MISRA C:2012 Rules: semantics that do not lead to unexpected behaviour. - Tagged as `safe` for ECLAIR. + * - R11.1 + - The conversion from 'void noreturn (*)(...)' to 'void (*)(...)' is safe + because the semantics of the 'noreturn' attribute do not alter the calling + convention or behavior of the resulting code, parameters handling remain + consistent. + - Tagged as `safe` for ECLAIR. + * - R11.2 - The conversion from a pointer to an incomplete type to unsigned long does not lose any information, provided that the target type has enough diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index d9fd92160b..6812eb7e8a 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -409,11 +409,12 @@ maintainers if you want to suggest a change. * - `Rule 11.1 `_ - Required - - Conversions shall not be performed between a pointer to a - function and any other type + - Conversions shall not be performed between a pointer to a function + and any other type - All conversions to integer types are permitted if the destination - type has enough bits to hold the entire value. Conversions to - bool and void* are permitted. + type has enough bits to hold the entire value. Conversions to bool + and void* are permitted. Conversions from 'void noreturn (*)(...)' + to 'void (*)(...)' are permitted. * - `Rule 11.2 `_ - Required -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 22:44:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 22:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071010.1434572 (Exim 4.92) (envelope-from ) id 1ujQO4-0004bC-0j; Tue, 05 Aug 2025 22:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071010.1434572; Tue, 05 Aug 2025 22:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQO3-0004b2-U0; Tue, 05 Aug 2025 22:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1071010; Tue, 05 Aug 2025 22:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQO2-0004au-NN for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujQO2-002wey-1W for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujQO2-006Clz-1M for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=flGlluBGYAdNmwetG4H6ygBtJeSK2LpTEeMQdVKSfQI=; b=cliKjl6UXpyso/yVunyp2OkMlo POrq2JGlDyq3E/LxBDfkHViADHYRiFhDjM8EAGi0ca3w2I7eIYPs5qZkcctSjU+aeGq5EqjI3BIS/ qRFKyWp3rLVBbrkfxPC2hPWMeI10ffkjmvPKbckqQJ8ACWcTLk+sYHSRCQaZzSNTOZOA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/version: Fold print_build_id() into print_version() Message-Id: Date: Tue, 05 Aug 2025 22:44:02 +0000 commit bfb57fecdc184adf1544cee961fdc7ceb89a9dc9 Author: Andrew Cooper AuthorDate: Fri Jun 13 15:36:27 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/version: Fold print_build_id() into print_version() Both callsites call them as a pair, and more generally, anyone wanting the changeset wants the buildid too. This involves rearranging console_init_preirq() to ensure xen_build_init() is ahead of print_version(). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/keyhandler.c | 1 - xen/common/version.c | 19 ++++++------------- xen/drivers/char/console.c | 7 +++---- xen/include/xen/lib.h | 1 - 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index b0a2051408..cb6df2823b 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -131,7 +131,6 @@ static void cf_check show_handlers(unsigned char key) printk("'%c' pressed -> showing installed handlers\n", key); print_version(); - print_build_id(); for ( i = 0; i < ARRAY_SIZE(key_table); i++ ) if ( key_table[i].fn ) diff --git a/xen/common/version.c b/xen/common/version.c index 56b51c81d2..84bd77e746 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -94,6 +94,9 @@ const char *xen_build_info(void) return build_info; } +static const void *build_id_p __read_mostly; +static unsigned int build_id_len __read_mostly; + void print_version(void) { printk("Xen version %d.%d%s (%s@%s) (%s) %s %s\n", @@ -102,10 +105,10 @@ void print_version(void) xen_build_info(), xen_compile_date()); printk("Latest ChangeSet: %s\n", xen_changeset()); -} -static const void *build_id_p __read_mostly; -static unsigned int build_id_len __read_mostly; + if ( build_id_len ) + printk("build-id: %*phN\n", build_id_len, build_id_p); +} int xen_build_id(const void **p, unsigned int *len) { @@ -118,16 +121,6 @@ int xen_build_id(const void **p, unsigned int *len) return 0; } -void print_build_id(void) -{ - /* - * NB: build_id_len may be 0 if XEN_HAS_BUILD_ID=n. - * Do not print empty build-id. - */ - if ( build_id_len ) - printk("build-id: %*phN\n", build_id_len, build_id_p); -} - #ifdef BUILD_ID /* Defined in linker script. */ extern const Elf_Note __note_gnu_build_id_start[], __note_gnu_build_id_end[]; diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 963c7b043c..a5af660239 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1105,11 +1105,10 @@ void __init console_init_preirq(void) __putstr(xen_banner()); nrspin_unlock(&console_lock); - print_version(); - - /* Locate and print the buildid, if applicable. */ + /* Locate the buildid, if possible. */ xen_build_init(); - print_build_id(); + + print_version(); if ( opt_sync_console ) { diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index e63ec5039f..36d904ba1a 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -48,7 +48,6 @@ int parse_signed_integer(const char *name, const char *s, const char *e, int cmdline_strcmp(const char *frag, const char *name); void print_version(void); -void print_build_id(void); #ifdef CONFIG_DEBUG_TRACE extern void debugtrace_dump(void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 22:44:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 22:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071011.1434577 (Exim 4.92) (envelope-from ) id 1ujQOE-0004ck-23; Tue, 05 Aug 2025 22:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071011.1434577; Tue, 05 Aug 2025 22:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOD-0004ca-VP; Tue, 05 Aug 2025 22:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1071011; Tue, 05 Aug 2025 22:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOC-0004cO-Ml for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujQOC-002wf2-2B for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujQOC-006CnY-1i for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Gy6iEcWLSV6NPuZFNxEcNHyEXdrEOg5uw9lcbCakL5g=; b=F3qrl7syYnF/0XPUBi4tHsGmKq ajPwCB/Qx+FBj0uvFqps+xjlS3iVVDFi9tjZ5JFpY7cVKls9Hzmo28UzY+rYmj5ly+BUZXUq2r3rd myJVgXhjLMhwN4VqPZkVqNTgYO6k8ItXOKUWR290d3BfVppIkIxcQ28qFEzGuuXvosu4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/version: Remove xen_build_id() and export the variable instead Message-Id: Date: Tue, 05 Aug 2025 22:44:12 +0000 commit a8dc4ec94290a30cc1c3241cd4e16d273cdc29d0 Author: Andrew Cooper AuthorDate: Fri Jun 13 15:53:13 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/version: Remove xen_build_id() and export the variable instead The API is unergonomic to use, and leads to poor code generation because of unnecessary forcing of data to the stack. Rename build_id_p to xen_build_id, and build_id_len to xen_build_id_len, make them __ro_after_init, and export the variables directly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Ross Lagerwall --- xen/common/kernel.c | 14 ++++---------- xen/common/livepatch.c | 23 ++++++++++------------- xen/common/version.c | 25 +++++++------------------ xen/include/xen/version.h | 4 +++- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 5be668ba85..e6979352e1 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -510,21 +510,15 @@ static long xenver_varbuf_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct xen_varbuf user_str; const char *str = NULL; size_t sz; - int rc; switch ( cmd ) { case XENVER_build_id: - { - unsigned int local_sz; - - rc = xen_build_id((const void **)&str, &local_sz); - if ( rc ) - return rc; - - sz = local_sz; + str = xen_build_id; + sz = xen_build_id_len; + if ( !sz ) + return -ENODATA; goto have_len; - } case XENVER_extraversion2: str = xen_extra_version(); diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index 9a0df5363b..9285f88644 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -475,8 +475,8 @@ static int parse_buildid(const struct livepatch_elf_sec *sec, static int check_xen_buildid(const struct livepatch_elf *elf) { - const void *id; - unsigned int len; + const void *id = xen_build_id; + unsigned int len = xen_build_id_len; struct livepatch_build_id lp_id; const struct livepatch_elf_sec *sec = livepatch_elf_sec_by_name(elf, ELF_LIVEPATCH_XEN_DEPENDS); @@ -498,13 +498,12 @@ static int check_xen_buildid(const struct livepatch_elf *elf) return -EINVAL; } - rc = xen_build_id(&id, &len); - if ( rc ) + if ( !len ) { printk(XENLOG_ERR LIVEPATCH "%s: unable to get running Xen build-id: %d\n", elf->name, rc); - return rc; + return -ENODATA; } if ( lp_id.len != len || memcmp(id, lp_id.p, len) ) @@ -1984,7 +1983,6 @@ static int build_id_dep(struct payload *payload, bool internal) { const void *id = NULL; unsigned int len = 0; - int rc; const char *name = "hypervisor"; ASSERT(payload->dep.len && payload->dep.p); @@ -1992,9 +1990,10 @@ static int build_id_dep(struct payload *payload, bool internal) /* First time user is against hypervisor. */ if ( internal ) { - rc = xen_build_id(&id, &len); - if ( rc ) - return rc; + id = xen_build_id; + len = xen_build_id_len; + if ( !len ) + return -ENODATA; } else { @@ -2249,14 +2248,12 @@ static const char *state2str(unsigned int state) static void cf_check livepatch_printall(unsigned char key) { struct payload *data; - const void *binary_id = NULL; - unsigned int len = 0; unsigned int i; printk("'%c' pressed - Dumping all livepatch patches\n", key); - if ( !xen_build_id(&binary_id, &len) ) - printk("build-id: %*phN\n", len, binary_id); + if ( xen_build_id_len ) + printk("build-id: %*phN\n", xen_build_id_len, xen_build_id); if ( !spin_trylock(&payload_lock) ) { diff --git a/xen/common/version.c b/xen/common/version.c index 84bd77e746..553b97ba9b 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -94,8 +94,8 @@ const char *xen_build_info(void) return build_info; } -static const void *build_id_p __read_mostly; -static unsigned int build_id_len __read_mostly; +const void *__ro_after_init xen_build_id; +unsigned int __ro_after_init xen_build_id_len; void print_version(void) { @@ -106,19 +106,8 @@ void print_version(void) printk("Latest ChangeSet: %s\n", xen_changeset()); - if ( build_id_len ) - printk("build-id: %*phN\n", build_id_len, build_id_p); -} - -int xen_build_id(const void **p, unsigned int *len) -{ - if ( !build_id_len ) - return -ENODATA; - - *len = build_id_len; - *p = build_id_p; - - return 0; + if ( xen_build_id_len ) + printk("build-id: %*phN\n", xen_build_id_len, xen_build_id); } #ifdef BUILD_ID @@ -193,7 +182,7 @@ void __init xen_build_init(void) sz = (uintptr_t)__note_gnu_build_id_end - (uintptr_t)n; - rc = xen_build_id_check(n, sz, &build_id_p, &build_id_len); + rc = xen_build_id_check(n, sz, &xen_build_id, &xen_build_id_len); #ifdef CONFIG_X86 /* @@ -219,8 +208,8 @@ void __init xen_build_init(void) if ( info->cv_signature == CVINFO_PDB70_CVSIGNATURE ) { - build_id_p = info->signature; - build_id_len = sizeof(info->signature); + xen_build_id = info->signature; + xen_build_id_len = sizeof(info->signature); rc = 0; } } diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h index 4856ad1b44..6f5d9c9560 100644 --- a/xen/include/xen/version.h +++ b/xen/include/xen/version.h @@ -17,10 +17,12 @@ const char *xen_changeset(void); const char *xen_banner(void); const char *xen_deny(void); const char *xen_build_info(void); -int xen_build_id(const void **p, unsigned int *len); extern char xen_cap_info[128]; +extern const void *xen_build_id; +extern unsigned int xen_build_id_len; /* 0 -> No build id. */ + #ifdef BUILD_ID void xen_build_init(void); int xen_build_id_check(const Elf_Note *n, unsigned int n_sz, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 22:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 22:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071012.1434579 (Exim 4.92) (envelope-from ) id 1ujQOO-0004gW-2z; Tue, 05 Aug 2025 22:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071012.1434579; Tue, 05 Aug 2025 22:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOO-0004gN-0R; Tue, 05 Aug 2025 22:44:24 +0000 Received: by outflank-mailman (input) for mailman id 1071012; Tue, 05 Aug 2025 22:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOM-0004es-TS for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujQOM-002wfF-2U for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujQOM-006Cp5-2M for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dmWYB7YCbjzXRaPBocWwpSlrMYQxMa0IjKk+mzLf2bA=; b=Yya4JUUzabdeKx2eXPzlfcv20z /8tJUrlR/mYMcyFHYOzaldCot3OIEsO7MFwFxi/SbaD1IoTQY0NHKaCx6fiNcQbm/PL718cTKK9LA Kaikpj/kelzwvXd0R6KCMnIhBhiNL+japiAx1YlnNhs22qmAsHxiTsZMm5n05OkmEdj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: irq: drop unreachable pirq callbacks Message-Id: Date: Tue, 05 Aug 2025 22:44:22 +0000 commit c9c6c0b7cb16ff59000bbcc431d75edc8cdf2e24 Author: Grygorii Strashko AuthorDate: Tue Aug 5 18:40:20 2025 +0000 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/arm: irq: drop unreachable pirq callbacks Since commit 341f271cf86f ("xen/evtchn: fully restrict concept of pIRQ for arches with pIRQ support only"), the corresponding Arm arch pIRQ callbacks become unreachable, so drop them. Signed-off-by: Grygorii Strashko Acked-by: Andrew Cooper Reviewed-by: Denis Mukhin Acked-by: Julien Grall --- xen/arch/arm/irq.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 03fbb90c6c..4bbf0b0664 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -595,35 +595,6 @@ unlock: return ret; } -/* - * pirq event channels. We don't use these on ARM, instead we use the - * features of the GIC to inject virtualised normal interrupts. - */ -struct pirq *alloc_pirq_struct(struct domain *d) -{ - return NULL; -} - -/* - * These are all unreachable given an alloc_pirq_struct - * which returns NULL, all callers try to lookup struct pirq first - * which will fail. - */ -int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) -{ - BUG(); -} - -void pirq_guest_unbind(struct domain *d, struct pirq *pirq) -{ - BUG(); -} - -void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) -{ - BUG(); -} - static bool irq_validate_new_type(unsigned int curr, unsigned int new) { return (curr == IRQ_TYPE_INVALID || curr == new ); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 22:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 22:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071013.1434584 (Exim 4.92) (envelope-from ) id 1ujQOY-0004jR-4Y; Tue, 05 Aug 2025 22:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071013.1434584; Tue, 05 Aug 2025 22:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOY-0004jK-1q; Tue, 05 Aug 2025 22:44:34 +0000 Received: by outflank-mailman (input) for mailman id 1071013; Tue, 05 Aug 2025 22:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOW-0004jD-UN for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujQOW-002wfk-2l for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujQOW-006Cpk-2f for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZYX1jjyUGx7I0eWWDhSxwKRRl4hkNi3OmpcNjwE+Rx4=; b=IGfe/uv4l5XH7ZCNKRNi2p5qna DdOdxbBz6vkNhdP5o2bCIEN2cGVb30DusdJ6NCBbfne2Qfn7sohvQQT4845j+vTB5z9c4t6enJ71W wB28hNNvjbnXlDIGPWsW4GSC18vUriy3xC/vs/MLIIcCUBT7Vxvkk+9Y/YD0gzAVvAe0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/ppc: irq: drop unreachable pirq callbacks Message-Id: Date: Tue, 05 Aug 2025 22:44:32 +0000 commit aa8e28b633ef6118a12da18f976f79ceb86df9f4 Author: Grygorii Strashko AuthorDate: Tue Aug 5 18:40:20 2025 +0000 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/ppc: irq: drop unreachable pirq callbacks Since commit 341f271cf86f ("xen/evtchn: fully restrict concept of pIRQ for arches with pIRQ support only"), the corresponding PPC arch pIRQ callbacks become unreachable, so drop them. Signed-off-by: Grygorii Strashko Acked-by: Andrew Cooper Reviewed-by: Denis Mukhin --- xen/arch/ppc/stubs.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index 671e71aa0a..bdaf474c5c 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -103,26 +103,6 @@ void smp_send_call_function_mask(const cpumask_t *mask) /* irq.c */ -struct pirq *alloc_pirq_struct(struct domain *d) -{ - BUG_ON("unimplemented"); -} - -int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) -{ - BUG_ON("unimplemented"); -} - -void pirq_guest_unbind(struct domain *d, struct pirq *pirq) -{ - BUG_ON("unimplemented"); -} - -void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) -{ - BUG_ON("unimplemented"); -} - void irq_ack_none(struct irq_desc *desc) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 22:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 22:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071014.1434588 (Exim 4.92) (envelope-from ) id 1ujQOi-0004lh-64; Tue, 05 Aug 2025 22:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071014.1434588; Tue, 05 Aug 2025 22:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOi-0004lZ-3P; Tue, 05 Aug 2025 22:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1071014; Tue, 05 Aug 2025 22:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujQOg-0004lO-WA for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujQOg-002wfv-32 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujQOg-006Cq6-2v for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 22:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D3Rg1RkDEkDAc8LSAjRTwha+ah2sdiF+/QhtjwMz1kI=; b=aUdp0xJ3hdlTaza0MmYvR82eBw 4hMEo1T8LCirkG+vAjtRVr6R65LOdXU+nUvsU8D678VDcob3j6jI6QRJpF746OPhJT3AnMNXRBhuk hnaUfw6QaGyMouIOHseKhTDNDrtrzU7l+9uGzCaCPdhn+yTL2SAhDZ4Ta4lUWLOvYmjA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: irq: drop unreachable pirq callbacks Message-Id: Date: Tue, 05 Aug 2025 22:44:42 +0000 commit 68797a710f4e91cc09fe5650ee14478316010f88 Author: Grygorii Strashko AuthorDate: Tue Aug 5 18:40:21 2025 +0000 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/riscv: irq: drop unreachable pirq callbacks Since commit 341f271cf86f ("xen/evtchn: fully restrict concept of pIRQ for arches with pIRQ support only"), the corresponding RISCV arch pIRQ callbacks become unreachable, so drop them. Signed-off-by: Grygorii Strashko Reviewed-by: Oleksii Kurochko Acked-by: Andrew Cooper Reviewed-by: Denis Mukhin LGTM: Oleksii Kurochko --- xen/arch/riscv/stubs.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 8918cebf35..1a8c86cd8d 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -82,26 +82,6 @@ void smp_send_call_function_mask(const cpumask_t *mask) /* irq.c */ -struct pirq *alloc_pirq_struct(struct domain *d) -{ - BUG_ON("unimplemented"); -} - -int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) -{ - BUG_ON("unimplemented"); -} - -void pirq_guest_unbind(struct domain *d, struct pirq *pirq) -{ - BUG_ON("unimplemented"); -} - -void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) -{ - BUG_ON("unimplemented"); -} - void irq_ack_none(struct irq_desc *desc) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 23:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 23:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071026.1434592 (Exim 4.92) (envelope-from ) id 1ujR9T-00027F-CI; Tue, 05 Aug 2025 23:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071026.1434592; Tue, 05 Aug 2025 23:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9T-000277-9G; Tue, 05 Aug 2025 23:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1071026; Tue, 05 Aug 2025 23:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9R-000271-Uz for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujR9R-002xsh-2S for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujR9R-006ERl-2J for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sV59N9lwvlCscyd9rYSIVP4kHpSmzwbZwTXeQd7iqWU=; b=bg46lXQp3SsbIKvr1cTxU+kPUz v9Cyf/DTMok1FP4XiMhInoKcqkRVveRa9qA8OiDvgGITYYze1Qo2K3lvo3CsOMCz78N/4zL3js6Qd 538RR8nrvmRRKxH41L5wxEnBYy2lAm3gW0aRzgwTeKdzqjrMpi4FRmHylbVqFZjdA/KA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/version: Fold print_build_id() into print_version() Message-Id: Date: Tue, 05 Aug 2025 23:33:01 +0000 commit bfb57fecdc184adf1544cee961fdc7ceb89a9dc9 Author: Andrew Cooper AuthorDate: Fri Jun 13 15:36:27 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/version: Fold print_build_id() into print_version() Both callsites call them as a pair, and more generally, anyone wanting the changeset wants the buildid too. This involves rearranging console_init_preirq() to ensure xen_build_init() is ahead of print_version(). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/keyhandler.c | 1 - xen/common/version.c | 19 ++++++------------- xen/drivers/char/console.c | 7 +++---- xen/include/xen/lib.h | 1 - 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index b0a2051408..cb6df2823b 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -131,7 +131,6 @@ static void cf_check show_handlers(unsigned char key) printk("'%c' pressed -> showing installed handlers\n", key); print_version(); - print_build_id(); for ( i = 0; i < ARRAY_SIZE(key_table); i++ ) if ( key_table[i].fn ) diff --git a/xen/common/version.c b/xen/common/version.c index 56b51c81d2..84bd77e746 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -94,6 +94,9 @@ const char *xen_build_info(void) return build_info; } +static const void *build_id_p __read_mostly; +static unsigned int build_id_len __read_mostly; + void print_version(void) { printk("Xen version %d.%d%s (%s@%s) (%s) %s %s\n", @@ -102,10 +105,10 @@ void print_version(void) xen_build_info(), xen_compile_date()); printk("Latest ChangeSet: %s\n", xen_changeset()); -} -static const void *build_id_p __read_mostly; -static unsigned int build_id_len __read_mostly; + if ( build_id_len ) + printk("build-id: %*phN\n", build_id_len, build_id_p); +} int xen_build_id(const void **p, unsigned int *len) { @@ -118,16 +121,6 @@ int xen_build_id(const void **p, unsigned int *len) return 0; } -void print_build_id(void) -{ - /* - * NB: build_id_len may be 0 if XEN_HAS_BUILD_ID=n. - * Do not print empty build-id. - */ - if ( build_id_len ) - printk("build-id: %*phN\n", build_id_len, build_id_p); -} - #ifdef BUILD_ID /* Defined in linker script. */ extern const Elf_Note __note_gnu_build_id_start[], __note_gnu_build_id_end[]; diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 963c7b043c..a5af660239 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1105,11 +1105,10 @@ void __init console_init_preirq(void) __putstr(xen_banner()); nrspin_unlock(&console_lock); - print_version(); - - /* Locate and print the buildid, if applicable. */ + /* Locate the buildid, if possible. */ xen_build_init(); - print_build_id(); + + print_version(); if ( opt_sync_console ) { diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index e63ec5039f..36d904ba1a 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -48,7 +48,6 @@ int parse_signed_integer(const char *name, const char *s, const char *e, int cmdline_strcmp(const char *frag, const char *name); void print_version(void); -void print_build_id(void); #ifdef CONFIG_DEBUG_TRACE extern void debugtrace_dump(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 23:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 23:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071027.1434596 (Exim 4.92) (envelope-from ) id 1ujR9d-00029S-Ew; Tue, 05 Aug 2025 23:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071027.1434596; Tue, 05 Aug 2025 23:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9d-00029K-CO; Tue, 05 Aug 2025 23:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1071027; Tue, 05 Aug 2025 23:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9b-000298-T3 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujR9b-002xsm-2n for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujR9b-006ES7-2e for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ruF3NCSXiuyS2EEu1vFRSYpTUcv5DkdBk7qd3QKtHNI=; b=VjKp1H8WJ3DchswJA/ZZTOMv4h 95vUe1cfXwvYyR9mcTDzuq3pcGPGblwDvY39xpp917CUqD2nDlGG8UK4dET6fVtKR3Lg9loUp2tRP yFPMx0XhgBB8EO0ij3Y9nO2ihZqkwM/yodVsg2DDQ96b9YtCh7++IIoygofP3HAKTDHk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/version: Remove xen_build_id() and export the variable instead Message-Id: Date: Tue, 05 Aug 2025 23:33:11 +0000 commit a8dc4ec94290a30cc1c3241cd4e16d273cdc29d0 Author: Andrew Cooper AuthorDate: Fri Jun 13 15:53:13 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/version: Remove xen_build_id() and export the variable instead The API is unergonomic to use, and leads to poor code generation because of unnecessary forcing of data to the stack. Rename build_id_p to xen_build_id, and build_id_len to xen_build_id_len, make them __ro_after_init, and export the variables directly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Ross Lagerwall --- xen/common/kernel.c | 14 ++++---------- xen/common/livepatch.c | 23 ++++++++++------------- xen/common/version.c | 25 +++++++------------------ xen/include/xen/version.h | 4 +++- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 5be668ba85..e6979352e1 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -510,21 +510,15 @@ static long xenver_varbuf_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct xen_varbuf user_str; const char *str = NULL; size_t sz; - int rc; switch ( cmd ) { case XENVER_build_id: - { - unsigned int local_sz; - - rc = xen_build_id((const void **)&str, &local_sz); - if ( rc ) - return rc; - - sz = local_sz; + str = xen_build_id; + sz = xen_build_id_len; + if ( !sz ) + return -ENODATA; goto have_len; - } case XENVER_extraversion2: str = xen_extra_version(); diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index 9a0df5363b..9285f88644 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -475,8 +475,8 @@ static int parse_buildid(const struct livepatch_elf_sec *sec, static int check_xen_buildid(const struct livepatch_elf *elf) { - const void *id; - unsigned int len; + const void *id = xen_build_id; + unsigned int len = xen_build_id_len; struct livepatch_build_id lp_id; const struct livepatch_elf_sec *sec = livepatch_elf_sec_by_name(elf, ELF_LIVEPATCH_XEN_DEPENDS); @@ -498,13 +498,12 @@ static int check_xen_buildid(const struct livepatch_elf *elf) return -EINVAL; } - rc = xen_build_id(&id, &len); - if ( rc ) + if ( !len ) { printk(XENLOG_ERR LIVEPATCH "%s: unable to get running Xen build-id: %d\n", elf->name, rc); - return rc; + return -ENODATA; } if ( lp_id.len != len || memcmp(id, lp_id.p, len) ) @@ -1984,7 +1983,6 @@ static int build_id_dep(struct payload *payload, bool internal) { const void *id = NULL; unsigned int len = 0; - int rc; const char *name = "hypervisor"; ASSERT(payload->dep.len && payload->dep.p); @@ -1992,9 +1990,10 @@ static int build_id_dep(struct payload *payload, bool internal) /* First time user is against hypervisor. */ if ( internal ) { - rc = xen_build_id(&id, &len); - if ( rc ) - return rc; + id = xen_build_id; + len = xen_build_id_len; + if ( !len ) + return -ENODATA; } else { @@ -2249,14 +2248,12 @@ static const char *state2str(unsigned int state) static void cf_check livepatch_printall(unsigned char key) { struct payload *data; - const void *binary_id = NULL; - unsigned int len = 0; unsigned int i; printk("'%c' pressed - Dumping all livepatch patches\n", key); - if ( !xen_build_id(&binary_id, &len) ) - printk("build-id: %*phN\n", len, binary_id); + if ( xen_build_id_len ) + printk("build-id: %*phN\n", xen_build_id_len, xen_build_id); if ( !spin_trylock(&payload_lock) ) { diff --git a/xen/common/version.c b/xen/common/version.c index 84bd77e746..553b97ba9b 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -94,8 +94,8 @@ const char *xen_build_info(void) return build_info; } -static const void *build_id_p __read_mostly; -static unsigned int build_id_len __read_mostly; +const void *__ro_after_init xen_build_id; +unsigned int __ro_after_init xen_build_id_len; void print_version(void) { @@ -106,19 +106,8 @@ void print_version(void) printk("Latest ChangeSet: %s\n", xen_changeset()); - if ( build_id_len ) - printk("build-id: %*phN\n", build_id_len, build_id_p); -} - -int xen_build_id(const void **p, unsigned int *len) -{ - if ( !build_id_len ) - return -ENODATA; - - *len = build_id_len; - *p = build_id_p; - - return 0; + if ( xen_build_id_len ) + printk("build-id: %*phN\n", xen_build_id_len, xen_build_id); } #ifdef BUILD_ID @@ -193,7 +182,7 @@ void __init xen_build_init(void) sz = (uintptr_t)__note_gnu_build_id_end - (uintptr_t)n; - rc = xen_build_id_check(n, sz, &build_id_p, &build_id_len); + rc = xen_build_id_check(n, sz, &xen_build_id, &xen_build_id_len); #ifdef CONFIG_X86 /* @@ -219,8 +208,8 @@ void __init xen_build_init(void) if ( info->cv_signature == CVINFO_PDB70_CVSIGNATURE ) { - build_id_p = info->signature; - build_id_len = sizeof(info->signature); + xen_build_id = info->signature; + xen_build_id_len = sizeof(info->signature); rc = 0; } } diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h index 4856ad1b44..6f5d9c9560 100644 --- a/xen/include/xen/version.h +++ b/xen/include/xen/version.h @@ -17,10 +17,12 @@ const char *xen_changeset(void); const char *xen_banner(void); const char *xen_deny(void); const char *xen_build_info(void); -int xen_build_id(const void **p, unsigned int *len); extern char xen_cap_info[128]; +extern const void *xen_build_id; +extern unsigned int xen_build_id_len; /* 0 -> No build id. */ + #ifdef BUILD_ID void xen_build_init(void); int xen_build_id_check(const Elf_Note *n, unsigned int n_sz, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 23:33:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 23:33:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071028.1434600 (Exim 4.92) (envelope-from ) id 1ujR9m-0002Bl-GT; Tue, 05 Aug 2025 23:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071028.1434600; Tue, 05 Aug 2025 23:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9m-0002Bd-Dh; Tue, 05 Aug 2025 23:33:22 +0000 Received: by outflank-mailman (input) for mailman id 1071028; Tue, 05 Aug 2025 23:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9m-0002BV-0g for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujR9l-002xsq-39 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujR9l-006EST-2z for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MVUstKGkHVyw7gfT41Cf7hTwelGvD+svcRhkfQnY6Kk=; b=eJP+XTI5Gj28Si57wMVyIN0VeV gsq11R5narNeG8dAG64rGs9t+rNOyopgoY7M8AyLsWGgX8vpwC3x3Ouqo0wHADfUr4CHI7NAg91Vy KPhB6IFQPPfIDCuF1qEgKczXIEe0e/ynGWzbnEtIm1klK7U3M9SOmrSQIvPbnVj2Ncoc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: irq: drop unreachable pirq callbacks Message-Id: Date: Tue, 05 Aug 2025 23:33:21 +0000 commit c9c6c0b7cb16ff59000bbcc431d75edc8cdf2e24 Author: Grygorii Strashko AuthorDate: Tue Aug 5 18:40:20 2025 +0000 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/arm: irq: drop unreachable pirq callbacks Since commit 341f271cf86f ("xen/evtchn: fully restrict concept of pIRQ for arches with pIRQ support only"), the corresponding Arm arch pIRQ callbacks become unreachable, so drop them. Signed-off-by: Grygorii Strashko Acked-by: Andrew Cooper Reviewed-by: Denis Mukhin Acked-by: Julien Grall --- xen/arch/arm/irq.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 03fbb90c6c..4bbf0b0664 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -595,35 +595,6 @@ unlock: return ret; } -/* - * pirq event channels. We don't use these on ARM, instead we use the - * features of the GIC to inject virtualised normal interrupts. - */ -struct pirq *alloc_pirq_struct(struct domain *d) -{ - return NULL; -} - -/* - * These are all unreachable given an alloc_pirq_struct - * which returns NULL, all callers try to lookup struct pirq first - * which will fail. - */ -int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) -{ - BUG(); -} - -void pirq_guest_unbind(struct domain *d, struct pirq *pirq) -{ - BUG(); -} - -void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) -{ - BUG(); -} - static bool irq_validate_new_type(unsigned int curr, unsigned int new) { return (curr == IRQ_TYPE_INVALID || curr == new ); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 23:33:32 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 23:33:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071029.1434603 (Exim 4.92) (envelope-from ) id 1ujR9w-0002EI-Hn; Tue, 05 Aug 2025 23:33:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071029.1434603; Tue, 05 Aug 2025 23:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9w-0002EA-F3; Tue, 05 Aug 2025 23:33:32 +0000 Received: by outflank-mailman (input) for mailman id 1071029; Tue, 05 Aug 2025 23:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujR9w-0002E4-3I for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujR9w-002xtC-0E for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujR9w-006ET4-06 for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gT1qhovA/q1dY8qDjbMLbU6aV7EYUG/qOmrnJnmVjaY=; b=xS7YhQcZ3AmkHsJ4yW7vPE0GN8 VBckxJPp75DADbpPtpdomL3iqrTdaZpoWh+JGsa+wnenDdxCPQda5s4R/7AVdU7d+brlarG6ibAoK hRrffub4MaKC6hKIBn5P9VEMEPm1aHGzuyTWtJfVOSlLrGzex6ZaSb3b5b1ie5WTTc+k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: irq: drop unreachable pirq callbacks Message-Id: Date: Tue, 05 Aug 2025 23:33:32 +0000 commit aa8e28b633ef6118a12da18f976f79ceb86df9f4 Author: Grygorii Strashko AuthorDate: Tue Aug 5 18:40:20 2025 +0000 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/ppc: irq: drop unreachable pirq callbacks Since commit 341f271cf86f ("xen/evtchn: fully restrict concept of pIRQ for arches with pIRQ support only"), the corresponding PPC arch pIRQ callbacks become unreachable, so drop them. Signed-off-by: Grygorii Strashko Acked-by: Andrew Cooper Reviewed-by: Denis Mukhin --- xen/arch/ppc/stubs.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index 671e71aa0a..bdaf474c5c 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -103,26 +103,6 @@ void smp_send_call_function_mask(const cpumask_t *mask) /* irq.c */ -struct pirq *alloc_pirq_struct(struct domain *d) -{ - BUG_ON("unimplemented"); -} - -int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) -{ - BUG_ON("unimplemented"); -} - -void pirq_guest_unbind(struct domain *d, struct pirq *pirq) -{ - BUG_ON("unimplemented"); -} - -void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) -{ - BUG_ON("unimplemented"); -} - void irq_ack_none(struct irq_desc *desc) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 05 23:33:42 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2025 23:33:42 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071030.1434608 (Exim 4.92) (envelope-from ) id 1ujRA6-0002Gf-J6; Tue, 05 Aug 2025 23:33:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071030.1434608; Tue, 05 Aug 2025 23:33:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujRA6-0002GY-GS; Tue, 05 Aug 2025 23:33:42 +0000 Received: by outflank-mailman (input) for mailman id 1071030; Tue, 05 Aug 2025 23:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujRA6-0002GS-6T for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujRA6-002xtG-0X for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujRA6-006ETa-0P for xen-changelog@lists.xenproject.org; Tue, 05 Aug 2025 23:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JLSUadmgjO+tGT6TdOrS0V2l12039HHwwGS/+yNSqNI=; b=DbQsdhHPifrd6+tIYjDunu/mf1 /FxGR3x9nQ8J6JECEUvGr1qpNALBAEzapFHn5mIhMuUnImKgHiFe8mrHCHU89j+HbQVYgk2QEDP8e Brjt4o8vjuIpPUjqGWi7Y1SWTtD+HtpwvPaUhMHjBv47Fejo7yole5zCAZFlGkXqGXD4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: irq: drop unreachable pirq callbacks Message-Id: Date: Tue, 05 Aug 2025 23:33:42 +0000 commit 68797a710f4e91cc09fe5650ee14478316010f88 Author: Grygorii Strashko AuthorDate: Tue Aug 5 18:40:21 2025 +0000 Commit: Andrew Cooper CommitDate: Tue Aug 5 22:09:35 2025 +0100 xen/riscv: irq: drop unreachable pirq callbacks Since commit 341f271cf86f ("xen/evtchn: fully restrict concept of pIRQ for arches with pIRQ support only"), the corresponding RISCV arch pIRQ callbacks become unreachable, so drop them. Signed-off-by: Grygorii Strashko Reviewed-by: Oleksii Kurochko Acked-by: Andrew Cooper Reviewed-by: Denis Mukhin LGTM: Oleksii Kurochko --- xen/arch/riscv/stubs.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 8918cebf35..1a8c86cd8d 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -82,26 +82,6 @@ void smp_send_call_function_mask(const cpumask_t *mask) /* irq.c */ -struct pirq *alloc_pirq_struct(struct domain *d) -{ - BUG_ON("unimplemented"); -} - -int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) -{ - BUG_ON("unimplemented"); -} - -void pirq_guest_unbind(struct domain *d, struct pirq *pirq) -{ - BUG_ON("unimplemented"); -} - -void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) -{ - BUG_ON("unimplemented"); -} - void irq_ack_none(struct irq_desc *desc) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 12:44:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 12:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071756.1435142 (Exim 4.92) (envelope-from ) id 1ujdUx-00017t-6Z; Wed, 06 Aug 2025 12:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071756.1435142; Wed, 06 Aug 2025 12:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujdUx-00017l-3c; Wed, 06 Aug 2025 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1071756; Wed, 06 Aug 2025 12:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujdUw-00017f-3F for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 12:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujdUv-004Rz4-2C for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 12:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujdUv-006qlZ-22 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 12:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sMJmmgScGF43HEo5kmFI/iX25GkOkRuBzacwbMaknvE=; b=yZ0Notfz4+2FQ/dplXVyzNULqX uEE8yOecXVceUI7GdPVoQQkGbeEPdzy6VhLwOt2kBJGfkKCubsdpws02xnLL+SGP3ZwV+48NIMn6+ xMkN9pQz7ipP5nthmj7T1KvTYP1sPV8nSqLQsyAHmnqYHnu5qftPkgEMcF84wlCXBYDA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hpet: do local APIC EOI after interrupt processing Message-Id: Date: Wed, 06 Aug 2025 12:44:01 +0000 commit 1db7829e56578970c1037c4dd1c27f939be4c054 Author: Roger Pau Monne AuthorDate: Tue Aug 5 11:25:15 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Aug 6 10:47:16 2025 +0200 x86/hpet: do local APIC EOI after interrupt processing The current logic in the HPET interrupt ->ack() hook will perform a local APIC EOI ahead of enabling interrupts, possibly leading to recursion in the interrupt handler. Fix this by doing the local APIC EOI strictly after the window with interrupt enabled, as that prevents the recursion, and would only allow for interrupts with higher priority to be serviced. Use the generic ack_nonmaskable_msi_irq() and end_nonmaskable_irq() functions, removing the need for hpet_msi_ack(). Reported-by: Andrew Cooper Fixes: 3ba523ff957c ('CPUIDLE: enable MSI capable HPET for timer broadcast') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/hpet.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 192de433cf..d05b5eb136 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -303,13 +303,6 @@ static unsigned int cf_check hpet_msi_startup(struct irq_desc *desc) #define hpet_msi_shutdown hpet_msi_mask -static void cf_check hpet_msi_ack(struct irq_desc *desc) -{ - irq_complete_move(desc); - move_native_irq(desc); - ack_APIC_irq(); -} - static void cf_check hpet_msi_set_affinity( struct irq_desc *desc, const cpumask_t *mask) { @@ -337,7 +330,8 @@ static hw_irq_controller hpet_msi_type = { .shutdown = hpet_msi_shutdown, .enable = hpet_msi_unmask, .disable = hpet_msi_mask, - .ack = hpet_msi_ack, + .ack = ack_nonmaskable_msi_irq, + .end = end_nonmaskable_irq, .set_affinity = hpet_msi_set_affinity, }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 14:00:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 14:00:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071814.1435182 (Exim 4.92) (envelope-from ) id 1ujegU-0003P7-69; Wed, 06 Aug 2025 14:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071814.1435182; Wed, 06 Aug 2025 14:00:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujegU-0003Ok-3B; Wed, 06 Aug 2025 14:00:02 +0000 Received: by outflank-mailman (input) for mailman id 1071814; Wed, 06 Aug 2025 14:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujegT-0003GL-Je for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 14:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujegT-004TSf-1P for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 14:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujegT-006uDX-16 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 14:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=arfQ9+8by4/xEqCcGfuGJks4ARmbqMQ4CDxFwEUngf4=; b=NqlHqyLVlgyTqmlmQnhTwkra6D v201XSruneWJ5ORpq1JsK06KKkagKAMJqAlqgFCjAjAdVaf3kysZ1V4kfCc5zut2seI93b4I+BOCA JVgdYLs1ynSFCjE3VM8o8WRe2sdct/aASHto2cGJ/ckJdDORilPoMTcdnaVS5gNGW6lg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hpet: do local APIC EOI after interrupt processing Message-Id: Date: Wed, 06 Aug 2025 14:00:01 +0000 commit 1db7829e56578970c1037c4dd1c27f939be4c054 Author: Roger Pau Monne AuthorDate: Tue Aug 5 11:25:15 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Aug 6 10:47:16 2025 +0200 x86/hpet: do local APIC EOI after interrupt processing The current logic in the HPET interrupt ->ack() hook will perform a local APIC EOI ahead of enabling interrupts, possibly leading to recursion in the interrupt handler. Fix this by doing the local APIC EOI strictly after the window with interrupt enabled, as that prevents the recursion, and would only allow for interrupts with higher priority to be serviced. Use the generic ack_nonmaskable_msi_irq() and end_nonmaskable_irq() functions, removing the need for hpet_msi_ack(). Reported-by: Andrew Cooper Fixes: 3ba523ff957c ('CPUIDLE: enable MSI capable HPET for timer broadcast') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/hpet.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 192de433cf..d05b5eb136 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -303,13 +303,6 @@ static unsigned int cf_check hpet_msi_startup(struct irq_desc *desc) #define hpet_msi_shutdown hpet_msi_mask -static void cf_check hpet_msi_ack(struct irq_desc *desc) -{ - irq_complete_move(desc); - move_native_irq(desc); - ack_APIC_irq(); -} - static void cf_check hpet_msi_set_affinity( struct irq_desc *desc, const cpumask_t *mask) { @@ -337,7 +330,8 @@ static hw_irq_controller hpet_msi_type = { .shutdown = hpet_msi_shutdown, .enable = hpet_msi_unmask, .disable = hpet_msi_mask, - .ack = hpet_msi_ack, + .ack = ack_nonmaskable_msi_irq, + .end = end_nonmaskable_irq, .set_affinity = hpet_msi_set_affinity, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071964.1435293 (Exim 4.92) (envelope-from ) id 1ujgYd-00089N-1R; Wed, 06 Aug 2025 16:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071964.1435293; Wed, 06 Aug 2025 16:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgYc-00088j-Ut; Wed, 06 Aug 2025 16:00:02 +0000 Received: by outflank-mailman (input) for mailman id 1071964; Wed, 06 Aug 2025 16:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgYb-0007Xd-Ui for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujgYb-004W6h-2S for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujgYb-006zB8-2J for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=46QMbu51IrqEdyECV27XHjyZKSNT6afeUm+OcayJs00=; b=eKFq5ih7TzLpUibWPtYlejj38p 1WwXyw04Ah2HO1iwVOGW8z3d594qAXmV6MqMweR9tgVYj4WK+S1DxB+YyS+9Wuc6bt7zjqa9zrykw 0mttz3yvDR1L00jctITnTq0ySnZ8KFlDynSAZfv06w7cQHGTm8UhtpyvjPHKLLl6Cxt8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: implement sbi_remote_hfence_gvma() Message-Id: Date: Wed, 06 Aug 2025 16:00:01 +0000 commit f64ee2f615f9d02bce647ce2255182a192cf67f6 Author: Oleksii Kurochko AuthorDate: Wed Aug 6 14:46:29 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:46:29 2025 +0200 xen/riscv: implement sbi_remote_hfence_gvma() Instruct the remote harts to execute one or more HFENCE.GVMA instructions, covering the range of guest physical addresses between start_addr and start_addr + size for all VMIDs. The remote fence operation applies to the entire address space if either: - start_addr and size are both 0, or - size is equal to 2^XLEN-1. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/sbi.h | 19 +++++++++++++++++++ xen/arch/riscv/sbi.c | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h index 527d773277..560dca3be4 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -89,6 +89,25 @@ bool sbi_has_rfence(void); int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, size_t size); +/* + * Instruct the remote harts to execute one or more HFENCE.GVMA + * instructions, covering the range of guest physical addresses + * in [start_addr, start_addr + size) for all VMIDs. + * + * Returns 0 if IPI was sent to all the targeted harts successfully + * or negative value if start_addr or size is not valid. + * + * The remote fence operation applies to the entire address space if either: + * - start_addr and size are both 0, or + * - size is equal to 2^XLEN-1. + * + * @cpu_mask a cpu mask containing all the target CPUs (in Xen space). + * @param start virtual address start + * @param size virtual address range size + */ +int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, + size_t size); + /* * Initialize SBI library * diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 4209520389..1809f614c5 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -258,6 +258,13 @@ int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, cpu_mask, start, size, 0, 0); } +int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, + size_t size) +{ + return sbi_rfence(SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA, + cpu_mask, start, size, 0, 0); +} + /* This function must always succeed. */ #define sbi_get_spec_version() \ sbi_ext_base_func(SBI_EXT_BASE_GET_SPEC_VERSION) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:00:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071965.1435299 (Exim 4.92) (envelope-from ) id 1ujgYn-0000QL-3T; Wed, 06 Aug 2025 16:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071965.1435299; Wed, 06 Aug 2025 16:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgYn-0000Q9-04; Wed, 06 Aug 2025 16:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1071965; Wed, 06 Aug 2025 16:00:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgYl-0000Q1-SX for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujgYl-004WN4-2l for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujgYl-006zCf-2d for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J9k4CouULagQurZlfiI9Dmb1W6YzsEqs8ZkhDx4oACQ=; b=beh08rkRswDHjRhZC+dCwu79UH krP7oVIqtOqQXj8QFVEJkMKupuPl25aUAAswq2GUPzFA3XAGqnpAaCqXqbj0dNLpEf4MDcMOFNctB uviMIDyAvTAiQolznb1ndCi93AisIJODFYxGEz1LOyOkp0BbAelPl+sRvDQu+ifktEac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce sbi_remote_hfence_gvma_vmid() Message-Id: Date: Wed, 06 Aug 2025 16:00:11 +0000 commit 2c9b947aafc6ac802d99525d6a797012269aa3ab Author: Oleksii Kurochko AuthorDate: Wed Aug 6 14:46:50 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:46:50 2025 +0200 xen/riscv: introduce sbi_remote_hfence_gvma_vmid() It instructs the remote harts to execute one or more HFENCE.GVMA instructions by making an SBI call, covering the range of guest physical addresses between start_addr and start_addr + size only for the given VMID. The remote fence operation applies to the entire address space if either: - start_addr and size are both 0, or - size is equal to 2^XLEN-1. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/sbi.h | 13 +++++++++++++ xen/arch/riscv/sbi.c | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h index 560dca3be4..ade24a572d 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -108,6 +108,19 @@ int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, size_t size); +/* + * Instruct the remote harts to execute one or more HFENCE.GVMA + * instructions, covering the range of guest physical addresses + * in [start_addr, start_addr + size) only for the given VMID. + * + * @cpu_mask a cpu mask containing all the target CPUs (in Xen space). + * @param start virtual address start + * @param size virtual address range size + * @param vmid virtual machine id + */ +int sbi_remote_hfence_gvma_vmid(const cpumask_t *cpu_mask, vaddr_t start, + size_t size, unsigned long vmid); + /* * Initialize SBI library * diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 1809f614c5..425dce44c6 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -265,6 +265,13 @@ int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, cpu_mask, start, size, 0, 0); } +int sbi_remote_hfence_gvma_vmid(const cpumask_t *cpu_mask, vaddr_t start, + size_t size, unsigned long vmid) +{ + return sbi_rfence(SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID, + cpu_mask, start, size, vmid, 0); +} + /* This function must always succeed. */ #define sbi_get_spec_version() \ sbi_ext_base_func(SBI_EXT_BASE_GET_SPEC_VERSION) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:00:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071966.1435300 (Exim 4.92) (envelope-from ) id 1ujgYx-0000Sh-44; Wed, 06 Aug 2025 16:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071966.1435300; Wed, 06 Aug 2025 16:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgYx-0000Sa-1V; Wed, 06 Aug 2025 16:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1071966; Wed, 06 Aug 2025 16:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgYv-0000SO-Vy for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujgYv-004WSR-36 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujgYv-006zD4-2w for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/hI2IAFJeMtcHKG8KT6QFkPkU5pcDoLjEJCcVcGTMtM=; b=gKo+zmErtJUmXP4sB+bh20LsLb Us9Z3ks5yeOl3OybgJgjB1WoRhnQaZdtePouZYIWZXmLjH+f5TuO9wly5fmYGxY/K6eplGTHwdMO0 I208iDwTPYMrwKgWFL12y34YKZx1j9UQgw0FGG0YbkVxfvCDEHMeCBWzmNNPo09T/PTI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] console: make printk_ratelimit_{burst,ms} const Message-Id: Date: Wed, 06 Aug 2025 16:00:21 +0000 commit 3d79573f0251b432e03bcb03c382c28446065b5d Author: Jan Beulich AuthorDate: Wed Aug 6 14:48:02 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:48:02 2025 +0200 console: make printk_ratelimit_{burst,ms} const Them not being altered by any means, their __read_mostly attribute is actually counter-productive: It causes the compiler to instantiate the variables, when already with just the attributes dropped the compiler can constant-propagate the values into the sole use site. Make the situation yet more explicit by adding const. Also switch the variables away from being plain int, and have the parameters of __printk_ratelimit() follow suit. While there also similarly adjust the type of "missed" and "lost", and - while touching the adjacent line - increase lost_str[] to accommodate any unsigned 32-bit number. Fixes: a8b1845a7845 ("Miscellaneous data placement adjustments") Signed-off-by: Jan Beulich Reviewed-by: Denis Mukhin Reviewed-by: Jason Andryuk --- xen/drivers/char/console.c | 20 +++++++++++--------- xen/include/xen/lib.h | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index a5af660239..9bd5b4825d 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1267,12 +1267,12 @@ void console_end_sync(void) * This enforces a rate limit: not more than one kernel message * every printk_ratelimit_ms (millisecs). */ -int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) +int __printk_ratelimit(unsigned int ratelimit_ms, unsigned int ratelimit_burst) { static DEFINE_SPINLOCK(ratelimit_lock); static unsigned long toks = 10 * 5 * 1000; static unsigned long last_msg; - static int missed; + static unsigned int missed; unsigned long flags; unsigned long long now = NOW(); /* ns */ unsigned long ms; @@ -1287,14 +1287,16 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) toks = ratelimit_burst * ratelimit_ms; if ( toks >= ratelimit_ms ) { - int lost = missed; + unsigned int lost = missed; + missed = 0; toks -= ratelimit_ms; spin_unlock(&ratelimit_lock); if ( lost ) { - char lost_str[8]; - snprintf(lost_str, sizeof(lost_str), "%d", lost); + char lost_str[10]; + + snprintf(lost_str, sizeof(lost_str), "%u", lost); /* console_lock may already be acquired by printk(). */ rspin_lock(&console_lock); printk_start_of_line(CONSOLE_PREFIX); @@ -1311,11 +1313,11 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) return 0; } -/* minimum time in ms between messages */ -static int __read_mostly printk_ratelimit_ms = 5 * 1000; +/* Minimum time in ms between messages */ +static const unsigned int printk_ratelimit_ms = 5 * 1000; -/* number of messages we send before ratelimiting */ -static int __read_mostly printk_ratelimit_burst = 10; +/* Number of messages we send before ratelimiting */ +static const unsigned int printk_ratelimit_burst = 10; int printk_ratelimit(void) { diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 36d904ba1a..c434dd5f16 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -79,7 +79,8 @@ extern void guest_printk(const struct domain *d, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); extern void noreturn panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -extern int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst); +extern int __printk_ratelimit(unsigned int ratelimit_ms, + unsigned int ratelimit_burst); extern int printk_ratelimit(void); #define gprintk(lvl, fmt, args...) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:00:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071967.1435305 (Exim 4.92) (envelope-from ) id 1ujgZ7-0000dA-5c; Wed, 06 Aug 2025 16:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071967.1435305; Wed, 06 Aug 2025 16:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgZ7-0000d2-32; Wed, 06 Aug 2025 16:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1071967; Wed, 06 Aug 2025 16:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgZ6-0000Xz-2z for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujgZ6-004WSg-0C for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujgZ6-006zE2-03 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+eSxrhG6ivtUX//8PU2FNbyS88A3mD9lVdBpvw6EFh8=; b=W/oGnU/78nVx4JFqCkdzBJ1o3O cKRJUqLDAJBPsFA+KEcN50pLW19j4X3SDXJZJ0ID7H+DHmrE54dVcczsWUFI7DROvG8nsBEYN2VCl Ckti+2NoatJblHeLdBBqTiT/SMFgNOSJlaXTsbj9A7wA6bQ/ydHqh39tuWQxs6HHZa4s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: polish hvm_asid_init() a little Message-Id: Date: Wed, 06 Aug 2025 16:00:32 +0000 commit b58ebec511beda7559c8209ca13e91187a060f98 Author: Jan Beulich AuthorDate: Wed Aug 6 14:49:17 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:49:17 2025 +0200 x86/HVM: polish hvm_asid_init() a little While the logic there covers asymmetric cases, the resulting log messages would likely raise more confusion than clarify anything. Split the BSP action from the AP one, indicating the odd CPU in the AP log message, thus avoiding the impression that global state would have changed. While there also - move g_disabled into .data.ro_after_init; only the BSP will ever write to it, - make the function's parameter unsigned; no negative values may be passed in. Also reflect this in svm_asid_init(). Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk Acked-by: Roger Pau Monné --- xen/arch/x86/hvm/asid.c | 14 ++++++++------ xen/arch/x86/hvm/svm/asid.c | 2 +- xen/arch/x86/include/asm/hvm/asid.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/asid.c b/xen/arch/x86/hvm/asid.c index 8d27b7dba1..935cae3901 100644 --- a/xen/arch/x86/hvm/asid.c +++ b/xen/arch/x86/hvm/asid.c @@ -48,20 +48,22 @@ struct hvm_asid_data { static DEFINE_PER_CPU(struct hvm_asid_data, hvm_asid_data); -void hvm_asid_init(int nasids) +void hvm_asid_init(unsigned int nasids) { - static int8_t g_disabled = -1; + static int8_t __ro_after_init g_disabled = -1; struct hvm_asid_data *data = &this_cpu(hvm_asid_data); data->max_asid = nasids - 1; data->disabled = !opt_asid_enabled || (nasids <= 1); - if ( g_disabled != data->disabled ) + if ( g_disabled < 0 ) { - printk("HVM: ASIDs %sabled.\n", data->disabled ? "dis" : "en"); - if ( g_disabled < 0 ) - g_disabled = data->disabled; + g_disabled = data->disabled; + printk("HVM: ASIDs %sabled\n", data->disabled ? "dis" : "en"); } + else if ( g_disabled != data->disabled ) + printk("HVM: CPU%u: ASIDs %sabled\n", smp_processor_id(), + data->disabled ? "dis" : "en"); /* Zero indicates 'invalid generation', so we start the count at one. */ data->core_asid_generation = 1; diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 0bc1f5aa72..03f98b7a8b 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -12,7 +12,7 @@ void svm_asid_init(const struct cpuinfo_x86 *c) { - int nasids = 0; + unsigned int nasids = 0; /* Check for erratum #170, and leave ASIDs disabled if it's present. */ if ( !cpu_has_amd_erratum(c, AMD_ERRATUM_170) ) diff --git a/xen/arch/x86/include/asm/hvm/asid.h b/xen/arch/x86/include/asm/hvm/asid.h index 17c58353d1..25ba57e768 100644 --- a/xen/arch/x86/include/asm/hvm/asid.h +++ b/xen/arch/x86/include/asm/hvm/asid.h @@ -13,7 +13,7 @@ struct vcpu; struct hvm_vcpu_asid; /* Initialise ASID management for the current physical CPU. */ -void hvm_asid_init(int nasids); +void hvm_asid_init(unsigned int nasids); /* Invalidate a particular ASID allocation: forces re-allocation. */ void hvm_asid_flush_vcpu_asid(struct hvm_vcpu_asid *asid); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:00:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1071968.1435310 (Exim 4.92) (envelope-from ) id 1ujgZH-0000gI-7v; Wed, 06 Aug 2025 16:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1071968.1435310; Wed, 06 Aug 2025 16:00:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgZH-0000g9-4M; Wed, 06 Aug 2025 16:00:43 +0000 Received: by outflank-mailman (input) for mailman id 1071968; Wed, 06 Aug 2025 16:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujgZG-0000fy-5Z for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujgZG-004WVE-0T for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujgZG-006zEw-0N for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3zsQKiAA5YGw5L5YR67ZS/l4XF3EoJVNH17hKcIcpmQ=; b=UstU0HR2Tpi3jct7T+fduvmd4n p+jr7ZwpCJ4I71C8wNq2JhW4fKcMU+59+uNUF2LyCY9J58cbXosB/PpprJ8OcbLPpb2ooD0cuuaP0 YsfvUz1w1dW9wIOI9IjFORuuzXOBeGfc9ZShmAnVs39tNj4HSKdFyJKvt90vCvD0kp9g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: drop paging_get_mode() Message-Id: Date: Wed, 06 Aug 2025 16:00:42 +0000 commit dbcbbed4e9dc25faa211d359c2f04a9c70f087c9 Author: Jan Beulich AuthorDate: Wed Aug 6 14:49:45 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:49:45 2025 +0200 x86/mm: drop paging_get_mode() The function was introduced without any caller, and never gained any. Thus it has always been violating Misra rule 2.1 (unreachable code). Fixes: dd6de3ab9985 ("Implement Nested-on-Nested") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/paging.h | 1 - xen/arch/x86/mm/paging.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 8a2a0af408..94c31a268e 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -225,7 +225,6 @@ int paging_enable(struct domain *d, u32 mode); #define paging_get_hostmode(v) ((v)->arch.paging.mode) #define paging_get_nestedmode(v) ((v)->arch.paging.nestedmode) -const struct paging_mode *paging_get_mode(struct vcpu *v); void paging_update_nestedmode(struct vcpu *v); /* Page fault handler diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index c77f4c1dac..165e0f88c2 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -946,14 +946,6 @@ void paging_dump_vcpu_info(struct vcpu *v) } } -const struct paging_mode *paging_get_mode(struct vcpu *v) -{ - if (!nestedhvm_is_n2(v)) - return paging_get_hostmode(v); - - return paging_get_nestedmode(v); -} - #ifdef CONFIG_HVM void paging_update_nestedmode(struct vcpu *v) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1072016.1435332 (Exim 4.92) (envelope-from ) id 1ujhPq-0000OM-IN; Wed, 06 Aug 2025 16:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1072016.1435332; Wed, 06 Aug 2025 16:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhPq-0000OE-Fo; Wed, 06 Aug 2025 16:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1072016; Wed, 06 Aug 2025 16:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhPp-0000O8-RZ for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujhPp-004Y1M-1h for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujhPp-0075UE-1Y for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5gKBSKRaCt5ojnRXaimkxKwCcriof97+DnC0n0546nE=; b=awIHqV9InFLZYu6JwOoI6TP3ZM Px1hjMGOr3q/X4JTHSvkTi2mDyAGig2/RQyETIIKhFRaURHLoS0EJI4eoqRnyuVeajF6wJwb5xjnT +Ic0/2itT4xMSu31k1JVfiW3uFUUsWcd0Bif5z6oVdJmrpxHJw0syMf+3DYJ+NBu9Yiw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: implement sbi_remote_hfence_gvma() Message-Id: Date: Wed, 06 Aug 2025 16:55:01 +0000 commit f64ee2f615f9d02bce647ce2255182a192cf67f6 Author: Oleksii Kurochko AuthorDate: Wed Aug 6 14:46:29 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:46:29 2025 +0200 xen/riscv: implement sbi_remote_hfence_gvma() Instruct the remote harts to execute one or more HFENCE.GVMA instructions, covering the range of guest physical addresses between start_addr and start_addr + size for all VMIDs. The remote fence operation applies to the entire address space if either: - start_addr and size are both 0, or - size is equal to 2^XLEN-1. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/sbi.h | 19 +++++++++++++++++++ xen/arch/riscv/sbi.c | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h index 527d773277..560dca3be4 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -89,6 +89,25 @@ bool sbi_has_rfence(void); int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, size_t size); +/* + * Instruct the remote harts to execute one or more HFENCE.GVMA + * instructions, covering the range of guest physical addresses + * in [start_addr, start_addr + size) for all VMIDs. + * + * Returns 0 if IPI was sent to all the targeted harts successfully + * or negative value if start_addr or size is not valid. + * + * The remote fence operation applies to the entire address space if either: + * - start_addr and size are both 0, or + * - size is equal to 2^XLEN-1. + * + * @cpu_mask a cpu mask containing all the target CPUs (in Xen space). + * @param start virtual address start + * @param size virtual address range size + */ +int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, + size_t size); + /* * Initialize SBI library * diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 4209520389..1809f614c5 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -258,6 +258,13 @@ int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, cpu_mask, start, size, 0, 0); } +int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, + size_t size) +{ + return sbi_rfence(SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA, + cpu_mask, start, size, 0, 0); +} + /* This function must always succeed. */ #define sbi_get_spec_version() \ sbi_ext_base_func(SBI_EXT_BASE_GET_SPEC_VERSION) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:55:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1072017.1435337 (Exim 4.92) (envelope-from ) id 1ujhQ0-0000QL-Jx; Wed, 06 Aug 2025 16:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1072017.1435337; Wed, 06 Aug 2025 16:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQ0-0000QD-H3; Wed, 06 Aug 2025 16:55:12 +0000 Received: by outflank-mailman (input) for mailman id 1072017; Wed, 06 Aug 2025 16:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhPz-0000Pz-Lc for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujhPz-004Y1m-23 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujhPz-0075j1-1t for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uU4f+E6uq8zYtw79x00udoX6g/+iM9HHOn/sfSYdqMc=; b=NA8o1PQeiryTlEnzluv1MXUQV1 nQADGaX0O5+e3tAswCqT7FoP1ZGilAmknpBqwKkAnGPBvTCsZRTrJAPD6u5gW40mwM/n4hX8bjn3i 0xZcRtDe+DK/yUVysZcj4kN8wyw+jidFnZDEAG8DhRDbdJa6OYUd7zJFu/+UQLbjXfR0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce sbi_remote_hfence_gvma_vmid() Message-Id: Date: Wed, 06 Aug 2025 16:55:11 +0000 commit 2c9b947aafc6ac802d99525d6a797012269aa3ab Author: Oleksii Kurochko AuthorDate: Wed Aug 6 14:46:50 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:46:50 2025 +0200 xen/riscv: introduce sbi_remote_hfence_gvma_vmid() It instructs the remote harts to execute one or more HFENCE.GVMA instructions by making an SBI call, covering the range of guest physical addresses between start_addr and start_addr + size only for the given VMID. The remote fence operation applies to the entire address space if either: - start_addr and size are both 0, or - size is equal to 2^XLEN-1. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/sbi.h | 13 +++++++++++++ xen/arch/riscv/sbi.c | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h index 560dca3be4..ade24a572d 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -108,6 +108,19 @@ int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, size_t size); +/* + * Instruct the remote harts to execute one or more HFENCE.GVMA + * instructions, covering the range of guest physical addresses + * in [start_addr, start_addr + size) only for the given VMID. + * + * @cpu_mask a cpu mask containing all the target CPUs (in Xen space). + * @param start virtual address start + * @param size virtual address range size + * @param vmid virtual machine id + */ +int sbi_remote_hfence_gvma_vmid(const cpumask_t *cpu_mask, vaddr_t start, + size_t size, unsigned long vmid); + /* * Initialize SBI library * diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 1809f614c5..425dce44c6 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -265,6 +265,13 @@ int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, cpu_mask, start, size, 0, 0); } +int sbi_remote_hfence_gvma_vmid(const cpumask_t *cpu_mask, vaddr_t start, + size_t size, unsigned long vmid) +{ + return sbi_rfence(SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID, + cpu_mask, start, size, vmid, 0); +} + /* This function must always succeed. */ #define sbi_get_spec_version() \ sbi_ext_base_func(SBI_EXT_BASE_GET_SPEC_VERSION) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1072019.1435351 (Exim 4.92) (envelope-from ) id 1ujhQB-0000iX-14; Wed, 06 Aug 2025 16:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1072019.1435351; Wed, 06 Aug 2025 16:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQA-0000iO-Ue; Wed, 06 Aug 2025 16:55:22 +0000 Received: by outflank-mailman (input) for mailman id 1072019; Wed, 06 Aug 2025 16:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQ9-0000hi-P0 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujhQ9-004Y20-2L for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujhQ9-0075mG-2E for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4faDQBBMXPpMGqgoDIiKkFqN3HUUaKhoonF+BDV8K6k=; b=yCdx7p+RJcqglTWn6Iy28ao7z/ R8DhsdP/tJn7O0KXUSpFHn6prR42GoZPNEUavSYVAbUcYADy49jmRN2zj78VM3GTJ6lcaoFGz6VUw ZZMLRalp2kOEcTtPXTrkakmYlK0gMIV5phRlZGuc44E3n1+C0hXPuUz/I7QJrVnDbPKA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] console: make printk_ratelimit_{burst,ms} const Message-Id: Date: Wed, 06 Aug 2025 16:55:21 +0000 commit 3d79573f0251b432e03bcb03c382c28446065b5d Author: Jan Beulich AuthorDate: Wed Aug 6 14:48:02 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:48:02 2025 +0200 console: make printk_ratelimit_{burst,ms} const Them not being altered by any means, their __read_mostly attribute is actually counter-productive: It causes the compiler to instantiate the variables, when already with just the attributes dropped the compiler can constant-propagate the values into the sole use site. Make the situation yet more explicit by adding const. Also switch the variables away from being plain int, and have the parameters of __printk_ratelimit() follow suit. While there also similarly adjust the type of "missed" and "lost", and - while touching the adjacent line - increase lost_str[] to accommodate any unsigned 32-bit number. Fixes: a8b1845a7845 ("Miscellaneous data placement adjustments") Signed-off-by: Jan Beulich Reviewed-by: Denis Mukhin Reviewed-by: Jason Andryuk --- xen/drivers/char/console.c | 20 +++++++++++--------- xen/include/xen/lib.h | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index a5af660239..9bd5b4825d 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1267,12 +1267,12 @@ void console_end_sync(void) * This enforces a rate limit: not more than one kernel message * every printk_ratelimit_ms (millisecs). */ -int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) +int __printk_ratelimit(unsigned int ratelimit_ms, unsigned int ratelimit_burst) { static DEFINE_SPINLOCK(ratelimit_lock); static unsigned long toks = 10 * 5 * 1000; static unsigned long last_msg; - static int missed; + static unsigned int missed; unsigned long flags; unsigned long long now = NOW(); /* ns */ unsigned long ms; @@ -1287,14 +1287,16 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) toks = ratelimit_burst * ratelimit_ms; if ( toks >= ratelimit_ms ) { - int lost = missed; + unsigned int lost = missed; + missed = 0; toks -= ratelimit_ms; spin_unlock(&ratelimit_lock); if ( lost ) { - char lost_str[8]; - snprintf(lost_str, sizeof(lost_str), "%d", lost); + char lost_str[10]; + + snprintf(lost_str, sizeof(lost_str), "%u", lost); /* console_lock may already be acquired by printk(). */ rspin_lock(&console_lock); printk_start_of_line(CONSOLE_PREFIX); @@ -1311,11 +1313,11 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst) return 0; } -/* minimum time in ms between messages */ -static int __read_mostly printk_ratelimit_ms = 5 * 1000; +/* Minimum time in ms between messages */ +static const unsigned int printk_ratelimit_ms = 5 * 1000; -/* number of messages we send before ratelimiting */ -static int __read_mostly printk_ratelimit_burst = 10; +/* Number of messages we send before ratelimiting */ +static const unsigned int printk_ratelimit_burst = 10; int printk_ratelimit(void) { diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 36d904ba1a..c434dd5f16 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -79,7 +79,8 @@ extern void guest_printk(const struct domain *d, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); extern void noreturn panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -extern int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst); +extern int __printk_ratelimit(unsigned int ratelimit_ms, + unsigned int ratelimit_burst); extern int printk_ratelimit(void); #define gprintk(lvl, fmt, args...) \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1072021.1435356 (Exim 4.92) (envelope-from ) id 1ujhQL-0000nn-2r; Wed, 06 Aug 2025 16:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1072021.1435356; Wed, 06 Aug 2025 16:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQK-0000nd-W6; Wed, 06 Aug 2025 16:55:32 +0000 Received: by outflank-mailman (input) for mailman id 1072021; Wed, 06 Aug 2025 16:55:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQJ-0000nE-Ro for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujhQJ-004Y2K-2f for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujhQJ-0075md-2W for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O1XKs4QCwb4yZvcJuiIE2D6E0jsWSXzoBiVciC7FPe4=; b=EyzIS9/6JEIaoQ//FRkM37Ua4C 6FZoGPge7Kduoo3/fpiiWaxiASqnt+haY4tqfss4U6eaOkGL3crCf0Bkrr2nGAc0uKIMAatOJx7R7 Mhdb8iEO3av2owyMc8ZoSlIvRXMSysI4dsqHAV5WnFszg2wTvZknnjQPGJDf4PFVO2VY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: polish hvm_asid_init() a little Message-Id: Date: Wed, 06 Aug 2025 16:55:31 +0000 commit b58ebec511beda7559c8209ca13e91187a060f98 Author: Jan Beulich AuthorDate: Wed Aug 6 14:49:17 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:49:17 2025 +0200 x86/HVM: polish hvm_asid_init() a little While the logic there covers asymmetric cases, the resulting log messages would likely raise more confusion than clarify anything. Split the BSP action from the AP one, indicating the odd CPU in the AP log message, thus avoiding the impression that global state would have changed. While there also - move g_disabled into .data.ro_after_init; only the BSP will ever write to it, - make the function's parameter unsigned; no negative values may be passed in. Also reflect this in svm_asid_init(). Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk Acked-by: Roger Pau Monné --- xen/arch/x86/hvm/asid.c | 14 ++++++++------ xen/arch/x86/hvm/svm/asid.c | 2 +- xen/arch/x86/include/asm/hvm/asid.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/asid.c b/xen/arch/x86/hvm/asid.c index 8d27b7dba1..935cae3901 100644 --- a/xen/arch/x86/hvm/asid.c +++ b/xen/arch/x86/hvm/asid.c @@ -48,20 +48,22 @@ struct hvm_asid_data { static DEFINE_PER_CPU(struct hvm_asid_data, hvm_asid_data); -void hvm_asid_init(int nasids) +void hvm_asid_init(unsigned int nasids) { - static int8_t g_disabled = -1; + static int8_t __ro_after_init g_disabled = -1; struct hvm_asid_data *data = &this_cpu(hvm_asid_data); data->max_asid = nasids - 1; data->disabled = !opt_asid_enabled || (nasids <= 1); - if ( g_disabled != data->disabled ) + if ( g_disabled < 0 ) { - printk("HVM: ASIDs %sabled.\n", data->disabled ? "dis" : "en"); - if ( g_disabled < 0 ) - g_disabled = data->disabled; + g_disabled = data->disabled; + printk("HVM: ASIDs %sabled\n", data->disabled ? "dis" : "en"); } + else if ( g_disabled != data->disabled ) + printk("HVM: CPU%u: ASIDs %sabled\n", smp_processor_id(), + data->disabled ? "dis" : "en"); /* Zero indicates 'invalid generation', so we start the count at one. */ data->core_asid_generation = 1; diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 0bc1f5aa72..03f98b7a8b 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -12,7 +12,7 @@ void svm_asid_init(const struct cpuinfo_x86 *c) { - int nasids = 0; + unsigned int nasids = 0; /* Check for erratum #170, and leave ASIDs disabled if it's present. */ if ( !cpu_has_amd_erratum(c, AMD_ERRATUM_170) ) diff --git a/xen/arch/x86/include/asm/hvm/asid.h b/xen/arch/x86/include/asm/hvm/asid.h index 17c58353d1..25ba57e768 100644 --- a/xen/arch/x86/include/asm/hvm/asid.h +++ b/xen/arch/x86/include/asm/hvm/asid.h @@ -13,7 +13,7 @@ struct vcpu; struct hvm_vcpu_asid; /* Initialise ASID management for the current physical CPU. */ -void hvm_asid_init(int nasids); +void hvm_asid_init(unsigned int nasids); /* Invalidate a particular ASID allocation: forces re-allocation. */ void hvm_asid_flush_vcpu_asid(struct hvm_vcpu_asid *asid); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 06 16:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2025 16:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1072023.1435359 (Exim 4.92) (envelope-from ) id 1ujhQV-0000wY-42; Wed, 06 Aug 2025 16:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1072023.1435359; Wed, 06 Aug 2025 16:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQV-0000wQ-1F; Wed, 06 Aug 2025 16:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1072023; Wed, 06 Aug 2025 16:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ujhQT-0000us-V6 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ujhQT-004Y4s-31 for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ujhQT-0077MI-2r for xen-changelog@lists.xenproject.org; Wed, 06 Aug 2025 16:55:41 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XfJsFqbqNfpQFCREL1h/SkOdfS00KAf6hosynpswgZ4=; b=2CnrWodKGs5D6hrPmrYRJm0ekJ 4uxAwSUlTOaUmOuPqyPqMu+g9uKhCyU81LACi1zwrymzTJDUX7y3VMbo9uLbJcJmm01PA7T//ZXr/ O/sAgUhMZrq63lhlfLPq1gaQDQ9ZKnyD55abLGtvjhehqoGU2m55vhE5oGtp1QXD/J4c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: drop paging_get_mode() Message-Id: Date: Wed, 06 Aug 2025 16:55:41 +0000 commit dbcbbed4e9dc25faa211d359c2f04a9c70f087c9 Author: Jan Beulich AuthorDate: Wed Aug 6 14:49:45 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 14:49:45 2025 +0200 x86/mm: drop paging_get_mode() The function was introduced without any caller, and never gained any. Thus it has always been violating Misra rule 2.1 (unreachable code). Fixes: dd6de3ab9985 ("Implement Nested-on-Nested") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/paging.h | 1 - xen/arch/x86/mm/paging.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 8a2a0af408..94c31a268e 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -225,7 +225,6 @@ int paging_enable(struct domain *d, u32 mode); #define paging_get_hostmode(v) ((v)->arch.paging.mode) #define paging_get_nestedmode(v) ((v)->arch.paging.nestedmode) -const struct paging_mode *paging_get_mode(struct vcpu *v); void paging_update_nestedmode(struct vcpu *v); /* Page fault handler diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index c77f4c1dac..165e0f88c2 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -946,14 +946,6 @@ void paging_dump_vcpu_info(struct vcpu *v) } } -const struct paging_mode *paging_get_mode(struct vcpu *v) -{ - if (!nestedhvm_is_n2(v)) - return paging_get_hostmode(v); - - return paging_get_nestedmode(v); -} - #ifdef CONFIG_HVM void paging_update_nestedmode(struct vcpu *v) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 12:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 12:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074363.1436995 (Exim 4.92) (envelope-from ) id 1ukMHP-0001bu-MS; Fri, 08 Aug 2025 12:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074363.1436995; Fri, 08 Aug 2025 12:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHP-0001bm-J0; Fri, 08 Aug 2025 12:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1074363; Fri, 08 Aug 2025 12:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHN-0001bg-Ul for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukMHN-007wxx-1z for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukMHN-0094rn-1r for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8GMCNYU2oVM3kcXlF5NeIb4+4eTbw0XOZwn9r4Wy6qI=; b=taBdvHVk4L3zOp7idDeglnVdCf IGXF306qnIR+KkyKxh08TOVqn03M3sMtmXbAfYwtiK/ue5imEeWEMHq7mZRHfv0ZMvv+G0b4R1aFl wDtPqnTj2C84H3Va73L1cC+IwjhIQVT1sgxGngDCnR54OCnHEmpc7VxG6JRsPosREdMM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/domctl: Stop using XLAT_cpu_user_regs() Message-Id: Date: Fri, 08 Aug 2025 12:33:01 +0000 commit 9f892f84c27970840d255aef7e2851b762967de7 Author: Andrew Cooper AuthorDate: Mon Dec 30 11:49:14 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86/domctl: Stop using XLAT_cpu_user_regs() In order to support FRED, we're going to have to remove the {ds..gs} fields from struct cpu_user_regs, meaning that it is going to have to become a different type to the structure embedded in vcpu_guest_context_u. In both arch_{get,set}_info_guest(), expand the memcpy()/XLAT_cpu_user_regs() to copy the fields individually. This will allow us to eventually make them different types. This does cause some minor changes in behaviour for the hypercalls. It is specifically not the case that a toolstack could set_info(); get_info(); and get an identical bit pattern back. Amongst other things, the architectural sticky bits in registers are applied during setting. Previously, XLAT_cpu_user_regs() omitted the _pad fields in the compat case whereas the non-compat case included them owing to the single memcpy(). Omit the _pad fields in the non-compat case too; for all but the oldest of CPUs, the segment selectors are zero-extended by hardware when pushed onto the stack, so non-zero values here get lost naturally. Furthermore, FRED reuses the space above cs and ss for extra state, and a PV guest for now at least must not be able to write the control state. Omit the error_code and entry_vector fields too. They're already identified as private fields in the public API, and are stale outside of Xen's interrupt/exception/syscall handler. They're also a very minor information leak of which event caused the last deschedule of a vCPU. Finally, omit saved_upcall_mask. Xen doesn't consume this, and only produces it in {compat_,}create_bounce_frame(), based on the vcpu_info shared state and settings about the event being injected. Similar to error_code/entry_vector, it is stale outside of the guest's event handler. No change that toolstacks or guests are expected to notice or care about. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 38 ++++++++++++++++++++++++++++++++++++-- xen/arch/x86/domctl.c | 38 ++++++++++++++++++++++++++++++++++++-- xen/include/xlat.lst | 2 -- 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 56c3816187..41d75dde42 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1231,9 +1231,27 @@ int arch_set_info_guest( else vcpu_reset_fpu(v); + memset(&v->arch.user_regs, 0, sizeof(v->arch.user_regs)); + if ( !compat ) { - memcpy(&v->arch.user_regs, &c.nat->user_regs, sizeof(c.nat->user_regs)); + v->arch.user_regs.rbx = c.nat->user_regs.rbx; + v->arch.user_regs.rcx = c.nat->user_regs.rcx; + v->arch.user_regs.rdx = c.nat->user_regs.rdx; + v->arch.user_regs.rsi = c.nat->user_regs.rsi; + v->arch.user_regs.rdi = c.nat->user_regs.rdi; + v->arch.user_regs.rbp = c.nat->user_regs.rbp; + v->arch.user_regs.rax = c.nat->user_regs.rax; + v->arch.user_regs.rip = c.nat->user_regs.rip; + v->arch.user_regs.cs = c.nat->user_regs.cs; + v->arch.user_regs.rflags = c.nat->user_regs.rflags; + v->arch.user_regs.rsp = c.nat->user_regs.rsp; + v->arch.user_regs.ss = c.nat->user_regs.ss; + v->arch.user_regs.es = c.nat->user_regs.es; + v->arch.user_regs.ds = c.nat->user_regs.ds; + v->arch.user_regs.fs = c.nat->user_regs.fs; + v->arch.user_regs.gs = c.nat->user_regs.gs; + if ( is_pv_domain(d) ) memcpy(v->arch.pv.trap_ctxt, c.nat->trap_ctxt, sizeof(c.nat->trap_ctxt)); @@ -1241,7 +1259,23 @@ int arch_set_info_guest( #ifdef CONFIG_COMPAT else { - XLAT_cpu_user_regs(&v->arch.user_regs, &c.cmp->user_regs); + v->arch.user_regs.ebx = c.cmp->user_regs.ebx; + v->arch.user_regs.ecx = c.cmp->user_regs.ecx; + v->arch.user_regs.edx = c.cmp->user_regs.edx; + v->arch.user_regs.esi = c.cmp->user_regs.esi; + v->arch.user_regs.edi = c.cmp->user_regs.edi; + v->arch.user_regs.ebp = c.cmp->user_regs.ebp; + v->arch.user_regs.eax = c.cmp->user_regs.eax; + v->arch.user_regs.eip = c.cmp->user_regs.eip; + v->arch.user_regs.cs = c.cmp->user_regs.cs; + v->arch.user_regs.eflags = c.cmp->user_regs.eflags; + v->arch.user_regs.esp = c.cmp->user_regs.esp; + v->arch.user_regs.ss = c.cmp->user_regs.ss; + v->arch.user_regs.es = c.cmp->user_regs.es; + v->arch.user_regs.ds = c.cmp->user_regs.ds; + v->arch.user_regs.fs = c.cmp->user_regs.fs; + v->arch.user_regs.gs = c.cmp->user_regs.gs; + if ( is_pv_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3044f706de..28fec0e12d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1399,7 +1399,24 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c(flags |= VGCF_online); if ( !compat ) { - memcpy(&c.nat->user_regs, &v->arch.user_regs, sizeof(c.nat->user_regs)); + /* Backing memory is pre-zeroed. */ + c.nat->user_regs.rbx = v->arch.user_regs.rbx; + c.nat->user_regs.rcx = v->arch.user_regs.rcx; + c.nat->user_regs.rdx = v->arch.user_regs.rdx; + c.nat->user_regs.rsi = v->arch.user_regs.rsi; + c.nat->user_regs.rdi = v->arch.user_regs.rdi; + c.nat->user_regs.rbp = v->arch.user_regs.rbp; + c.nat->user_regs.rax = v->arch.user_regs.rax; + c.nat->user_regs.rip = v->arch.user_regs.rip; + c.nat->user_regs.cs = v->arch.user_regs.cs; + c.nat->user_regs.rflags = v->arch.user_regs.rflags; + c.nat->user_regs.rsp = v->arch.user_regs.rsp; + c.nat->user_regs.ss = v->arch.user_regs.ss; + c.nat->user_regs.es = v->arch.user_regs.es; + c.nat->user_regs.ds = v->arch.user_regs.ds; + c.nat->user_regs.fs = v->arch.user_regs.fs; + c.nat->user_regs.gs = v->arch.user_regs.gs; + if ( is_pv_domain(d) ) memcpy(c.nat->trap_ctxt, v->arch.pv.trap_ctxt, sizeof(c.nat->trap_ctxt)); @@ -1407,7 +1424,24 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) #ifdef CONFIG_COMPAT else { - XLAT_cpu_user_regs(&c.cmp->user_regs, &v->arch.user_regs); + /* Backing memory is pre-zeroed. */ + c.cmp->user_regs.ebx = v->arch.user_regs.ebx; + c.cmp->user_regs.ecx = v->arch.user_regs.ecx; + c.cmp->user_regs.edx = v->arch.user_regs.edx; + c.cmp->user_regs.esi = v->arch.user_regs.esi; + c.cmp->user_regs.edi = v->arch.user_regs.edi; + c.cmp->user_regs.ebp = v->arch.user_regs.ebp; + c.cmp->user_regs.eax = v->arch.user_regs.eax; + c.cmp->user_regs.eip = v->arch.user_regs.eip; + c.cmp->user_regs.cs = v->arch.user_regs.cs; + c.cmp->user_regs.eflags = v->arch.user_regs.eflags; + c.cmp->user_regs.esp = v->arch.user_regs.esp; + c.cmp->user_regs.ss = v->arch.user_regs.ss; + c.cmp->user_regs.es = v->arch.user_regs.es; + c.cmp->user_regs.ds = v->arch.user_regs.ds; + c.cmp->user_regs.fs = v->arch.user_regs.fs; + c.cmp->user_regs.gs = v->arch.user_regs.gs; + if ( is_pv_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 3c7b6c6830..6d6c6cfab2 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -34,8 +34,6 @@ ? pmu_intel_ctxt arch-x86/pmu.h ? pmu_regs arch-x86/pmu.h -! cpu_user_regs arch-x86/xen-@arch@.h - ? cpu_offline_action arch-x86/xen-mca.h ? mc arch-x86/xen-mca.h ! mc_fetch arch-x86/xen-mca.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 12:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 12:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074364.1436997 (Exim 4.92) (envelope-from ) id 1ukMHZ-0001de-N5; Fri, 08 Aug 2025 12:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074364.1436997; Fri, 08 Aug 2025 12:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHZ-0001dX-KL; Fri, 08 Aug 2025 12:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1074364; Fri, 08 Aug 2025 12:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHX-0001dL-OM for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukMHX-007wyC-2K for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukMHX-0094sF-2C for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+E5gbPfG4pqAMu/OMmTJWN+QVs4DFQVMZ4x0tb9JjEU=; b=BZ23yOJesueGetzCYmrBu/wo/p pxDmE95k9u1QNS2RinZAg/0FG6cIV2E9CcvyRjM26rQJP23R5tNze07z43di3zjDHM3S+qtnGmAGT st8s57p0yeYY0IeCqsYSk5cjEZyz1qLE2jXekF69qyTQeuf8X2HQ2JAga0h/twHwK9bU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: Store the data segment selectors outside of cpu_user_regs Message-Id: Date: Fri, 08 Aug 2025 12:33:11 +0000 commit 68ae02120aa2e6db2fa48991b76b200c88a4c1ee Author: Andrew Cooper AuthorDate: Mon Dec 30 15:50:56 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86/pv: Store the data segment selectors outside of cpu_user_regs In order to support FRED, we're going to have to remove the {ds..gs} fields from struct cpu_user_regs. This will impact v->arch.user_regs. These fields are unused for HVM guests, but for PV hold the selector values when the vCPU is scheduled out. Introduce new fields for the selectors in struct pv_vcpu, and update: * {save,load}_segments(), context switching * arch_{set,set}_info_guest(), hypercalls * vcpu_show_registers(), diagnostics * dom0_construct(), PV dom0 to use the new storage. This removes the final user of read_sregs() so drop it too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 70 +++++++++++++++++++-------------------- xen/arch/x86/domctl.c | 16 ++++----- xen/arch/x86/include/asm/domain.h | 2 ++ xen/arch/x86/include/asm/regs.h | 8 ----- xen/arch/x86/pv/dom0_build.c | 6 ++-- xen/arch/x86/x86_64/traps.c | 8 ++--- 6 files changed, 53 insertions(+), 57 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 41d75dde42..28c91cf023 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1247,10 +1247,10 @@ int arch_set_info_guest( v->arch.user_regs.rflags = c.nat->user_regs.rflags; v->arch.user_regs.rsp = c.nat->user_regs.rsp; v->arch.user_regs.ss = c.nat->user_regs.ss; - v->arch.user_regs.es = c.nat->user_regs.es; - v->arch.user_regs.ds = c.nat->user_regs.ds; - v->arch.user_regs.fs = c.nat->user_regs.fs; - v->arch.user_regs.gs = c.nat->user_regs.gs; + v->arch.pv.es = c.nat->user_regs.es; + v->arch.pv.ds = c.nat->user_regs.ds; + v->arch.pv.fs = c.nat->user_regs.fs; + v->arch.pv.gs = c.nat->user_regs.gs; if ( is_pv_domain(d) ) memcpy(v->arch.pv.trap_ctxt, c.nat->trap_ctxt, @@ -1271,10 +1271,10 @@ int arch_set_info_guest( v->arch.user_regs.eflags = c.cmp->user_regs.eflags; v->arch.user_regs.esp = c.cmp->user_regs.esp; v->arch.user_regs.ss = c.cmp->user_regs.ss; - v->arch.user_regs.es = c.cmp->user_regs.es; - v->arch.user_regs.ds = c.cmp->user_regs.ds; - v->arch.user_regs.fs = c.cmp->user_regs.fs; - v->arch.user_regs.gs = c.cmp->user_regs.gs; + v->arch.pv.es = c.cmp->user_regs.es; + v->arch.pv.ds = c.cmp->user_regs.ds; + v->arch.pv.fs = c.cmp->user_regs.fs; + v->arch.pv.gs = c.cmp->user_regs.gs; if ( is_pv_domain(d) ) { @@ -1762,7 +1762,6 @@ long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) */ static void load_segments(struct vcpu *n) { - struct cpu_user_regs *uregs = &n->arch.user_regs; unsigned long gsb = 0, gss = 0; bool compat = is_pv_32bit_vcpu(n); bool all_segs_okay = true, fs_gs_done = false; @@ -1796,7 +1795,7 @@ static void load_segments(struct vcpu *n) if ( !(n->arch.flags & TF_kernel_mode) ) SWAP(gsb, gss); - if ( using_svm() && (uregs->fs | uregs->gs) <= 3 ) + if ( using_svm() && (n->arch.pv.fs | n->arch.pv.gs) <= 3 ) fs_gs_done = svm_load_segs(n->arch.pv.ldt_ents, LDT_VIRT_START(n), n->arch.pv.fs_base, gsb, gss); } @@ -1805,12 +1804,12 @@ static void load_segments(struct vcpu *n) { load_LDT(n); - TRY_LOAD_SEG(fs, uregs->fs); - TRY_LOAD_SEG(gs, uregs->gs); + TRY_LOAD_SEG(fs, n->arch.pv.fs); + TRY_LOAD_SEG(gs, n->arch.pv.gs); } - TRY_LOAD_SEG(ds, uregs->ds); - TRY_LOAD_SEG(es, uregs->es); + TRY_LOAD_SEG(ds, n->arch.pv.ds); + TRY_LOAD_SEG(es, n->arch.pv.es); if ( !fs_gs_done && !compat ) { @@ -1863,13 +1862,13 @@ static void load_segments(struct vcpu *n) } if ( ret | - put_guest(rflags, esp - 1) | - put_guest(cs_and_mask, esp - 2) | - put_guest(regs->eip, esp - 3) | - put_guest(uregs->gs, esp - 4) | - put_guest(uregs->fs, esp - 5) | - put_guest(uregs->es, esp - 6) | - put_guest(uregs->ds, esp - 7) ) + put_guest(rflags, esp - 1) | + put_guest(cs_and_mask, esp - 2) | + put_guest(regs->eip, esp - 3) | + put_guest(n->arch.pv.gs, esp - 4) | + put_guest(n->arch.pv.fs, esp - 5) | + put_guest(n->arch.pv.es, esp - 6) | + put_guest(n->arch.pv.ds, esp - 7) ) domain_crash(n->domain, "Error creating compat failsafe callback frame\n"); @@ -1895,17 +1894,17 @@ static void load_segments(struct vcpu *n) cs_and_mask = (unsigned long)regs->cs | ((unsigned long)vcpu_info(n, evtchn_upcall_mask) << 32); - if ( put_guest(regs->ss, rsp - 1) | - put_guest(regs->rsp, rsp - 2) | - put_guest(rflags, rsp - 3) | - put_guest(cs_and_mask, rsp - 4) | - put_guest(regs->rip, rsp - 5) | - put_guest(uregs->gs, rsp - 6) | - put_guest(uregs->fs, rsp - 7) | - put_guest(uregs->es, rsp - 8) | - put_guest(uregs->ds, rsp - 9) | - put_guest(regs->r11, rsp - 10) | - put_guest(regs->rcx, rsp - 11) ) + if ( put_guest(regs->ss, rsp - 1) | + put_guest(regs->rsp, rsp - 2) | + put_guest(rflags, rsp - 3) | + put_guest(cs_and_mask, rsp - 4) | + put_guest(regs->rip, rsp - 5) | + put_guest(n->arch.pv.gs, rsp - 6) | + put_guest(n->arch.pv.fs, rsp - 7) | + put_guest(n->arch.pv.es, rsp - 8) | + put_guest(n->arch.pv.ds, rsp - 9) | + put_guest(regs->r11, rsp - 10) | + put_guest(regs->rcx, rsp - 11) ) domain_crash(n->domain, "Error creating failsafe callback frame\n"); @@ -1934,9 +1933,10 @@ static void load_segments(struct vcpu *n) */ static void save_segments(struct vcpu *v) { - struct cpu_user_regs *regs = &v->arch.user_regs; - - read_sregs(regs); + asm ( "mov %%ds, %0" : "=m" (v->arch.pv.ds) ); + asm ( "mov %%es, %0" : "=m" (v->arch.pv.es) ); + asm ( "mov %%fs, %0" : "=m" (v->arch.pv.fs) ); + asm ( "mov %%gs, %0" : "=m" (v->arch.pv.gs) ); if ( !is_pv_32bit_vcpu(v) ) { diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 28fec0e12d..3e94af51a7 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1412,10 +1412,10 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c.nat->user_regs.rflags = v->arch.user_regs.rflags; c.nat->user_regs.rsp = v->arch.user_regs.rsp; c.nat->user_regs.ss = v->arch.user_regs.ss; - c.nat->user_regs.es = v->arch.user_regs.es; - c.nat->user_regs.ds = v->arch.user_regs.ds; - c.nat->user_regs.fs = v->arch.user_regs.fs; - c.nat->user_regs.gs = v->arch.user_regs.gs; + c.nat->user_regs.es = v->arch.pv.es; + c.nat->user_regs.ds = v->arch.pv.ds; + c.nat->user_regs.fs = v->arch.pv.fs; + c.nat->user_regs.gs = v->arch.pv.gs; if ( is_pv_domain(d) ) memcpy(c.nat->trap_ctxt, v->arch.pv.trap_ctxt, @@ -1437,10 +1437,10 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c.cmp->user_regs.eflags = v->arch.user_regs.eflags; c.cmp->user_regs.esp = v->arch.user_regs.esp; c.cmp->user_regs.ss = v->arch.user_regs.ss; - c.cmp->user_regs.es = v->arch.user_regs.es; - c.cmp->user_regs.ds = v->arch.user_regs.ds; - c.cmp->user_regs.fs = v->arch.user_regs.fs; - c.cmp->user_regs.gs = v->arch.user_regs.gs; + c.cmp->user_regs.es = v->arch.pv.es; + c.cmp->user_regs.ds = v->arch.pv.ds; + c.cmp->user_regs.fs = v->arch.pv.fs; + c.cmp->user_regs.gs = v->arch.pv.gs; if ( is_pv_domain(d) ) { diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index 8c0dea12a5..c31e74c6fa 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -546,6 +546,8 @@ struct pv_vcpu bool syscall32_disables_events; bool sysenter_disables_events; + uint16_t ds, es, fs, gs; + /* * 64bit segment bases. * diff --git a/xen/arch/x86/include/asm/regs.h b/xen/arch/x86/include/asm/regs.h index 60b0d7b873..ce9b028276 100644 --- a/xen/arch/x86/include/asm/regs.h +++ b/xen/arch/x86/include/asm/regs.h @@ -44,12 +44,4 @@ __sel; \ }) -static inline void read_sregs(struct cpu_user_regs *regs) -{ - asm ( "mov %%ds, %0" : "=m" (regs->ds) ); - asm ( "mov %%es, %0" : "=m" (regs->es) ); - asm ( "mov %%fs, %0" : "=m" (regs->fs) ); - asm ( "mov %%gs, %0" : "=m" (regs->gs) ); -} - #endif /* __X86_REGS_H__ */ diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index c37bea9454..21158ce181 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -1012,8 +1012,10 @@ static int __init dom0_construct(const struct boot_domain *bd) * [rAX,rBX,rCX,rDX,rDI,rBP,R8-R15 are zero] */ regs = &v->arch.user_regs; - regs->ds = regs->es = regs->fs = regs->gs = - (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.ds = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.es = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.fs = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.gs = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); regs->ss = (compat ? FLAT_COMPAT_KERNEL_SS : FLAT_KERNEL_SS); regs->cs = (compat ? FLAT_COMPAT_KERNEL_CS : FLAT_KERNEL_CS); regs->rip = parms.virt_entry; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 8460a4a1ae..29ac5a14ca 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -220,10 +220,10 @@ void vcpu_show_registers(struct vcpu *v) state.gsb = gsb; state.gss = gss; - state.ds = v->arch.user_regs.ds; - state.es = v->arch.user_regs.es; - state.fs = v->arch.user_regs.fs; - state.gs = v->arch.user_regs.gs; + state.ds = v->arch.pv.ds; + state.es = v->arch.pv.es; + state.fs = v->arch.pv.fs; + state.gs = v->arch.pv.gs; context = CTXT_pv_guest; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 12:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 12:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074365.1437002 (Exim 4.92) (envelope-from ) id 1ukMHj-0001ft-Pw; Fri, 08 Aug 2025 12:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074365.1437002; Fri, 08 Aug 2025 12:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHj-0001fl-M5; Fri, 08 Aug 2025 12:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1074365; Fri, 08 Aug 2025 12:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHh-0001fU-Ti for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukMHh-007wyZ-2p for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukMHh-0094su-2W for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jfpn0zQrX2LJOy1ywoSf71r7HErJmjjeltpszFHZZw8=; b=uWlCBnQUs+zs9LRLYh/pFLDfp3 rmoaYrmJXd2boRWg8mJCMPdtK8XJol7DSk4dDl6h/NZt9wfu5vo+fU54acUCdWCjNAiXngZ4lhJS+ 3llzlTtD0UTz7vriZVE4k4I5NXFyeg1E1SjKB9mFfF7W/CU+REp6tG5D+PYypwQVvvBM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/public: Split the struct cpu_user_regs type Message-Id: Date: Fri, 08 Aug 2025 12:33:21 +0000 commit e473f2bb87e598114e3177b12d2bc07e17766f6d Author: Andrew Cooper AuthorDate: Sun Dec 29 17:40:54 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86/public: Split the struct cpu_user_regs type In order to support FRED, we're going to have to remove the {ds..gs} fields from struct cpu_user_regs, meaning that it is going to have to become a different type to the structure embedded in vcpu_guest_context_u. struct cpu_user_regs is a name used in common Xen code (i.e. needs to stay using this name), so renaming the public struct to be guest_user_regs in Xen's view only. Introduce a brand hew cpu-user-regs.h, currently containing a duplicate structure. Notably, this removes the need to include pubic/xen.h in ~every translation unit in Xen (via current.h), and highlights one case where the emulator was picking up cpu_user_regs transitively. Include comments describing how hardware interacts with this structure under IDT delivery, as it's quite magic to start with. FRED is going make things more complicated. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/include/asm/cpu-user-regs.h | 63 ++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/current.h | 3 +- xen/arch/x86/x86_emulate/private.h | 1 + xen/include/public/arch-x86/xen-x86_32.h | 9 +++++ xen/include/public/arch-x86/xen-x86_64.h | 9 +++++ xen/include/public/arch-x86/xen.h | 11 ++++++ 6 files changed, 95 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h new file mode 100644 index 0000000000..0e78e38ed0 --- /dev/null +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef X86_CPU_USER_REGS_H +#define X86_CPU_USER_REGS_H + +#include + +/* + * cpu_user_regs represents the interrupted GPR state at the point of an + * interrupt, exception or syscall. The layout is dictated by the hardware + * format for the event frame, with software filling in the rest. + */ +struct cpu_user_regs +{ + union { uint64_t r15; uint32_t r15d; uint16_t r15w; uint8_t r15b; }; + union { uint64_t r14; uint32_t r14d; uint16_t r14w; uint8_t r14b; }; + union { uint64_t r13; uint32_t r13d; uint16_t r13w; uint8_t r13b; }; + union { uint64_t r12; uint32_t r12d; uint16_t r12w; uint8_t r12b; }; + union { uint64_t rbp; uint32_t ebp; uint16_t bp; uint8_t bpl; }; + union { uint64_t rbx; uint32_t ebx; uint16_t bx; struct { uint8_t bl, bh; }; }; + union { uint64_t r11; uint32_t r11d; uint16_t r11w; uint8_t r11b; }; + union { uint64_t r10; uint32_t r10d; uint16_t r10w; uint8_t r10b; }; + union { uint64_t r9; uint32_t r9d; uint16_t r9w; uint8_t r9b; }; + union { uint64_t r8; uint32_t r8d; uint16_t r8w; uint8_t r8b; }; + union { uint64_t rax; uint32_t eax; uint16_t ax; struct { uint8_t al, ah; }; }; + union { uint64_t rcx; uint32_t ecx; uint16_t cx; struct { uint8_t cl, ch; }; }; + union { uint64_t rdx; uint32_t edx; uint16_t dx; struct { uint8_t dl, dh; }; }; + union { uint64_t rsi; uint32_t esi; uint16_t si; uint8_t sil; }; + union { uint64_t rdi; uint32_t edi; uint16_t di; uint8_t dil; }; + + /* + * During IDT delivery for exceptions with an error code, hardware pushes + * to this point. Entry_vector is filled in by software. + */ + + uint32_t error_code; + uint32_t entry_vector; + + /* + * During IDT delivery for interrupts or exceptions without an error code, + * hardware pushes to this point. Both error_code and entry_vector are + * filled in by software. + */ + + union { uint64_t rip; uint32_t eip; uint16_t ip; }; + uint16_t cs, _pad0[1]; + uint8_t saved_upcall_mask; /* PV (v)rflags.IF == !saved_upcall_mask */ + uint8_t _pad1[3]; + union { uint64_t rflags; uint32_t eflags; uint16_t flags; }; + union { uint64_t rsp; uint32_t esp; uint16_t sp; uint8_t spl; }; + uint16_t ss, _pad2[3]; + + /* + * For IDT delivery, tss->rsp0 points to this boundary as embedded within + * struct cpu_info. It must be 16-byte aligned. + */ + + uint16_t es, _pad3[3]; + uint16_t ds, _pad4[3]; + uint16_t fs, _pad5[3]; + uint16_t gs, _pad6[3]; +}; + +#endif /* X86_CPU_USER_REGS_H */ diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index bcec328c98..243d17ef79 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -9,7 +9,8 @@ #include #include -#include + +#include /* * Xen's cpu stacks are 8 pages (8-page aligned), arranged as: diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 9400879870..24c79c4e8f 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -14,6 +14,7 @@ # include # include +# include # include # include # include diff --git a/xen/include/public/arch-x86/xen-x86_32.h b/xen/include/public/arch-x86/xen-x86_32.h index 9e3bf06b12..25cc447288 100644 --- a/xen/include/public/arch-x86/xen-x86_32.h +++ b/xen/include/public/arch-x86/xen-x86_32.h @@ -114,6 +114,10 @@ #define __DECL_REG_LO16(name) uint32_t e ## name #endif +#ifdef __XEN__ +#define cpu_user_regs guest_user_regs +#endif + struct cpu_user_regs { __DECL_REG_LO8(b); __DECL_REG_LO8(c); @@ -136,8 +140,13 @@ struct cpu_user_regs { uint16_t fs, _pad4; uint16_t gs, _pad5; }; + +#ifdef __XEN__ +#undef cpu_user_regs +#else typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); +#endif #undef __DECL_REG_LO8 #undef __DECL_REG_LO16 diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h index 43f6e3d220..ea6b56aa3b 100644 --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -159,6 +159,10 @@ struct iret_context { #define __DECL_REG_HI(num) uint64_t r ## num #endif +#ifdef __XEN__ +#define cpu_user_regs guest_user_regs +#endif + struct cpu_user_regs { __DECL_REG_HI(15); __DECL_REG_HI(14); @@ -189,8 +193,13 @@ struct cpu_user_regs { uint16_t fs, _pad5[3]; uint16_t gs, _pad6[3]; }; + +#ifdef __XEN__ +#undef cpu_user_regs +#else typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); +#endif #undef __DECL_REG #undef __DECL_REG_LOHI diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index fc24879866..b99a691706 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -173,7 +173,18 @@ struct vcpu_guest_context { #define _VGCF_online 5 #define VGCF_online (1<<_VGCF_online) unsigned long flags; /* VGCF_* flags */ + + /* + * Outside of Xen, regs type stays named cpu_user_regs for backwards + * compatibility. Inside Xen, the type called cpu_user_regs is different, + * and the public API type is renamed to guest_user_regs. + */ +#ifdef __XEN__ + struct guest_user_regs user_regs; /* User-level CPU registers */ +#else struct cpu_user_regs user_regs; /* User-level CPU registers */ +#endif + struct trap_info trap_ctxt[256]; /* Virtual IDT */ unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 12:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 12:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074366.1437004 (Exim 4.92) (envelope-from ) id 1ukMHt-0001iv-RU; Fri, 08 Aug 2025 12:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074366.1437004; Fri, 08 Aug 2025 12:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHt-0001in-Ou; Fri, 08 Aug 2025 12:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1074366; Fri, 08 Aug 2025 12:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukMHr-0001iZ-W9 for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukMHr-007wyf-37 for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukMHr-0094tf-31 for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 12:33:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=K9f1MC0alcxtnaBTBp6/y+fhYKnB4IvOVlwV7i7e4Tw=; b=IqiO08JrQRojlUZNt6wPihW8aS Pilq5jZ6CVeV3/9SXtwzoTyOFpFie7PVpa+LhWSzK68/18U9x8rGjPpdCpfrjT447Z4OC2avFmam9 m4UFSwqRIX9rN6KLLaFaD4+rqC9A9B2ES4DJqnTeVoujFt++Wg04VaWIk0djZY7XWk3U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Drop the vm86 segments selectors from struct cpu_user_regs Message-Id: Date: Fri, 08 Aug 2025 12:33:31 +0000 commit 3c66a25672b4943a5a51d52f57038cdad6f9349e Author: Andrew Cooper AuthorDate: Sun Dec 29 14:46:34 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86: Drop the vm86 segments selectors from struct cpu_user_regs The data segment registers are part of the on-stack IRET frame when interrupting Virtual 8086 mode, but this ceased being relevant for Xen in commit 5d1181a5ea5e ("xen: Remove x86_32 build target.") in 2012. With all other cleanup in place, delete the fields so we can introduce FRED support which uses this space for different data. Everywhere which used the es field as an offset in cpu_user_regs needs adjusting. However, they'll change again for FRED, so no cleanup is performed at this juncture. This also undoes the OoB Read workaround in show_registers(), which can now switch back to being simple structure copy. No functional change, but a lot of rearranging of stack and struct layout under the hood. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/include/asm/cpu-user-regs.h | 5 ----- xen/arch/x86/include/asm/current.h | 8 ++++---- xen/arch/x86/include/asm/hvm/hvm.h | 4 ---- xen/arch/x86/include/asm/regs.h | 3 +-- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/asm-offsets.c | 2 +- xen/arch/x86/x86_64/traps.c | 8 +------- 8 files changed, 9 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e063fe790a..97bdda1d4a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -959,7 +959,7 @@ void load_system_tables(void) * Defer checks until exception support is sufficiently set up. */ BUILD_BUG_ON((sizeof(struct cpu_info) - - offsetof(struct cpu_info, guest_cpu_user_regs.es)) & 0xf); + sizeof(struct cpu_user_regs)) & 0xf); BUG_ON(system_state != SYS_STATE_early_boot && (stack_bottom & 0xf)); } diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h index 0e78e38ed0..d700a3ef34 100644 --- a/xen/arch/x86/include/asm/cpu-user-regs.h +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -53,11 +53,6 @@ struct cpu_user_regs * For IDT delivery, tss->rsp0 points to this boundary as embedded within * struct cpu_info. It must be 16-byte aligned. */ - - uint16_t es, _pad3[3]; - uint16_t ds, _pad4[3]; - uint16_t fs, _pad5[3]; - uint16_t gs, _pad6[3]; }; #endif /* X86_CPU_USER_REGS_H */ diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index 243d17ef79..a7c9473428 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -106,12 +106,12 @@ static inline struct cpu_info *get_cpu_info(void) #define get_per_cpu_offset() (get_cpu_info()->per_cpu_offset) /* - * Get the bottom-of-stack, as stored in the per-CPU TSS. This actually points - * into the middle of cpu_info.guest_cpu_user_regs, at the section that - * precisely corresponds to a CPU trap frame. + * Get the bottom-of-stack, as stored in the per-CPU TSS. This points at the + * end of cpu_info.guest_cpu_user_regs, at the section that precisely + * corresponds to a CPU trap frame. */ #define get_stack_bottom() \ - ((unsigned long)&get_cpu_info()->guest_cpu_user_regs.es) + ((unsigned long)(&get_cpu_info()->guest_cpu_user_regs + 1)) /* * Get the reasonable stack bounds for stack traces and stack dumps. Stack diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index bf8bc2e100..18e40910ff 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -624,10 +624,6 @@ static inline void hvm_sanitize_regs_fields(struct cpu_user_regs *regs, regs->saved_upcall_mask = 0xbf; regs->cs = 0xbeef; regs->ss = 0xbeef; - regs->ds = 0xbeef; - regs->es = 0xbeef; - regs->fs = 0xbeef; - regs->gs = 0xbeef; #endif } diff --git a/xen/arch/x86/include/asm/regs.h b/xen/arch/x86/include/asm/regs.h index ce9b028276..72595110e2 100644 --- a/xen/arch/x86/include/asm/regs.h +++ b/xen/arch/x86/include/asm/regs.h @@ -23,8 +23,7 @@ (!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0)) /* Number of bytes of on-stack execution state to be context-switched. */ -/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */ -#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es)) +#define CTXT_SWITCH_STACK_BYTES sizeof(struct cpu_user_regs) #define guest_mode(r) \ ({ \ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 34dc077cad..238d923dd1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -387,7 +387,7 @@ unsigned long get_stack_trace_bottom(unsigned long sp) { case 1 ... 4: return ROUNDUP(sp, PAGE_SIZE) - - offsetof(struct cpu_user_regs, es) - sizeof(unsigned long); + sizeof(struct cpu_user_regs) - sizeof(unsigned long); case 6 ... 7: return ROUNDUP(sp, STACK_SIZE) - diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 630bdc3945..2258b4ce1b 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -52,7 +52,7 @@ void __dummy__(void) OFFSET(UREGS_eflags, struct cpu_user_regs, rflags); OFFSET(UREGS_rsp, struct cpu_user_regs, rsp); OFFSET(UREGS_ss, struct cpu_user_regs, ss); - OFFSET(UREGS_kernel_sizeof, struct cpu_user_regs, es); + DEFINE(UREGS_kernel_sizeof, sizeof(struct cpu_user_regs)); BLANK(); /* diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 29ac5a14ca..34adf55e48 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -135,17 +135,11 @@ static void _show_registers( void show_registers(const struct cpu_user_regs *regs) { - struct cpu_user_regs fault_regs; + struct cpu_user_regs fault_regs = *regs; struct extra_state fault_state; enum context context; struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; - /* - * Don't read beyond the end of the hardware frame. It is out of bounds - * for WARN()/etc. - */ - memcpy(&fault_regs, regs, offsetof(struct cpu_user_regs, es)); - if ( guest_mode(regs) && is_hvm_vcpu(v) ) { get_hvm_registers(v, &fault_regs, &fault_state); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 15:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 15:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074807.1437301 (Exim 4.92) (envelope-from ) id 1ukP5b-0005N8-35; Fri, 08 Aug 2025 15:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074807.1437301; Fri, 08 Aug 2025 15:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP5b-0005N0-0X; Fri, 08 Aug 2025 15:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1074807; Fri, 08 Aug 2025 15:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP5a-0005Mu-0h for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukP5Z-0080fj-29 for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukP5Z-009Cn8-1x for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eKcsm/spRcn9BgeytjafpcPpcJ/XdX8p6XHIuQRFNEU=; b=pUvSiB4ntiFIyzp2uxxCjeBrQr L6pIJfKzhVZSaZCh2pEPTN8Vjvb2zgsbUV11wVQgUlnaeUAviCxrRNzRZslcr2Q1hGOtzb/GiVbfZ FiSzbFdhw68NxhayIUj4p6sfUEvbFllSbJ75rVSbUcbBhQKerq5+XS8Tt/VWnVObkIW4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/domctl: Stop using XLAT_cpu_user_regs() Message-Id: Date: Fri, 08 Aug 2025 15:33:01 +0000 commit 9f892f84c27970840d255aef7e2851b762967de7 Author: Andrew Cooper AuthorDate: Mon Dec 30 11:49:14 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86/domctl: Stop using XLAT_cpu_user_regs() In order to support FRED, we're going to have to remove the {ds..gs} fields from struct cpu_user_regs, meaning that it is going to have to become a different type to the structure embedded in vcpu_guest_context_u. In both arch_{get,set}_info_guest(), expand the memcpy()/XLAT_cpu_user_regs() to copy the fields individually. This will allow us to eventually make them different types. This does cause some minor changes in behaviour for the hypercalls. It is specifically not the case that a toolstack could set_info(); get_info(); and get an identical bit pattern back. Amongst other things, the architectural sticky bits in registers are applied during setting. Previously, XLAT_cpu_user_regs() omitted the _pad fields in the compat case whereas the non-compat case included them owing to the single memcpy(). Omit the _pad fields in the non-compat case too; for all but the oldest of CPUs, the segment selectors are zero-extended by hardware when pushed onto the stack, so non-zero values here get lost naturally. Furthermore, FRED reuses the space above cs and ss for extra state, and a PV guest for now at least must not be able to write the control state. Omit the error_code and entry_vector fields too. They're already identified as private fields in the public API, and are stale outside of Xen's interrupt/exception/syscall handler. They're also a very minor information leak of which event caused the last deschedule of a vCPU. Finally, omit saved_upcall_mask. Xen doesn't consume this, and only produces it in {compat_,}create_bounce_frame(), based on the vcpu_info shared state and settings about the event being injected. Similar to error_code/entry_vector, it is stale outside of the guest's event handler. No change that toolstacks or guests are expected to notice or care about. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 38 ++++++++++++++++++++++++++++++++++++-- xen/arch/x86/domctl.c | 38 ++++++++++++++++++++++++++++++++++++-- xen/include/xlat.lst | 2 -- 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 56c3816187..41d75dde42 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1231,9 +1231,27 @@ int arch_set_info_guest( else vcpu_reset_fpu(v); + memset(&v->arch.user_regs, 0, sizeof(v->arch.user_regs)); + if ( !compat ) { - memcpy(&v->arch.user_regs, &c.nat->user_regs, sizeof(c.nat->user_regs)); + v->arch.user_regs.rbx = c.nat->user_regs.rbx; + v->arch.user_regs.rcx = c.nat->user_regs.rcx; + v->arch.user_regs.rdx = c.nat->user_regs.rdx; + v->arch.user_regs.rsi = c.nat->user_regs.rsi; + v->arch.user_regs.rdi = c.nat->user_regs.rdi; + v->arch.user_regs.rbp = c.nat->user_regs.rbp; + v->arch.user_regs.rax = c.nat->user_regs.rax; + v->arch.user_regs.rip = c.nat->user_regs.rip; + v->arch.user_regs.cs = c.nat->user_regs.cs; + v->arch.user_regs.rflags = c.nat->user_regs.rflags; + v->arch.user_regs.rsp = c.nat->user_regs.rsp; + v->arch.user_regs.ss = c.nat->user_regs.ss; + v->arch.user_regs.es = c.nat->user_regs.es; + v->arch.user_regs.ds = c.nat->user_regs.ds; + v->arch.user_regs.fs = c.nat->user_regs.fs; + v->arch.user_regs.gs = c.nat->user_regs.gs; + if ( is_pv_domain(d) ) memcpy(v->arch.pv.trap_ctxt, c.nat->trap_ctxt, sizeof(c.nat->trap_ctxt)); @@ -1241,7 +1259,23 @@ int arch_set_info_guest( #ifdef CONFIG_COMPAT else { - XLAT_cpu_user_regs(&v->arch.user_regs, &c.cmp->user_regs); + v->arch.user_regs.ebx = c.cmp->user_regs.ebx; + v->arch.user_regs.ecx = c.cmp->user_regs.ecx; + v->arch.user_regs.edx = c.cmp->user_regs.edx; + v->arch.user_regs.esi = c.cmp->user_regs.esi; + v->arch.user_regs.edi = c.cmp->user_regs.edi; + v->arch.user_regs.ebp = c.cmp->user_regs.ebp; + v->arch.user_regs.eax = c.cmp->user_regs.eax; + v->arch.user_regs.eip = c.cmp->user_regs.eip; + v->arch.user_regs.cs = c.cmp->user_regs.cs; + v->arch.user_regs.eflags = c.cmp->user_regs.eflags; + v->arch.user_regs.esp = c.cmp->user_regs.esp; + v->arch.user_regs.ss = c.cmp->user_regs.ss; + v->arch.user_regs.es = c.cmp->user_regs.es; + v->arch.user_regs.ds = c.cmp->user_regs.ds; + v->arch.user_regs.fs = c.cmp->user_regs.fs; + v->arch.user_regs.gs = c.cmp->user_regs.gs; + if ( is_pv_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3044f706de..28fec0e12d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1399,7 +1399,24 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c(flags |= VGCF_online); if ( !compat ) { - memcpy(&c.nat->user_regs, &v->arch.user_regs, sizeof(c.nat->user_regs)); + /* Backing memory is pre-zeroed. */ + c.nat->user_regs.rbx = v->arch.user_regs.rbx; + c.nat->user_regs.rcx = v->arch.user_regs.rcx; + c.nat->user_regs.rdx = v->arch.user_regs.rdx; + c.nat->user_regs.rsi = v->arch.user_regs.rsi; + c.nat->user_regs.rdi = v->arch.user_regs.rdi; + c.nat->user_regs.rbp = v->arch.user_regs.rbp; + c.nat->user_regs.rax = v->arch.user_regs.rax; + c.nat->user_regs.rip = v->arch.user_regs.rip; + c.nat->user_regs.cs = v->arch.user_regs.cs; + c.nat->user_regs.rflags = v->arch.user_regs.rflags; + c.nat->user_regs.rsp = v->arch.user_regs.rsp; + c.nat->user_regs.ss = v->arch.user_regs.ss; + c.nat->user_regs.es = v->arch.user_regs.es; + c.nat->user_regs.ds = v->arch.user_regs.ds; + c.nat->user_regs.fs = v->arch.user_regs.fs; + c.nat->user_regs.gs = v->arch.user_regs.gs; + if ( is_pv_domain(d) ) memcpy(c.nat->trap_ctxt, v->arch.pv.trap_ctxt, sizeof(c.nat->trap_ctxt)); @@ -1407,7 +1424,24 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) #ifdef CONFIG_COMPAT else { - XLAT_cpu_user_regs(&c.cmp->user_regs, &v->arch.user_regs); + /* Backing memory is pre-zeroed. */ + c.cmp->user_regs.ebx = v->arch.user_regs.ebx; + c.cmp->user_regs.ecx = v->arch.user_regs.ecx; + c.cmp->user_regs.edx = v->arch.user_regs.edx; + c.cmp->user_regs.esi = v->arch.user_regs.esi; + c.cmp->user_regs.edi = v->arch.user_regs.edi; + c.cmp->user_regs.ebp = v->arch.user_regs.ebp; + c.cmp->user_regs.eax = v->arch.user_regs.eax; + c.cmp->user_regs.eip = v->arch.user_regs.eip; + c.cmp->user_regs.cs = v->arch.user_regs.cs; + c.cmp->user_regs.eflags = v->arch.user_regs.eflags; + c.cmp->user_regs.esp = v->arch.user_regs.esp; + c.cmp->user_regs.ss = v->arch.user_regs.ss; + c.cmp->user_regs.es = v->arch.user_regs.es; + c.cmp->user_regs.ds = v->arch.user_regs.ds; + c.cmp->user_regs.fs = v->arch.user_regs.fs; + c.cmp->user_regs.gs = v->arch.user_regs.gs; + if ( is_pv_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); ++i ) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 3c7b6c6830..6d6c6cfab2 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -34,8 +34,6 @@ ? pmu_intel_ctxt arch-x86/pmu.h ? pmu_regs arch-x86/pmu.h -! cpu_user_regs arch-x86/xen-@arch@.h - ? cpu_offline_action arch-x86/xen-mca.h ? mc arch-x86/xen-mca.h ! mc_fetch arch-x86/xen-mca.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 15:33:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 15:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074809.1437304 (Exim 4.92) (envelope-from ) id 1ukP5l-0005PJ-4a; Fri, 08 Aug 2025 15:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074809.1437304; Fri, 08 Aug 2025 15:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP5l-0005PB-1w; Fri, 08 Aug 2025 15:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1074809; Fri, 08 Aug 2025 15:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP5j-0005Ov-Q6 for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukP5j-0080g0-2T for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukP5j-009Cns-2M for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MVmZOsqc3/ruT/8+r8eZqunZeAj0mWtUJITtiRu9lnw=; b=c6cZt9hcH1xGUkO6Fy+WemKYvW INNB7KyqxSvYTRyAUX78Nv+18r436uQgeUGmZ/l0YSH+h+5q575TyXi+fK5qoQkiIXJ2ADYcx2Xi5 3HNCK+NNIP3QK/7aga83CaVrczu2c5TRlpTIuevmVf1LmUlSvd673SUjzxYYKTfYVMhE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Store the data segment selectors outside of cpu_user_regs Message-Id: Date: Fri, 08 Aug 2025 15:33:11 +0000 commit 68ae02120aa2e6db2fa48991b76b200c88a4c1ee Author: Andrew Cooper AuthorDate: Mon Dec 30 15:50:56 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86/pv: Store the data segment selectors outside of cpu_user_regs In order to support FRED, we're going to have to remove the {ds..gs} fields from struct cpu_user_regs. This will impact v->arch.user_regs. These fields are unused for HVM guests, but for PV hold the selector values when the vCPU is scheduled out. Introduce new fields for the selectors in struct pv_vcpu, and update: * {save,load}_segments(), context switching * arch_{set,set}_info_guest(), hypercalls * vcpu_show_registers(), diagnostics * dom0_construct(), PV dom0 to use the new storage. This removes the final user of read_sregs() so drop it too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 70 +++++++++++++++++++-------------------- xen/arch/x86/domctl.c | 16 ++++----- xen/arch/x86/include/asm/domain.h | 2 ++ xen/arch/x86/include/asm/regs.h | 8 ----- xen/arch/x86/pv/dom0_build.c | 6 ++-- xen/arch/x86/x86_64/traps.c | 8 ++--- 6 files changed, 53 insertions(+), 57 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 41d75dde42..28c91cf023 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1247,10 +1247,10 @@ int arch_set_info_guest( v->arch.user_regs.rflags = c.nat->user_regs.rflags; v->arch.user_regs.rsp = c.nat->user_regs.rsp; v->arch.user_regs.ss = c.nat->user_regs.ss; - v->arch.user_regs.es = c.nat->user_regs.es; - v->arch.user_regs.ds = c.nat->user_regs.ds; - v->arch.user_regs.fs = c.nat->user_regs.fs; - v->arch.user_regs.gs = c.nat->user_regs.gs; + v->arch.pv.es = c.nat->user_regs.es; + v->arch.pv.ds = c.nat->user_regs.ds; + v->arch.pv.fs = c.nat->user_regs.fs; + v->arch.pv.gs = c.nat->user_regs.gs; if ( is_pv_domain(d) ) memcpy(v->arch.pv.trap_ctxt, c.nat->trap_ctxt, @@ -1271,10 +1271,10 @@ int arch_set_info_guest( v->arch.user_regs.eflags = c.cmp->user_regs.eflags; v->arch.user_regs.esp = c.cmp->user_regs.esp; v->arch.user_regs.ss = c.cmp->user_regs.ss; - v->arch.user_regs.es = c.cmp->user_regs.es; - v->arch.user_regs.ds = c.cmp->user_regs.ds; - v->arch.user_regs.fs = c.cmp->user_regs.fs; - v->arch.user_regs.gs = c.cmp->user_regs.gs; + v->arch.pv.es = c.cmp->user_regs.es; + v->arch.pv.ds = c.cmp->user_regs.ds; + v->arch.pv.fs = c.cmp->user_regs.fs; + v->arch.pv.gs = c.cmp->user_regs.gs; if ( is_pv_domain(d) ) { @@ -1762,7 +1762,6 @@ long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) */ static void load_segments(struct vcpu *n) { - struct cpu_user_regs *uregs = &n->arch.user_regs; unsigned long gsb = 0, gss = 0; bool compat = is_pv_32bit_vcpu(n); bool all_segs_okay = true, fs_gs_done = false; @@ -1796,7 +1795,7 @@ static void load_segments(struct vcpu *n) if ( !(n->arch.flags & TF_kernel_mode) ) SWAP(gsb, gss); - if ( using_svm() && (uregs->fs | uregs->gs) <= 3 ) + if ( using_svm() && (n->arch.pv.fs | n->arch.pv.gs) <= 3 ) fs_gs_done = svm_load_segs(n->arch.pv.ldt_ents, LDT_VIRT_START(n), n->arch.pv.fs_base, gsb, gss); } @@ -1805,12 +1804,12 @@ static void load_segments(struct vcpu *n) { load_LDT(n); - TRY_LOAD_SEG(fs, uregs->fs); - TRY_LOAD_SEG(gs, uregs->gs); + TRY_LOAD_SEG(fs, n->arch.pv.fs); + TRY_LOAD_SEG(gs, n->arch.pv.gs); } - TRY_LOAD_SEG(ds, uregs->ds); - TRY_LOAD_SEG(es, uregs->es); + TRY_LOAD_SEG(ds, n->arch.pv.ds); + TRY_LOAD_SEG(es, n->arch.pv.es); if ( !fs_gs_done && !compat ) { @@ -1863,13 +1862,13 @@ static void load_segments(struct vcpu *n) } if ( ret | - put_guest(rflags, esp - 1) | - put_guest(cs_and_mask, esp - 2) | - put_guest(regs->eip, esp - 3) | - put_guest(uregs->gs, esp - 4) | - put_guest(uregs->fs, esp - 5) | - put_guest(uregs->es, esp - 6) | - put_guest(uregs->ds, esp - 7) ) + put_guest(rflags, esp - 1) | + put_guest(cs_and_mask, esp - 2) | + put_guest(regs->eip, esp - 3) | + put_guest(n->arch.pv.gs, esp - 4) | + put_guest(n->arch.pv.fs, esp - 5) | + put_guest(n->arch.pv.es, esp - 6) | + put_guest(n->arch.pv.ds, esp - 7) ) domain_crash(n->domain, "Error creating compat failsafe callback frame\n"); @@ -1895,17 +1894,17 @@ static void load_segments(struct vcpu *n) cs_and_mask = (unsigned long)regs->cs | ((unsigned long)vcpu_info(n, evtchn_upcall_mask) << 32); - if ( put_guest(regs->ss, rsp - 1) | - put_guest(regs->rsp, rsp - 2) | - put_guest(rflags, rsp - 3) | - put_guest(cs_and_mask, rsp - 4) | - put_guest(regs->rip, rsp - 5) | - put_guest(uregs->gs, rsp - 6) | - put_guest(uregs->fs, rsp - 7) | - put_guest(uregs->es, rsp - 8) | - put_guest(uregs->ds, rsp - 9) | - put_guest(regs->r11, rsp - 10) | - put_guest(regs->rcx, rsp - 11) ) + if ( put_guest(regs->ss, rsp - 1) | + put_guest(regs->rsp, rsp - 2) | + put_guest(rflags, rsp - 3) | + put_guest(cs_and_mask, rsp - 4) | + put_guest(regs->rip, rsp - 5) | + put_guest(n->arch.pv.gs, rsp - 6) | + put_guest(n->arch.pv.fs, rsp - 7) | + put_guest(n->arch.pv.es, rsp - 8) | + put_guest(n->arch.pv.ds, rsp - 9) | + put_guest(regs->r11, rsp - 10) | + put_guest(regs->rcx, rsp - 11) ) domain_crash(n->domain, "Error creating failsafe callback frame\n"); @@ -1934,9 +1933,10 @@ static void load_segments(struct vcpu *n) */ static void save_segments(struct vcpu *v) { - struct cpu_user_regs *regs = &v->arch.user_regs; - - read_sregs(regs); + asm ( "mov %%ds, %0" : "=m" (v->arch.pv.ds) ); + asm ( "mov %%es, %0" : "=m" (v->arch.pv.es) ); + asm ( "mov %%fs, %0" : "=m" (v->arch.pv.fs) ); + asm ( "mov %%gs, %0" : "=m" (v->arch.pv.gs) ); if ( !is_pv_32bit_vcpu(v) ) { diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 28fec0e12d..3e94af51a7 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1412,10 +1412,10 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c.nat->user_regs.rflags = v->arch.user_regs.rflags; c.nat->user_regs.rsp = v->arch.user_regs.rsp; c.nat->user_regs.ss = v->arch.user_regs.ss; - c.nat->user_regs.es = v->arch.user_regs.es; - c.nat->user_regs.ds = v->arch.user_regs.ds; - c.nat->user_regs.fs = v->arch.user_regs.fs; - c.nat->user_regs.gs = v->arch.user_regs.gs; + c.nat->user_regs.es = v->arch.pv.es; + c.nat->user_regs.ds = v->arch.pv.ds; + c.nat->user_regs.fs = v->arch.pv.fs; + c.nat->user_regs.gs = v->arch.pv.gs; if ( is_pv_domain(d) ) memcpy(c.nat->trap_ctxt, v->arch.pv.trap_ctxt, @@ -1437,10 +1437,10 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c.cmp->user_regs.eflags = v->arch.user_regs.eflags; c.cmp->user_regs.esp = v->arch.user_regs.esp; c.cmp->user_regs.ss = v->arch.user_regs.ss; - c.cmp->user_regs.es = v->arch.user_regs.es; - c.cmp->user_regs.ds = v->arch.user_regs.ds; - c.cmp->user_regs.fs = v->arch.user_regs.fs; - c.cmp->user_regs.gs = v->arch.user_regs.gs; + c.cmp->user_regs.es = v->arch.pv.es; + c.cmp->user_regs.ds = v->arch.pv.ds; + c.cmp->user_regs.fs = v->arch.pv.fs; + c.cmp->user_regs.gs = v->arch.pv.gs; if ( is_pv_domain(d) ) { diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index 8c0dea12a5..c31e74c6fa 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -546,6 +546,8 @@ struct pv_vcpu bool syscall32_disables_events; bool sysenter_disables_events; + uint16_t ds, es, fs, gs; + /* * 64bit segment bases. * diff --git a/xen/arch/x86/include/asm/regs.h b/xen/arch/x86/include/asm/regs.h index 60b0d7b873..ce9b028276 100644 --- a/xen/arch/x86/include/asm/regs.h +++ b/xen/arch/x86/include/asm/regs.h @@ -44,12 +44,4 @@ __sel; \ }) -static inline void read_sregs(struct cpu_user_regs *regs) -{ - asm ( "mov %%ds, %0" : "=m" (regs->ds) ); - asm ( "mov %%es, %0" : "=m" (regs->es) ); - asm ( "mov %%fs, %0" : "=m" (regs->fs) ); - asm ( "mov %%gs, %0" : "=m" (regs->gs) ); -} - #endif /* __X86_REGS_H__ */ diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index c37bea9454..21158ce181 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -1012,8 +1012,10 @@ static int __init dom0_construct(const struct boot_domain *bd) * [rAX,rBX,rCX,rDX,rDI,rBP,R8-R15 are zero] */ regs = &v->arch.user_regs; - regs->ds = regs->es = regs->fs = regs->gs = - (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.ds = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.es = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.fs = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); + v->arch.pv.gs = (compat ? FLAT_COMPAT_KERNEL_DS : FLAT_KERNEL_DS); regs->ss = (compat ? FLAT_COMPAT_KERNEL_SS : FLAT_KERNEL_SS); regs->cs = (compat ? FLAT_COMPAT_KERNEL_CS : FLAT_KERNEL_CS); regs->rip = parms.virt_entry; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 8460a4a1ae..29ac5a14ca 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -220,10 +220,10 @@ void vcpu_show_registers(struct vcpu *v) state.gsb = gsb; state.gss = gss; - state.ds = v->arch.user_regs.ds; - state.es = v->arch.user_regs.es; - state.fs = v->arch.user_regs.fs; - state.gs = v->arch.user_regs.gs; + state.ds = v->arch.pv.ds; + state.es = v->arch.pv.es; + state.fs = v->arch.pv.fs; + state.gs = v->arch.pv.gs; context = CTXT_pv_guest; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 15:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 15:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074810.1437309 (Exim 4.92) (envelope-from ) id 1ukP5v-0005SE-7p; Fri, 08 Aug 2025 15:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074810.1437309; Fri, 08 Aug 2025 15:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP5v-0005S7-59; Fri, 08 Aug 2025 15:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1074810; Fri, 08 Aug 2025 15:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP5t-0005Rr-Sl for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukP5t-0080g4-2m for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukP5t-009CpT-2f for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IepxpK7H/rWIirMgcu4EDvk8FGkB5ywZ5TE/3HBGkFE=; b=yvzoX2N8ZCMAsooPfgMYRuISI9 uBdyRmVdcSapfBOlZ6Jr6mrYFRI40ttRiYcuLxGS+n6Nq7/sY4LV0EkMBynhMzytMSjESUszeLqb8 u7zvCbloBLBsA7KLZimxSPpD/MGwe2o/kEbU8HTdNH8k+YYrQ1/elBRF14RrhMPAqW5M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/public: Split the struct cpu_user_regs type Message-Id: Date: Fri, 08 Aug 2025 15:33:21 +0000 commit e473f2bb87e598114e3177b12d2bc07e17766f6d Author: Andrew Cooper AuthorDate: Sun Dec 29 17:40:54 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86/public: Split the struct cpu_user_regs type In order to support FRED, we're going to have to remove the {ds..gs} fields from struct cpu_user_regs, meaning that it is going to have to become a different type to the structure embedded in vcpu_guest_context_u. struct cpu_user_regs is a name used in common Xen code (i.e. needs to stay using this name), so renaming the public struct to be guest_user_regs in Xen's view only. Introduce a brand hew cpu-user-regs.h, currently containing a duplicate structure. Notably, this removes the need to include pubic/xen.h in ~every translation unit in Xen (via current.h), and highlights one case where the emulator was picking up cpu_user_regs transitively. Include comments describing how hardware interacts with this structure under IDT delivery, as it's quite magic to start with. FRED is going make things more complicated. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/include/asm/cpu-user-regs.h | 63 ++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/current.h | 3 +- xen/arch/x86/x86_emulate/private.h | 1 + xen/include/public/arch-x86/xen-x86_32.h | 9 +++++ xen/include/public/arch-x86/xen-x86_64.h | 9 +++++ xen/include/public/arch-x86/xen.h | 11 ++++++ 6 files changed, 95 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h new file mode 100644 index 0000000000..0e78e38ed0 --- /dev/null +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef X86_CPU_USER_REGS_H +#define X86_CPU_USER_REGS_H + +#include + +/* + * cpu_user_regs represents the interrupted GPR state at the point of an + * interrupt, exception or syscall. The layout is dictated by the hardware + * format for the event frame, with software filling in the rest. + */ +struct cpu_user_regs +{ + union { uint64_t r15; uint32_t r15d; uint16_t r15w; uint8_t r15b; }; + union { uint64_t r14; uint32_t r14d; uint16_t r14w; uint8_t r14b; }; + union { uint64_t r13; uint32_t r13d; uint16_t r13w; uint8_t r13b; }; + union { uint64_t r12; uint32_t r12d; uint16_t r12w; uint8_t r12b; }; + union { uint64_t rbp; uint32_t ebp; uint16_t bp; uint8_t bpl; }; + union { uint64_t rbx; uint32_t ebx; uint16_t bx; struct { uint8_t bl, bh; }; }; + union { uint64_t r11; uint32_t r11d; uint16_t r11w; uint8_t r11b; }; + union { uint64_t r10; uint32_t r10d; uint16_t r10w; uint8_t r10b; }; + union { uint64_t r9; uint32_t r9d; uint16_t r9w; uint8_t r9b; }; + union { uint64_t r8; uint32_t r8d; uint16_t r8w; uint8_t r8b; }; + union { uint64_t rax; uint32_t eax; uint16_t ax; struct { uint8_t al, ah; }; }; + union { uint64_t rcx; uint32_t ecx; uint16_t cx; struct { uint8_t cl, ch; }; }; + union { uint64_t rdx; uint32_t edx; uint16_t dx; struct { uint8_t dl, dh; }; }; + union { uint64_t rsi; uint32_t esi; uint16_t si; uint8_t sil; }; + union { uint64_t rdi; uint32_t edi; uint16_t di; uint8_t dil; }; + + /* + * During IDT delivery for exceptions with an error code, hardware pushes + * to this point. Entry_vector is filled in by software. + */ + + uint32_t error_code; + uint32_t entry_vector; + + /* + * During IDT delivery for interrupts or exceptions without an error code, + * hardware pushes to this point. Both error_code and entry_vector are + * filled in by software. + */ + + union { uint64_t rip; uint32_t eip; uint16_t ip; }; + uint16_t cs, _pad0[1]; + uint8_t saved_upcall_mask; /* PV (v)rflags.IF == !saved_upcall_mask */ + uint8_t _pad1[3]; + union { uint64_t rflags; uint32_t eflags; uint16_t flags; }; + union { uint64_t rsp; uint32_t esp; uint16_t sp; uint8_t spl; }; + uint16_t ss, _pad2[3]; + + /* + * For IDT delivery, tss->rsp0 points to this boundary as embedded within + * struct cpu_info. It must be 16-byte aligned. + */ + + uint16_t es, _pad3[3]; + uint16_t ds, _pad4[3]; + uint16_t fs, _pad5[3]; + uint16_t gs, _pad6[3]; +}; + +#endif /* X86_CPU_USER_REGS_H */ diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index bcec328c98..243d17ef79 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -9,7 +9,8 @@ #include #include -#include + +#include /* * Xen's cpu stacks are 8 pages (8-page aligned), arranged as: diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 9400879870..24c79c4e8f 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -14,6 +14,7 @@ # include # include +# include # include # include # include diff --git a/xen/include/public/arch-x86/xen-x86_32.h b/xen/include/public/arch-x86/xen-x86_32.h index 9e3bf06b12..25cc447288 100644 --- a/xen/include/public/arch-x86/xen-x86_32.h +++ b/xen/include/public/arch-x86/xen-x86_32.h @@ -114,6 +114,10 @@ #define __DECL_REG_LO16(name) uint32_t e ## name #endif +#ifdef __XEN__ +#define cpu_user_regs guest_user_regs +#endif + struct cpu_user_regs { __DECL_REG_LO8(b); __DECL_REG_LO8(c); @@ -136,8 +140,13 @@ struct cpu_user_regs { uint16_t fs, _pad4; uint16_t gs, _pad5; }; + +#ifdef __XEN__ +#undef cpu_user_regs +#else typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); +#endif #undef __DECL_REG_LO8 #undef __DECL_REG_LO16 diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h index 43f6e3d220..ea6b56aa3b 100644 --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -159,6 +159,10 @@ struct iret_context { #define __DECL_REG_HI(num) uint64_t r ## num #endif +#ifdef __XEN__ +#define cpu_user_regs guest_user_regs +#endif + struct cpu_user_regs { __DECL_REG_HI(15); __DECL_REG_HI(14); @@ -189,8 +193,13 @@ struct cpu_user_regs { uint16_t fs, _pad5[3]; uint16_t gs, _pad6[3]; }; + +#ifdef __XEN__ +#undef cpu_user_regs +#else typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); +#endif #undef __DECL_REG #undef __DECL_REG_LOHI diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index fc24879866..b99a691706 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -173,7 +173,18 @@ struct vcpu_guest_context { #define _VGCF_online 5 #define VGCF_online (1<<_VGCF_online) unsigned long flags; /* VGCF_* flags */ + + /* + * Outside of Xen, regs type stays named cpu_user_regs for backwards + * compatibility. Inside Xen, the type called cpu_user_regs is different, + * and the public API type is renamed to guest_user_regs. + */ +#ifdef __XEN__ + struct guest_user_regs user_regs; /* User-level CPU registers */ +#else struct cpu_user_regs user_regs; /* User-level CPU registers */ +#endif + struct trap_info trap_ctxt[256]; /* Virtual IDT */ unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 08 15:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2025 15:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1074811.1437312 (Exim 4.92) (envelope-from ) id 1ukP65-0005UV-9E; Fri, 08 Aug 2025 15:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1074811.1437312; Fri, 08 Aug 2025 15:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP65-0005UN-6f; Fri, 08 Aug 2025 15:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1074811; Fri, 08 Aug 2025 15:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ukP63-0005UD-WE for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ukP63-0080gY-37 for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ukP63-009CqJ-2z for xen-changelog@lists.xenproject.org; Fri, 08 Aug 2025 15:33:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XznWMtuuMQji6Y+uIgk7KQv4wLz1dSZnzWkr+TV4NxI=; b=kjNywq/kxXwwh0P+QSz/DrmDy5 fpt304Wpp8TRbSancKIbFnDU/9hDq1/qZbAL+eugF44ovgLIlq2L4j64Z5s4XKqTWcDRPCaMi928T LoFDk+vRY/AnADfLWpE2QQEcBRu7adOdAGACgQi2qdzdHJVc8rKVLv9sWLOpfuZEX4Ak=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Drop the vm86 segments selectors from struct cpu_user_regs Message-Id: Date: Fri, 08 Aug 2025 15:33:31 +0000 commit 3c66a25672b4943a5a51d52f57038cdad6f9349e Author: Andrew Cooper AuthorDate: Sun Dec 29 14:46:34 2024 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 8 13:23:11 2025 +0100 x86: Drop the vm86 segments selectors from struct cpu_user_regs The data segment registers are part of the on-stack IRET frame when interrupting Virtual 8086 mode, but this ceased being relevant for Xen in commit 5d1181a5ea5e ("xen: Remove x86_32 build target.") in 2012. With all other cleanup in place, delete the fields so we can introduce FRED support which uses this space for different data. Everywhere which used the es field as an offset in cpu_user_regs needs adjusting. However, they'll change again for FRED, so no cleanup is performed at this juncture. This also undoes the OoB Read workaround in show_registers(), which can now switch back to being simple structure copy. No functional change, but a lot of rearranging of stack and struct layout under the hood. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/include/asm/cpu-user-regs.h | 5 ----- xen/arch/x86/include/asm/current.h | 8 ++++---- xen/arch/x86/include/asm/hvm/hvm.h | 4 ---- xen/arch/x86/include/asm/regs.h | 3 +-- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/asm-offsets.c | 2 +- xen/arch/x86/x86_64/traps.c | 8 +------- 8 files changed, 9 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e063fe790a..97bdda1d4a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -959,7 +959,7 @@ void load_system_tables(void) * Defer checks until exception support is sufficiently set up. */ BUILD_BUG_ON((sizeof(struct cpu_info) - - offsetof(struct cpu_info, guest_cpu_user_regs.es)) & 0xf); + sizeof(struct cpu_user_regs)) & 0xf); BUG_ON(system_state != SYS_STATE_early_boot && (stack_bottom & 0xf)); } diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h index 0e78e38ed0..d700a3ef34 100644 --- a/xen/arch/x86/include/asm/cpu-user-regs.h +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -53,11 +53,6 @@ struct cpu_user_regs * For IDT delivery, tss->rsp0 points to this boundary as embedded within * struct cpu_info. It must be 16-byte aligned. */ - - uint16_t es, _pad3[3]; - uint16_t ds, _pad4[3]; - uint16_t fs, _pad5[3]; - uint16_t gs, _pad6[3]; }; #endif /* X86_CPU_USER_REGS_H */ diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index 243d17ef79..a7c9473428 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -106,12 +106,12 @@ static inline struct cpu_info *get_cpu_info(void) #define get_per_cpu_offset() (get_cpu_info()->per_cpu_offset) /* - * Get the bottom-of-stack, as stored in the per-CPU TSS. This actually points - * into the middle of cpu_info.guest_cpu_user_regs, at the section that - * precisely corresponds to a CPU trap frame. + * Get the bottom-of-stack, as stored in the per-CPU TSS. This points at the + * end of cpu_info.guest_cpu_user_regs, at the section that precisely + * corresponds to a CPU trap frame. */ #define get_stack_bottom() \ - ((unsigned long)&get_cpu_info()->guest_cpu_user_regs.es) + ((unsigned long)(&get_cpu_info()->guest_cpu_user_regs + 1)) /* * Get the reasonable stack bounds for stack traces and stack dumps. Stack diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index bf8bc2e100..18e40910ff 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -624,10 +624,6 @@ static inline void hvm_sanitize_regs_fields(struct cpu_user_regs *regs, regs->saved_upcall_mask = 0xbf; regs->cs = 0xbeef; regs->ss = 0xbeef; - regs->ds = 0xbeef; - regs->es = 0xbeef; - regs->fs = 0xbeef; - regs->gs = 0xbeef; #endif } diff --git a/xen/arch/x86/include/asm/regs.h b/xen/arch/x86/include/asm/regs.h index ce9b028276..72595110e2 100644 --- a/xen/arch/x86/include/asm/regs.h +++ b/xen/arch/x86/include/asm/regs.h @@ -23,8 +23,7 @@ (!is_pv_32bit_vcpu(v) ? ((tb)->eip == 0) : (((tb)->cs & ~3) == 0)) /* Number of bytes of on-stack execution state to be context-switched. */ -/* NB. Segment registers and bases are not saved/restored on x86/64 stack. */ -#define CTXT_SWITCH_STACK_BYTES (offsetof(struct cpu_user_regs, es)) +#define CTXT_SWITCH_STACK_BYTES sizeof(struct cpu_user_regs) #define guest_mode(r) \ ({ \ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 34dc077cad..238d923dd1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -387,7 +387,7 @@ unsigned long get_stack_trace_bottom(unsigned long sp) { case 1 ... 4: return ROUNDUP(sp, PAGE_SIZE) - - offsetof(struct cpu_user_regs, es) - sizeof(unsigned long); + sizeof(struct cpu_user_regs) - sizeof(unsigned long); case 6 ... 7: return ROUNDUP(sp, STACK_SIZE) - diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 630bdc3945..2258b4ce1b 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -52,7 +52,7 @@ void __dummy__(void) OFFSET(UREGS_eflags, struct cpu_user_regs, rflags); OFFSET(UREGS_rsp, struct cpu_user_regs, rsp); OFFSET(UREGS_ss, struct cpu_user_regs, ss); - OFFSET(UREGS_kernel_sizeof, struct cpu_user_regs, es); + DEFINE(UREGS_kernel_sizeof, sizeof(struct cpu_user_regs)); BLANK(); /* diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 29ac5a14ca..34adf55e48 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -135,17 +135,11 @@ static void _show_registers( void show_registers(const struct cpu_user_regs *regs) { - struct cpu_user_regs fault_regs; + struct cpu_user_regs fault_regs = *regs; struct extra_state fault_state; enum context context; struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; - /* - * Don't read beyond the end of the hardware frame. It is out of bounds - * for WARN()/etc. - */ - memcpy(&fault_regs, regs, offsetof(struct cpu_user_regs, es)); - if ( guest_mode(regs) && is_hvm_vcpu(v) ) { get_hvm_registers(v, &fault_regs, &fault_state); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 08:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 08:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078435.1439416 (Exim 4.92) (envelope-from ) id 1ulkGh-0006sP-75; Tue, 12 Aug 2025 08:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078435.1439416; Tue, 12 Aug 2025 08:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkGh-0006sH-4N; Tue, 12 Aug 2025 08:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1078435; Tue, 12 Aug 2025 08:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkGf-0006s7-Sb for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulkGf-001cyK-1I for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulkGf-0014rU-1s for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=j/sNCbCwMKo2wm0ogyxenA31814SIvVHn3XTWNhJ4+I=; b=ip2DwxvhPYNIonJHw72D8Ri2o3 XivCDPczuSQ1wOyIaKcOXoY8mH3KzOJEMDmjNB8u3Ql/W4gUPdXsfAp12PCdutDfDaH7bUmMQkcq6 u4q2IyBW/RI7yfbViABtPJyhIXf5ujyVKttdOIyoSDp3P3TlsOeaJ2vblhABecWRwpME=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] kconfig: turn PDX compression into a choice Message-Id: Date: Tue, 12 Aug 2025 08:22:01 +0000 commit b541c627b227ecdca53602a31628d9b94218a0a6 Author: Roger Pau Monne AuthorDate: Mon May 26 16:42:49 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:05 2025 +0200 kconfig: turn PDX compression into a choice Rename the current CONFIG_PDX_COMPRESSION to CONFIG_PDX_MASK_COMPRESSION, and make it part of the PDX compression choice block, in preparation for adding further PDX compression algorithms. The PDX compression defaults should still be the same for all architectures, however the choice block cannot be protected under EXPERT and still have a default choice being unconditionally selected. As a result, the new "PDX (Page inDeX) compression" item will be unconditionally visible in Kconfig, even on architectures like x86 that previously had no way to enable PDX compression. As part of this preparation work to introduce new PDX compressions, adjust some of the comments on pdx.h to note they apply to a specific PDX compression. Also shuffle function prototypes and dummy implementations around to make it easier to introduce a new PDX compression. Note all PDX compression implementations are expected to provide a pdx_is_region_compressible() that takes the same set of arguments. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- xen/common/Kconfig | 18 +++++++++++++++--- xen/common/pdx.c | 4 ++-- xen/include/xen/pdx.h | 32 +++++++++++++++++++------------- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index bb35afe56c..a77b31071e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -258,7 +258,7 @@ void __init init_pdx(void) paddr_t bank_start, bank_size, bank_end, ram_end = 0; int bank; -#ifdef CONFIG_PDX_COMPRESSION +#ifndef CONFIG_PDX_NONE /* * Arm does not have any restrictions on the bits to compress. Pass 0 to * let the common code further restrict the mask. diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 16936418a6..8dad0c923a 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -57,9 +57,10 @@ config EVTCHN_FIFO If unsure, say Y. -config PDX_COMPRESSION - bool "PDX (Page inDeX) compression" if EXPERT && !X86 && !RISCV - default ARM || PPC +choice + prompt "PDX (Page inDeX) compression" + default PDX_MASK_COMPRESSION if !X86 && !RISCV + default PDX_NONE help PDX compression is a technique designed to reduce the memory overhead of physical memory management on platforms with sparse RAM @@ -72,6 +73,17 @@ config PDX_COMPRESSION If your platform does not have sparse RAM banks, do not enable PDX compression. +config PDX_MASK_COMPRESSION + bool "Mask compression" + help + Compression relying on all RAM addresses sharing a zeroed bit region. + +config PDX_NONE + bool "None" + help + No compression +endchoice + config ALTERNATIVE_CALL bool diff --git a/xen/common/pdx.c b/xen/common/pdx.c index b8384e6189..00aa7e4300 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -34,7 +34,7 @@ bool __mfn_valid(unsigned long mfn) { bool invalid = mfn >= max_page; -#ifdef CONFIG_PDX_COMPRESSION +#ifdef CONFIG_PDX_MASK_COMPRESSION invalid |= mfn & pfn_hole_mask; #endif @@ -55,7 +55,7 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) __set_bit(idx, pdx_group_valid); } -#ifdef CONFIG_PDX_COMPRESSION +#ifdef CONFIG_PDX_MASK_COMPRESSION /* * Diagram to make sense of the following variables. The masks and shifts diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index c1423d64a9..8e373cac8b 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -25,7 +25,7 @@ * this by keeping a bitmap of the ranges in the frame table containing * invalid entries and not allocating backing memory for them. * - * ## PDX compression + * ## PDX mask compression * * This is a technique to avoid wasting memory on machines known to have * split their machine address space in several big discontinuous and highly @@ -101,22 +101,13 @@ bool __mfn_valid(unsigned long mfn); #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) #define pdx_to_paddr(px) pfn_to_paddr(pdx_to_pfn(px)) -#ifdef CONFIG_PDX_COMPRESSION +#ifdef CONFIG_PDX_MASK_COMPRESSION extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; extern unsigned int pfn_pdx_hole_shift; extern unsigned long pfn_hole_mask; extern unsigned long pfn_top_mask, ma_top_mask; -/** - * Validate a region's compatibility with the current compression runtime - * - * @param base Base address of the region - * @param npages Number of PAGE_SIZE-sized pages in the region - * @return True iff the region can be used with the current compression - */ -bool pdx_is_region_compressible(paddr_t base, unsigned long npages); - /** * Calculates a mask covering "moving" bits of all addresses of a region * @@ -209,7 +200,9 @@ static inline paddr_t directmapoff_to_maddr(unsigned long offset) */ void pfn_pdx_hole_setup(unsigned long mask); -#else /* !CONFIG_PDX_COMPRESSION */ +#endif /* CONFIG_PDX_MASK_COMPRESSION */ + +#ifdef CONFIG_PDX_NONE /* Without PDX compression we can skip some computations */ @@ -241,7 +234,20 @@ static inline void pfn_pdx_hole_setup(unsigned long mask) { } -#endif /* CONFIG_PDX_COMPRESSION */ +#else /* !CONFIG_PDX_NONE */ + +/* Shared functions implemented by all PDX compressions. */ + +/** + * Validate a region's compatibility with the current compression runtime + * + * @param base Base address of the region + * @param npages Number of PAGE_SIZE-sized pages in the region + * @return True iff the region can be used with the current compression + */ +bool pdx_is_region_compressible(paddr_t base, unsigned long npages); + +#endif /* !CONFIG_PDX_NONE */ #endif /* __XEN_PDX_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 08:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 08:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078436.1439420 (Exim 4.92) (envelope-from ) id 1ulkGr-0006uz-8I; Tue, 12 Aug 2025 08:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078436.1439420; Tue, 12 Aug 2025 08:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkGr-0006ur-5l; Tue, 12 Aug 2025 08:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1078436; Tue, 12 Aug 2025 08:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkGp-0006ub-Nd for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulkGp-001cyO-1a for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulkGp-0014s3-2A for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lZaQE9VMBJ8q9T0XMxhMO3nMyfBE/uQzZwt6WehRAvM=; b=yMja/xPW0ndlIutwIMaUKX+gED x/u1nR2gOFzMjF6KKFX2yknyX0TlW+jPH5Tw2XJlrIVMK6iOYiiPyQwQbrgfFXKMIBTiHjhRpdfuz O/07qupeFJHsYyCNfkEr1tv8FLLmbniVm2hp9ltazleU9ugAJxFK/OZNMGDWOPVgPG6E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pdx: provide a common set of init functions Message-Id: Date: Tue, 12 Aug 2025 08:22:11 +0000 commit fd23bc59c2db2d36172225c433f8a803df6fa8bc Author: Roger Pau Monne AuthorDate: Mon Jun 9 16:43:44 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:33 2025 +0200 pdx: provide a common set of init functions The current setup (pdx_init_mask() and pdx_region_mask()) and init (pfn_pdx_hole_setup()) PDX compression functions are tailored to the existing PDX compression algorithm. In preparation for introducing a new compression algorithm convert the setup and init functions to more generic interfaces that aren't tied to the compression in-use. To accomplish this introduce a function that registers all the PFN RAM ranges, plus an init function. This has the downside of requiring a static array to store such ranges ahead of being processed by the setup function, however it's the only way to pass all the possible information to the different compression setup functions without using per-compression specific setup functions. Per-arch compression setup also need to be adjusted to use the new interface. There's a slight ordering adjustment, in that after PDX compression setup the caller will check whether all the RAM regions are properly covered by the newly setup compression, otherwise compression is disabled by resetting to the initial values. No functional change intended in the resulting PDX compression values. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich Acked-by: Julien Grall # ARM --- xen/arch/arm/setup.c | 32 ++++++------- xen/arch/x86/srat.c | 28 +++++++----- xen/common/pdx.c | 122 +++++++++++++++++++++++++++++++++++++++++++------- xen/include/xen/pdx.h | 73 +++++++++++------------------- 4 files changed, 165 insertions(+), 90 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index a77b31071e..7ad870e382 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -256,9 +256,11 @@ void __init init_pdx(void) { const struct membanks *mem = bootinfo_get_mem(); paddr_t bank_start, bank_size, bank_end, ram_end = 0; - int bank; + unsigned int bank; #ifndef CONFIG_PDX_NONE + for ( bank = 0 ; bank < mem->nr_banks; bank++ ) + pfn_pdx_add_region(mem->bank[bank].start, mem->bank[bank].size); /* * Arm does not have any restrictions on the bits to compress. Pass 0 to * let the common code further restrict the mask. @@ -266,26 +268,24 @@ void __init init_pdx(void) * If the logic changes in pfn_pdx_hole_setup we might have to * update this function too. */ - uint64_t mask = pdx_init_mask(0x0); + pfn_pdx_compression_setup(0); for ( bank = 0 ; bank < mem->nr_banks; bank++ ) { - bank_start = mem->bank[bank].start; - bank_size = mem->bank[bank].size; + const struct membank *m = &mem->bank[bank]; - mask |= bank_start | pdx_region_mask(bank_start, bank_size); - } - - for ( bank = 0 ; bank < mem->nr_banks; bank++ ) - { - bank_start = mem->bank[bank].start; - bank_size = mem->bank[bank].size; - - if (~mask & pdx_region_mask(bank_start, bank_size)) - mask = 0; + if ( !pdx_is_region_compressible(m->start, + PFN_UP(m->start + m->size) - + PFN_DOWN(m->start)) ) + { + pfn_pdx_compression_reset(); + printk(XENLOG_WARNING + "PFN compression disabled, RAM region [%#" PRIpaddr ", %#" + PRIpaddr "] not covered\n", + m->start, m->start + m->size - 1); + break; + } } - - pfn_pdx_hole_setup(mask >> PAGE_SHIFT); #endif for ( bank = 0 ; bank < mem->nr_banks; bank++ ) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 688f410287..747607439f 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -261,8 +261,6 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma) void __init acpi_numa_arch_fixup(void) {} -static uint64_t __initdata srat_region_mask; - static int __init cf_check srat_parse_region( struct acpi_subtable_header *header, const unsigned long end) { @@ -282,15 +280,13 @@ static int __init cf_check srat_parse_region( printk(KERN_INFO "SRAT: %013"PRIx64"-%013"PRIx64"\n", ma->base_address, ma->base_address + ma->length - 1); - srat_region_mask |= ma->base_address | - pdx_region_mask(ma->base_address, ma->length); + pfn_pdx_add_region(ma->base_address, ma->length); return 0; } void __init srat_parse_regions(paddr_t addr) { - u64 mask; unsigned int i; if (acpi_disabled || acpi_numa < 0 || @@ -299,19 +295,29 @@ void __init srat_parse_regions(paddr_t addr) /* Set "PXM" as early as feasible. */ numa_fw_nid_name = "PXM"; - srat_region_mask = pdx_init_mask(addr); acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); - for (mask = srat_region_mask, i = 0; mask && i < e820.nr_map; i++) { + pfn_pdx_compression_setup(addr); + + /* Ensure all RAM ranges in the e820 are covered. */ + for (i = 0; i < e820.nr_map; i++) { if (e820.map[i].type != E820_RAM) continue; - if (~mask & pdx_region_mask(e820.map[i].addr, e820.map[i].size)) - mask = 0; + if (!pdx_is_region_compressible( + e820.map[i].addr, + PFN_UP(e820.map[i].addr + e820.map[i].size) - + PFN_DOWN(e820.map[i].addr))) { + pfn_pdx_compression_reset(); + printk(XENLOG_WARNING + "PFN compression disabled, RAM region [%#" PRIx64 + ", %#" PRIx64 "] not covered\n", + e820.map[i].addr, + e820.map[i].addr + e820.map[i].size - 1); + return; + } } - - pfn_pdx_hole_setup(mask >> PAGE_SHIFT); } unsigned int numa_node_to_arch_nid(nodeid_t n) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 00aa7e4300..c5ea58873c 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -19,6 +19,7 @@ #include #include #include +#include #include /** @@ -55,6 +56,44 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) __set_bit(idx, pdx_group_valid); } +#ifndef CONFIG_PDX_NONE + +#ifdef CONFIG_X86 +# include +# define MAX_PFN_RANGES E820MAX +#elif defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY) +# include +# define MAX_PFN_RANGES NR_MEM_BANKS +#endif + +#ifndef MAX_PFN_RANGES +# error "Missing architecture maximum number of RAM ranges" +#endif + +/* Generic PFN compression helpers. */ +static struct pfn_range { + unsigned long base_pfn, pages; +} ranges[MAX_PFN_RANGES] __initdata; +static unsigned int __initdata nr_ranges; + +void __init pfn_pdx_add_region(paddr_t base, paddr_t size) +{ + if ( !size ) + return; + + if ( nr_ranges >= ARRAY_SIZE(ranges) ) + { + ASSERT((nr_ranges + 1) > nr_ranges); + nr_ranges++; + return; + } + + ranges[nr_ranges].base_pfn = PFN_DOWN(base); + ranges[nr_ranges++].pages = PFN_UP(base + size) - PFN_DOWN(base); +} + +#endif /* !CONFIG_PDX_NONE */ + #ifdef CONFIG_PDX_MASK_COMPRESSION /* @@ -115,20 +154,25 @@ static uint64_t fill_mask(uint64_t mask) return mask; } -bool pdx_is_region_compressible(paddr_t base, unsigned long npages) -{ - return !(paddr_to_pfn(base) & pfn_hole_mask) && - !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); -} - -/* We don't want to compress the low MAX_ORDER bits of the addresses. */ -uint64_t __init pdx_init_mask(uint64_t base_addr) -{ - return fill_mask(max(base_addr, - (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); -} - -uint64_t pdx_region_mask(uint64_t base, uint64_t len) +/** + * Calculates a mask covering "moving" bits of all addresses of a region + * + * The i-th bit of the mask must be set if there's 2 different addresses + * in the region that have different j-th bits. where j >= i. + * + * e.g: + * base=0x1B00000000 + * len+base=0x1B00042000 + * + * ought to return 0x000007FFFF, which implies that every bit position + * with a zero in the mask remains unchanged in every address of the + * region. + * + * @param base Base address of the region + * @param len Size in octets of the region + * @return Mask of moving bits at the bottom of all the region addresses + */ +static uint64_t pdx_region_mask(uint64_t base, uint64_t len) { /* * We say a bit "moves" in a range if there exist 2 addresses in that @@ -143,9 +187,45 @@ uint64_t pdx_region_mask(uint64_t base, uint64_t len) return fill_mask(base ^ (base + len - 1)); } -void __init pfn_pdx_hole_setup(unsigned long mask) +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + return !(paddr_to_pfn(base) & pfn_hole_mask) && + !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); +} + +/** + * Creates the mask to start from when calculating non-compressible bits + * + * This function is intimately related to pdx_region_mask(), and together + * they are meant to calculate the mask of non-compressible bits given the + * current memory map. + * + * @param base_addr Address of the first maddr in the system + * @return An integer of the form 2^n - 1 + */ +static uint64_t __init pdx_init_mask(uint64_t base_addr) +{ + return fill_mask(max(base_addr, + /* Don't compress the low MAX_ORDER bits. */ + (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); +} + +void __init pfn_pdx_compression_setup(paddr_t base) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; + unsigned long mask = pdx_init_mask(base) >> PAGE_SHIFT; + + if ( nr_ranges > ARRAY_SIZE(ranges) ) + { + printk(XENLOG_WARNING + "Too many PFN ranges (%u > %zu), not attempting PFN compression\n", + nr_ranges, ARRAY_SIZE(ranges)); + return; + } + + for ( i = 0; i < nr_ranges; i++ ) + mask |= ranges[i].base_pfn | + pdx_region_mask(ranges[i].base_pfn, ranges[i].pages); /* * We skip the first MAX_ORDER bits, as we never want to compress them. @@ -184,6 +264,18 @@ void __init pfn_pdx_hole_setup(unsigned long mask) ma_top_mask = pfn_top_mask << PAGE_SHIFT; } +void __init pfn_pdx_compression_reset(void) +{ + pfn_pdx_bottom_mask = ~0UL; + ma_va_bottom_mask = ~0UL; + pfn_top_mask = 0; + ma_top_mask = 0; + pfn_hole_mask = 0; + pfn_pdx_hole_shift = 0; + + nr_ranges = 0; +} + #endif /* CONFIG_PDX_COMPRESSION */ /* diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 8e373cac8b..10153da98b 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -108,38 +108,6 @@ extern unsigned int pfn_pdx_hole_shift; extern unsigned long pfn_hole_mask; extern unsigned long pfn_top_mask, ma_top_mask; -/** - * Calculates a mask covering "moving" bits of all addresses of a region - * - * The i-th bit of the mask must be set if there's 2 different addresses - * in the region that have different j-th bits. where j >= i. - * - * e.g: - * base=0x1B00000000 - * len+base=0x1B00042000 - * - * ought to return 0x000007FFFF, which implies that every bit position - * with a zero in the mask remains unchanged in every address of the - * region. - * - * @param base Base address of the region - * @param len Size in octets of the region - * @return Mask of moving bits at the bottom of all the region addresses - */ -uint64_t pdx_region_mask(uint64_t base, uint64_t len); - -/** - * Creates the mask to start from when calculating non-compressible bits - * - * This function is intimately related to pdx_region_mask(), and together - * they are meant to calculate the mask of non-compressible bits given the - * current memory map. - * - * @param base_addr Address of the first maddr in the system - * @return An integer of the form 2^n - 1 - */ -uint64_t pdx_init_mask(uint64_t base_addr); - /** * Map pfn to its corresponding pdx * @@ -189,17 +157,6 @@ static inline paddr_t directmapoff_to_maddr(unsigned long offset) (offset & ma_va_bottom_mask)); } -/** - * Initializes global variables with information about the compressible - * range of the current memory regions. - * - * @param mask This mask is the biggest pdx_mask of every region in the - * system ORed with all base addresses of every region in the - * system. This results in a mask where every zero in a bit - * position marks a potentially compressible bit. - */ -void pfn_pdx_hole_setup(unsigned long mask); - #endif /* CONFIG_PDX_MASK_COMPRESSION */ #ifdef CONFIG_PDX_NONE @@ -220,17 +177,15 @@ static inline bool pdx_is_region_compressible(paddr_t base, return true; } -static inline uint64_t pdx_init_mask(uint64_t base_addr) +static inline void pfn_pdx_add_region(paddr_t base, paddr_t size) { - return 0; } -static inline uint64_t pdx_region_mask(uint64_t base, uint64_t len) +static inline void pfn_pdx_compression_setup(paddr_t base) { - return 0; } -static inline void pfn_pdx_hole_setup(unsigned long mask) +static inline void pfn_pdx_compression_reset(void) { } @@ -247,6 +202,28 @@ static inline void pfn_pdx_hole_setup(unsigned long mask) */ bool pdx_is_region_compressible(paddr_t base, unsigned long npages); +/** + * Register a RAM region with the PFN compression logic. + * + * @param base Start of the region in bytes. + * @param size Length of the region in bytes. + */ +void pfn_pdx_add_region(paddr_t base, paddr_t size); + +/** + * Initializes global variables with information about the compressible + * range of the current memory regions. + * + * @param base address to start compression from. + */ +void pfn_pdx_compression_setup(paddr_t base); + +/** + * Reset the global variables to it's default values, thus disabling PFN + * compression. + */ +void pfn_pdx_compression_reset(void); + #endif /* !CONFIG_PDX_NONE */ #endif /* __XEN_PDX_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 08:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 08:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078437.1439424 (Exim 4.92) (envelope-from ) id 1ulkH1-0006xl-AL; Tue, 12 Aug 2025 08:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078437.1439424; Tue, 12 Aug 2025 08:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkH1-0006xd-7A; Tue, 12 Aug 2025 08:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1078437; Tue, 12 Aug 2025 08:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkGz-0006xO-Qp for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulkGz-001cyZ-1s for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulkGz-0014sQ-2S for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kXrLRCq9kXYz+ZdeI9KCWRQDdD0JDxAnw+fkjpB0Q9Q=; b=p+uOkPwVj8S45Odjst0s/pVfT8 6o+Tf7ZPudmJYp8bOo62ul0jCV5wPsRF1zc+KQRyBnQyYYMkDAmbDxNwF18oPmcujW3QUa4HpeX/M UJlo+jo331NtNlyPs/PCg8Wr+ghtzpziYxjBE80CZFhwU78pFObR2LIq5295xqgze8Yg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pdx: introduce command line compression toggle Message-Id: Date: Tue, 12 Aug 2025 08:22:21 +0000 commit 31d9c88a3857b1140d8dc39d7b5d3a4efca8498a Author: Roger Pau Monne AuthorDate: Wed Jun 18 12:24:44 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 pdx: introduce command line compression toggle Introduce a command line option to allow disabling PDX compression. The disabling is done by turning pfn_pdx_add_region() into a no-op, so when attempting to initialize the selected compression algorithm the array of ranges to compress is empty. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 9 +++++++++ xen/common/pdx.c | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 6865a61220..5dd2ab82b7 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2072,6 +2072,15 @@ for all of them (`true`), only for those subject to XPTI (`xpti`) or for those not subject to XPTI (`no-xpti`). The feature is used only in case INVPCID is supported and not disabled via `invpcid=false`. +### pdx-compress +> `= ` + +> Default: `true` if CONFIG_PDX_NONE is unset + +Only relevant when the hypervisor is build with PFN PDX compression. Controls +whether Xen will engage in PFN compression. The algorithm used for PFN +compression is selected at build time from Kconfig. + ### ple_gap > `= ` diff --git a/xen/common/pdx.c b/xen/common/pdx.c index c5ea58873c..f4a3dcf6cb 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -76,9 +77,13 @@ static struct pfn_range { } ranges[MAX_PFN_RANGES] __initdata; static unsigned int __initdata nr_ranges; +static bool __initdata pdx_compress = true; +boolean_param("pdx-compress", pdx_compress); + void __init pfn_pdx_add_region(paddr_t base, paddr_t size) { - if ( !size ) + /* Without ranges there's no PFN compression. */ + if ( !size || !pdx_compress ) return; if ( nr_ranges >= ARRAY_SIZE(ranges) ) @@ -215,6 +220,13 @@ void __init pfn_pdx_compression_setup(paddr_t base) unsigned int i, j, bottom_shift = 0, hole_shift = 0; unsigned long mask = pdx_init_mask(base) >> PAGE_SHIFT; + if ( !nr_ranges ) + { + printk(XENLOG_DEBUG "PFN compression disabled%s\n", + pdx_compress ? ": no ranges provided" : ""); + return; + } + if ( nr_ranges > ARRAY_SIZE(ranges) ) { printk(XENLOG_WARNING -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 08:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 08:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078438.1439427 (Exim 4.92) (envelope-from ) id 1ulkHB-0006zj-B7; Tue, 12 Aug 2025 08:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078438.1439427; Tue, 12 Aug 2025 08:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkHB-0006zc-8d; Tue, 12 Aug 2025 08:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1078438; Tue, 12 Aug 2025 08:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkH9-0006zU-W9 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulkH9-001cyu-2R for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulkH9-0014su-2j for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7dFY2Cn9iM78SaheKQIckd98T223mlAAPeOUz7yiBU8=; b=n+pjmKzJp7D0RQE8I8DYmmtjeu fnwHwWXxd825Z5nZ6bt9AbN2eZ2gfh9r+1VylTfQwxkMJhnlxLeBtRtU7hxym77RUtMU3zSS9GxzG RYvaKvfPAkk7ngQ4aUsOo0V7W+VeaQpD/HBqxdSw00JqXCH/QG3w6olaumQV9tKLxQJc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pdx: allow per-arch optimization of PDX conversion helpers Message-Id: Date: Tue, 12 Aug 2025 08:22:31 +0000 commit bd0b3a876d805b95c5cfcf292d7651334c8dba80 Author: Roger Pau Monne AuthorDate: Fri Jun 20 09:50:51 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 pdx: allow per-arch optimization of PDX conversion helpers There are four performance critical PDX conversion helpers that do the PFN to/from PDX and the physical addresses to/from directmap offsets translations. In the absence of an active PDX compression, those functions would still do the calculations needed, just to return the same input value as no translation is in place and hence PFN and PDX spaces are identity mapped. To reduce the overhead of having to do the pointless calculations allow architectures to implement the translation helpers in a per-arch header. Rename the existing conversion functions to add a trailing _xlate suffix, so that the per-arch headers can define the non suffixed versions. Currently only x86 implements meaningful custom handlers to short circuit the translation when not active, using asm goto. Other architectures use generic macros that map the non-xlate to the xlate variants to keep the previous behavior. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/pdx.h | 71 ++++++++++++++++++++++++++++++++++ xen/arch/x86/srat.c | 6 ++- xen/common/pdx.c | 10 +++-- xen/include/xen/pdx.h | 29 +++++++++++--- 5 files changed, 106 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index bc108c3819..71308d9daf 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ +XEN_CPUFEATURE(PDX_COMPRESSION, X86_SYNTH(31)) /* PDX compression */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/pdx.h b/xen/arch/x86/include/asm/pdx.h new file mode 100644 index 0000000000..6be7e1185e --- /dev/null +++ b/xen/arch/x86/include/asm/pdx.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef X86_PDX_H +#define X86_PDX_H + +#include + +/* + * Introduce a macro to avoid repeating the same asm goto block in each helper. + * Note the macro is strictly tied to the code in the helpers. + */ +#define PDX_ASM_GOTO(label) \ + asm_inline goto ( \ + ALTERNATIVE( \ + "", \ + "jmp %l0", \ + ALT_NOT(X86_FEATURE_PDX_COMPRESSION)) \ + : : : : label ) + +static inline unsigned long pfn_to_pdx(unsigned long pfn) +{ + PDX_ASM_GOTO(skip); + + return pfn_to_pdx_xlate(pfn); + + skip: + return pfn; +} + +static inline unsigned long pdx_to_pfn(unsigned long pdx) +{ + PDX_ASM_GOTO(skip); + + return pdx_to_pfn_xlate(pdx); + + skip: + return pdx; +} + +static inline unsigned long maddr_to_directmapoff(paddr_t ma) +{ + PDX_ASM_GOTO(skip); + + return maddr_to_directmapoff_xlate(ma); + + skip: + return ma; +} + +static inline paddr_t directmapoff_to_maddr(unsigned long offset) +{ + PDX_ASM_GOTO(skip); + + return directmapoff_to_maddr_xlate(offset); + + skip: + return offset; +} + +#undef PDX_ASM_GOTO_SKIP + +#endif /* X86_PDX_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 747607439f..42ccb0c0f3 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -298,7 +298,8 @@ void __init srat_parse_regions(paddr_t addr) acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); - pfn_pdx_compression_setup(addr); + if (!pfn_pdx_compression_setup(addr)) + return; /* Ensure all RAM ranges in the e820 are covered. */ for (i = 0; i < e820.nr_map; i++) { @@ -318,6 +319,9 @@ void __init srat_parse_regions(paddr_t addr) return; } } + + /* If we got this far compression is working as expected. */ + setup_force_cpu_cap(X86_FEATURE_PDX_COMPRESSION); } unsigned int numa_node_to_arch_nid(nodeid_t n) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index f4a3dcf6cb..c9ec867291 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -215,7 +215,7 @@ static uint64_t __init pdx_init_mask(uint64_t base_addr) (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); } -void __init pfn_pdx_compression_setup(paddr_t base) +bool __init pfn_pdx_compression_setup(paddr_t base) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; unsigned long mask = pdx_init_mask(base) >> PAGE_SHIFT; @@ -224,7 +224,7 @@ void __init pfn_pdx_compression_setup(paddr_t base) { printk(XENLOG_DEBUG "PFN compression disabled%s\n", pdx_compress ? ": no ranges provided" : ""); - return; + return false; } if ( nr_ranges > ARRAY_SIZE(ranges) ) @@ -232,7 +232,7 @@ void __init pfn_pdx_compression_setup(paddr_t base) printk(XENLOG_WARNING "Too many PFN ranges (%u > %zu), not attempting PFN compression\n", nr_ranges, ARRAY_SIZE(ranges)); - return; + return false; } for ( i = 0; i < nr_ranges; i++ ) @@ -263,7 +263,7 @@ void __init pfn_pdx_compression_setup(paddr_t base) } } if ( !hole_shift ) - return; + return false; printk(KERN_INFO "PFN compression on bits %u...%u\n", bottom_shift, bottom_shift + hole_shift - 1); @@ -274,6 +274,8 @@ void __init pfn_pdx_compression_setup(paddr_t base) pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT; + + return true; } void __init pfn_pdx_compression_reset(void) diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 10153da98b..425d45e9f0 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -114,7 +114,7 @@ extern unsigned long pfn_top_mask, ma_top_mask; * @param pfn Frame number * @return Obtained pdx after compressing the pfn */ -static inline unsigned long pfn_to_pdx(unsigned long pfn) +static inline unsigned long pfn_to_pdx_xlate(unsigned long pfn) { return (pfn & pfn_pdx_bottom_mask) | ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); @@ -126,7 +126,7 @@ static inline unsigned long pfn_to_pdx(unsigned long pfn) * @param pdx Page index * @return Obtained pfn after decompressing the pdx */ -static inline unsigned long pdx_to_pfn(unsigned long pdx) +static inline unsigned long pdx_to_pfn_xlate(unsigned long pdx) { return (pdx & pfn_pdx_bottom_mask) | ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); @@ -139,7 +139,7 @@ static inline unsigned long pdx_to_pfn(unsigned long pdx) * @return Offset on the direct map where that * machine address can be accessed */ -static inline unsigned long maddr_to_directmapoff(paddr_t ma) +static inline unsigned long maddr_to_directmapoff_xlate(paddr_t ma) { return (((ma & ma_top_mask) >> pfn_pdx_hole_shift) | (ma & ma_va_bottom_mask)); @@ -151,7 +151,7 @@ static inline unsigned long maddr_to_directmapoff(paddr_t ma) * @param offset Offset into the direct map * @return Corresponding machine address of that virtual location */ -static inline paddr_t directmapoff_to_maddr(unsigned long offset) +static inline paddr_t directmapoff_to_maddr_xlate(unsigned long offset) { return ((((paddr_t)offset << pfn_pdx_hole_shift) & ma_top_mask) | (offset & ma_va_bottom_mask)); @@ -181,8 +181,9 @@ static inline void pfn_pdx_add_region(paddr_t base, paddr_t size) { } -static inline void pfn_pdx_compression_setup(paddr_t base) +static inline bool pfn_pdx_compression_setup(paddr_t base) { + return false; } static inline void pfn_pdx_compression_reset(void) @@ -191,6 +192,21 @@ static inline void pfn_pdx_compression_reset(void) #else /* !CONFIG_PDX_NONE */ +/* + * Allow each architecture to define its (possibly optimized) versions of the + * translation functions. + * + * Do not use _xlate suffixed functions, always use the non _xlate variants. + */ +#if __has_include() +# include +#else +# define pdx_to_pfn pdx_to_pfn_xlate +# define pfn_to_pdx pfn_to_pdx_xlate +# define maddr_to_directmapoff maddr_to_directmapoff_xlate +# define directmapoff_to_maddr directmapoff_to_maddr_xlate +#endif + /* Shared functions implemented by all PDX compressions. */ /** @@ -215,8 +231,9 @@ void pfn_pdx_add_region(paddr_t base, paddr_t size); * range of the current memory regions. * * @param base address to start compression from. + * @return True if PDX compression has been enabled. */ -void pfn_pdx_compression_setup(paddr_t base); +bool pfn_pdx_compression_setup(paddr_t base); /** * Reset the global variables to it's default values, thus disabling PFN -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 08:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 08:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078439.1439432 (Exim 4.92) (envelope-from ) id 1ulkHL-00072j-Ek; Tue, 12 Aug 2025 08:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078439.1439432; Tue, 12 Aug 2025 08:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkHL-00072Z-Bq; Tue, 12 Aug 2025 08:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1078439; Tue, 12 Aug 2025 08:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkHK-00072P-2x for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulkHJ-001cyy-2i for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulkHK-0014tO-04 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6kb4kbwx13IlvhEEitdNZ6MeN1z1xLaNFhueXZcaPo4=; b=EP67fCo5TE+JbLGDucKs/ErDPC 7DQEFcgXGem9Es7IlNkgd8hAe2ZvJbmheHQbS33IeR4rB6hwyIHeSbMmWCNpSgChZgsxhd5dheVMO zsku2ZnrrRBglsJ2RFm8/rNnU4TSS6DLvbv+7cNiEZrYrD1GMd3IlC4e7vvEqs4S27/Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] test/pdx: add PDX compression unit tests Message-Id: Date: Tue, 12 Aug 2025 08:22:42 +0000 commit cb50e4033717632e948a47599ebcaa1d1f4e048c Author: Roger Pau Monne AuthorDate: Tue Jun 17 10:19:58 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 test/pdx: add PDX compression unit tests Introduce a set of unit tests for PDX compression. The unit tests contains both real and crafted memory maps that are then compressed using the selected PDX algorithm. Note the build system for the unit tests has been done in a way to support adding new compression algorithms easily. That requires generating a new test-pdx- executable that's build with the selected PDX compression enabled. Currently the only generated executable is test-pdx-mask that tests PDX mask compression. Signed-off-by: Roger Pau Monné Reviewed-by: Anthony PERARD --- tools/tests/Makefile | 1 + tools/tests/pdx/.gitignore | 2 + tools/tests/pdx/Makefile | 49 +++++++++ tools/tests/pdx/harness.h | 84 ++++++++++++++ tools/tests/pdx/test-pdx.c | 267 +++++++++++++++++++++++++++++++++++++++++++++ xen/common/pdx.c | 4 + 6 files changed, 407 insertions(+) diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 36928676a6..97ba2a1389 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -9,6 +9,7 @@ ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif SUBDIRS-y += xenstore +SUBDIRS-y += pdx SUBDIRS-y += rangeset SUBDIRS-y += vpci SUBDIRS-y += paging-mempool diff --git a/tools/tests/pdx/.gitignore b/tools/tests/pdx/.gitignore new file mode 100644 index 0000000000..a32c7db4de --- /dev/null +++ b/tools/tests/pdx/.gitignore @@ -0,0 +1,2 @@ +/pdx.h +/test-pdx-mask diff --git a/tools/tests/pdx/Makefile b/tools/tests/pdx/Makefile new file mode 100644 index 0000000000..b3734afde6 --- /dev/null +++ b/tools/tests/pdx/Makefile @@ -0,0 +1,49 @@ +XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +TARGETS := test-pdx-mask + +.PHONY: all +all: $(TARGETS) + +.PHONY: run +run: $(TARGETS) +ifeq ($(CC),$(HOSTCC)) + set -e; \ + for test in $? ; do \ + ./$$test ; \ + done +else + $(warning HOSTCC != CC, will not run test) +endif + +.PHONY: clean +clean: + $(RM) -- *.o $(TARGETS) $(DEPS_RM) pdx.h + +.PHONY: distclean +distclean: clean + $(RM) -- *~ + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC)/tests + +.PHONY: uninstall +uninstall: + $(RM) -- $(patsubst %,$(DESTDIR)$(LIBEXEC)/tests/%,$(TARGETS)) + +pdx.h: $(XEN_ROOT)/xen/include/xen/pdx.h + sed -E -e '/^#[[:space:]]*include/d' <$< >$@ + +CFLAGS += -D__XEN_TOOLS__ +CFLAGS += $(APPEND_CFLAGS) +CFLAGS += $(CFLAGS_xeninclude) + +test-pdx-mask: CFLAGS += -DCONFIG_PDX_MASK_COMPRESSION + +test-pdx-%: test-pdx.c pdx.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -o $@ $< $(APPEND_CFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h new file mode 100644 index 0000000000..5bef7df650 --- /dev/null +++ b/tools/tests/pdx/harness.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for PDX compression. + * + * Copyright (C) 2025 Cloud Software Group + */ + +#ifndef _TEST_HARNESS_ +#define _TEST_HARNESS_ + +#include +#include +#include +#include +#include +#include + +#include + +#define __init +#define __initdata +#define __ro_after_init +#define cf_check + +#define printk printf +#define XENLOG_INFO +#define XENLOG_DEBUG +#define XENLOG_WARNING +#define KERN_INFO + +#define BITS_PER_LONG (unsigned int)(sizeof(unsigned long) * 8) + +#define PAGE_SHIFT 12 +/* Some libcs define PAGE_SIZE in limits.h. */ +#undef PAGE_SIZE +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define MAX_ORDER 18 /* 2 * PAGETABLE_ORDER (9) */ + +#define PFN_DOWN(x) ((x) >> PAGE_SHIFT) +#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) + +#define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) +#define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) + +#define MAX_RANGES 16 +#define MAX_PFN_RANGES MAX_RANGES + +#define ASSERT assert + +#define CONFIG_DEBUG + +static inline unsigned int find_next( + const unsigned long *addr, unsigned int size, unsigned int off, bool value) +{ + unsigned int i; + + ASSERT(size <= BITS_PER_LONG); + + for ( i = off; i < size; i++ ) + if ( !!(*addr & (1UL << i)) == value ) + return i; + + return size; +} + +#define find_next_zero_bit(a, s, o) find_next(a, s, o, false) +#define find_next_bit(a, s, o) find_next(a, s, o, true) + +#define boolean_param(name, func) + +typedef uint64_t paddr_t; + +#include "pdx.h" + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c new file mode 100644 index 0000000000..0798ccee35 --- /dev/null +++ b/tools/tests/pdx/test-pdx.c @@ -0,0 +1,267 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for PDX compression. + * + * Copyright (C) 2025 Cloud Software Group + */ + +#include "harness.h" + +#include "../../xen/common/pdx.c" + +struct range { + /* Ranges are defined as [start, end). */ + unsigned long start, end; +}; + +static void print_ranges(const struct range *r) +{ + unsigned int i; + + printf("Ranges:\n"); + + for ( i = 0; i < MAX_RANGES; i++ ) + { + if ( !r[i].start && !r[i].end ) + break; + + printf(" %013lx-%013lx\n", r[i].start, r[i].end); + } +} + +int main(int argc, char **argv) +{ + static const struct { + struct range ranges[MAX_RANGES]; + bool compress; + } tests[] = { +#ifdef __LP64__ + /* + * Only for targets where unsigned long is 64bits, otherwise compiler + * will complain about truncation from 'long long' -> 'long' conversion. + * + * Real memory map from a 4s Intel GNR. Not compressible using PDX + * mask compression. + */ + { + .ranges = { + { .start = 0, .end = 0x80000UL }, + { .start = 0x0100000UL, .end = 0x8080000UL }, + { .start = 0x63e80000UL, .end = 0x6be80000UL }, + { .start = 0xc7e80000UL, .end = 0xcfe80000UL }, + { .start = 0x12be80000UL, .end = 0x133e80000UL }, + }, + .compress = false, + }, + /* Simple hole. */ + { + .ranges = { + { .start = 0, + .end = (1UL << MAX_ORDER) * 1 }, + { .start = (1UL << (MAX_ORDER * 2)) | 0, + .end = (1UL << (MAX_ORDER * 2)) | (1UL << MAX_ORDER) * 1 }, + }, + .compress = true, + }, + /* Simple hole, unsorted ranges. */ + { + .ranges = { + { .start = (1UL << (MAX_ORDER * 2)) | 0, + .end = (1UL << (MAX_ORDER * 2)) | (1UL << MAX_ORDER) * 1 }, + { .start = 0, + .end = (1UL << MAX_ORDER) * 1 }, + }, + .compress = true, + }, + /* PDX compression, 2 ranges covered by the lower mask. */ + { + .ranges = { + { .start = 0, + .end = (1 << MAX_ORDER) * 1 }, + { .start = (1 << MAX_ORDER) * 2, + .end = (1 << MAX_ORDER) * 3 }, + { .start = (1 << MAX_ORDER) * 20, + .end = (1 << MAX_ORDER) * 22 }, + }, + .compress = true, + }, + /* Single range not starting at 0. */ + { + .ranges = { + { .start = (1 << MAX_ORDER) * 10, + .end = (1 << MAX_ORDER) * 11 }, + }, + .compress = true, + }, + /* Resulting PDX region size leads to no compression. */ + { + .ranges = { + { .start = 0, + .end = (1 << MAX_ORDER) * 1 }, + { .start = (1 << MAX_ORDER) * 2, + .end = (1 << MAX_ORDER) * 3 }, + { .start = (1 << MAX_ORDER) * 4, + .end = (1 << MAX_ORDER) * 7 }, + { .start = (1 << MAX_ORDER) * 8, + .end = (1 << MAX_ORDER) * 12 }, + }, + .compress = false, + }, + /* AMD Versal Gen 2 ARM board. */ + { + .ranges = { + { .start = 0, .end = 0x80000UL }, + { .start = 0x800000UL, .end = 0x880000UL }, + { .start = 0x50000000UL, .end = 0x50080000UL }, + { .start = 0x60000000UL, .end = 0x60080000UL }, + { .start = 0x70000000UL, .end = 0x70080000UL }, + }, + .compress = true, + }, + /* Unsorted ranges, lower one not starting at 0. */ + { + .ranges = { + { .start = (1UL << (35 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 2, + .end = (1UL << (35 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3 }, + { .start = (1 << MAX_ORDER) * 2, + .end = (1 << MAX_ORDER) * 3 }, + }, + .compress = true, + }, + /* Two ranges with the same high bit set. */ + { + .ranges = { + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 0, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 1 }, + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 4 }, + }, + .compress = true, + }, +#endif + /* AMD Naples Epyc 7281 2 sockets, 8 NUMA nodes. */ + { + .ranges = { + { .start = 0, .end = 0xa0UL }, + { .start = 0x100UL, .end = 0xb0000UL }, + { .start = 0x100000UL, .end = 0x430000UL }, + { .start = 0x430000UL, .end = 0x830000UL }, + { .start = 0x830000UL, .end = 0xc30000UL }, + { .start = 0xc30000UL, .end = 0x1030000UL }, + { .start = 0x1030000UL, .end = 0x1430000UL }, + { .start = 0x1430000UL, .end = 0x1830000UL }, + { .start = 0x1830000UL, .end = 0x1c30000UL }, + { .start = 0x1c30000UL, .end = 0x2030000UL }, + }, + .compress = false, + }, + /* 2-node 2GB per-node QEMU layout. */ + { + .ranges = { + { .start = 0, .end = 0x80000UL }, + { .start = 0x100000UL, .end = 0x180000UL }, + }, + .compress = true, + }, + /* Not compressible, smaller than MAX_ORDER. */ + { + .ranges = { + { .start = 0, .end = 1 }, + { .start = 0x100UL, .end = 0x101UL }, + }, + .compress = false, + }, + /* Compressible, requires adjusting size to (1 << MAX_ORDER). */ + { + .ranges = { + { .start = 0, .end = 1 }, + { .start = 0x100000UL, .end = 0x100001UL }, + }, + .compress = true, + }, + /* 2s Intel CLX with contiguous ranges, no compression. */ + { + .ranges = { + { .start = 0 , .end = 0x180000UL }, + { .start = 0x180000UL, .end = 0x3040000UL }, + }, + .compress = false, + }, + }; + int ret_code = EXIT_SUCCESS; + + for ( unsigned int i = 0 ; i < ARRAY_SIZE(tests); i++ ) + { + unsigned int j; + + pfn_pdx_compression_reset(); + + for ( j = 0; j < ARRAY_SIZE(tests[i].ranges); j++ ) + { + unsigned long size = tests[i].ranges[j].end - + tests[i].ranges[j].start; + + if ( !tests[i].ranges[j].start && !tests[i].ranges[j].end ) + break; + + pfn_pdx_add_region(tests[i].ranges[j].start << PAGE_SHIFT, + size << PAGE_SHIFT); + } + + if ( pfn_pdx_compression_setup(0) != tests[i].compress ) + { + printf("PFN compression diverge, expected %scompressible\n", + tests[i].compress ? "" : "un"); + print_ranges(tests[i].ranges); + + ret_code = EXIT_FAILURE; + continue; + } + + if ( !tests[i].compress ) + continue; + + for ( j = 0; j < ARRAY_SIZE(tests[i].ranges); j++ ) + { + unsigned long start = tests[i].ranges[j].start; + unsigned long end = tests[i].ranges[j].end; + + if ( !start && !end ) + break; + + if ( !pdx_is_region_compressible(start << PAGE_SHIFT, 1) || + !pdx_is_region_compressible((end - 1) << PAGE_SHIFT, 1) ) + { + printf( + "PFN compression invalid, pages %#lx and %#lx should be compressible\n", + start, end - 1); + print_ranges(tests[i].ranges); + ret_code = EXIT_FAILURE; + } + + if ( start != pdx_to_pfn(pfn_to_pdx(start)) || + end - 1 != pdx_to_pfn(pfn_to_pdx(end - 1)) ) + { + printf("Compression is not bi-directional:\n"); + printf(" PFN %#lx -> PDX %#lx -> PFN %#lx\n", + start, pfn_to_pdx(start), pdx_to_pfn(pfn_to_pdx(start))); + printf(" PFN %#lx -> PDX %#lx -> PFN %#lx\n", + end - 1, pfn_to_pdx(end - 1), + pdx_to_pfn(pfn_to_pdx(end - 1))); + print_ranges(tests[i].ranges); + ret_code = EXIT_FAILURE; + } + } + } + + return ret_code; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/pdx.c b/xen/common/pdx.c index c9ec867291..cd8a9e75a8 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -15,6 +15,8 @@ * along with this program; If not, see . */ +/* Trim content when built for the test harness. */ +#ifdef __XEN__ #include #include #include @@ -57,6 +59,8 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) __set_bit(idx, pdx_group_valid); } +#endif /* __XEN__ */ + #ifndef CONFIG_PDX_NONE #ifdef CONFIG_X86 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 08:22:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 08:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078440.1439437 (Exim 4.92) (envelope-from ) id 1ulkHV-00074s-H9; Tue, 12 Aug 2025 08:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078440.1439437; Tue, 12 Aug 2025 08:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkHV-00074l-DG; Tue, 12 Aug 2025 08:22:53 +0000 Received: by outflank-mailman (input) for mailman id 1078440; Tue, 12 Aug 2025 08:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulkHU-00074X-7T for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulkHT-001cz5-32 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulkHU-0014u2-0K for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 08:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tnk1QLMiHAwoHqYqa5ZiGHEUn4SfvCJHCLJ94d2i798=; b=FzXcSv9kMqMRpiRnMNynciF8XQ zHHvLViadE1+CUBQ2/zitNTdDl9EDW6y472fnT+0rl1L2/3lh93c6kd1fRSfuBOxNSqIbi2cr6Nqm Mt7qYMZmAztztKYjOLALVtep6ZVInFxvWZ6P9eZ0k5EpSY1sdOkcfdr/7aNRXWffzdWk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pdx: move some helpers in preparation for new compression Message-Id: Date: Tue, 12 Aug 2025 08:22:52 +0000 commit 353e5952943fe03bb0866243132333dace700ff1 Author: Roger Pau Monne AuthorDate: Tue Jun 17 16:35:13 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 pdx: move some helpers in preparation for new compression Move fill_mask(), pdx_region_mask() and pdx_init_mask() to the !CONFIG_PDX_NONE section in preparation of them also being used by a newly added PDX compression. No functional change intended. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/common/pdx.c | 118 +++++++++++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index cd8a9e75a8..9e6b36086f 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -101,59 +101,6 @@ void __init pfn_pdx_add_region(paddr_t base, paddr_t size) ranges[nr_ranges++].pages = PFN_UP(base + size) - PFN_DOWN(base); } -#endif /* !CONFIG_PDX_NONE */ - -#ifdef CONFIG_PDX_MASK_COMPRESSION - -/* - * Diagram to make sense of the following variables. The masks and shifts - * are done on mfn values in order to convert to/from pdx: - * - * pfn_hole_mask - * pfn_pdx_hole_shift (mask bitsize) - * | - * |---------| - * | | - * V V - * -------------------------- - * |HHHHHHH|000000000|LLLLLL| <--- mfn - * -------------------------- - * ^ ^ ^ ^ - * | | |------| - * | | | - * | | pfn_pdx_bottom_mask - * | | - * |-------| - * | - * pfn_top_mask - * - * ma_{top,va_bottom}_mask is simply a shifted pfn_{top,pdx_bottom}_mask, - * where ma_top_mask has zeroes shifted in while ma_va_bottom_mask has - * ones. - */ - -/** Mask for the lower non-compressible bits of an mfn */ -unsigned long __ro_after_init pfn_pdx_bottom_mask = ~0UL; - -/** Mask for the lower non-compressible bits of an maddr or vaddr */ -unsigned long __ro_after_init ma_va_bottom_mask = ~0UL; - -/** Mask for the higher non-compressible bits of an mfn */ -unsigned long __ro_after_init pfn_top_mask = 0; - -/** Mask for the higher non-compressible bits of an maddr or vaddr */ -unsigned long __ro_after_init ma_top_mask = 0; - -/** - * Mask for a pdx compression bit slice. - * - * Invariant: valid(mfn) implies (mfn & pfn_hole_mask) == 0 - */ -unsigned long __ro_after_init pfn_hole_mask = 0; - -/** Number of bits of the "compressible" bit slice of an mfn */ -unsigned int __ro_after_init pfn_pdx_hole_shift = 0; - /* Sets all bits from the most-significant 1-bit down to the LSB */ static uint64_t fill_mask(uint64_t mask) { @@ -196,12 +143,6 @@ static uint64_t pdx_region_mask(uint64_t base, uint64_t len) return fill_mask(base ^ (base + len - 1)); } -bool pdx_is_region_compressible(paddr_t base, unsigned long npages) -{ - return !(paddr_to_pfn(base) & pfn_hole_mask) && - !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); -} - /** * Creates the mask to start from when calculating non-compressible bits * @@ -219,6 +160,65 @@ static uint64_t __init pdx_init_mask(uint64_t base_addr) (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); } +#endif /* !CONFIG_PDX_NONE */ + +#ifdef CONFIG_PDX_MASK_COMPRESSION + +/* + * Diagram to make sense of the following variables. The masks and shifts + * are done on mfn values in order to convert to/from pdx: + * + * pfn_hole_mask + * pfn_pdx_hole_shift (mask bitsize) + * | + * |---------| + * | | + * V V + * -------------------------- + * |HHHHHHH|000000000|LLLLLL| <--- mfn + * -------------------------- + * ^ ^ ^ ^ + * | | |------| + * | | | + * | | pfn_pdx_bottom_mask + * | | + * |-------| + * | + * pfn_top_mask + * + * ma_{top,va_bottom}_mask is simply a shifted pfn_{top,pdx_bottom}_mask, + * where ma_top_mask has zeroes shifted in while ma_va_bottom_mask has + * ones. + */ + +/** Mask for the lower non-compressible bits of an mfn */ +unsigned long __ro_after_init pfn_pdx_bottom_mask = ~0UL; + +/** Mask for the lower non-compressible bits of an maddr or vaddr */ +unsigned long __ro_after_init ma_va_bottom_mask = ~0UL; + +/** Mask for the higher non-compressible bits of an mfn */ +unsigned long __ro_after_init pfn_top_mask = 0; + +/** Mask for the higher non-compressible bits of an maddr or vaddr */ +unsigned long __ro_after_init ma_top_mask = 0; + +/** + * Mask for a pdx compression bit slice. + * + * Invariant: valid(mfn) implies (mfn & pfn_hole_mask) == 0 + */ +unsigned long __ro_after_init pfn_hole_mask = 0; + +/** Number of bits of the "compressible" bit slice of an mfn */ +unsigned int __ro_after_init pfn_pdx_hole_shift = 0; + +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + return !(paddr_to_pfn(base) & pfn_hole_mask) && + !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); +} + bool __init pfn_pdx_compression_setup(paddr_t base) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:44:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078475.1439479 (Exim 4.92) (envelope-from ) id 1ullY3-0002Lj-RV; Tue, 12 Aug 2025 09:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078475.1439479; Tue, 12 Aug 2025 09:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullY3-0002Lc-Ow; Tue, 12 Aug 2025 09:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1078475; Tue, 12 Aug 2025 09:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullY2-0002L2-6X for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullY1-001eVv-29 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullY1-0018Uh-2U for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PHOtWpDfguW8Xmwlu9PJZI6eSqRoHeTHNLktLf8dUCE=; b=ok7gM9qAADO+LJolCKX/Ivd+7f 1uOsgYBcivOGN4Hg+BrxEAzy7RBfEvZdWfnk1aBarZRXHDnwq7EjtiwoIbK+5vY/wbfoasEa6h4KW TTDopEBOfF9xmLPBkVA4MeRKYADOVEwx0RRvC2/Z4hUUnxLmJTerGd+x+oX9BetPZQG4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] kconfig: turn PDX compression into a choice Message-Id: Date: Tue, 12 Aug 2025 09:44:01 +0000 commit b541c627b227ecdca53602a31628d9b94218a0a6 Author: Roger Pau Monne AuthorDate: Mon May 26 16:42:49 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:05 2025 +0200 kconfig: turn PDX compression into a choice Rename the current CONFIG_PDX_COMPRESSION to CONFIG_PDX_MASK_COMPRESSION, and make it part of the PDX compression choice block, in preparation for adding further PDX compression algorithms. The PDX compression defaults should still be the same for all architectures, however the choice block cannot be protected under EXPERT and still have a default choice being unconditionally selected. As a result, the new "PDX (Page inDeX) compression" item will be unconditionally visible in Kconfig, even on architectures like x86 that previously had no way to enable PDX compression. As part of this preparation work to introduce new PDX compressions, adjust some of the comments on pdx.h to note they apply to a specific PDX compression. Also shuffle function prototypes and dummy implementations around to make it easier to introduce a new PDX compression. Note all PDX compression implementations are expected to provide a pdx_is_region_compressible() that takes the same set of arguments. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- xen/common/Kconfig | 18 +++++++++++++++--- xen/common/pdx.c | 4 ++-- xen/include/xen/pdx.h | 32 +++++++++++++++++++------------- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index bb35afe56c..a77b31071e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -258,7 +258,7 @@ void __init init_pdx(void) paddr_t bank_start, bank_size, bank_end, ram_end = 0; int bank; -#ifdef CONFIG_PDX_COMPRESSION +#ifndef CONFIG_PDX_NONE /* * Arm does not have any restrictions on the bits to compress. Pass 0 to * let the common code further restrict the mask. diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 16936418a6..8dad0c923a 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -57,9 +57,10 @@ config EVTCHN_FIFO If unsure, say Y. -config PDX_COMPRESSION - bool "PDX (Page inDeX) compression" if EXPERT && !X86 && !RISCV - default ARM || PPC +choice + prompt "PDX (Page inDeX) compression" + default PDX_MASK_COMPRESSION if !X86 && !RISCV + default PDX_NONE help PDX compression is a technique designed to reduce the memory overhead of physical memory management on platforms with sparse RAM @@ -72,6 +73,17 @@ config PDX_COMPRESSION If your platform does not have sparse RAM banks, do not enable PDX compression. +config PDX_MASK_COMPRESSION + bool "Mask compression" + help + Compression relying on all RAM addresses sharing a zeroed bit region. + +config PDX_NONE + bool "None" + help + No compression +endchoice + config ALTERNATIVE_CALL bool diff --git a/xen/common/pdx.c b/xen/common/pdx.c index b8384e6189..00aa7e4300 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -34,7 +34,7 @@ bool __mfn_valid(unsigned long mfn) { bool invalid = mfn >= max_page; -#ifdef CONFIG_PDX_COMPRESSION +#ifdef CONFIG_PDX_MASK_COMPRESSION invalid |= mfn & pfn_hole_mask; #endif @@ -55,7 +55,7 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) __set_bit(idx, pdx_group_valid); } -#ifdef CONFIG_PDX_COMPRESSION +#ifdef CONFIG_PDX_MASK_COMPRESSION /* * Diagram to make sense of the following variables. The masks and shifts diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index c1423d64a9..8e373cac8b 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -25,7 +25,7 @@ * this by keeping a bitmap of the ranges in the frame table containing * invalid entries and not allocating backing memory for them. * - * ## PDX compression + * ## PDX mask compression * * This is a technique to avoid wasting memory on machines known to have * split their machine address space in several big discontinuous and highly @@ -101,22 +101,13 @@ bool __mfn_valid(unsigned long mfn); #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) #define pdx_to_paddr(px) pfn_to_paddr(pdx_to_pfn(px)) -#ifdef CONFIG_PDX_COMPRESSION +#ifdef CONFIG_PDX_MASK_COMPRESSION extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; extern unsigned int pfn_pdx_hole_shift; extern unsigned long pfn_hole_mask; extern unsigned long pfn_top_mask, ma_top_mask; -/** - * Validate a region's compatibility with the current compression runtime - * - * @param base Base address of the region - * @param npages Number of PAGE_SIZE-sized pages in the region - * @return True iff the region can be used with the current compression - */ -bool pdx_is_region_compressible(paddr_t base, unsigned long npages); - /** * Calculates a mask covering "moving" bits of all addresses of a region * @@ -209,7 +200,9 @@ static inline paddr_t directmapoff_to_maddr(unsigned long offset) */ void pfn_pdx_hole_setup(unsigned long mask); -#else /* !CONFIG_PDX_COMPRESSION */ +#endif /* CONFIG_PDX_MASK_COMPRESSION */ + +#ifdef CONFIG_PDX_NONE /* Without PDX compression we can skip some computations */ @@ -241,7 +234,20 @@ static inline void pfn_pdx_hole_setup(unsigned long mask) { } -#endif /* CONFIG_PDX_COMPRESSION */ +#else /* !CONFIG_PDX_NONE */ + +/* Shared functions implemented by all PDX compressions. */ + +/** + * Validate a region's compatibility with the current compression runtime + * + * @param base Base address of the region + * @param npages Number of PAGE_SIZE-sized pages in the region + * @return True iff the region can be used with the current compression + */ +bool pdx_is_region_compressible(paddr_t base, unsigned long npages); + +#endif /* !CONFIG_PDX_NONE */ #endif /* __XEN_PDX_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078479.1439484 (Exim 4.92) (envelope-from ) id 1ullYC-0002S4-Vm; Tue, 12 Aug 2025 09:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078479.1439484; Tue, 12 Aug 2025 09:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYC-0002Rw-Sx; Tue, 12 Aug 2025 09:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1078479; Tue, 12 Aug 2025 09:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYB-0002Re-W4 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullYB-001eW2-2R for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullYB-0018Y0-30 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I1t4N/2um4kGTJSLDFcpwDvIMc8/Qyo/R69MobG6pKw=; b=yQN6o01KvehoDNYfuvJcCOETA6 nSQiYQnmjIG61D/3cWIIEV43BFhSUypLLUphua3BPZT5j5VZm6me6XrOIt54KwLhJSKe404jLUqVZ C/d62llESu4BXNJlM+xumwkFfNSV0pCRrjbAbkMBcBto6/fzZ/y8CO8F9zkPdpekD+Fc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pdx: provide a common set of init functions Message-Id: Date: Tue, 12 Aug 2025 09:44:11 +0000 commit fd23bc59c2db2d36172225c433f8a803df6fa8bc Author: Roger Pau Monne AuthorDate: Mon Jun 9 16:43:44 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:33 2025 +0200 pdx: provide a common set of init functions The current setup (pdx_init_mask() and pdx_region_mask()) and init (pfn_pdx_hole_setup()) PDX compression functions are tailored to the existing PDX compression algorithm. In preparation for introducing a new compression algorithm convert the setup and init functions to more generic interfaces that aren't tied to the compression in-use. To accomplish this introduce a function that registers all the PFN RAM ranges, plus an init function. This has the downside of requiring a static array to store such ranges ahead of being processed by the setup function, however it's the only way to pass all the possible information to the different compression setup functions without using per-compression specific setup functions. Per-arch compression setup also need to be adjusted to use the new interface. There's a slight ordering adjustment, in that after PDX compression setup the caller will check whether all the RAM regions are properly covered by the newly setup compression, otherwise compression is disabled by resetting to the initial values. No functional change intended in the resulting PDX compression values. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich Acked-by: Julien Grall # ARM --- xen/arch/arm/setup.c | 32 ++++++------- xen/arch/x86/srat.c | 28 +++++++----- xen/common/pdx.c | 122 +++++++++++++++++++++++++++++++++++++++++++------- xen/include/xen/pdx.h | 73 +++++++++++------------------- 4 files changed, 165 insertions(+), 90 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index a77b31071e..7ad870e382 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -256,9 +256,11 @@ void __init init_pdx(void) { const struct membanks *mem = bootinfo_get_mem(); paddr_t bank_start, bank_size, bank_end, ram_end = 0; - int bank; + unsigned int bank; #ifndef CONFIG_PDX_NONE + for ( bank = 0 ; bank < mem->nr_banks; bank++ ) + pfn_pdx_add_region(mem->bank[bank].start, mem->bank[bank].size); /* * Arm does not have any restrictions on the bits to compress. Pass 0 to * let the common code further restrict the mask. @@ -266,26 +268,24 @@ void __init init_pdx(void) * If the logic changes in pfn_pdx_hole_setup we might have to * update this function too. */ - uint64_t mask = pdx_init_mask(0x0); + pfn_pdx_compression_setup(0); for ( bank = 0 ; bank < mem->nr_banks; bank++ ) { - bank_start = mem->bank[bank].start; - bank_size = mem->bank[bank].size; + const struct membank *m = &mem->bank[bank]; - mask |= bank_start | pdx_region_mask(bank_start, bank_size); - } - - for ( bank = 0 ; bank < mem->nr_banks; bank++ ) - { - bank_start = mem->bank[bank].start; - bank_size = mem->bank[bank].size; - - if (~mask & pdx_region_mask(bank_start, bank_size)) - mask = 0; + if ( !pdx_is_region_compressible(m->start, + PFN_UP(m->start + m->size) - + PFN_DOWN(m->start)) ) + { + pfn_pdx_compression_reset(); + printk(XENLOG_WARNING + "PFN compression disabled, RAM region [%#" PRIpaddr ", %#" + PRIpaddr "] not covered\n", + m->start, m->start + m->size - 1); + break; + } } - - pfn_pdx_hole_setup(mask >> PAGE_SHIFT); #endif for ( bank = 0 ; bank < mem->nr_banks; bank++ ) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 688f410287..747607439f 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -261,8 +261,6 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma) void __init acpi_numa_arch_fixup(void) {} -static uint64_t __initdata srat_region_mask; - static int __init cf_check srat_parse_region( struct acpi_subtable_header *header, const unsigned long end) { @@ -282,15 +280,13 @@ static int __init cf_check srat_parse_region( printk(KERN_INFO "SRAT: %013"PRIx64"-%013"PRIx64"\n", ma->base_address, ma->base_address + ma->length - 1); - srat_region_mask |= ma->base_address | - pdx_region_mask(ma->base_address, ma->length); + pfn_pdx_add_region(ma->base_address, ma->length); return 0; } void __init srat_parse_regions(paddr_t addr) { - u64 mask; unsigned int i; if (acpi_disabled || acpi_numa < 0 || @@ -299,19 +295,29 @@ void __init srat_parse_regions(paddr_t addr) /* Set "PXM" as early as feasible. */ numa_fw_nid_name = "PXM"; - srat_region_mask = pdx_init_mask(addr); acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); - for (mask = srat_region_mask, i = 0; mask && i < e820.nr_map; i++) { + pfn_pdx_compression_setup(addr); + + /* Ensure all RAM ranges in the e820 are covered. */ + for (i = 0; i < e820.nr_map; i++) { if (e820.map[i].type != E820_RAM) continue; - if (~mask & pdx_region_mask(e820.map[i].addr, e820.map[i].size)) - mask = 0; + if (!pdx_is_region_compressible( + e820.map[i].addr, + PFN_UP(e820.map[i].addr + e820.map[i].size) - + PFN_DOWN(e820.map[i].addr))) { + pfn_pdx_compression_reset(); + printk(XENLOG_WARNING + "PFN compression disabled, RAM region [%#" PRIx64 + ", %#" PRIx64 "] not covered\n", + e820.map[i].addr, + e820.map[i].addr + e820.map[i].size - 1); + return; + } } - - pfn_pdx_hole_setup(mask >> PAGE_SHIFT); } unsigned int numa_node_to_arch_nid(nodeid_t n) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 00aa7e4300..c5ea58873c 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -19,6 +19,7 @@ #include #include #include +#include #include /** @@ -55,6 +56,44 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) __set_bit(idx, pdx_group_valid); } +#ifndef CONFIG_PDX_NONE + +#ifdef CONFIG_X86 +# include +# define MAX_PFN_RANGES E820MAX +#elif defined(CONFIG_HAS_DEVICE_TREE_DISCOVERY) +# include +# define MAX_PFN_RANGES NR_MEM_BANKS +#endif + +#ifndef MAX_PFN_RANGES +# error "Missing architecture maximum number of RAM ranges" +#endif + +/* Generic PFN compression helpers. */ +static struct pfn_range { + unsigned long base_pfn, pages; +} ranges[MAX_PFN_RANGES] __initdata; +static unsigned int __initdata nr_ranges; + +void __init pfn_pdx_add_region(paddr_t base, paddr_t size) +{ + if ( !size ) + return; + + if ( nr_ranges >= ARRAY_SIZE(ranges) ) + { + ASSERT((nr_ranges + 1) > nr_ranges); + nr_ranges++; + return; + } + + ranges[nr_ranges].base_pfn = PFN_DOWN(base); + ranges[nr_ranges++].pages = PFN_UP(base + size) - PFN_DOWN(base); +} + +#endif /* !CONFIG_PDX_NONE */ + #ifdef CONFIG_PDX_MASK_COMPRESSION /* @@ -115,20 +154,25 @@ static uint64_t fill_mask(uint64_t mask) return mask; } -bool pdx_is_region_compressible(paddr_t base, unsigned long npages) -{ - return !(paddr_to_pfn(base) & pfn_hole_mask) && - !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); -} - -/* We don't want to compress the low MAX_ORDER bits of the addresses. */ -uint64_t __init pdx_init_mask(uint64_t base_addr) -{ - return fill_mask(max(base_addr, - (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); -} - -uint64_t pdx_region_mask(uint64_t base, uint64_t len) +/** + * Calculates a mask covering "moving" bits of all addresses of a region + * + * The i-th bit of the mask must be set if there's 2 different addresses + * in the region that have different j-th bits. where j >= i. + * + * e.g: + * base=0x1B00000000 + * len+base=0x1B00042000 + * + * ought to return 0x000007FFFF, which implies that every bit position + * with a zero in the mask remains unchanged in every address of the + * region. + * + * @param base Base address of the region + * @param len Size in octets of the region + * @return Mask of moving bits at the bottom of all the region addresses + */ +static uint64_t pdx_region_mask(uint64_t base, uint64_t len) { /* * We say a bit "moves" in a range if there exist 2 addresses in that @@ -143,9 +187,45 @@ uint64_t pdx_region_mask(uint64_t base, uint64_t len) return fill_mask(base ^ (base + len - 1)); } -void __init pfn_pdx_hole_setup(unsigned long mask) +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + return !(paddr_to_pfn(base) & pfn_hole_mask) && + !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); +} + +/** + * Creates the mask to start from when calculating non-compressible bits + * + * This function is intimately related to pdx_region_mask(), and together + * they are meant to calculate the mask of non-compressible bits given the + * current memory map. + * + * @param base_addr Address of the first maddr in the system + * @return An integer of the form 2^n - 1 + */ +static uint64_t __init pdx_init_mask(uint64_t base_addr) +{ + return fill_mask(max(base_addr, + /* Don't compress the low MAX_ORDER bits. */ + (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); +} + +void __init pfn_pdx_compression_setup(paddr_t base) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; + unsigned long mask = pdx_init_mask(base) >> PAGE_SHIFT; + + if ( nr_ranges > ARRAY_SIZE(ranges) ) + { + printk(XENLOG_WARNING + "Too many PFN ranges (%u > %zu), not attempting PFN compression\n", + nr_ranges, ARRAY_SIZE(ranges)); + return; + } + + for ( i = 0; i < nr_ranges; i++ ) + mask |= ranges[i].base_pfn | + pdx_region_mask(ranges[i].base_pfn, ranges[i].pages); /* * We skip the first MAX_ORDER bits, as we never want to compress them. @@ -184,6 +264,18 @@ void __init pfn_pdx_hole_setup(unsigned long mask) ma_top_mask = pfn_top_mask << PAGE_SHIFT; } +void __init pfn_pdx_compression_reset(void) +{ + pfn_pdx_bottom_mask = ~0UL; + ma_va_bottom_mask = ~0UL; + pfn_top_mask = 0; + ma_top_mask = 0; + pfn_hole_mask = 0; + pfn_pdx_hole_shift = 0; + + nr_ranges = 0; +} + #endif /* CONFIG_PDX_COMPRESSION */ /* diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 8e373cac8b..10153da98b 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -108,38 +108,6 @@ extern unsigned int pfn_pdx_hole_shift; extern unsigned long pfn_hole_mask; extern unsigned long pfn_top_mask, ma_top_mask; -/** - * Calculates a mask covering "moving" bits of all addresses of a region - * - * The i-th bit of the mask must be set if there's 2 different addresses - * in the region that have different j-th bits. where j >= i. - * - * e.g: - * base=0x1B00000000 - * len+base=0x1B00042000 - * - * ought to return 0x000007FFFF, which implies that every bit position - * with a zero in the mask remains unchanged in every address of the - * region. - * - * @param base Base address of the region - * @param len Size in octets of the region - * @return Mask of moving bits at the bottom of all the region addresses - */ -uint64_t pdx_region_mask(uint64_t base, uint64_t len); - -/** - * Creates the mask to start from when calculating non-compressible bits - * - * This function is intimately related to pdx_region_mask(), and together - * they are meant to calculate the mask of non-compressible bits given the - * current memory map. - * - * @param base_addr Address of the first maddr in the system - * @return An integer of the form 2^n - 1 - */ -uint64_t pdx_init_mask(uint64_t base_addr); - /** * Map pfn to its corresponding pdx * @@ -189,17 +157,6 @@ static inline paddr_t directmapoff_to_maddr(unsigned long offset) (offset & ma_va_bottom_mask)); } -/** - * Initializes global variables with information about the compressible - * range of the current memory regions. - * - * @param mask This mask is the biggest pdx_mask of every region in the - * system ORed with all base addresses of every region in the - * system. This results in a mask where every zero in a bit - * position marks a potentially compressible bit. - */ -void pfn_pdx_hole_setup(unsigned long mask); - #endif /* CONFIG_PDX_MASK_COMPRESSION */ #ifdef CONFIG_PDX_NONE @@ -220,17 +177,15 @@ static inline bool pdx_is_region_compressible(paddr_t base, return true; } -static inline uint64_t pdx_init_mask(uint64_t base_addr) +static inline void pfn_pdx_add_region(paddr_t base, paddr_t size) { - return 0; } -static inline uint64_t pdx_region_mask(uint64_t base, uint64_t len) +static inline void pfn_pdx_compression_setup(paddr_t base) { - return 0; } -static inline void pfn_pdx_hole_setup(unsigned long mask) +static inline void pfn_pdx_compression_reset(void) { } @@ -247,6 +202,28 @@ static inline void pfn_pdx_hole_setup(unsigned long mask) */ bool pdx_is_region_compressible(paddr_t base, unsigned long npages); +/** + * Register a RAM region with the PFN compression logic. + * + * @param base Start of the region in bytes. + * @param size Length of the region in bytes. + */ +void pfn_pdx_add_region(paddr_t base, paddr_t size); + +/** + * Initializes global variables with information about the compressible + * range of the current memory regions. + * + * @param base address to start compression from. + */ +void pfn_pdx_compression_setup(paddr_t base); + +/** + * Reset the global variables to it's default values, thus disabling PFN + * compression. + */ +void pfn_pdx_compression_reset(void); + #endif /* !CONFIG_PDX_NONE */ #endif /* __XEN_PDX_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078485.1439488 (Exim 4.92) (envelope-from ) id 1ullYO-0002Zk-0q; Tue, 12 Aug 2025 09:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078485.1439488; Tue, 12 Aug 2025 09:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYN-0002Zc-UX; Tue, 12 Aug 2025 09:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1078485; Tue, 12 Aug 2025 09:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYM-0002ZN-5N for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullYL-001eWB-2z for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullYM-0018Z9-04 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N2fzoMgqizouq5jDxrbqpCjMD1QJQsT0JxavNjBJwHk=; b=USYtF+5zRi26ku3rwFVHDYDhXs Afwb6Du4N4LByLR7Bo5/amDef+KetkoBX7qadzxRJdXw92C9cPrZq0wLH2hVBZZ4RbI8iLf8FCX2x E6L3wR48BnrdlR9UD/BKFEHLibrDPTJ1u49bpe7qGlIH73CZ24TfehjnUos9WqOr1fIs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pdx: introduce command line compression toggle Message-Id: Date: Tue, 12 Aug 2025 09:44:22 +0000 commit 31d9c88a3857b1140d8dc39d7b5d3a4efca8498a Author: Roger Pau Monne AuthorDate: Wed Jun 18 12:24:44 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 pdx: introduce command line compression toggle Introduce a command line option to allow disabling PDX compression. The disabling is done by turning pfn_pdx_add_region() into a no-op, so when attempting to initialize the selected compression algorithm the array of ranges to compress is empty. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 9 +++++++++ xen/common/pdx.c | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 6865a61220..5dd2ab82b7 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2072,6 +2072,15 @@ for all of them (`true`), only for those subject to XPTI (`xpti`) or for those not subject to XPTI (`no-xpti`). The feature is used only in case INVPCID is supported and not disabled via `invpcid=false`. +### pdx-compress +> `= ` + +> Default: `true` if CONFIG_PDX_NONE is unset + +Only relevant when the hypervisor is build with PFN PDX compression. Controls +whether Xen will engage in PFN compression. The algorithm used for PFN +compression is selected at build time from Kconfig. + ### ple_gap > `= ` diff --git a/xen/common/pdx.c b/xen/common/pdx.c index c5ea58873c..f4a3dcf6cb 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -76,9 +77,13 @@ static struct pfn_range { } ranges[MAX_PFN_RANGES] __initdata; static unsigned int __initdata nr_ranges; +static bool __initdata pdx_compress = true; +boolean_param("pdx-compress", pdx_compress); + void __init pfn_pdx_add_region(paddr_t base, paddr_t size) { - if ( !size ) + /* Without ranges there's no PFN compression. */ + if ( !size || !pdx_compress ) return; if ( nr_ranges >= ARRAY_SIZE(ranges) ) @@ -215,6 +220,13 @@ void __init pfn_pdx_compression_setup(paddr_t base) unsigned int i, j, bottom_shift = 0, hole_shift = 0; unsigned long mask = pdx_init_mask(base) >> PAGE_SHIFT; + if ( !nr_ranges ) + { + printk(XENLOG_DEBUG "PFN compression disabled%s\n", + pdx_compress ? ": no ranges provided" : ""); + return; + } + if ( nr_ranges > ARRAY_SIZE(ranges) ) { printk(XENLOG_WARNING -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078487.1439492 (Exim 4.92) (envelope-from ) id 1ullYY-0002c7-2h; Tue, 12 Aug 2025 09:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078487.1439492; Tue, 12 Aug 2025 09:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYX-0002bz-Vw; Tue, 12 Aug 2025 09:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1078487; Tue, 12 Aug 2025 09:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYW-0002bg-82 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullYW-001eWG-02 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullYW-0018a7-0c for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LvasvM9De1Ao7chUPCSIrD+fk6hp9w8QlPT5RleLfmg=; b=YLDG62tHyO6Q5goUzCRMu8mtXC SeBPxnqzSIyOspBPNdO7xnwJwFyeLYNT5Z1sbTqGDfI+q3ykN3JlkLuHlObH9ckpY9G2oMr36PR4c PU2N9Oz/JxJ7NIO6jwsBn44M/8mw/+1PEWYKLJhV+YYqx87CIQt8gGmAvqQgz+01cdjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pdx: allow per-arch optimization of PDX conversion helpers Message-Id: Date: Tue, 12 Aug 2025 09:44:32 +0000 commit bd0b3a876d805b95c5cfcf292d7651334c8dba80 Author: Roger Pau Monne AuthorDate: Fri Jun 20 09:50:51 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 pdx: allow per-arch optimization of PDX conversion helpers There are four performance critical PDX conversion helpers that do the PFN to/from PDX and the physical addresses to/from directmap offsets translations. In the absence of an active PDX compression, those functions would still do the calculations needed, just to return the same input value as no translation is in place and hence PFN and PDX spaces are identity mapped. To reduce the overhead of having to do the pointless calculations allow architectures to implement the translation helpers in a per-arch header. Rename the existing conversion functions to add a trailing _xlate suffix, so that the per-arch headers can define the non suffixed versions. Currently only x86 implements meaningful custom handlers to short circuit the translation when not active, using asm goto. Other architectures use generic macros that map the non-xlate to the xlate variants to keep the previous behavior. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/cpufeatures.h | 1 + xen/arch/x86/include/asm/pdx.h | 71 ++++++++++++++++++++++++++++++++++ xen/arch/x86/srat.c | 6 ++- xen/common/pdx.c | 10 +++-- xen/include/xen/pdx.h | 29 +++++++++++--- 5 files changed, 106 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index bc108c3819..71308d9daf 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -42,6 +42,7 @@ XEN_CPUFEATURE(XEN_IBT, X86_SYNTH(27)) /* Xen uses CET Indirect Branch XEN_CPUFEATURE(IBPB_ENTRY_PV, X86_SYNTH(28)) /* MSR_PRED_CMD used by Xen for PV */ XEN_CPUFEATURE(IBPB_ENTRY_HVM, X86_SYNTH(29)) /* MSR_PRED_CMD used by Xen for HVM */ XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCALL */ +XEN_CPUFEATURE(PDX_COMPRESSION, X86_SYNTH(31)) /* PDX compression */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/arch/x86/include/asm/pdx.h b/xen/arch/x86/include/asm/pdx.h new file mode 100644 index 0000000000..6be7e1185e --- /dev/null +++ b/xen/arch/x86/include/asm/pdx.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef X86_PDX_H +#define X86_PDX_H + +#include + +/* + * Introduce a macro to avoid repeating the same asm goto block in each helper. + * Note the macro is strictly tied to the code in the helpers. + */ +#define PDX_ASM_GOTO(label) \ + asm_inline goto ( \ + ALTERNATIVE( \ + "", \ + "jmp %l0", \ + ALT_NOT(X86_FEATURE_PDX_COMPRESSION)) \ + : : : : label ) + +static inline unsigned long pfn_to_pdx(unsigned long pfn) +{ + PDX_ASM_GOTO(skip); + + return pfn_to_pdx_xlate(pfn); + + skip: + return pfn; +} + +static inline unsigned long pdx_to_pfn(unsigned long pdx) +{ + PDX_ASM_GOTO(skip); + + return pdx_to_pfn_xlate(pdx); + + skip: + return pdx; +} + +static inline unsigned long maddr_to_directmapoff(paddr_t ma) +{ + PDX_ASM_GOTO(skip); + + return maddr_to_directmapoff_xlate(ma); + + skip: + return ma; +} + +static inline paddr_t directmapoff_to_maddr(unsigned long offset) +{ + PDX_ASM_GOTO(skip); + + return directmapoff_to_maddr_xlate(offset); + + skip: + return offset; +} + +#undef PDX_ASM_GOTO_SKIP + +#endif /* X86_PDX_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 747607439f..42ccb0c0f3 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -298,7 +298,8 @@ void __init srat_parse_regions(paddr_t addr) acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); - pfn_pdx_compression_setup(addr); + if (!pfn_pdx_compression_setup(addr)) + return; /* Ensure all RAM ranges in the e820 are covered. */ for (i = 0; i < e820.nr_map; i++) { @@ -318,6 +319,9 @@ void __init srat_parse_regions(paddr_t addr) return; } } + + /* If we got this far compression is working as expected. */ + setup_force_cpu_cap(X86_FEATURE_PDX_COMPRESSION); } unsigned int numa_node_to_arch_nid(nodeid_t n) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index f4a3dcf6cb..c9ec867291 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -215,7 +215,7 @@ static uint64_t __init pdx_init_mask(uint64_t base_addr) (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); } -void __init pfn_pdx_compression_setup(paddr_t base) +bool __init pfn_pdx_compression_setup(paddr_t base) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; unsigned long mask = pdx_init_mask(base) >> PAGE_SHIFT; @@ -224,7 +224,7 @@ void __init pfn_pdx_compression_setup(paddr_t base) { printk(XENLOG_DEBUG "PFN compression disabled%s\n", pdx_compress ? ": no ranges provided" : ""); - return; + return false; } if ( nr_ranges > ARRAY_SIZE(ranges) ) @@ -232,7 +232,7 @@ void __init pfn_pdx_compression_setup(paddr_t base) printk(XENLOG_WARNING "Too many PFN ranges (%u > %zu), not attempting PFN compression\n", nr_ranges, ARRAY_SIZE(ranges)); - return; + return false; } for ( i = 0; i < nr_ranges; i++ ) @@ -263,7 +263,7 @@ void __init pfn_pdx_compression_setup(paddr_t base) } } if ( !hole_shift ) - return; + return false; printk(KERN_INFO "PFN compression on bits %u...%u\n", bottom_shift, bottom_shift + hole_shift - 1); @@ -274,6 +274,8 @@ void __init pfn_pdx_compression_setup(paddr_t base) pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT; + + return true; } void __init pfn_pdx_compression_reset(void) diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 10153da98b..425d45e9f0 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -114,7 +114,7 @@ extern unsigned long pfn_top_mask, ma_top_mask; * @param pfn Frame number * @return Obtained pdx after compressing the pfn */ -static inline unsigned long pfn_to_pdx(unsigned long pfn) +static inline unsigned long pfn_to_pdx_xlate(unsigned long pfn) { return (pfn & pfn_pdx_bottom_mask) | ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); @@ -126,7 +126,7 @@ static inline unsigned long pfn_to_pdx(unsigned long pfn) * @param pdx Page index * @return Obtained pfn after decompressing the pdx */ -static inline unsigned long pdx_to_pfn(unsigned long pdx) +static inline unsigned long pdx_to_pfn_xlate(unsigned long pdx) { return (pdx & pfn_pdx_bottom_mask) | ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); @@ -139,7 +139,7 @@ static inline unsigned long pdx_to_pfn(unsigned long pdx) * @return Offset on the direct map where that * machine address can be accessed */ -static inline unsigned long maddr_to_directmapoff(paddr_t ma) +static inline unsigned long maddr_to_directmapoff_xlate(paddr_t ma) { return (((ma & ma_top_mask) >> pfn_pdx_hole_shift) | (ma & ma_va_bottom_mask)); @@ -151,7 +151,7 @@ static inline unsigned long maddr_to_directmapoff(paddr_t ma) * @param offset Offset into the direct map * @return Corresponding machine address of that virtual location */ -static inline paddr_t directmapoff_to_maddr(unsigned long offset) +static inline paddr_t directmapoff_to_maddr_xlate(unsigned long offset) { return ((((paddr_t)offset << pfn_pdx_hole_shift) & ma_top_mask) | (offset & ma_va_bottom_mask)); @@ -181,8 +181,9 @@ static inline void pfn_pdx_add_region(paddr_t base, paddr_t size) { } -static inline void pfn_pdx_compression_setup(paddr_t base) +static inline bool pfn_pdx_compression_setup(paddr_t base) { + return false; } static inline void pfn_pdx_compression_reset(void) @@ -191,6 +192,21 @@ static inline void pfn_pdx_compression_reset(void) #else /* !CONFIG_PDX_NONE */ +/* + * Allow each architecture to define its (possibly optimized) versions of the + * translation functions. + * + * Do not use _xlate suffixed functions, always use the non _xlate variants. + */ +#if __has_include() +# include +#else +# define pdx_to_pfn pdx_to_pfn_xlate +# define pfn_to_pdx pfn_to_pdx_xlate +# define maddr_to_directmapoff maddr_to_directmapoff_xlate +# define directmapoff_to_maddr directmapoff_to_maddr_xlate +#endif + /* Shared functions implemented by all PDX compressions. */ /** @@ -215,8 +231,9 @@ void pfn_pdx_add_region(paddr_t base, paddr_t size); * range of the current memory regions. * * @param base address to start compression from. + * @return True if PDX compression has been enabled. */ -void pfn_pdx_compression_setup(paddr_t base); +bool pfn_pdx_compression_setup(paddr_t base); /** * Reset the global variables to it's default values, thus disabling PFN -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078488.1439496 (Exim 4.92) (envelope-from ) id 1ullYi-0002fe-5Z; Tue, 12 Aug 2025 09:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078488.1439496; Tue, 12 Aug 2025 09:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYi-0002fV-2y; Tue, 12 Aug 2025 09:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1078488; Tue, 12 Aug 2025 09:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYg-0002f4-GA for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullYg-001eWa-0U for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullYg-0018aW-0t for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N2hIztghiYLv4jptZVob+1pqxQcrqtZ4dHP1P+O7Zj4=; b=p7j5xkwiUsjiyc1INqmhNFjrdV z0E3cOLu0bI2o/drenKicPRnrOLMWaN5aBVsdsgdnLaFGi6RdeMnnAbLsLzdV6FH+7892IMj4o2ei aqWzTQryrmoV1T5lxL8RkrS+AKLaCDL0wabRcc9cSOKDJVxsZuih/pzdgrAKB4JppVHk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] test/pdx: add PDX compression unit tests Message-Id: Date: Tue, 12 Aug 2025 09:44:42 +0000 commit cb50e4033717632e948a47599ebcaa1d1f4e048c Author: Roger Pau Monne AuthorDate: Tue Jun 17 10:19:58 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 test/pdx: add PDX compression unit tests Introduce a set of unit tests for PDX compression. The unit tests contains both real and crafted memory maps that are then compressed using the selected PDX algorithm. Note the build system for the unit tests has been done in a way to support adding new compression algorithms easily. That requires generating a new test-pdx- executable that's build with the selected PDX compression enabled. Currently the only generated executable is test-pdx-mask that tests PDX mask compression. Signed-off-by: Roger Pau Monné Reviewed-by: Anthony PERARD --- tools/tests/Makefile | 1 + tools/tests/pdx/.gitignore | 2 + tools/tests/pdx/Makefile | 49 +++++++++ tools/tests/pdx/harness.h | 84 ++++++++++++++ tools/tests/pdx/test-pdx.c | 267 +++++++++++++++++++++++++++++++++++++++++++++ xen/common/pdx.c | 4 + 6 files changed, 407 insertions(+) diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 36928676a6..97ba2a1389 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -9,6 +9,7 @@ ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif SUBDIRS-y += xenstore +SUBDIRS-y += pdx SUBDIRS-y += rangeset SUBDIRS-y += vpci SUBDIRS-y += paging-mempool diff --git a/tools/tests/pdx/.gitignore b/tools/tests/pdx/.gitignore new file mode 100644 index 0000000000..a32c7db4de --- /dev/null +++ b/tools/tests/pdx/.gitignore @@ -0,0 +1,2 @@ +/pdx.h +/test-pdx-mask diff --git a/tools/tests/pdx/Makefile b/tools/tests/pdx/Makefile new file mode 100644 index 0000000000..b3734afde6 --- /dev/null +++ b/tools/tests/pdx/Makefile @@ -0,0 +1,49 @@ +XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +TARGETS := test-pdx-mask + +.PHONY: all +all: $(TARGETS) + +.PHONY: run +run: $(TARGETS) +ifeq ($(CC),$(HOSTCC)) + set -e; \ + for test in $? ; do \ + ./$$test ; \ + done +else + $(warning HOSTCC != CC, will not run test) +endif + +.PHONY: clean +clean: + $(RM) -- *.o $(TARGETS) $(DEPS_RM) pdx.h + +.PHONY: distclean +distclean: clean + $(RM) -- *~ + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC)/tests + +.PHONY: uninstall +uninstall: + $(RM) -- $(patsubst %,$(DESTDIR)$(LIBEXEC)/tests/%,$(TARGETS)) + +pdx.h: $(XEN_ROOT)/xen/include/xen/pdx.h + sed -E -e '/^#[[:space:]]*include/d' <$< >$@ + +CFLAGS += -D__XEN_TOOLS__ +CFLAGS += $(APPEND_CFLAGS) +CFLAGS += $(CFLAGS_xeninclude) + +test-pdx-mask: CFLAGS += -DCONFIG_PDX_MASK_COMPRESSION + +test-pdx-%: test-pdx.c pdx.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -o $@ $< $(APPEND_CFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h new file mode 100644 index 0000000000..5bef7df650 --- /dev/null +++ b/tools/tests/pdx/harness.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for PDX compression. + * + * Copyright (C) 2025 Cloud Software Group + */ + +#ifndef _TEST_HARNESS_ +#define _TEST_HARNESS_ + +#include +#include +#include +#include +#include +#include + +#include + +#define __init +#define __initdata +#define __ro_after_init +#define cf_check + +#define printk printf +#define XENLOG_INFO +#define XENLOG_DEBUG +#define XENLOG_WARNING +#define KERN_INFO + +#define BITS_PER_LONG (unsigned int)(sizeof(unsigned long) * 8) + +#define PAGE_SHIFT 12 +/* Some libcs define PAGE_SIZE in limits.h. */ +#undef PAGE_SIZE +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define MAX_ORDER 18 /* 2 * PAGETABLE_ORDER (9) */ + +#define PFN_DOWN(x) ((x) >> PAGE_SHIFT) +#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) + +#define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) +#define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) + +#define MAX_RANGES 16 +#define MAX_PFN_RANGES MAX_RANGES + +#define ASSERT assert + +#define CONFIG_DEBUG + +static inline unsigned int find_next( + const unsigned long *addr, unsigned int size, unsigned int off, bool value) +{ + unsigned int i; + + ASSERT(size <= BITS_PER_LONG); + + for ( i = off; i < size; i++ ) + if ( !!(*addr & (1UL << i)) == value ) + return i; + + return size; +} + +#define find_next_zero_bit(a, s, o) find_next(a, s, o, false) +#define find_next_bit(a, s, o) find_next(a, s, o, true) + +#define boolean_param(name, func) + +typedef uint64_t paddr_t; + +#include "pdx.h" + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c new file mode 100644 index 0000000000..0798ccee35 --- /dev/null +++ b/tools/tests/pdx/test-pdx.c @@ -0,0 +1,267 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for PDX compression. + * + * Copyright (C) 2025 Cloud Software Group + */ + +#include "harness.h" + +#include "../../xen/common/pdx.c" + +struct range { + /* Ranges are defined as [start, end). */ + unsigned long start, end; +}; + +static void print_ranges(const struct range *r) +{ + unsigned int i; + + printf("Ranges:\n"); + + for ( i = 0; i < MAX_RANGES; i++ ) + { + if ( !r[i].start && !r[i].end ) + break; + + printf(" %013lx-%013lx\n", r[i].start, r[i].end); + } +} + +int main(int argc, char **argv) +{ + static const struct { + struct range ranges[MAX_RANGES]; + bool compress; + } tests[] = { +#ifdef __LP64__ + /* + * Only for targets where unsigned long is 64bits, otherwise compiler + * will complain about truncation from 'long long' -> 'long' conversion. + * + * Real memory map from a 4s Intel GNR. Not compressible using PDX + * mask compression. + */ + { + .ranges = { + { .start = 0, .end = 0x80000UL }, + { .start = 0x0100000UL, .end = 0x8080000UL }, + { .start = 0x63e80000UL, .end = 0x6be80000UL }, + { .start = 0xc7e80000UL, .end = 0xcfe80000UL }, + { .start = 0x12be80000UL, .end = 0x133e80000UL }, + }, + .compress = false, + }, + /* Simple hole. */ + { + .ranges = { + { .start = 0, + .end = (1UL << MAX_ORDER) * 1 }, + { .start = (1UL << (MAX_ORDER * 2)) | 0, + .end = (1UL << (MAX_ORDER * 2)) | (1UL << MAX_ORDER) * 1 }, + }, + .compress = true, + }, + /* Simple hole, unsorted ranges. */ + { + .ranges = { + { .start = (1UL << (MAX_ORDER * 2)) | 0, + .end = (1UL << (MAX_ORDER * 2)) | (1UL << MAX_ORDER) * 1 }, + { .start = 0, + .end = (1UL << MAX_ORDER) * 1 }, + }, + .compress = true, + }, + /* PDX compression, 2 ranges covered by the lower mask. */ + { + .ranges = { + { .start = 0, + .end = (1 << MAX_ORDER) * 1 }, + { .start = (1 << MAX_ORDER) * 2, + .end = (1 << MAX_ORDER) * 3 }, + { .start = (1 << MAX_ORDER) * 20, + .end = (1 << MAX_ORDER) * 22 }, + }, + .compress = true, + }, + /* Single range not starting at 0. */ + { + .ranges = { + { .start = (1 << MAX_ORDER) * 10, + .end = (1 << MAX_ORDER) * 11 }, + }, + .compress = true, + }, + /* Resulting PDX region size leads to no compression. */ + { + .ranges = { + { .start = 0, + .end = (1 << MAX_ORDER) * 1 }, + { .start = (1 << MAX_ORDER) * 2, + .end = (1 << MAX_ORDER) * 3 }, + { .start = (1 << MAX_ORDER) * 4, + .end = (1 << MAX_ORDER) * 7 }, + { .start = (1 << MAX_ORDER) * 8, + .end = (1 << MAX_ORDER) * 12 }, + }, + .compress = false, + }, + /* AMD Versal Gen 2 ARM board. */ + { + .ranges = { + { .start = 0, .end = 0x80000UL }, + { .start = 0x800000UL, .end = 0x880000UL }, + { .start = 0x50000000UL, .end = 0x50080000UL }, + { .start = 0x60000000UL, .end = 0x60080000UL }, + { .start = 0x70000000UL, .end = 0x70080000UL }, + }, + .compress = true, + }, + /* Unsorted ranges, lower one not starting at 0. */ + { + .ranges = { + { .start = (1UL << (35 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 2, + .end = (1UL << (35 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3 }, + { .start = (1 << MAX_ORDER) * 2, + .end = (1 << MAX_ORDER) * 3 }, + }, + .compress = true, + }, + /* Two ranges with the same high bit set. */ + { + .ranges = { + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 0, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 1 }, + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 4 }, + }, + .compress = true, + }, +#endif + /* AMD Naples Epyc 7281 2 sockets, 8 NUMA nodes. */ + { + .ranges = { + { .start = 0, .end = 0xa0UL }, + { .start = 0x100UL, .end = 0xb0000UL }, + { .start = 0x100000UL, .end = 0x430000UL }, + { .start = 0x430000UL, .end = 0x830000UL }, + { .start = 0x830000UL, .end = 0xc30000UL }, + { .start = 0xc30000UL, .end = 0x1030000UL }, + { .start = 0x1030000UL, .end = 0x1430000UL }, + { .start = 0x1430000UL, .end = 0x1830000UL }, + { .start = 0x1830000UL, .end = 0x1c30000UL }, + { .start = 0x1c30000UL, .end = 0x2030000UL }, + }, + .compress = false, + }, + /* 2-node 2GB per-node QEMU layout. */ + { + .ranges = { + { .start = 0, .end = 0x80000UL }, + { .start = 0x100000UL, .end = 0x180000UL }, + }, + .compress = true, + }, + /* Not compressible, smaller than MAX_ORDER. */ + { + .ranges = { + { .start = 0, .end = 1 }, + { .start = 0x100UL, .end = 0x101UL }, + }, + .compress = false, + }, + /* Compressible, requires adjusting size to (1 << MAX_ORDER). */ + { + .ranges = { + { .start = 0, .end = 1 }, + { .start = 0x100000UL, .end = 0x100001UL }, + }, + .compress = true, + }, + /* 2s Intel CLX with contiguous ranges, no compression. */ + { + .ranges = { + { .start = 0 , .end = 0x180000UL }, + { .start = 0x180000UL, .end = 0x3040000UL }, + }, + .compress = false, + }, + }; + int ret_code = EXIT_SUCCESS; + + for ( unsigned int i = 0 ; i < ARRAY_SIZE(tests); i++ ) + { + unsigned int j; + + pfn_pdx_compression_reset(); + + for ( j = 0; j < ARRAY_SIZE(tests[i].ranges); j++ ) + { + unsigned long size = tests[i].ranges[j].end - + tests[i].ranges[j].start; + + if ( !tests[i].ranges[j].start && !tests[i].ranges[j].end ) + break; + + pfn_pdx_add_region(tests[i].ranges[j].start << PAGE_SHIFT, + size << PAGE_SHIFT); + } + + if ( pfn_pdx_compression_setup(0) != tests[i].compress ) + { + printf("PFN compression diverge, expected %scompressible\n", + tests[i].compress ? "" : "un"); + print_ranges(tests[i].ranges); + + ret_code = EXIT_FAILURE; + continue; + } + + if ( !tests[i].compress ) + continue; + + for ( j = 0; j < ARRAY_SIZE(tests[i].ranges); j++ ) + { + unsigned long start = tests[i].ranges[j].start; + unsigned long end = tests[i].ranges[j].end; + + if ( !start && !end ) + break; + + if ( !pdx_is_region_compressible(start << PAGE_SHIFT, 1) || + !pdx_is_region_compressible((end - 1) << PAGE_SHIFT, 1) ) + { + printf( + "PFN compression invalid, pages %#lx and %#lx should be compressible\n", + start, end - 1); + print_ranges(tests[i].ranges); + ret_code = EXIT_FAILURE; + } + + if ( start != pdx_to_pfn(pfn_to_pdx(start)) || + end - 1 != pdx_to_pfn(pfn_to_pdx(end - 1)) ) + { + printf("Compression is not bi-directional:\n"); + printf(" PFN %#lx -> PDX %#lx -> PFN %#lx\n", + start, pfn_to_pdx(start), pdx_to_pfn(pfn_to_pdx(start))); + printf(" PFN %#lx -> PDX %#lx -> PFN %#lx\n", + end - 1, pfn_to_pdx(end - 1), + pdx_to_pfn(pfn_to_pdx(end - 1))); + print_ranges(tests[i].ranges); + ret_code = EXIT_FAILURE; + } + } + } + + return ret_code; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/pdx.c b/xen/common/pdx.c index c9ec867291..cd8a9e75a8 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -15,6 +15,8 @@ * along with this program; If not, see . */ +/* Trim content when built for the test harness. */ +#ifdef __XEN__ #include #include #include @@ -57,6 +59,8 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) __set_bit(idx, pdx_group_valid); } +#endif /* __XEN__ */ + #ifndef CONFIG_PDX_NONE #ifdef CONFIG_X86 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078489.1439500 (Exim 4.92) (envelope-from ) id 1ullYs-0002i9-6v; Tue, 12 Aug 2025 09:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078489.1439500; Tue, 12 Aug 2025 09:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYs-0002i1-4L; Tue, 12 Aug 2025 09:44:54 +0000 Received: by outflank-mailman (input) for mailman id 1078489; Tue, 12 Aug 2025 09:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullYq-0002hl-FI for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullYq-001eWp-0l for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullYq-0018b0-1L for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=j/5SdhfbnAF/Pw0BDq9K5dBYPjfu0B00hntd6aywEbQ=; b=pP+QI8ruScm5Jrt8ZeDqDpYdKX qCZ2H/Skt8ZP0Gz48X5LwGO+3Gjprh1l85N+yRepGTSlX+M385HyTdnfW41SLG0JR6ibtsH08lmVt D0cUpTwZT079dLtFOlCxGCqwoHzVN4ktaM5Yo5taZVpbCcqPFcEDMmdm/hSowXKGfIyA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pdx: move some helpers in preparation for new compression Message-Id: Date: Tue, 12 Aug 2025 09:44:52 +0000 commit 353e5952943fe03bb0866243132333dace700ff1 Author: Roger Pau Monne AuthorDate: Tue Jun 17 16:35:13 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Aug 11 18:45:52 2025 +0200 pdx: move some helpers in preparation for new compression Move fill_mask(), pdx_region_mask() and pdx_init_mask() to the !CONFIG_PDX_NONE section in preparation of them also being used by a newly added PDX compression. No functional change intended. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/common/pdx.c | 118 +++++++++++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index cd8a9e75a8..9e6b36086f 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -101,59 +101,6 @@ void __init pfn_pdx_add_region(paddr_t base, paddr_t size) ranges[nr_ranges++].pages = PFN_UP(base + size) - PFN_DOWN(base); } -#endif /* !CONFIG_PDX_NONE */ - -#ifdef CONFIG_PDX_MASK_COMPRESSION - -/* - * Diagram to make sense of the following variables. The masks and shifts - * are done on mfn values in order to convert to/from pdx: - * - * pfn_hole_mask - * pfn_pdx_hole_shift (mask bitsize) - * | - * |---------| - * | | - * V V - * -------------------------- - * |HHHHHHH|000000000|LLLLLL| <--- mfn - * -------------------------- - * ^ ^ ^ ^ - * | | |------| - * | | | - * | | pfn_pdx_bottom_mask - * | | - * |-------| - * | - * pfn_top_mask - * - * ma_{top,va_bottom}_mask is simply a shifted pfn_{top,pdx_bottom}_mask, - * where ma_top_mask has zeroes shifted in while ma_va_bottom_mask has - * ones. - */ - -/** Mask for the lower non-compressible bits of an mfn */ -unsigned long __ro_after_init pfn_pdx_bottom_mask = ~0UL; - -/** Mask for the lower non-compressible bits of an maddr or vaddr */ -unsigned long __ro_after_init ma_va_bottom_mask = ~0UL; - -/** Mask for the higher non-compressible bits of an mfn */ -unsigned long __ro_after_init pfn_top_mask = 0; - -/** Mask for the higher non-compressible bits of an maddr or vaddr */ -unsigned long __ro_after_init ma_top_mask = 0; - -/** - * Mask for a pdx compression bit slice. - * - * Invariant: valid(mfn) implies (mfn & pfn_hole_mask) == 0 - */ -unsigned long __ro_after_init pfn_hole_mask = 0; - -/** Number of bits of the "compressible" bit slice of an mfn */ -unsigned int __ro_after_init pfn_pdx_hole_shift = 0; - /* Sets all bits from the most-significant 1-bit down to the LSB */ static uint64_t fill_mask(uint64_t mask) { @@ -196,12 +143,6 @@ static uint64_t pdx_region_mask(uint64_t base, uint64_t len) return fill_mask(base ^ (base + len - 1)); } -bool pdx_is_region_compressible(paddr_t base, unsigned long npages) -{ - return !(paddr_to_pfn(base) & pfn_hole_mask) && - !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); -} - /** * Creates the mask to start from when calculating non-compressible bits * @@ -219,6 +160,65 @@ static uint64_t __init pdx_init_mask(uint64_t base_addr) (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); } +#endif /* !CONFIG_PDX_NONE */ + +#ifdef CONFIG_PDX_MASK_COMPRESSION + +/* + * Diagram to make sense of the following variables. The masks and shifts + * are done on mfn values in order to convert to/from pdx: + * + * pfn_hole_mask + * pfn_pdx_hole_shift (mask bitsize) + * | + * |---------| + * | | + * V V + * -------------------------- + * |HHHHHHH|000000000|LLLLLL| <--- mfn + * -------------------------- + * ^ ^ ^ ^ + * | | |------| + * | | | + * | | pfn_pdx_bottom_mask + * | | + * |-------| + * | + * pfn_top_mask + * + * ma_{top,va_bottom}_mask is simply a shifted pfn_{top,pdx_bottom}_mask, + * where ma_top_mask has zeroes shifted in while ma_va_bottom_mask has + * ones. + */ + +/** Mask for the lower non-compressible bits of an mfn */ +unsigned long __ro_after_init pfn_pdx_bottom_mask = ~0UL; + +/** Mask for the lower non-compressible bits of an maddr or vaddr */ +unsigned long __ro_after_init ma_va_bottom_mask = ~0UL; + +/** Mask for the higher non-compressible bits of an mfn */ +unsigned long __ro_after_init pfn_top_mask = 0; + +/** Mask for the higher non-compressible bits of an maddr or vaddr */ +unsigned long __ro_after_init ma_top_mask = 0; + +/** + * Mask for a pdx compression bit slice. + * + * Invariant: valid(mfn) implies (mfn & pfn_hole_mask) == 0 + */ +unsigned long __ro_after_init pfn_hole_mask = 0; + +/** Number of bits of the "compressible" bit slice of an mfn */ +unsigned int __ro_after_init pfn_pdx_hole_shift = 0; + +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + return !(paddr_to_pfn(base) & pfn_hole_mask) && + !(pdx_region_mask(base, npages * PAGE_SIZE) & ~ma_va_bottom_mask); +} + bool __init pfn_pdx_compression_setup(paddr_t base) { unsigned int i, j, bottom_shift = 0, hole_shift = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:45:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078491.1439503 (Exim 4.92) (envelope-from ) id 1ullZ2-0002ko-8b; Tue, 12 Aug 2025 09:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078491.1439503; Tue, 12 Aug 2025 09:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZ2-0002kg-5l; Tue, 12 Aug 2025 09:45:04 +0000 Received: by outflank-mailman (input) for mailman id 1078491; Tue, 12 Aug 2025 09:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZ0-0002kU-W3 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullZ0-001eXF-2R for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullZ0-0018dF-31 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PcnDNYg3rAnyZI0bG/HKLc62pJfHu/X5XfWMcEUnir8=; b=QyHO7IbgwzGQ36TQ/Z6pwXyrZt zW6/UEyve7w26XCDC1fTD8jHyRfco8G8F7IDFyo8a7ZNua+t52EcP5ZzA+byP6H5/jvs9qACjsiPU 5cxUH5EjWT8ezEpSUAud/+NoOWC6LmT372SX25YpgAFOAEz1XQtSkmvp05UFKDSfp4TM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: correct PG_log_dirty definition Message-Id: Date: Tue, 12 Aug 2025 09:45:02 +0000 commit 2ae8a68df21e70cc0cde65d661c85b98f1a462f6 Author: Jan Beulich AuthorDate: Tue Aug 12 09:57:40 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 x86/mm: correct PG_log_dirty definition While it is correct that in shim-exclusive mode log-dirty handling is all unreachable code, the present conditional still isn't correct: In a HVM=n and SHADOW_PAGING=n configuration log-dirty code also is all unreachable (and hence violating Misra rule 2.1). As we're aiming at moving away from special casing PV_SHIM_EXCLUSIVE=y, don't retain that part of the conditional. Because of hypercall-defs.c we need to carry out the dependency by introducing a new auxiliary PAGING control. Since compiling out mm/paging.c altogether would entail further changes, merely conditionalize the one function in there (paging_enable()) which would otherwise remain unreachable (Misra rule 2.1 again) when PAGING=n. Fixes: 23d4e0d17b76 ("x86/shim: fix build with PV_SHIM_EXCLUSIVE and SHADOW_PAGING") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk Acked-by: Andrew Cooper --- xen/arch/x86/Kconfig | 3 +++ xen/arch/x86/domctl.c | 4 ++++ xen/arch/x86/include/asm/paging.h | 2 +- xen/arch/x86/mm/paging.c | 2 ++ xen/include/hypercall-defs.c | 6 ++++-- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index a45ce106e2..3f0f3a0f3a 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -162,6 +162,9 @@ config SHADOW_PAGING If unsure, say Y. +config PAGING + def_bool HVM || SHADOW_PAGING + config BIGMEM bool "big memory support" default n diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3e94af51a7..f07cae6a70 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -213,11 +213,15 @@ long arch_do_domctl( { case XEN_DOMCTL_shadow_op: +#ifdef CONFIG_PAGING ret = paging_domctl(d, &domctl->u.shadow_op, u_domctl, 0); if ( ret == -ERESTART ) return hypercall_create_continuation( __HYPERVISOR_paging_domctl_cont, "h", u_domctl); copyback = true; +#else + ret = -EOPNOTSUPP; +#endif break; case XEN_DOMCTL_ioport_permission: diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 94c31a268e..768b077ebd 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -55,7 +55,7 @@ #define PG_translate 0 #define PG_external 0 #endif -#if defined(CONFIG_HVM) || !defined(CONFIG_PV_SHIM_EXCLUSIVE) +#ifdef CONFIG_PAGING /* Enable log dirty mode */ #define PG_log_dirty (XEN_DOMCTL_SHADOW_ENABLE_LOG_DIRTY << PG_mode_shift) #else diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 165e0f88c2..3aafb0990b 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -864,6 +864,7 @@ void paging_final_teardown(struct domain *d) p2m_final_teardown(d); } +#ifdef CONFIG_PAGING /* Enable an arbitrary paging-assistance mode. Call once at domain * creation. */ int paging_enable(struct domain *d, u32 mode) @@ -889,6 +890,7 @@ int paging_enable(struct domain *d, u32 mode) else return shadow_enable(d, mode); } +#endif #ifdef CONFIG_HVM /* Called from the guest to indicate that a process is being torn down diff --git a/xen/include/hypercall-defs.c b/xen/include/hypercall-defs.c index c1081d87a2..8370b4b289 100644 --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -197,9 +197,11 @@ dm_op(domid_t domid, unsigned int nr_bufs, xen_dm_op_buf_t *bufs) #ifdef CONFIG_SYSCTL sysctl(xen_sysctl_t *u_sysctl) #endif +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) +paging_domctl_cont(xen_domctl_t *u_domctl) +#endif #ifndef CONFIG_PV_SHIM_EXCLUSIVE domctl(xen_domctl_t *u_domctl) -paging_domctl_cont(xen_domctl_t *u_domctl) platform_op(xen_platform_op_t *u_xenpf_op) #endif #ifdef CONFIG_HVM @@ -296,7 +298,7 @@ dm_op compat do compat do do hypfs_op do do do do do #endif mca do do - - - -#ifndef CONFIG_PV_SHIM_EXCLUSIVE +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) paging_domctl_cont do do do do - #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:45:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078492.1439508 (Exim 4.92) (envelope-from ) id 1ullZC-0002oR-Bj; Tue, 12 Aug 2025 09:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078492.1439508; Tue, 12 Aug 2025 09:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZC-0002oJ-9B; Tue, 12 Aug 2025 09:45:14 +0000 Received: by outflank-mailman (input) for mailman id 1078492; Tue, 12 Aug 2025 09:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZB-0002o2-4M for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullZA-001eXO-2t for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullZB-0018eS-04 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XWYkBf51Qjh21cSvT0BNb5Xi79TDTWulxTRmh2Ltm4g=; b=Nqg+IP8gm2sgBW410ATe5ZF+Od 4STBx47/WpJ4/YfwQ+xmEEW0/QSuLMvRvS+Q+H6RNV0GMBLMjUqQTSHC6caftitNGXo7cMU2m+am+ 5o9/NByrYep3gnwRnk/DKbOpvMlyexW9MliGULyktWIFl3fx4an8TKW+vNPvOQxGPbXg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] efi: Call FreePages() only if needed Message-Id: Date: Tue, 12 Aug 2025 09:45:13 +0000 commit 7fddedd530561797d8ce5fba78e83cc9cc6b58dd Author: Ross Lagerwall AuthorDate: Tue Aug 12 09:58:07 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 efi: Call FreePages() only if needed If the config file is builtin, cfg.addr will be zero but Xen unconditionally calls FreePages() on the address. Xen may also call FreePages() with a zero address if blexit() is called after this point since cfg.need_to_free is not set to false. The UEFI specification does not say whether calling FreePages() with a zero address is allowed so let's be cautious and use cfg.need_to_free properly. Fixes: 8a71d50ed40b ("efi: Enable booting unified hypervisor/kernel/initrd images") Fixes: 04be2c3a0678 ("efi/boot.c: add file.need_to_free") Signed-off-by: Ross Lagerwall Acked-by: Andrew Cooper Acked-by Daniel P. Smith --- xen/common/efi/boot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 778a39cc48..50ff1d1bd2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1534,8 +1534,11 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, efi_arch_cfg_file_late(loaded_image, dir_handle, section.s); - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.addr = 0; + if ( cfg.need_to_free ) + { + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + cfg.need_to_free = false; + } if ( dir_handle ) dir_handle->Close(dir_handle); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:45:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078493.1439512 (Exim 4.92) (envelope-from ) id 1ullZM-0002qV-DA; Tue, 12 Aug 2025 09:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078493.1439512; Tue, 12 Aug 2025 09:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZM-0002qN-AZ; Tue, 12 Aug 2025 09:45:24 +0000 Received: by outflank-mailman (input) for mailman id 1078493; Tue, 12 Aug 2025 09:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZL-0002qF-7J for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullZK-001eXW-3C for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullZL-0018fS-0X for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9wynuZk6L9QpvPzUN2WzclR74R8vHOUAgQLIMuFavvA=; b=EGHsQIuG94WhtotZBe1hO31Amp VHEnlWlmnSJxrgXCLOu5CqJ3Ko5srastooRAX9NtECcr5xz3wsk2QnnnShnAmkOdC5uj4fdv5Nw+l 3sl+g6Z82u9mkTZxwFijcmNTwU/vKKXgOHHrr3iweC2N5frqSpoz2hfXHnt8SfqNXR50=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: restrict clean target to xen Message-Id: Date: Tue, 12 Aug 2025 09:45:23 +0000 commit 16104cde015dd6f43e2ea0b70c8023a5fe2d16c0 Author: Nicola Vetrini AuthorDate: Tue Aug 12 09:58:26 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 automation/eclair: restrict clean target to xen The clean target also clears files outside the xen directory, which is not needed for the purposes of running an analysis. No functional change. Reported-by: Andrew Cooper Signed-off-by: Nicola Vetrini Reviewed-by: Denis Mukhin Acked-by: Andrew Cooper --- automation/eclair_analysis/prepare.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/prepare.sh b/automation/eclair_analysis/prepare.sh index 4285ff26de..e941e6edc4 100755 --- a/automation/eclair_analysis/prepare.sh +++ b/automation/eclair_analysis/prepare.sh @@ -39,12 +39,12 @@ fi fi ./configure - make clean + make -C xen clean find . -type f -name "*.safparse" -print -delete "${script_dir}/build.sh" "$1" # Generate additional configuration files "${script_dir}/ECLAIR/generate_ecl.sh" - make clean + make -C xen clean cd xen make -f "${script_dir}/Makefile.prepare" prepare # Translate the /* SAF-n-safe */ comments into ECLAIR CBTs -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 09:45:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 09:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078494.1439516 (Exim 4.92) (envelope-from ) id 1ullZW-0002sy-ET; Tue, 12 Aug 2025 09:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078494.1439516; Tue, 12 Aug 2025 09:45:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZW-0002sq-By; Tue, 12 Aug 2025 09:45:34 +0000 Received: by outflank-mailman (input) for mailman id 1078494; Tue, 12 Aug 2025 09:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ullZV-0002sZ-AD for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ullZV-001eXx-0G for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ullZV-0018gd-0p for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 09:45:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3WkV+mvPAZU6IBlWQ7/X00JUU0qWZMwb5Q4uReNy9QE=; b=V5Eic9UHotxAEYRmNdRxFuGK/N 87u+NahNSoJ2V7J3ZZQHbwL8ZEVTTSA++/G2aaKsYcqXAbyR/hbH31lNZSiDm5lKDtsa5ISsxPgAp 1bgaiQQZMoGlKZvVsqCt52CsfM6B2XaP/fUsexFxp0g5rrE6Y/G7UCQVFWK6JMrcL5ew=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Drop logic for old clang versions Message-Id: Date: Tue, 12 Aug 2025 09:45:33 +0000 commit e4a042062787423646b71d7bc20fdf445be9ab79 Author: Nicola Vetrini AuthorDate: Tue Aug 12 09:58:39 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 xen: Drop logic for old clang versions The enforced toolchain baseline for clang is version 11, therefore this logic is effectively dead code. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Roger Pau Monné --- xen/common/coverage/llvm.c | 4 ---- xen/include/xen/self-tests.h | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xen/common/coverage/llvm.c b/xen/common/coverage/llvm.c index 50d7a3c5d3..517b2aa8c2 100644 --- a/xen/common/coverage/llvm.c +++ b/xen/common/coverage/llvm.c @@ -44,12 +44,8 @@ ((uint64_t)'f' << 16) | ((uint64_t)'R' << 8) | ((uint64_t)129) #endif -#if __clang_major__ >= 4 || (__clang_major__ == 3 && __clang_minor__ >= 9) #define LLVM_PROFILE_VERSION 4 #define LLVM_PROFILE_NUM_KINDS 2 -#else -#error "clang version not supported with coverage" -#endif struct llvm_profile_data { uint64_t name_ref; diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h index bd8a4867aa..c57cceb3b9 100644 --- a/xen/include/xen/self-tests.h +++ b/xen/include/xen/self-tests.h @@ -10,16 +10,12 @@ #include /* - * Check that fn(val) can be calcuated by the compiler, and that it gives the + * Check that fn(val) can be calculated by the compiler, and that it gives the * expected answer. * - * Clang < 8 can't fold constants through static inlines, causing this to - * fail. Simply skip it for incredibly old compilers. - * * N.B. fn is intentionally not bracketed to allow us to test function-like * macros too. */ -#if !defined(CONFIG_CC_IS_CLANG) || CONFIG_CLANG_VERSION >= 80000 #define COMPILE_CHECK(fn, val, res) \ do { \ typeof(fn(val)) real = fn(val); \ @@ -29,9 +25,6 @@ else if ( real != (res) ) \ BUILD_ERROR("Compile time check '" STR(fn(val) == res) "' failed"); \ } while ( 0 ) -#else -#define COMPILE_CHECK(fn, val, res) -#endif /* * Check that Xen's runtime logic for fn(val) gives the expected answer. This -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078691.1439720 (Exim 4.92) (envelope-from ) id 1ulmuE-0000AX-TQ; Tue, 12 Aug 2025 11:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078691.1439720; Tue, 12 Aug 2025 11:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuE-0000AO-Qo; Tue, 12 Aug 2025 11:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1078691; Tue, 12 Aug 2025 11:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuD-0000A9-KK for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmuD-001gDo-1F for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmuD-001C7V-1q for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Kwe8HYrIrXCTsx14cwnCpYC4/NY8ceVlaQMofx1R9oM=; b=d8h7G44rwadUGjoLgYAF3ThXNa P1CX2kaC485eCAR0ebUkREuKKlicBtr8ewK3JQjr0Y40RETBbdBE0ZE83BgEKhPYuOeTWdzgtZwPT xxnbGIr1QKAHG6dN7GylnElvHwQaYRLPf3ufScq4sBhm6lzRUOpRjS8MVEVgdS76ZoO4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Create tee command line parameter Message-Id: Date: Tue, 12 Aug 2025 11:11:01 +0000 commit 719ace560d5312147c691038482bc99c34999ffa Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:34:57 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:40 2025 +0100 xen/arm: Create tee command line parameter Add a new command line parameter "tee=" to be used to explicitly select what tee mediator is to be used by Xen and fail if it does not exist or the probe function for it failed. Without specifying which tee is to be used, Xen will use the first one for which the probe function succeeds which depends on the order of the mediator list which depends on the compiler. Using the command line argument, it is now possible to explicit request a specific TEE mediator and panic on boot if it is not available. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- docs/misc/xen-command-line.pandoc | 14 ++++++++++++++ xen/arch/arm/include/asm/tee/tee.h | 4 ++++ xen/arch/arm/tee/tee.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 5dd2ab82b7..a28a1b172b 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2664,6 +2664,20 @@ Specify the per-cpu trace buffer size in pages. Flag to enable TSC deadline as the APIC timer mode. +### tee (arm) +> `= ` + +Specify the TEE mediator to be probed and use. + +The default behaviour is to probe all TEEs supported by Xen and use +the first one successfully probed. When this parameter is passed, Xen will +probe only the TEE mediator passed as argument and boot will fail if this +mediator is not properly probed or if the requested TEE is not supported by +Xen. + +This parameter can be set to `optee` or `ffa` if the corresponding mediators +are compiled in. + ### tevt_mask > `= ` diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index 0169fd746b..15d664e28d 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -55,6 +55,9 @@ struct tee_mediator_desc { /* Printable name of the TEE. */ const char *name; + /* Command line name of the TEE (to be used with tee= cmdline option) */ + const char *cmdline_name; + /* Mediator callbacks as described above. */ const struct tee_mediator_ops *ops; @@ -77,6 +80,7 @@ void tee_free_domain_ctx(struct domain *d); static const struct tee_mediator_desc __tee_desc_##_name __used \ __section(".teemediator.info") = { \ .name = _namestr, \ + .cmdline_name = #_name, \ .ops = _ops, \ .tee_type = _type \ } diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index 3f65e45a78..8501443c8e 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -25,6 +26,10 @@ extern const struct tee_mediator_desc _steemediator[], _eteemediator[]; static const struct tee_mediator_desc __read_mostly *cur_mediator; +/* Select the TEE mediator using a name on command line. */ +static char __initdata opt_mediator[16] = ""; +string_param("tee", opt_mediator); + /* * TODO: Add function to alter Dom0 DTB, so we can properly describe * present TEE. @@ -80,15 +85,42 @@ uint16_t tee_get_type(void) static int __init tee_init(void) { const struct tee_mediator_desc *desc; + bool select_mediator = strcmp(opt_mediator, ""); + + if ( select_mediator ) + printk(XENLOG_INFO "TEE Mediator %s selected from command line\n", + opt_mediator); + /* + * When a specific TEE is selected using the 'tee=' command line + * argument, we panic if the probe fails or if the requested TEE is not + * supported. + */ for ( desc = _steemediator; desc != _eteemediator; desc++ ) { + if ( select_mediator && + strncmp(opt_mediator, desc->cmdline_name, sizeof(opt_mediator)) ) + continue; + if ( desc->ops->probe() ) { printk(XENLOG_INFO "Using TEE mediator for %s\n", desc->name); cur_mediator = desc; return 0; } + else if ( select_mediator ) + { + panic("TEE mediator %s from command line probe failed\n", + opt_mediator); + return -EFAULT; + } + } + + if ( select_mediator ) + { + panic("TEE Mediator %s from command line not supported\n", + opt_mediator); + return -EINVAL; } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078694.1439724 (Exim 4.92) (envelope-from ) id 1ulmuO-0000J3-Un; Tue, 12 Aug 2025 11:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078694.1439724; Tue, 12 Aug 2025 11:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuO-0000Iv-SB; Tue, 12 Aug 2025 11:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1078694; Tue, 12 Aug 2025 11:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuO-0000Ie-33 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmuN-001gE5-1X for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmuN-001C8K-27 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YMov+fBQO4NLFf8nOFwpdMjX2szC5Ln0bybMiSNTH8Q=; b=JeVgBygf+5MBT8Ho7QEZIsmqkd EtXdgYGWQOsVajztaU2Metu02xzsh/DSpZAi59Vu/GAX9Mqwzg5Pj/2wYFkZhld1tnXiU8r7o+C+V vklwKV2pM0/kZ4hB5DcbB8ntVGF7ggs2rbTxqUdkvzwUSj2gMS8brqDLQfjb8J/f0F/E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: Rework partinfo_get implementation Message-Id: Date: Tue, 12 Aug 2025 11:11:11 +0000 commit 36dd9a7a42bd524c1587e45e1c39d9cd24f4322d Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:34:58 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:40 2025 +0100 xen/arm: ffa: Rework partinfo_get implementation This patch is in preparation for VM to VM support in order to do the changes on the SP handling part of partinfo_get before adding support for the VM part. This patches is doing the following changes: - split partinfo_get into 3 functions to have the locking handling and proper exit on error handled more clearly - add some potential overflow checks to validate the offset and sizes passed by the VM on partinfo call. - Introduce a maximum number of SPs (for now set to 64) to prevent holding the CPU for too long in case there would be a lot of partitions in the secure world. The limit currently set is thought to be realistic for most use cases as 64 secure partitions is a very high number compared to current seen usage (more 3 or 4). - fix include ordering in ffa_private.h to be in alphabetic order Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa_partinfo.c | 202 +++++++++++++++++++++++----------------- xen/arch/arm/tee/ffa_private.h | 18 +++- 2 files changed, 132 insertions(+), 88 deletions(-) diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c index c0510ceb83..dfa0b23eaf 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -63,9 +63,96 @@ static int32_t ffa_partition_info_get(uint32_t *uuid, uint32_t flags, return ret; } -void ffa_handle_partition_info_get(struct cpu_user_regs *regs) +static int32_t ffa_get_sp_count(uint32_t *uuid, uint32_t *sp_count) +{ + uint32_t src_size; + + return ffa_partition_info_get(uuid, FFA_PARTITION_INFO_GET_COUNT_FLAG, + sp_count, &src_size); +} + +static int32_t ffa_get_sp_partinfo(uint32_t *uuid, uint32_t *sp_count, + void *dst_buf, void *end_buf, + uint32_t dst_size) { int32_t ret; + uint32_t src_size, real_sp_count; + void *src_buf = ffa_rx; + uint32_t count = 0; + + /* Do we have a RX buffer with the SPMC */ + if ( !ffa_rx ) + return FFA_RET_DENIED; + + /* We need to use the RX buffer to receive the list */ + spin_lock(&ffa_rx_buffer_lock); + + ret = ffa_partition_info_get(uuid, 0, &real_sp_count, &src_size); + if ( ret ) + goto out; + + /* We now own the RX buffer */ + + /* Validate the src_size we got */ + if ( src_size < sizeof(struct ffa_partition_info_1_0) || + src_size >= FFA_PAGE_SIZE ) + { + ret = FFA_RET_NOT_SUPPORTED; + goto out_release; + } + + /* + * Limit the maximum time we hold the CPU by limiting the number of SPs. + * We just ignore the extra ones as this is tested during init in + * ffa_partinfo_init so the only possible reason is SP have been added + * since boot. + */ + if ( real_sp_count > FFA_MAX_NUM_SP ) + real_sp_count = FFA_MAX_NUM_SP; + + /* Make sure the data fits in our buffer */ + if ( real_sp_count > (FFA_RXTX_PAGE_COUNT * FFA_PAGE_SIZE) / src_size ) + { + ret = FFA_RET_NOT_SUPPORTED; + goto out_release; + } + + for ( uint32_t sp_num = 0; sp_num < real_sp_count; sp_num++ ) + { + struct ffa_partition_info_1_1 *fpi = src_buf; + + /* filter out SP not following bit 15 convention if any */ + if ( FFA_ID_IS_SECURE(fpi->id) ) + { + if ( dst_buf > (end_buf - dst_size) ) + { + ret = FFA_RET_NO_MEMORY; + goto out_release; + } + + memcpy(dst_buf, src_buf, MIN(src_size, dst_size)); + if ( dst_size > src_size ) + memset(dst_buf + src_size, 0, dst_size - src_size); + + dst_buf += dst_size; + count++; + } + + src_buf += src_size; + } + + *sp_count = count; + +out_release: + ffa_hyp_rx_release(); +out: + spin_unlock(&ffa_rx_buffer_lock); + return ret; +} + +void ffa_handle_partition_info_get(struct cpu_user_regs *regs) +{ + int32_t ret = FFA_RET_OK; struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; uint32_t flags = get_user_reg(regs, 5); @@ -75,8 +162,8 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) get_user_reg(regs, 3), get_user_reg(regs, 4), }; - uint32_t src_size, dst_size; - void *dst_buf; + uint32_t dst_size = 0; + void *dst_buf, *end_buf; uint32_t ffa_sp_count = 0; /* @@ -89,31 +176,26 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) else dst_size = sizeof(struct ffa_partition_info_1_1); - /* - * FF-A v1.0 has w5 MBZ while v1.1 allows - * FFA_PARTITION_INFO_GET_COUNT_FLAG to be non-zero. - * - * FFA_PARTITION_INFO_GET_COUNT is only using registers and not the - * rxtx buffer so do the partition_info_get directly. - */ - if ( flags == FFA_PARTITION_INFO_GET_COUNT_FLAG && - ctx->guest_vers == FFA_VERSION_1_1 ) + /* Only count requested */ + if ( flags ) { + /* + * FF-A v1.0 has w5 MBZ while v1.1 allows + * FFA_PARTITION_INFO_GET_COUNT_FLAG to be non-zero. + */ + if ( ctx->guest_vers == FFA_VERSION_1_0 || + flags != FFA_PARTITION_INFO_GET_COUNT_FLAG ) + { + ret = FFA_RET_INVALID_PARAMETERS; + goto out; + } + if ( ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) - ret = ffa_partition_info_get(uuid, flags, &ffa_sp_count, - &src_size); - else - ret = FFA_RET_OK; + ret = ffa_get_sp_count(uuid, &ffa_sp_count); goto out; } - if ( flags ) - { - ret = FFA_RET_INVALID_PARAMETERS; - goto out; - } - if ( !ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) { /* Just give an empty partition list to the caller */ @@ -121,80 +203,33 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) goto out; } + /* Get the RX buffer to write the list of partitions */ ret = ffa_rx_acquire(d); if ( ret != FFA_RET_OK ) goto out; dst_buf = ctx->rx; + end_buf = ctx->rx + ctx->page_count * FFA_PAGE_SIZE; - if ( !ffa_rx ) - { - ret = FFA_RET_DENIED; - goto out_rx_release; - } - - spin_lock(&ffa_rx_buffer_lock); - - ret = ffa_partition_info_get(uuid, 0, &ffa_sp_count, &src_size); - - if ( ret ) - goto out_rx_hyp_unlock; + /* An entry should be smaller than a page */ + BUILD_BUG_ON(sizeof(struct ffa_partition_info_1_1) > FFA_PAGE_SIZE); /* - * ffa_partition_info_get() succeeded so we now own the RX buffer we - * share with the SPMC. We must give it back using ffa_hyp_rx_release() - * once we've copied the content. + * Check for overflow and that we can at least store one entry. + * page_count cannot be 0 so we have at least one page. */ - - /* we cannot have a size smaller than 1.0 structure */ - if ( src_size < sizeof(struct ffa_partition_info_1_0) ) - { - ret = FFA_RET_NOT_SUPPORTED; - goto out_rx_hyp_release; - } - - if ( ctx->page_count * FFA_PAGE_SIZE < ffa_sp_count * dst_size ) + if ( dst_buf >= end_buf || dst_buf > (end_buf - dst_size) ) { - ret = FFA_RET_NO_MEMORY; - goto out_rx_hyp_release; + ret = FFA_RET_INVALID_PARAMETERS; + goto out_rx_release; } - if ( ffa_sp_count > 0 ) - { - uint32_t n, n_limit = ffa_sp_count; - void *src_buf = ffa_rx; - - /* copy the secure partitions info */ - for ( n = 0; n < n_limit; n++ ) - { - struct ffa_partition_info_1_1 *fpi = src_buf; - - /* filter out SP not following bit 15 convention if any */ - if ( FFA_ID_IS_SECURE(fpi->id) ) - { - memcpy(dst_buf, src_buf, dst_size); - dst_buf += dst_size; - } - else - ffa_sp_count--; + ret = ffa_get_sp_partinfo(uuid, &ffa_sp_count, dst_buf, end_buf, + dst_size); - src_buf += src_size; - } - } -out_rx_hyp_release: - ffa_hyp_rx_release(); -out_rx_hyp_unlock: - spin_unlock(&ffa_rx_buffer_lock); out_rx_release: - /* - * The calling VM RX buffer only contains data to be used by the VM if the - * call was successful, in which case the VM has to release the buffer - * once it has used the data. - * If something went wrong during the call, we have to release the RX - * buffer back to the SPMC as the VM will not do it. - */ - if ( ret != FFA_RET_OK ) + if ( ret ) ffa_rx_release(d); out: if ( ret ) @@ -353,9 +388,10 @@ bool ffa_partinfo_init(void) goto out; } - if ( count >= UINT16_MAX ) + if ( count >= FFA_MAX_NUM_SP ) { - printk(XENLOG_ERR "ffa: Impossible number of SPs: %u\n", count); + printk(XENLOG_ERR "ffa: More SPs than the maximum supported: %u - %u\n", + count, FFA_MAX_NUM_SP); goto out; } diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index c4cd655389..0a9c1082db 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -6,15 +6,15 @@ #ifndef __FFA_PRIVATE_H__ #define __FFA_PRIVATE_H__ +#include #include -#include -#include -#include #include -#include +#include #include +#include +#include #include -#include +#include /* Error codes */ #define FFA_RET_OK 0 @@ -108,6 +108,14 @@ */ #define FFA_CTX_TEARDOWN_DELAY SECONDS(1) +/* + * The maximum number of Secure partitions we support for partinfo_get. + * This prevents holding the CPU during potentially to long time during + * a partinfo_get call. Value choosen seems realistic for any configuration + * but can be incremented here if needed. + */ +#define FFA_MAX_NUM_SP 64 + /* * We rely on the convention suggested but not mandated by the FF-A * specification that secure world endpoint identifiers have the bit 15 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078695.1439728 (Exim 4.92) (envelope-from ) id 1ulmuZ-0000NW-1Z; Tue, 12 Aug 2025 11:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078695.1439728; Tue, 12 Aug 2025 11:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuY-0000NO-V2; Tue, 12 Aug 2025 11:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1078695; Tue, 12 Aug 2025 11:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuX-0000NE-Pz for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmuX-001gEJ-1p for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmuX-001C96-2P for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V/WX2knBOfSTa4ePolkxXRQicd0Aoemdb8Gbb5DcZAI=; b=2jxx3+xjBDigevDPqD3j+OVSuA 3lD8WJYO4Z+rLrbpdRKMZxFk057GkZTLQxnhFLWimpjweIst7Gy8zeIhjD20Upyx+mcdHtx7PAnyX Kf9HankA6Jcg1AXCV8VsjLIWSJpvfb3NbjNPp8Gnf3eG/f6yJrzGYQ3tvsdmO7pwB51Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: Introduce VM to VM support Message-Id: Date: Tue, 12 Aug 2025 11:11:21 +0000 commit 09a201605f990a09d61d69fbb51c30ef10fd6468 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:34:59 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Introduce VM to VM support Create a CONFIG_FFA_VM_TO_VM parameter to activate FFA communication between VMs. When activated list VMs in the system with FF-A support in part_info_get. When VM to VM is activated, Xen will be tainted as Insecure and a message is displayed to the user during the boot as there is no filtering of VMs in FF-A so any VM can communicate or see any other VM in the system. WARNING: There is no filtering for now and all VMs are listed !! This patch is reorganizing the ffa_ctx structure to make clear which lock is protecting what parts. This patch is introducing a chain list of the ffa_ctx with a FFA Version negotiated allowing to create the partinfo results for VMs in parallel by using rwlock which only ensure addition/removal of entries are protected. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/Kconfig | 11 ++++ xen/arch/arm/tee/ffa.c | 49 ++++++++++++++++- xen/arch/arm/tee/ffa_partinfo.c | 100 ++++++++++++++++++++++++++++++---- xen/arch/arm/tee/ffa_private.h | 117 +++++++++++++++++++++++++++++++++------- 4 files changed, 245 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/tee/Kconfig b/xen/arch/arm/tee/Kconfig index c5b0f88d75..88a4c4c991 100644 --- a/xen/arch/arm/tee/Kconfig +++ b/xen/arch/arm/tee/Kconfig @@ -28,5 +28,16 @@ config FFA [1] https://developer.arm.com/documentation/den0077/latest +config FFA_VM_TO_VM + bool "Enable FF-A between VMs (UNSUPPORTED)" if UNSUPPORTED + default n + depends on FFA + help + This option enables to use FF-A between VMs. + This is experimental and there is no access control so any + guest can communicate with any other guest. + + If unsure, say N. + endmenu diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 3bbdd7168a..0eb6a0bda5 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -118,10 +118,18 @@ void *ffa_tx __read_mostly; DEFINE_SPINLOCK(ffa_rx_buffer_lock); DEFINE_SPINLOCK(ffa_tx_buffer_lock); +LIST_HEAD(ffa_ctx_head); +/* RW Lock to protect addition/removal and reading in ffa_ctx_head */ +DEFINE_RWLOCK(ffa_ctx_list_rwlock); + +#ifdef CONFIG_FFA_VM_TO_VM +atomic_t ffa_vm_count; +#endif /* Used to track domains that could not be torn down immediately. */ static struct timer ffa_teardown_timer; -static struct list_head ffa_teardown_head; + +static LIST_HEAD(ffa_teardown_head); static DEFINE_SPINLOCK(ffa_teardown_lock); static bool ffa_get_version(uint32_t *vers) @@ -151,6 +159,7 @@ static void handle_version(struct cpu_user_regs *regs) struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; uint32_t vers = get_user_reg(regs, 1); + uint32_t old_vers; /* * Guest will use the version it requested if it is our major and minor @@ -160,10 +169,23 @@ static void handle_version(struct cpu_user_regs *regs) */ if ( FFA_VERSION_MAJOR(vers) == FFA_MY_VERSION_MAJOR ) { + spin_lock(&ctx->lock); + old_vers = ctx->guest_vers; + if ( FFA_VERSION_MINOR(vers) > FFA_MY_VERSION_MINOR ) ctx->guest_vers = FFA_MY_VERSION; else ctx->guest_vers = vers; + spin_unlock(&ctx->lock); + + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !old_vers ) + { + /* One more VM with FF-A support available */ + inc_ffa_vm_count(); + write_lock(&ffa_ctx_list_rwlock); + list_add_tail(&ctx->ctx_list, &ffa_ctx_head); + write_unlock(&ffa_ctx_list_rwlock); + } } ffa_set_regs(regs, FFA_MY_VERSION, 0, 0, 0, 0, 0, 0, 0); } @@ -345,6 +367,10 @@ static int ffa_domain_init(struct domain *d) ctx->teardown_d = d; INIT_LIST_HEAD(&ctx->shm_list); + ctx->ffa_id = ffa_get_vm_id(d); + ctx->num_vcpus = d->max_vcpus; + ctx->is_64bit = is_64bit_domain(d); + /* * ffa_domain_teardown() will be called if ffa_domain_init() returns an * error, so no need for cleanup in this function. @@ -421,6 +447,14 @@ static int ffa_domain_teardown(struct domain *d) if ( !ctx ) return 0; + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) && ctx->guest_vers ) + { + dec_ffa_vm_count(); + write_lock(&ffa_ctx_list_rwlock); + list_del(&ctx->ctx_list); + write_unlock(&ffa_ctx_list_rwlock); + } + ffa_rxtx_domain_destroy(d); ffa_notif_domain_destroy(d); @@ -464,6 +498,18 @@ static bool ffa_probe(void) printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + { + /* + * When FFA VM to VM is enabled, the current implementation does not + * offer any way to limit which VM can communicate with which VM using + * FF-A. + * Signal this in the xen console and taint the system as insecure. + * TODO: Introduce a solution to limit what a VM can do through FFA. + */ + printk(XENLOG_ERR "ffa: VM to VM is enabled, system is insecure !!\n"); + add_taint(TAINT_MACHINE_INSECURE); + } /* * psci_init_smccc() updates this value with what's reported by EL-3 * or secure world. @@ -537,7 +583,6 @@ static bool ffa_probe(void) goto err_rxtx_destroy; ffa_notif_init(); - INIT_LIST_HEAD(&ffa_teardown_head); init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); return true; diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c index dfa0b23eaf..fa56b1587e 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -150,6 +150,73 @@ out: return ret; } +static int32_t ffa_get_vm_partinfo(uint32_t *vm_count, void *dst_buf, + void *end_buf, uint32_t dst_size) +{ + struct ffa_ctx *curr_ctx = current->domain->arch.tee; + struct ffa_ctx *dest_ctx; + uint32_t count = 0; + int32_t ret = FFA_RET_OK; + + /* + * There could potentially be a lot of VMs in the system and we could + * hold the CPU for long here. + * Right now there is no solution in FF-A specification to split + * the work in this case. + * TODO: Check how we could delay the work or have preemption checks. + */ + read_lock(&ffa_ctx_list_rwlock); + list_for_each_entry(dest_ctx, &ffa_ctx_head, ctx_list) + { + /* + * Do not include an entry for the caller VM as the spec is not + * clearly mandating it and it is not supported by Linux. + */ + if ( dest_ctx != curr_ctx ) + { + /* + * We do not have UUID info for VMs so use + * the 1.0 structure so that we set UUIDs to + * zero using memset + */ + struct ffa_partition_info_1_0 info; + + if ( dst_buf > (end_buf - dst_size) ) + { + ret = FFA_RET_NO_MEMORY; + goto out; + } + + /* + * Context might has been removed since we go it or being removed + * right now so we might return information for a VM not existing + * anymore. This is acceptable as we return a view of the system + * which could change at any time. + */ + info.id = dest_ctx->ffa_id; + info.execution_context = dest_ctx->num_vcpus; + info.partition_properties = FFA_PART_VM_PROP; + if ( dest_ctx->is_64bit ) + info.partition_properties |= FFA_PART_PROP_AARCH64_STATE; + + memcpy(dst_buf, &info, MIN(sizeof(info), dst_size)); + + if ( dst_size > sizeof(info) ) + memset(dst_buf + sizeof(info), 0, + dst_size - sizeof(info)); + + dst_buf += dst_size; + count++; + } + } + *vm_count = count; + +out: + read_unlock(&ffa_ctx_list_rwlock); + + return ret; +} + void ffa_handle_partition_info_get(struct cpu_user_regs *regs) { int32_t ret = FFA_RET_OK; @@ -164,7 +231,7 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) }; uint32_t dst_size = 0; void *dst_buf, *end_buf; - uint32_t ffa_sp_count = 0; + uint32_t ffa_vm_count = 0, ffa_sp_count = 0; /* * If the guest is v1.0, he does not get back the entry size so we must @@ -191,15 +258,18 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) } if ( ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) + { ret = ffa_get_sp_count(uuid, &ffa_sp_count); + if ( ret ) + goto out; + } - goto out; - } + /* + * Do not count the caller VM as the spec is not clearly mandating it + * and it is not supported by Linux. + */ + ffa_vm_count = get_ffa_vm_count() - 1; - if ( !ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) - { - /* Just give an empty partition list to the caller */ - ret = FFA_RET_OK; goto out; } @@ -224,9 +294,19 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) goto out_rx_release; } - ret = ffa_get_sp_partinfo(uuid, &ffa_sp_count, dst_buf, end_buf, - dst_size); + if ( ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) + { + ret = ffa_get_sp_partinfo(uuid, &ffa_sp_count, dst_buf, end_buf, + dst_size); + + if ( ret ) + goto out_rx_release; + + dst_buf += ffa_sp_count * dst_size; + } + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + ret = ffa_get_vm_partinfo(&ffa_vm_count, dst_buf, end_buf, dst_size); out_rx_release: if ( ret ) @@ -235,7 +315,7 @@ out: if ( ret ) ffa_set_regs_error(regs, ret); else - ffa_set_regs_success(regs, ffa_sp_count, dst_size); + ffa_set_regs_success(regs, ffa_sp_count + ffa_vm_count, dst_size); } static int32_t ffa_direct_req_send_vm(uint16_t sp_id, uint16_t vm_id, diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 0a9c1082db..5cb2b51714 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -195,6 +195,18 @@ */ #define FFA_PARTITION_INFO_GET_COUNT_FLAG BIT(0, U) +/* + * Partition properties we give for a normal world VM: + * - can send direct message but not receive them + * - can handle indirect messages + * - can receive notifications + * 32/64 bit flag is set depending on the VM + */ +#define FFA_PART_VM_PROP (FFA_PART_PROP_DIRECT_REQ_SEND | \ + FFA_PART_PROP_INDIRECT_MSGS | \ + FFA_PART_PROP_RECV_NOTIF | \ + FFA_PART_PROP_IS_PE_ID) + /* Flags used in calls to FFA_NOTIFICATION_GET interface */ #define FFA_NOTIF_FLAG_BITMAP_SP BIT(0, U) #define FFA_NOTIF_FLAG_BITMAP_VM BIT(1, U) @@ -297,36 +309,72 @@ struct ffa_ctx_notif { }; struct ffa_ctx { - void *rx; - const void *tx; - struct page_info *rx_pg; - struct page_info *tx_pg; + /* + * Chain list of all FF-A contexts. + * As we might have several read from the list of context through parallel + * partinfo_get but fewer additions/removal as those happen only during a + * version negotiation or guest shutdown, access to this list is protected + * through a rwlock (addition/removal with write lock, reading through a + * read lock). + */ + struct list_head ctx_list; /* chain list of all FF-A contexts */ + + /* + * Data access unlocked (mainly for part_info_get in VM to VM). + * Those should be set before the ctx is added in the list. + */ + /* FF-A Endpoint ID */ + uint16_t ffa_id; + uint16_t num_vcpus; + bool is_64bit; + + /* + * Global data accessed atomically or using ACCES_ONCE. + */ + struct ffa_ctx_notif notif; + + /* + * Global data accessed with lock locked. + */ + spinlock_t lock; + /* + * FF-A version negotiated by the guest, only modifications to + * this field are done with the lock held as this is expected to + * be done once at init by a guest. + */ + uint32_t guest_vers; /* Number of 4kB pages in each of rx/rx_pg and tx/tx_pg */ unsigned int page_count; - /* FF-A version used by the guest */ - uint32_t guest_vers; - bool rx_is_free; - /* Used shared memory objects, struct ffa_shm_mem */ - struct list_head shm_list; /* Number of allocated shared memory object */ unsigned int shm_count; - struct ffa_ctx_notif notif; + /* Used shared memory objects, struct ffa_shm_mem */ + struct list_head shm_list; + /* - * tx_lock is used to serialize access to tx - * rx_lock is used to serialize access to rx_is_free - * lock is used for the rest in this struct + * Rx buffer, accessed with rx_lock locked. + * rx_is_free is used to serialize access. */ - spinlock_t tx_lock; spinlock_t rx_lock; - spinlock_t lock; - /* Used if domain can't be torn down immediately */ + bool rx_is_free; + void *rx; + struct page_info *rx_pg; + + /* + * Tx buffer, access with tx_lock locked. + */ + spinlock_t tx_lock; + const void *tx; + struct page_info *tx_pg; + + + /* + * Domain teardown handling if data shared or used by other domains + * do not allow to teardown the domain immediately. + */ struct domain *teardown_d; struct list_head teardown_list; s_time_t teardown_expire; - /* - * Used for ffa_domain_teardown() to keep track of which SPs should be - * notified that this guest is being destroyed. - */ + /* Keep track of SPs that should be notified of VM destruction */ unsigned long *vm_destroy_bitmap; }; @@ -336,6 +384,12 @@ extern spinlock_t ffa_rx_buffer_lock; extern spinlock_t ffa_tx_buffer_lock; extern DECLARE_BITMAP(ffa_fw_abi_supported, FFA_ABI_BITMAP_SIZE); +extern struct list_head ffa_ctx_head; +extern rwlock_t ffa_ctx_list_rwlock; +#ifdef CONFIG_FFA_VM_TO_VM +extern atomic_t ffa_vm_count; +#endif + bool ffa_shm_domain_destroy(struct domain *d); void ffa_handle_mem_share(struct cpu_user_regs *regs); int ffa_handle_mem_reclaim(uint64_t handle, uint32_t flags); @@ -368,6 +422,29 @@ int ffa_handle_notification_set(struct cpu_user_regs *regs); void ffa_handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t fid); int32_t ffa_handle_msg_send2(struct cpu_user_regs *regs); +#ifdef CONFIG_FFA_VM_TO_VM +static inline uint16_t get_ffa_vm_count(void) +{ + return atomic_read(&ffa_vm_count); +} + +static inline void inc_ffa_vm_count(void) +{ + atomic_inc(&ffa_vm_count); +} + +static inline void dec_ffa_vm_count(void) +{ + ASSERT(atomic_read(&ffa_vm_count) > 0); + atomic_dec(&ffa_vm_count); +} +#else +/* Only count the caller VM */ +#define get_ffa_vm_count() ((uint16_t)1UL) +#define inc_ffa_vm_count() do {} while(0) +#define dec_ffa_vm_count() do {} while(0) +#endif + static inline uint16_t ffa_get_vm_id(const struct domain *d) { /* +1 since 0 is reserved for the hypervisor in FF-A */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078696.1439732 (Exim 4.92) (envelope-from ) id 1ulmuj-0000Pe-3E; Tue, 12 Aug 2025 11:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078696.1439732; Tue, 12 Aug 2025 11:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuj-0000PW-0I; Tue, 12 Aug 2025 11:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1078696; Tue, 12 Aug 2025 11:11:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmuh-0000PQ-Sl for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmuh-001gET-26 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmuh-001C9p-2g for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UrxYJmY/NV0V26Km6ctGdN8ezGxDE2I2jE1vASeSSIw=; b=GDvHhhBwcaBV7x2wAYNuttMZbW 6LBJevDlCsbjxH2jnIEU/tE3QJ3KG3RuVF1WKbAw2ygZk5gjcB9F5vmcYoWpwv7UBXGsX+W9DIhwI 4PTtjRUTeZYSj1tTlG/FIUD49SKIqakphUTgdqqepCkGXQudX6V5A/ad6pWFip/TTWzI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: Add buffer full notification support Message-Id: Date: Tue, 12 Aug 2025 11:11:31 +0000 commit 3935c705688e5958bb30d3f061fca660191be693 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:35:00 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Add buffer full notification support Add support to raise a Rx buffer full notification to a VM. This function will be used for indirect message support between VM and is only activated if CONFIG_FFA_VM_TO_VM is selected. Even if there are 32 framework notifications possible, right now only one is defined so the implementation is simplified to only handle the buffer full notification using a boolean. If other framework notifications have to be supported one day, the design will have to be modified to handle it properly. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa_notif.c | 36 ++++++++++++++++++++++++++++++------ xen/arch/arm/tee/ffa_private.h | 23 ++++++++++++++++++++++- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c index 00efaf8f73..f6df2f15bb 100644 --- a/xen/arch/arm/tee/ffa_notif.c +++ b/xen/arch/arm/tee/ffa_notif.c @@ -69,6 +69,7 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) { struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; + bool notif_pending; if ( !notif_enabled ) { @@ -76,7 +77,11 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) return; } - if ( test_and_clear_bool(ctx->notif.secure_pending) ) + notif_pending = test_and_clear_bool(ctx->notif.secure_pending); + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + notif_pending |= test_and_clear_bool(ctx->notif.vm_pending); + + if ( notif_pending ) { /* A pending global notification for the guest */ ffa_set_regs(regs, FFA_SUCCESS_64, 0, @@ -93,6 +98,7 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) void ffa_handle_notification_get(struct cpu_user_regs *regs) { struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; uint32_t recv = get_user_reg(regs, 1); uint32_t flags = get_user_reg(regs, 2); uint32_t w2 = 0; @@ -132,11 +138,7 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) */ if ( ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) && ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) ) - { - struct ffa_ctx *ctx = d->arch.tee; - - ACCESS_ONCE(ctx->notif.secure_pending) = false; - } + ACCESS_ONCE(ctx->notif.secure_pending) = false; arm_smccc_1_2_smc(&arg, &resp); e = ffa_get_ret_code(&resp); @@ -156,6 +158,14 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) w6 = resp.a6; } + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) && + flags & FFA_NOTIF_FLAG_BITMAP_HYP && + test_and_clear_bool(ctx->notif.buff_full_pending) ) + { + ACCESS_ONCE(ctx->notif.vm_pending) = false; + w7 = FFA_NOTIF_RX_BUFFER_FULL; + } + ffa_set_regs(regs, FFA_SUCCESS_32, 0, w2, w3, w4, w5, w6, w7); } @@ -178,6 +188,20 @@ int ffa_handle_notification_set(struct cpu_user_regs *regs) bitmap_hi); } +#ifdef CONFIG_FFA_VM_TO_VM +void ffa_raise_rx_buffer_full(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + + if ( !ctx ) + return; + + ACCESS_ONCE(ctx->notif.buff_full_pending) = true; + if ( !test_and_set_bool(ctx->notif.vm_pending) ) + vgic_inject_irq(d, d->vcpu[0], GUEST_FFA_NOTIF_PEND_INTR_ID, true); +} +#endif + /* * Extract a 16-bit ID (index n) from the successful return value from * FFA_NOTIFICATION_INFO_GET_64 or FFA_NOTIFICATION_INFO_GET_32. IDs are diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 5cb2b51714..6dbdb200d8 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -218,6 +218,8 @@ #define FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT 7 #define FFA_NOTIF_INFO_GET_ID_COUNT_MASK 0x1F +#define FFA_NOTIF_RX_BUFFER_FULL BIT(0, U) + /* Feature IDs used with FFA_FEATURES */ #define FFA_FEATURE_NOTIF_PEND_INTR 0x1U #define FFA_FEATURE_SCHEDULE_RECV_INTR 0x2U @@ -303,9 +305,20 @@ struct ffa_mem_region { struct ffa_ctx_notif { /* * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have - * pending global notifications. + * pending notifications from the secure world. */ bool secure_pending; + + /* + * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have + * pending notifications from VMs (including framework ones). + */ + bool vm_pending; + + /* + * True if domain has buffer full notification pending + */ + bool buff_full_pending; }; struct ffa_ctx { @@ -419,6 +432,14 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs); void ffa_handle_notification_get(struct cpu_user_regs *regs); int ffa_handle_notification_set(struct cpu_user_regs *regs); +#ifdef CONFIG_FFA_VM_TO_VM +void ffa_raise_rx_buffer_full(struct domain *d); +#else +static inline void ffa_raise_rx_buffer_full(struct domain *d) +{ +} +#endif + void ffa_handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t fid); int32_t ffa_handle_msg_send2(struct cpu_user_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:11:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078697.1439737 (Exim 4.92) (envelope-from ) id 1ulmut-0000Rp-5R; Tue, 12 Aug 2025 11:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078697.1439737; Tue, 12 Aug 2025 11:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmut-0000Rh-1d; Tue, 12 Aug 2025 11:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1078697; Tue, 12 Aug 2025 11:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmur-0000RZ-VF for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmur-001gEs-2M for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmur-001CAD-2x for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:41 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T5YQsjG0Rw4fm018VLyygoHlcJIHbmQhiufMT1Bu3yg=; b=2liSc/NZ7JLLb8G9wTY1dTLJ3M FjRhXjMXoB9RxsOv2p6UFDVMn1O45LywCq0vc3ACVnvTs0pMsq7HY44IFBR/UfAIoDZcWvlqwhi7x Ak3vEcUqzstowyCUsbKDxGa9n66oWwZIGLt3Bp6ost4QgRGlEZ17T0j5UPtbv4LMkNSc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: Add indirect message between VM Message-Id: Date: Tue, 12 Aug 2025 11:11:41 +0000 commit 98af565b1e614dd14631199826f385f2ab77ed53 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:35:01 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Add indirect message between VM Add support for indirect messages between VMs. This is only enabled if CONFIG_FFA_VM_TO_VM is selected. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa_msg.c | 117 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/tee/ffa_msg.c b/xen/arch/arm/tee/ffa_msg.c index ee594e737f..c20c5bec0f 100644 --- a/xen/arch/arm/tee/ffa_msg.c +++ b/xen/arch/arm/tee/ffa_msg.c @@ -88,43 +88,130 @@ out: resp.a7 & mask); } +static int32_t ffa_msg_send2_vm(uint16_t dst_id, const void *src_buf, + struct ffa_part_msg_rxtx *src_msg) +{ + struct domain *dst_d; + struct ffa_ctx *dst_ctx; + struct ffa_part_msg_rxtx *dst_msg; + int err; + int32_t ret; + + if ( dst_id == 0 ) + /* FF-A ID 0 is the hypervisor, this is not valid */ + return FFA_RET_INVALID_PARAMETERS; + + /* This is also checking that dest is not src */ + err = rcu_lock_live_remote_domain_by_id(dst_id - 1, &dst_d); + if ( err ) + return FFA_RET_INVALID_PARAMETERS; + + if ( dst_d->arch.tee == NULL ) + { + ret = FFA_RET_INVALID_PARAMETERS; + goto out_unlock; + } + + dst_ctx = dst_d->arch.tee; + if ( !dst_ctx->guest_vers ) + { + ret = FFA_RET_INVALID_PARAMETERS; + goto out_unlock; + } + + /* This also checks that destination has set a Rx buffer */ + ret = ffa_rx_acquire(dst_d); + if ( ret ) + goto out_unlock; + + /* we need to have enough space in the destination buffer */ + if ( (dst_ctx->page_count * FFA_PAGE_SIZE - + sizeof(struct ffa_part_msg_rxtx)) < src_msg->msg_size ) + { + ret = FFA_RET_NO_MEMORY; + ffa_rx_release(dst_d); + goto out_unlock; + } + + dst_msg = dst_ctx->rx; + + /* prepare destination header */ + dst_msg->flags = 0; + dst_msg->reserved = 0; + dst_msg->msg_offset = sizeof(struct ffa_part_msg_rxtx); + dst_msg->send_recv_id = src_msg->send_recv_id; + dst_msg->msg_size = src_msg->msg_size; + + memcpy(dst_ctx->rx + sizeof(struct ffa_part_msg_rxtx), + src_buf + src_msg->msg_offset, src_msg->msg_size); + + /* receiver rx buffer will be released by the receiver*/ + +out_unlock: + rcu_unlock_domain(dst_d); + if ( !ret ) + ffa_raise_rx_buffer_full(dst_d); + + return ret; +} + int32_t ffa_handle_msg_send2(struct cpu_user_regs *regs) { struct domain *src_d = current->domain; struct ffa_ctx *src_ctx = src_d->arch.tee; - const struct ffa_part_msg_rxtx *src_msg; + struct ffa_part_msg_rxtx src_msg; uint16_t dst_id, src_id; int32_t ret; - if ( !ffa_fw_supports_fid(FFA_MSG_SEND2) ) - return FFA_RET_NOT_SUPPORTED; + BUILD_BUG_ON(sizeof(struct ffa_part_msg_rxtx) >= FFA_PAGE_SIZE); if ( !spin_trylock(&src_ctx->tx_lock) ) return FFA_RET_BUSY; - src_msg = src_ctx->tx; - src_id = src_msg->send_recv_id >> 16; - dst_id = src_msg->send_recv_id & GENMASK(15,0); + /* create a copy of the message header */ + memcpy(&src_msg, src_ctx->tx, sizeof(src_msg)); - if ( src_id != ffa_get_vm_id(src_d) || !FFA_ID_IS_SECURE(dst_id) ) + src_id = src_msg.send_recv_id >> 16; + dst_id = src_msg.send_recv_id & GENMASK(15,0); + + if ( src_id != ffa_get_vm_id(src_d) ) { ret = FFA_RET_INVALID_PARAMETERS; - goto out_unlock_tx; + goto out; } /* check source message fits in buffer */ - if ( src_ctx->page_count * FFA_PAGE_SIZE < - src_msg->msg_offset + src_msg->msg_size || - src_msg->msg_offset < sizeof(struct ffa_part_msg_rxtx) ) + if ( src_msg.msg_offset < sizeof(struct ffa_part_msg_rxtx) || + src_msg.msg_size == 0 || + src_msg.msg_offset > src_ctx->page_count * FFA_PAGE_SIZE || + src_msg.msg_size > (src_ctx->page_count * FFA_PAGE_SIZE - + src_msg.msg_offset) ) { ret = FFA_RET_INVALID_PARAMETERS; - goto out_unlock_tx; + goto out; } - ret = ffa_simple_call(FFA_MSG_SEND2, - ((uint32_t)ffa_get_vm_id(src_d)) << 16, 0, 0, 0); + if ( FFA_ID_IS_SECURE(dst_id) ) + { + /* Message for a secure partition */ + if ( !ffa_fw_supports_fid(FFA_MSG_SEND2) ) + { + ret = FFA_RET_NOT_SUPPORTED; + goto out; + } + + ret = ffa_simple_call(FFA_MSG_SEND2, + ((uint32_t)ffa_get_vm_id(src_d)) << 16, 0, 0, 0); + } + else if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + { + /* Message for a VM */ + ret = ffa_msg_send2_vm(dst_id, src_ctx->tx, &src_msg); + } + else + ret = FFA_RET_INVALID_PARAMETERS; -out_unlock_tx: +out: spin_unlock(&src_ctx->tx_lock); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:11:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078698.1439739 (Exim 4.92) (envelope-from ) id 1ulmv3-0000V6-7Z; Tue, 12 Aug 2025 11:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078698.1439739; Tue, 12 Aug 2025 11:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmv3-0000Uy-4T; Tue, 12 Aug 2025 11:11:53 +0000 Received: by outflank-mailman (input) for mailman id 1078698; Tue, 12 Aug 2025 11:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmv2-0000Un-1g for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmv1-001gF3-2c for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmv1-001CAa-3D for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:11:51 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kMpzIXpM0oi+5KabJZ0ZLUoFxrtrB+VBcabAUSXKE1M=; b=c42oo/OUnGZGPQpO9JeW+tvEkK g9EZQw+zny48sLoBx7flmu5RoSvX2xf5L/xgX2XnbyZNVeJqluxf0GGkhavHFSsmHIRieIZQ3OgxL i3lm3ipAF/RInncFgtoJkLU9UgaEg59cjBhVumD3k4oIsKFNUmdMOU4U8Ui5FeTQVhk4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: ffa: Enable VM to VM without firmware Message-Id: Date: Tue, 12 Aug 2025 11:11:51 +0000 commit 911b305e7bdab15ddf73667611091ef82edd5181 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:35:02 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Enable VM to VM without firmware When VM to VM support is activated and there is no suitable FF-A support in the firmware, enable FF-A support for VMs to allow using it for VM to VM communications. If there is OP-TEE running in the secure world and using the non FF-A communication system, having CONFIG_FFA_VM_TO_VM could be non functional (if optee is probed first) or OP-TEE could be non functional (if FF-A is probed first) so it is not recommended to activate the configuration option for such systems. To make buffer full notification work between VMs when there is no firmware, rework the notification handling and modify the global flag to only be used as check for firmware notification support instead. Also split probe function into one for firmware and one for vm to vm to make the implementation clearer. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa.c | 87 ++++++++++++++++++++++-------------- xen/arch/arm/tee/ffa_notif.c | 104 ++++++++++++++++++++----------------------- 2 files changed, 101 insertions(+), 90 deletions(-) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 0eb6a0bda5..1d0239cf69 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -346,8 +346,9 @@ static int ffa_domain_init(struct domain *d) struct ffa_ctx *ctx; int ret; - if ( !ffa_fw_version ) + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !ffa_fw_version ) return -ENODEV; + /* * We are using the domain_id + 1 as the FF-A ID for VMs as FF-A ID 0 is * reserved for the hypervisor and we only support secure endpoints using @@ -478,38 +479,12 @@ static void ffa_init_secondary(void) ffa_notif_init_interrupt(); } -static bool ffa_probe(void) +static bool ffa_probe_fw(void) { uint32_t vers; unsigned int major_vers; unsigned int minor_vers; - /* - * FF-A often works in units of 4K pages and currently it's assumed - * that we can map memory using that granularity. See also the comment - * above the FFA_PAGE_SIZE define. - * - * It is possible to support a PAGE_SIZE larger than 4K in Xen, but - * until that is fully handled in this code make sure that we only use - * 4K page sizes. - */ - BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); - - printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", - FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); - - if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) - { - /* - * When FFA VM to VM is enabled, the current implementation does not - * offer any way to limit which VM can communicate with which VM using - * FF-A. - * Signal this in the xen console and taint the system as insecure. - * TODO: Introduce a solution to limit what a VM can do through FFA. - */ - printk(XENLOG_ERR "ffa: VM to VM is enabled, system is insecure !!\n"); - add_taint(TAINT_MACHINE_INSECURE); - } /* * psci_init_smccc() updates this value with what's reported by EL-3 * or secure world. @@ -528,11 +503,6 @@ static bool ffa_probe(void) goto err_no_fw; } - /* Some sanity check in case we update the version we support */ - BUILD_BUG_ON(FFA_MIN_SPMC_VERSION > FFA_MY_VERSION); - BUILD_BUG_ON(FFA_VERSION_MAJOR(FFA_MIN_SPMC_VERSION) != - FFA_MY_VERSION_MAJOR); - major_vers = FFA_VERSION_MAJOR(vers); minor_vers = FFA_VERSION_MINOR(vers); @@ -583,7 +553,6 @@ static bool ffa_probe(void) goto err_rxtx_destroy; ffa_notif_init(); - init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); return true; @@ -597,6 +566,56 @@ err_no_fw: return false; } +static bool ffa_probe_vm_to_vm(void) +{ + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + return false; + + /* + * When FFA VM to VM is enabled, the current implementation does not + * offer any way to limit which VM can communicate with which VM using + * FF-A. + * Signal this in the xen console and taint the system as insecure. + * TODO: Introduce a solution to limit what a VM can do through FFA. + */ + printk(XENLOG_ERR "ffa: VM to VM is enabled, system is insecure !!\n"); + add_taint(TAINT_MACHINE_INSECURE); + + return true; +} + +static bool ffa_probe(void) +{ + /* + * FF-A often works in units of 4K pages and currently it's assumed + * that we can map memory using that granularity. See also the comment + * above the FFA_PAGE_SIZE define. + * + * It is possible to support a PAGE_SIZE larger than 4K in Xen, but + * until that is fully handled in this code make sure that we only use + * 4K page sizes. + */ + BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); + + /* Some sanity check in case we update the version we support */ + BUILD_BUG_ON(FFA_MIN_SPMC_VERSION > FFA_MY_VERSION); + BUILD_BUG_ON(FFA_VERSION_MAJOR(FFA_MIN_SPMC_VERSION) != + FFA_MY_VERSION_MAJOR); + + printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", + FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); + + if ( !ffa_probe_fw() && !ffa_probe_vm_to_vm() ) + return false; + + if ( !ffa_fw_version ) + printk(XENLOG_INFO "ARM FF-A only available between VMs\n"); + + init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); + + return true; +} + static const struct tee_mediator_ops ffa_ops = { .probe = ffa_probe, diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c index f6df2f15bb..86bef6b3b2 100644 --- a/xen/arch/arm/tee/ffa_notif.c +++ b/xen/arch/arm/tee/ffa_notif.c @@ -16,7 +16,7 @@ #include "ffa_private.h" -static bool __ro_after_init notif_enabled; +static bool __ro_after_init fw_notif_enabled; static unsigned int __ro_after_init notif_sri_irq; int ffa_handle_notification_bind(struct cpu_user_regs *regs) @@ -27,21 +27,17 @@ int ffa_handle_notification_bind(struct cpu_user_regs *regs) uint32_t bitmap_lo = get_user_reg(regs, 3); uint32_t bitmap_hi = get_user_reg(regs, 4); - if ( !notif_enabled ) - return FFA_RET_NOT_SUPPORTED; - if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) return FFA_RET_INVALID_PARAMETERS; if ( flags ) /* Only global notifications are supported */ return FFA_RET_DENIED; - /* - * We only support notifications from SP so no need to check the sender - * endpoint ID, the SPMC will take care of that for us. - */ - return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, bitmap_lo, - bitmap_hi); + if ( FFA_ID_IS_SECURE(src_dst >> 16) && fw_notif_enabled ) + return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, + bitmap_lo, bitmap_hi); + + return FFA_RET_NOT_SUPPORTED; } int ffa_handle_notification_unbind(struct cpu_user_regs *regs) @@ -51,18 +47,14 @@ int ffa_handle_notification_unbind(struct cpu_user_regs *regs) uint32_t bitmap_lo = get_user_reg(regs, 3); uint32_t bitmap_hi = get_user_reg(regs, 4); - if ( !notif_enabled ) - return FFA_RET_NOT_SUPPORTED; - if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) return FFA_RET_INVALID_PARAMETERS; - /* - * We only support notifications from SP so no need to check the - * destination endpoint ID, the SPMC will take care of that for us. - */ - return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_lo, - bitmap_hi); + if ( FFA_ID_IS_SECURE(src_dst >> 16) && fw_notif_enabled ) + return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_lo, + bitmap_hi); + + return FFA_RET_NOT_SUPPORTED; } void ffa_handle_notification_info_get(struct cpu_user_regs *regs) @@ -71,7 +63,7 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) struct ffa_ctx *ctx = d->arch.tee; bool notif_pending; - if ( !notif_enabled ) + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !fw_notif_enabled ) { ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return; @@ -108,7 +100,7 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) uint32_t w6 = 0; uint32_t w7 = 0; - if ( !notif_enabled ) + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !fw_notif_enabled ) { ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return; @@ -120,7 +112,8 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) return; } - if ( flags & ( FFA_NOTIF_FLAG_BITMAP_SP | FFA_NOTIF_FLAG_BITMAP_SPM ) ) + if ( fw_notif_enabled && (flags & ( FFA_NOTIF_FLAG_BITMAP_SP | + FFA_NOTIF_FLAG_BITMAP_SPM )) ) { struct arm_smccc_1_2_regs arg = { .a0 = FFA_NOTIFICATION_GET, @@ -177,15 +170,14 @@ int ffa_handle_notification_set(struct cpu_user_regs *regs) uint32_t bitmap_lo = get_user_reg(regs, 3); uint32_t bitmap_hi = get_user_reg(regs, 4); - if ( !notif_enabled ) - return FFA_RET_NOT_SUPPORTED; - if ( (src_dst >> 16) != ffa_get_vm_id(d) ) return FFA_RET_INVALID_PARAMETERS; - /* Let the SPMC check the destination of the notification */ - return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, - bitmap_hi); + if ( FFA_ID_IS_SECURE(src_dst >> 16) && fw_notif_enabled ) + return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, + bitmap_hi); + + return FFA_RET_NOT_SUPPORTED; } #ifdef CONFIG_FFA_VM_TO_VM @@ -371,7 +363,7 @@ void ffa_notif_init_interrupt(void) { int ret; - if ( notif_enabled && notif_sri_irq < NR_GIC_SGI ) + if ( fw_notif_enabled && notif_sri_irq < NR_GIC_SGI ) { /* * An error here is unlikely since the primary CPU has already @@ -402,41 +394,41 @@ void ffa_notif_init(void) int ret; /* Only enable fw notification if all ABIs we need are supported */ - if ( !(ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_CREATE) && - ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_DESTROY) && - ffa_fw_supports_fid(FFA_NOTIFICATION_GET) && - ffa_fw_supports_fid(FFA_NOTIFICATION_INFO_GET_64)) ) - return; - - arm_smccc_1_2_smc(&arg, &resp); - if ( resp.a0 != FFA_SUCCESS_32 ) - return; - - irq = resp.a2; - notif_sri_irq = irq; - if ( irq >= NR_GIC_SGI ) - irq_set_type(irq, IRQ_TYPE_EDGE_RISING); - ret = request_irq(irq, 0, notif_irq_handler, "FF-A notif", NULL); - if ( ret ) + if ( ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_CREATE) && + ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_DESTROY) && + ffa_fw_supports_fid(FFA_NOTIFICATION_GET) && + ffa_fw_supports_fid(FFA_NOTIFICATION_INFO_GET_64) ) { - printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", - irq, ret); - return; - } + arm_smccc_1_2_smc(&arg, &resp); + if ( resp.a0 != FFA_SUCCESS_32 ) + return; - notif_enabled = true; + irq = resp.a2; + notif_sri_irq = irq; + if ( irq >= NR_GIC_SGI ) + irq_set_type(irq, IRQ_TYPE_EDGE_RISING); + ret = request_irq(irq, 0, notif_irq_handler, "FF-A notif", NULL); + if ( ret ) + { + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + irq, ret); + return; + } + fw_notif_enabled = true; + } } int ffa_notif_domain_init(struct domain *d) { int32_t res; - if ( !notif_enabled ) - return 0; + if ( fw_notif_enabled ) + { - res = ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); - if ( res ) - return -ENOMEM; + res = ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); + if ( res ) + return -ENOMEM; + } return 0; } @@ -447,6 +439,6 @@ void ffa_notif_domain_destroy(struct domain *d) * Call bitmap_destroy even if bitmap create failed as the SPMC will * return a DENIED error that we will ignore. */ - if ( notif_enabled ) + if ( fw_notif_enabled ) ffa_notification_bitmap_destroy(ffa_get_vm_id(d)); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:12:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078699.1439743 (Exim 4.92) (envelope-from ) id 1ulmvD-0000XL-8w; Tue, 12 Aug 2025 11:12:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078699.1439743; Tue, 12 Aug 2025 11:12:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvD-0000XD-5v; Tue, 12 Aug 2025 11:12:03 +0000 Received: by outflank-mailman (input) for mailman id 1078699; Tue, 12 Aug 2025 11:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvC-0000X3-4W for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmvB-001gFI-2u for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmvC-001CCB-0F for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zuCrmvi15lnuTwlYQ7CoeEnCGSzgzjwgr8ixP+d7j9I=; b=kF/IZuVtHquvMig4MxyFDfXKt3 y8GXbUKRWSnltA4qHxbhdSloIAPJs70L5mM2xe3ZT88ho3RGcDOfHob4IoDpUq/JJnBwhLd0ZXbm8 Ir1AEn898+k7R4aI+z/O/a4az/xb7FRUk/U88uewmc6QsadB1xe6q/GtF8UqbueZN3KI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: irq: add missing spin_unlock() in init_local_irq_data() error path Message-Id: Date: Tue, 12 Aug 2025 11:12:02 +0000 commit 4c3aa6e93d3fc760bdcb9cf268f506c06c0639b2 Author: Mykola Kvach AuthorDate: Mon Aug 11 11:45:20 2025 +0300 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: irq: add missing spin_unlock() in init_local_irq_data() error path If init_one_irq_desc() fails, init_local_irq_data() returns without releasing local_irqs_type_lock, leading to a possible deadlock. Release the lock before returning to ensure proper cleanup. Fixes: 2bb32b809250 ("xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()") Signed-off-by: Mykola Kvach Reviewed-by: Denis Mukhin Acked-by: Julien Grall --- xen/arch/arm/irq.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 4bbf0b0664..02ca82c089 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -94,7 +94,10 @@ static int init_local_irq_data(unsigned int cpu) int rc = init_one_irq_desc(desc); if ( rc ) + { + spin_unlock(&local_irqs_type_lock); return rc; + } desc->irq = irq; desc->action = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:12:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:12:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078700.1439748 (Exim 4.92) (envelope-from ) id 1ulmvN-0000aq-9p; Tue, 12 Aug 2025 11:12:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078700.1439748; Tue, 12 Aug 2025 11:12:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvN-0000ai-7K; Tue, 12 Aug 2025 11:12:13 +0000 Received: by outflank-mailman (input) for mailman id 1078700; Tue, 12 Aug 2025 11:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvM-0000aV-7i for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmvM-001gFN-00 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmvM-001CDh-0Y for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0wDPhj0mTdgJ1OzPh5+hWh6WgmWBcM5u/xbRIbsSZXQ=; b=XaIFkJ/AbWph7zD9CA/Gqzc0+V ImEZrnjbSQU44XPuDZ3oqXfSiH1O4W5A47qMAbCm60q7f+wPH5DrwczrO2fiBSs73bmNRccSBeCX4 MGpQykWw8EWMChE3J30EWpmpkeO77WeWpNZeGuJHlswFsF7f8fitYTYf3BdBh7dlwtnI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/dom0less: arm: fix hwdom 1:1 low memory allocation Message-Id: Date: Tue, 12 Aug 2025 11:12:12 +0000 commit 2f6f9c7ae9de563764b0aaffa1abefc65c560a7a Author: Grygorii Strashko AuthorDate: Thu Aug 7 10:03:25 2025 +0000 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/dom0less: arm: fix hwdom 1:1 low memory allocation Call stack for dom0less hwdom case (1:1) memory: create_domUs |-construct_domU |-construct_hwdom() |-allocate_memory_11() And allocate_memory_11() uses "dom0_mem" as: min_low_order = get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); In case of dom0less boot the "dom0_mem" is not used and defaulted to 0, which causes min_low_order to get high value > order and so no allocations happens from low memory. Fix it, by using kinfo->unassigned_mem instead of "dom0_mem" which has correct memory size in both cases: regular dom0 boot and dom0less boot. Fixes: 52cb53f1816a ("xen/arm: dom0less hwdom construction") Signed-off-by: Grygorii Strashko Reviewed-by: Denis Mukhin Reviewed-by: Jason Andryuk Acked-by: Julien Grall --- docs/misc/xen-command-line.pandoc | 3 ++- xen/arch/arm/domain_build.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a28a1b172b..a75b6c9301 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1035,7 +1035,8 @@ For example, with `dom0_max_vcpus=4-8`: > `= ` Set the amount of memory for the initial domain (dom0). It must be -greater than zero. This parameter is required. +greater than zero. This parameter is required (and only used) when the initial +domain is not described in the Device-Tree. ### dom0_mem (x86) > `= List of ( min: | max: | )` diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 463ae4474d..a9e4153e3c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -249,7 +249,7 @@ fail: * * We first allocate the largest allocation we can as low as we * can. This then becomes the first bank. This bank must be at least - * 128MB (or dom0_mem if that is smaller). + * 128MB (or memory size requested for domain if that is smaller). * * Then we start allocating more memory, trying to allocate the * largest possible size and trying smaller sizes until we @@ -278,7 +278,7 @@ static void __init allocate_memory_11(struct domain *d, struct kernel_info *kinfo) { const unsigned int min_low_order = - get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); + get_order_from_bytes(min_t(paddr_t, kinfo->unassigned_mem, MB(128))); const unsigned int min_order = get_order_from_bytes(MB(4)); struct membanks *mem = kernel_info_get_mem(kinfo); struct page_info *pg; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:12:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:12:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078701.1439752 (Exim 4.92) (envelope-from ) id 1ulmvX-0000cr-BP; Tue, 12 Aug 2025 11:12:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078701.1439752; Tue, 12 Aug 2025 11:12:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvX-0000ch-8g; Tue, 12 Aug 2025 11:12:23 +0000 Received: by outflank-mailman (input) for mailman id 1078701; Tue, 12 Aug 2025 11:12:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvW-0000cZ-AK for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmvW-001gFb-0G for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmvW-001CE9-0q for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9I4PypceSUdMNkHpO3w9T0o9Fcnk9QfPL96e0Wb2mpE=; b=bbz584xsdnd54mxf4Jaq/i7O1A PGHkWaQdDKSMWmU3P9x0R7Bt0izNlRO+4myIWSo5wc4E8rtNylmB6y1FG4if6IQ/pPmYx833f4H1c YVkOzEbRbAjrvQmehklPppbYVxAIy4RJv5QEN7rWWtOp8W4FU19wPIr7fX5FeTBDSnyI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: fix arm_iommu_map_page after f9f6b22abf1d Message-Id: Date: Tue, 12 Aug 2025 11:12:22 +0000 commit 53d60d759dd43a462d1b4d0b428faafaf0cf28d3 Author: Stefano Stabellini AuthorDate: Fri Jul 25 10:01:25 2025 -0400 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: fix arm_iommu_map_page after f9f6b22abf1d Up until f9f6b22abf1d "xen/arm: Map ITS doorbell register to IOMMU page tables" the only caller of iommu_map on ARM was grant_table.c which has a specific usage model and restrictions as described by the in-code comment in arm_iommu_map_page. f9f6b22abf1d introduced a second caller to iommu_map on ARM: vgic_v3_its_init_virtual. This specific statement in the f9f6b22abf1d commit message is partially wrong: "Note that the 1:1 check in arm_iommu_map_page remains for now, as virtual ITSes are currently only created for hwdom where the doorbell mapping is always 1:1." Leading to crashes any time the hardware domain is not direct-mapped (e.g. cache coloring and non-Dom0 hardware domain): (XEN) Xen BUG at drivers/passthrough/arm/iommu_helpers.c:47 [...] (XEN) Xen call trace: (XEN) [<00000a000024c758>] arm_iommu_map_page+0x80/0x90 (PC) (XEN) [<00000a000024c750>] arm_iommu_map_page+0x78/0x90 (LR) (XEN) [<00000a0000250884>] iommu_map+0xcc/0x29c (XEN) [<00000a0000288024>] vgic_v3_its_init_domain+0x18c/0x1e8 (XEN) [<00000a0000285228>] vgic-v3.c#vgic_v3_domain_init+0x168/0x21c (XEN) [<00000a0000281dcc>] domain_vgic_init+0x14c/0x210 (XEN) [<00000a00002705a4>] arch_domain_create+0x150/0x1f0 (XEN) [<00000a00002055e8>] domain_create+0x47c/0x6c0 (XEN) [<00000a00002cf090>] create_domUs+0x7f8/0x8cc (XEN) [<00000a00002eb588>] start_xen+0x8f4/0x998 (XEN) [<00000a000020018c>] head.o#primary_switched+0x4/0x10 Specifically, non-1:1 hardware domain exists with cache coloring enabled. For that, is_domain_direct_mapped(d) is false but domain_use_host_layout(d) is true. Change the is_domain_direct_mapped(d) checks in arm_iommu_map_page and arm_iommu_unmap_page into domain_use_host_layout(d) checks. Drop stale in-code comment specific to grant table mappings. Fixes: f9f6b22abf1d ("xen/arm: Map ITS doorbell register to IOMMU page tables") Signed-off-by: Stefano Stabellini Signed-off-by: Stewart Hildebrand Tested-by: Jason Andryuk Reviewed-by: Julien Grall --- xen/drivers/passthrough/arm/iommu_helpers.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/xen/drivers/passthrough/arm/iommu_helpers.c b/xen/drivers/passthrough/arm/iommu_helpers.c index 5cb1987481..bdb271584b 100644 --- a/xen/drivers/passthrough/arm/iommu_helpers.c +++ b/xen/drivers/passthrough/arm/iommu_helpers.c @@ -36,15 +36,7 @@ int __must_check arm_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, { p2m_type_t t; - /* - * Grant mappings can be used for DMA requests. The dev_bus_addr - * returned by the hypercall is the MFN (not the IPA). For device - * protected by an IOMMU, Xen needs to add a 1:1 mapping in the domain - * p2m to allow DMA request to work. - * This is only valid when the domain is directed mapped. Hence this - * function should only be used by gnttab code with gfn == mfn == dfn. - */ - BUG_ON(!is_domain_direct_mapped(d)); + BUG_ON(!domain_use_host_layout(d)); BUG_ON(mfn_x(mfn) != dfn_x(dfn)); /* We only support readable and writable flags */ @@ -66,11 +58,7 @@ int __must_check arm_iommu_unmap_page(struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags) { - /* - * This function should only be used by gnttab code when the domain - * is direct mapped (i.e. gfn == mfn == dfn). - */ - if ( !is_domain_direct_mapped(d) ) + if ( !domain_use_host_layout(d) ) return -EINVAL; return guest_physmap_remove_page(d, _gfn(dfn_x(dfn)), _mfn(dfn_x(dfn)), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:12:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:12:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078702.1439756 (Exim 4.92) (envelope-from ) id 1ulmvh-0000g4-CQ; Tue, 12 Aug 2025 11:12:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078702.1439756; Tue, 12 Aug 2025 11:12:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvh-0000fw-A0; Tue, 12 Aug 2025 11:12:33 +0000 Received: by outflank-mailman (input) for mailman id 1078702; Tue, 12 Aug 2025 11:12:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulmvg-0000fl-Cz for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulmvg-001gFi-0W for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulmvg-001CFA-16 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:12:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Xkpr0/YxljJzn3rjEKje4H9evpnJ9kXVAYbglHIKSCE=; b=h+Z69im1/7a2zeAbSBxYE8TLAq e5ModDT3N4XPYRVKyt8Qs6danC+guFF1cij4cG4figJ9V+w6RLVEJZvKLNfXG9EqvXtW1svlmE4On WUeCEYtcqYOtfgDXTKES4+rR/qsmz18z5l7z6+29GbDN9PyOgztTic0+MahvxreimGTs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: allow translated iommu mappings Message-Id: Date: Tue, 12 Aug 2025 11:12:32 +0000 commit 4cde4a552ed35f3cc74df877d5a7cfbbfced8fb3 Author: Stefano Stabellini AuthorDate: Fri Jul 25 10:01:26 2025 -0400 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: allow translated iommu mappings In preparation of exposing vITS to domUs, generalize arm_iommu_map_page and arm_iommu_unmap_page to allow ITS doorbell mappings with dfn != mfn. The mfn does not need to be passed to guest_physmap_remove_page since there is no mfn checking on the p2m_iommu_map_{rw,ro} p2m types during unmap. Pass INVALID_MFN to guest_physmap_remove_page. Signed-off-by: Stefano Stabellini Signed-off-by: Stewart Hildebrand Tested-by: Jason Andryuk Reviewed-by: Julien Grall --- xen/drivers/passthrough/arm/iommu_helpers.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/arm/iommu_helpers.c b/xen/drivers/passthrough/arm/iommu_helpers.c index bdb271584b..a3e3cafb87 100644 --- a/xen/drivers/passthrough/arm/iommu_helpers.c +++ b/xen/drivers/passthrough/arm/iommu_helpers.c @@ -36,9 +36,6 @@ int __must_check arm_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, { p2m_type_t t; - BUG_ON(!domain_use_host_layout(d)); - BUG_ON(mfn_x(mfn) != dfn_x(dfn)); - /* We only support readable and writable flags */ if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) return -EINVAL; @@ -49,7 +46,7 @@ int __must_check arm_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, * The function guest_physmap_add_entry replaces the current mapping * if there is already one... */ - return guest_physmap_add_entry(d, _gfn(dfn_x(dfn)), _mfn(dfn_x(dfn)), + return guest_physmap_add_entry(d, _gfn(dfn_x(dfn)), mfn, IOMMUF_order(flags), t); } @@ -58,11 +55,7 @@ int __must_check arm_iommu_unmap_page(struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags) { - if ( !domain_use_host_layout(d) ) - return -EINVAL; - - return guest_physmap_remove_page(d, _gfn(dfn_x(dfn)), _mfn(dfn_x(dfn)), - order); + return guest_physmap_remove_page(d, _gfn(dfn_x(dfn)), INVALID_MFN, order); } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:22:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:22:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078732.1439789 (Exim 4.92) (envelope-from ) id 1uln4t-0003n1-QX; Tue, 12 Aug 2025 11:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078732.1439789; Tue, 12 Aug 2025 11:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln4t-0003mt-Nf; Tue, 12 Aug 2025 11:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1078732; Tue, 12 Aug 2025 11:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln4s-0003mk-Jj for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uln4s-001gR9-0c for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uln4s-001Cet-1B for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hdbSv8/ePm11Lb4NuKJQVN+uZmq9K+j6gjdZaXaSLpg=; b=2WZARWO5MBMXwcjnhIHP8JENXP Z2u5xzNeZxdWApFkdlqNY7UtV8Mcj96fAtMjl2Jk5zCRQNEQC2pZFKShX5/HWnVQdktH4KHa3Eo3E ArUiMyFo9VuuVQMlWuHKPdNdGUFES4M3+WRyP07qqcBTgekmYjIKZtJwE0bK9zAy1k0c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: correct PG_log_dirty definition Message-Id: Date: Tue, 12 Aug 2025 11:22:02 +0000 commit 2ae8a68df21e70cc0cde65d661c85b98f1a462f6 Author: Jan Beulich AuthorDate: Tue Aug 12 09:57:40 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 x86/mm: correct PG_log_dirty definition While it is correct that in shim-exclusive mode log-dirty handling is all unreachable code, the present conditional still isn't correct: In a HVM=n and SHADOW_PAGING=n configuration log-dirty code also is all unreachable (and hence violating Misra rule 2.1). As we're aiming at moving away from special casing PV_SHIM_EXCLUSIVE=y, don't retain that part of the conditional. Because of hypercall-defs.c we need to carry out the dependency by introducing a new auxiliary PAGING control. Since compiling out mm/paging.c altogether would entail further changes, merely conditionalize the one function in there (paging_enable()) which would otherwise remain unreachable (Misra rule 2.1 again) when PAGING=n. Fixes: 23d4e0d17b76 ("x86/shim: fix build with PV_SHIM_EXCLUSIVE and SHADOW_PAGING") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk Acked-by: Andrew Cooper --- xen/arch/x86/Kconfig | 3 +++ xen/arch/x86/domctl.c | 4 ++++ xen/arch/x86/include/asm/paging.h | 2 +- xen/arch/x86/mm/paging.c | 2 ++ xen/include/hypercall-defs.c | 6 ++++-- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index a45ce106e2..3f0f3a0f3a 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -162,6 +162,9 @@ config SHADOW_PAGING If unsure, say Y. +config PAGING + def_bool HVM || SHADOW_PAGING + config BIGMEM bool "big memory support" default n diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3e94af51a7..f07cae6a70 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -213,11 +213,15 @@ long arch_do_domctl( { case XEN_DOMCTL_shadow_op: +#ifdef CONFIG_PAGING ret = paging_domctl(d, &domctl->u.shadow_op, u_domctl, 0); if ( ret == -ERESTART ) return hypercall_create_continuation( __HYPERVISOR_paging_domctl_cont, "h", u_domctl); copyback = true; +#else + ret = -EOPNOTSUPP; +#endif break; case XEN_DOMCTL_ioport_permission: diff --git a/xen/arch/x86/include/asm/paging.h b/xen/arch/x86/include/asm/paging.h index 94c31a268e..768b077ebd 100644 --- a/xen/arch/x86/include/asm/paging.h +++ b/xen/arch/x86/include/asm/paging.h @@ -55,7 +55,7 @@ #define PG_translate 0 #define PG_external 0 #endif -#if defined(CONFIG_HVM) || !defined(CONFIG_PV_SHIM_EXCLUSIVE) +#ifdef CONFIG_PAGING /* Enable log dirty mode */ #define PG_log_dirty (XEN_DOMCTL_SHADOW_ENABLE_LOG_DIRTY << PG_mode_shift) #else diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 165e0f88c2..3aafb0990b 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -864,6 +864,7 @@ void paging_final_teardown(struct domain *d) p2m_final_teardown(d); } +#ifdef CONFIG_PAGING /* Enable an arbitrary paging-assistance mode. Call once at domain * creation. */ int paging_enable(struct domain *d, u32 mode) @@ -889,6 +890,7 @@ int paging_enable(struct domain *d, u32 mode) else return shadow_enable(d, mode); } +#endif #ifdef CONFIG_HVM /* Called from the guest to indicate that a process is being torn down diff --git a/xen/include/hypercall-defs.c b/xen/include/hypercall-defs.c index c1081d87a2..8370b4b289 100644 --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -197,9 +197,11 @@ dm_op(domid_t domid, unsigned int nr_bufs, xen_dm_op_buf_t *bufs) #ifdef CONFIG_SYSCTL sysctl(xen_sysctl_t *u_sysctl) #endif +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) +paging_domctl_cont(xen_domctl_t *u_domctl) +#endif #ifndef CONFIG_PV_SHIM_EXCLUSIVE domctl(xen_domctl_t *u_domctl) -paging_domctl_cont(xen_domctl_t *u_domctl) platform_op(xen_platform_op_t *u_xenpf_op) #endif #ifdef CONFIG_HVM @@ -296,7 +298,7 @@ dm_op compat do compat do do hypfs_op do do do do do #endif mca do do - - - -#ifndef CONFIG_PV_SHIM_EXCLUSIVE +#if defined(CONFIG_X86) && defined(CONFIG_PAGING) paging_domctl_cont do do do do - #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078733.1439793 (Exim 4.92) (envelope-from ) id 1uln52-0003pe-Ri; Tue, 12 Aug 2025 11:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078733.1439793; Tue, 12 Aug 2025 11:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln52-0003pW-PE; Tue, 12 Aug 2025 11:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1078733; Tue, 12 Aug 2025 11:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln52-0003pO-Gb for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uln52-001gRD-0t for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uln52-001Cfh-1S for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mn2eODDSjROjaSaa/JwjWa61TOF9vfrqAOllzQEPFmI=; b=ovhpSjdFtdN4DV1vPEGqrXmbc6 N+2dWbhpgS7/1EwFyxBEn/KyyVUI7qjLZJrf2KXR/aWFAEeuIr5hqF/YA5z8x0PQwwO2acbN2iNvW 3haKpBfnk7CWIBXtMI6uHdpdtbOzUgZTtABt+3tPHZmDqJURrgvjTKlrKP+uiGqb6cHI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] efi: Call FreePages() only if needed Message-Id: Date: Tue, 12 Aug 2025 11:22:12 +0000 commit 7fddedd530561797d8ce5fba78e83cc9cc6b58dd Author: Ross Lagerwall AuthorDate: Tue Aug 12 09:58:07 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 efi: Call FreePages() only if needed If the config file is builtin, cfg.addr will be zero but Xen unconditionally calls FreePages() on the address. Xen may also call FreePages() with a zero address if blexit() is called after this point since cfg.need_to_free is not set to false. The UEFI specification does not say whether calling FreePages() with a zero address is allowed so let's be cautious and use cfg.need_to_free properly. Fixes: 8a71d50ed40b ("efi: Enable booting unified hypervisor/kernel/initrd images") Fixes: 04be2c3a0678 ("efi/boot.c: add file.need_to_free") Signed-off-by: Ross Lagerwall Acked-by: Andrew Cooper Acked-by Daniel P. Smith --- xen/common/efi/boot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 778a39cc48..50ff1d1bd2 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1534,8 +1534,11 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, efi_arch_cfg_file_late(loaded_image, dir_handle, section.s); - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - cfg.addr = 0; + if ( cfg.need_to_free ) + { + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + cfg.need_to_free = false; + } if ( dir_handle ) dir_handle->Close(dir_handle); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078734.1439798 (Exim 4.92) (envelope-from ) id 1uln5D-0003sV-TY; Tue, 12 Aug 2025 11:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078734.1439798; Tue, 12 Aug 2025 11:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln5D-0003sO-Qj; Tue, 12 Aug 2025 11:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1078734; Tue, 12 Aug 2025 11:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln5C-0003sE-L4 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uln5C-001gRQ-1K for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uln5C-001Cg9-1j for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cQmVouE+UwoKVDjX2bA+b47DpS/bXF8em1kbXRRfsqk=; b=4bxYLS61Hf4MYPtdLeztSiiD1b qnCb5nX2FkTuZp+mRdBmmkuG6iDc0SJ/EYaeWNwaGkU2QZ/yqxTj6vkPq6duBv3j7uOZS+qjDdVa8 EelXfo1JN5cofEzZ6SdkxnCd/RDQRJrcoJeqPsyLB2ObLe7jpL8sGuBj638XTOhyHnTE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: restrict clean target to xen Message-Id: Date: Tue, 12 Aug 2025 11:22:22 +0000 commit 16104cde015dd6f43e2ea0b70c8023a5fe2d16c0 Author: Nicola Vetrini AuthorDate: Tue Aug 12 09:58:26 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 automation/eclair: restrict clean target to xen The clean target also clears files outside the xen directory, which is not needed for the purposes of running an analysis. No functional change. Reported-by: Andrew Cooper Signed-off-by: Nicola Vetrini Reviewed-by: Denis Mukhin Acked-by: Andrew Cooper --- automation/eclair_analysis/prepare.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/prepare.sh b/automation/eclair_analysis/prepare.sh index 4285ff26de..e941e6edc4 100755 --- a/automation/eclair_analysis/prepare.sh +++ b/automation/eclair_analysis/prepare.sh @@ -39,12 +39,12 @@ fi fi ./configure - make clean + make -C xen clean find . -type f -name "*.safparse" -print -delete "${script_dir}/build.sh" "$1" # Generate additional configuration files "${script_dir}/ECLAIR/generate_ecl.sh" - make clean + make -C xen clean cd xen make -f "${script_dir}/Makefile.prepare" prepare # Translate the /* SAF-n-safe */ comments into ECLAIR CBTs -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 11:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 11:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1078735.1439802 (Exim 4.92) (envelope-from ) id 1uln5N-0003ub-Ud; Tue, 12 Aug 2025 11:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1078735.1439802; Tue, 12 Aug 2025 11:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln5N-0003uT-S7; Tue, 12 Aug 2025 11:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1078735; Tue, 12 Aug 2025 11:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uln5M-0003uJ-QT for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uln5M-001gRW-1g for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uln5M-001CgZ-2B for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 11:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WKfb/5SiLwxBz+Los6higo4E4hXPgVeZ4cPXExryLoY=; b=mWguOWxQJDKons0s5a0P0pDR4h 7pGTDGZdha8sHsrCj+/JbFdDtV9UD1xIk17Vwgx4DW14Zj7keIs53SQVEaps4e2pceqFn17KuUUUj r09vL9p5ZK+A8vgaYfobOPS4rotFMxOkPoVVDrxcMTF4gpDgDIodpsYL1S5MyGxqWiDY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Drop logic for old clang versions Message-Id: Date: Tue, 12 Aug 2025 11:22:32 +0000 commit e4a042062787423646b71d7bc20fdf445be9ab79 Author: Nicola Vetrini AuthorDate: Tue Aug 12 09:58:39 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 11:40:28 2025 +0200 xen: Drop logic for old clang versions The enforced toolchain baseline for clang is version 11, therefore this logic is effectively dead code. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Roger Pau Monné --- xen/common/coverage/llvm.c | 4 ---- xen/include/xen/self-tests.h | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xen/common/coverage/llvm.c b/xen/common/coverage/llvm.c index 50d7a3c5d3..517b2aa8c2 100644 --- a/xen/common/coverage/llvm.c +++ b/xen/common/coverage/llvm.c @@ -44,12 +44,8 @@ ((uint64_t)'f' << 16) | ((uint64_t)'R' << 8) | ((uint64_t)129) #endif -#if __clang_major__ >= 4 || (__clang_major__ == 3 && __clang_minor__ >= 9) #define LLVM_PROFILE_VERSION 4 #define LLVM_PROFILE_NUM_KINDS 2 -#else -#error "clang version not supported with coverage" -#endif struct llvm_profile_data { uint64_t name_ref; diff --git a/xen/include/xen/self-tests.h b/xen/include/xen/self-tests.h index bd8a4867aa..c57cceb3b9 100644 --- a/xen/include/xen/self-tests.h +++ b/xen/include/xen/self-tests.h @@ -10,16 +10,12 @@ #include /* - * Check that fn(val) can be calcuated by the compiler, and that it gives the + * Check that fn(val) can be calculated by the compiler, and that it gives the * expected answer. * - * Clang < 8 can't fold constants through static inlines, causing this to - * fail. Simply skip it for incredibly old compilers. - * * N.B. fn is intentionally not bracketed to allow us to test function-like * macros too. */ -#if !defined(CONFIG_CC_IS_CLANG) || CONFIG_CLANG_VERSION >= 80000 #define COMPILE_CHECK(fn, val, res) \ do { \ typeof(fn(val)) real = fn(val); \ @@ -29,9 +25,6 @@ else if ( real != (res) ) \ BUILD_ERROR("Compile time check '" STR(fn(val) == res) "' failed"); \ } while ( 0 ) -#else -#define COMPILE_CHECK(fn, val, res) -#endif /* * Check that Xen's runtime logic for fn(val) gives the expected answer. This -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 20:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 20:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079191.1440149 (Exim 4.92) (envelope-from ) id 1ulvKp-0001Be-9J; Tue, 12 Aug 2025 20:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079191.1440149; Tue, 12 Aug 2025 20:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulvKp-0001BU-6c; Tue, 12 Aug 2025 20:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1079191; Tue, 12 Aug 2025 20:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulvKo-00019G-0v for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 20:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulvKn-001qdX-2E for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 20:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulvKn-001fmd-2n for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 20:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+x11DRj22L05ybpGLCo8A15IK0MALLeUr51JssWqm/w=; b=rR0MSbf+VY4/GHmDaWJeVBGfte 9ch6XYUqc8fMjFKwqhxw2wKOaoy+DvoC0UFych1Cex1OkCt3mSxYOEcj+9figCWBdWGlbwMRN+v/L 2DgZbkKjWOAaqGFKz4Wb3AH37oxI8Npm+3CRlft2o19F2dOxKqHy8m3P5D/iuIlqav6w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Turn debian/12-x86_64 into a non-root container Message-Id: Date: Tue, 12 Aug 2025 20:11:01 +0000 commit 93f4d2da2221d1d8b39b2c0998b625f4c68ef769 Author: Javi Merino AuthorDate: Tue Aug 12 16:47:34 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 12 20:17:25 2025 +0100 CI: Turn debian/12-x86_64 into a non-root container Since commit 4611ae6fb8f9 ("CI: save toolstack artifact as cpio.gz"), the various automation/scripts/* no longer need to be root to correctly repack the initrd for test. Signed-off-by: Javi Merino Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- automation/build/debian/12-x86_64.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile index e26a19079e..3cf99c730b 100644 --- a/automation/build/debian/12-x86_64.dockerfile +++ b/automation/build/debian/12-x86_64.dockerfile @@ -9,6 +9,8 @@ RUN < Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079212.1440153 (Exim 4.92) (envelope-from ) id 1ulwxT-0007KA-B7; Tue, 12 Aug 2025 21:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079212.1440153; Tue, 12 Aug 2025 21:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxT-0007K2-8U; Tue, 12 Aug 2025 21:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1079212; Tue, 12 Aug 2025 21:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxS-0007Jw-Lq for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwxS-001sZI-0Y for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwxS-001kMv-17 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jr9GByTNXpuv7tbzVTwkz5nBMpBICSvm34FT+Qa23eI=; b=pQ3t4NNobMWmWRv8BVVkiKWbtG laIieoHVnOUJWeznnaAEjsUXRWCpLX+Otfot4/69HeytFQgMx38JUXt0jeXBNRisXrBljkA5BZLK0 Ptczy99tXV5qzcKvot7s+GEA67JqudMXNn3vbLmGYTO7qjf9hIReU1R+JZJGpp9LPHGE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Create tee command line parameter Message-Id: Date: Tue, 12 Aug 2025 21:55:02 +0000 commit 719ace560d5312147c691038482bc99c34999ffa Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:34:57 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:40 2025 +0100 xen/arm: Create tee command line parameter Add a new command line parameter "tee=" to be used to explicitly select what tee mediator is to be used by Xen and fail if it does not exist or the probe function for it failed. Without specifying which tee is to be used, Xen will use the first one for which the probe function succeeds which depends on the order of the mediator list which depends on the compiler. Using the command line argument, it is now possible to explicit request a specific TEE mediator and panic on boot if it is not available. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- docs/misc/xen-command-line.pandoc | 14 ++++++++++++++ xen/arch/arm/include/asm/tee/tee.h | 4 ++++ xen/arch/arm/tee/tee.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 5dd2ab82b7..a28a1b172b 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2664,6 +2664,20 @@ Specify the per-cpu trace buffer size in pages. Flag to enable TSC deadline as the APIC timer mode. +### tee (arm) +> `= ` + +Specify the TEE mediator to be probed and use. + +The default behaviour is to probe all TEEs supported by Xen and use +the first one successfully probed. When this parameter is passed, Xen will +probe only the TEE mediator passed as argument and boot will fail if this +mediator is not properly probed or if the requested TEE is not supported by +Xen. + +This parameter can be set to `optee` or `ffa` if the corresponding mediators +are compiled in. + ### tevt_mask > `= ` diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index 0169fd746b..15d664e28d 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -55,6 +55,9 @@ struct tee_mediator_desc { /* Printable name of the TEE. */ const char *name; + /* Command line name of the TEE (to be used with tee= cmdline option) */ + const char *cmdline_name; + /* Mediator callbacks as described above. */ const struct tee_mediator_ops *ops; @@ -77,6 +80,7 @@ void tee_free_domain_ctx(struct domain *d); static const struct tee_mediator_desc __tee_desc_##_name __used \ __section(".teemediator.info") = { \ .name = _namestr, \ + .cmdline_name = #_name, \ .ops = _ops, \ .tee_type = _type \ } diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index 3f65e45a78..8501443c8e 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -25,6 +26,10 @@ extern const struct tee_mediator_desc _steemediator[], _eteemediator[]; static const struct tee_mediator_desc __read_mostly *cur_mediator; +/* Select the TEE mediator using a name on command line. */ +static char __initdata opt_mediator[16] = ""; +string_param("tee", opt_mediator); + /* * TODO: Add function to alter Dom0 DTB, so we can properly describe * present TEE. @@ -80,15 +85,42 @@ uint16_t tee_get_type(void) static int __init tee_init(void) { const struct tee_mediator_desc *desc; + bool select_mediator = strcmp(opt_mediator, ""); + + if ( select_mediator ) + printk(XENLOG_INFO "TEE Mediator %s selected from command line\n", + opt_mediator); + /* + * When a specific TEE is selected using the 'tee=' command line + * argument, we panic if the probe fails or if the requested TEE is not + * supported. + */ for ( desc = _steemediator; desc != _eteemediator; desc++ ) { + if ( select_mediator && + strncmp(opt_mediator, desc->cmdline_name, sizeof(opt_mediator)) ) + continue; + if ( desc->ops->probe() ) { printk(XENLOG_INFO "Using TEE mediator for %s\n", desc->name); cur_mediator = desc; return 0; } + else if ( select_mediator ) + { + panic("TEE mediator %s from command line probe failed\n", + opt_mediator); + return -EFAULT; + } + } + + if ( select_mediator ) + { + panic("TEE Mediator %s from command line not supported\n", + opt_mediator); + return -EINVAL; } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079213.1440158 (Exim 4.92) (envelope-from ) id 1ulwxd-0007Lk-Cb; Tue, 12 Aug 2025 21:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079213.1440158; Tue, 12 Aug 2025 21:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxd-0007Lc-A0; Tue, 12 Aug 2025 21:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1079213; Tue, 12 Aug 2025 21:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxc-0007LS-Gz for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwxc-001sZM-0u for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwxc-001kNO-1O for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CGyCdQPnQoTU9NvlMEAdUgQcihCFhwiMLUtHX5ZoCtw=; b=o+39BMRwiPto/Ax1c7/+kGbvy6 reLSkpPAPuYlybGt4SxB7nIK7K1+QFISxnKjRTkFVzO5OgR6YmexB+3zh2t7YYihNuNfZXwScStNQ nwc/HKbtkZ8aHrbcmVov2+AYjRJSVIF3Q0cIIAyRLK2FtCIqz+KNX+KQZOisede5dkf0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: Rework partinfo_get implementation Message-Id: Date: Tue, 12 Aug 2025 21:55:12 +0000 commit 36dd9a7a42bd524c1587e45e1c39d9cd24f4322d Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:34:58 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:40 2025 +0100 xen/arm: ffa: Rework partinfo_get implementation This patch is in preparation for VM to VM support in order to do the changes on the SP handling part of partinfo_get before adding support for the VM part. This patches is doing the following changes: - split partinfo_get into 3 functions to have the locking handling and proper exit on error handled more clearly - add some potential overflow checks to validate the offset and sizes passed by the VM on partinfo call. - Introduce a maximum number of SPs (for now set to 64) to prevent holding the CPU for too long in case there would be a lot of partitions in the secure world. The limit currently set is thought to be realistic for most use cases as 64 secure partitions is a very high number compared to current seen usage (more 3 or 4). - fix include ordering in ffa_private.h to be in alphabetic order Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa_partinfo.c | 202 +++++++++++++++++++++++----------------- xen/arch/arm/tee/ffa_private.h | 18 +++- 2 files changed, 132 insertions(+), 88 deletions(-) diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c index c0510ceb83..dfa0b23eaf 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -63,9 +63,96 @@ static int32_t ffa_partition_info_get(uint32_t *uuid, uint32_t flags, return ret; } -void ffa_handle_partition_info_get(struct cpu_user_regs *regs) +static int32_t ffa_get_sp_count(uint32_t *uuid, uint32_t *sp_count) +{ + uint32_t src_size; + + return ffa_partition_info_get(uuid, FFA_PARTITION_INFO_GET_COUNT_FLAG, + sp_count, &src_size); +} + +static int32_t ffa_get_sp_partinfo(uint32_t *uuid, uint32_t *sp_count, + void *dst_buf, void *end_buf, + uint32_t dst_size) { int32_t ret; + uint32_t src_size, real_sp_count; + void *src_buf = ffa_rx; + uint32_t count = 0; + + /* Do we have a RX buffer with the SPMC */ + if ( !ffa_rx ) + return FFA_RET_DENIED; + + /* We need to use the RX buffer to receive the list */ + spin_lock(&ffa_rx_buffer_lock); + + ret = ffa_partition_info_get(uuid, 0, &real_sp_count, &src_size); + if ( ret ) + goto out; + + /* We now own the RX buffer */ + + /* Validate the src_size we got */ + if ( src_size < sizeof(struct ffa_partition_info_1_0) || + src_size >= FFA_PAGE_SIZE ) + { + ret = FFA_RET_NOT_SUPPORTED; + goto out_release; + } + + /* + * Limit the maximum time we hold the CPU by limiting the number of SPs. + * We just ignore the extra ones as this is tested during init in + * ffa_partinfo_init so the only possible reason is SP have been added + * since boot. + */ + if ( real_sp_count > FFA_MAX_NUM_SP ) + real_sp_count = FFA_MAX_NUM_SP; + + /* Make sure the data fits in our buffer */ + if ( real_sp_count > (FFA_RXTX_PAGE_COUNT * FFA_PAGE_SIZE) / src_size ) + { + ret = FFA_RET_NOT_SUPPORTED; + goto out_release; + } + + for ( uint32_t sp_num = 0; sp_num < real_sp_count; sp_num++ ) + { + struct ffa_partition_info_1_1 *fpi = src_buf; + + /* filter out SP not following bit 15 convention if any */ + if ( FFA_ID_IS_SECURE(fpi->id) ) + { + if ( dst_buf > (end_buf - dst_size) ) + { + ret = FFA_RET_NO_MEMORY; + goto out_release; + } + + memcpy(dst_buf, src_buf, MIN(src_size, dst_size)); + if ( dst_size > src_size ) + memset(dst_buf + src_size, 0, dst_size - src_size); + + dst_buf += dst_size; + count++; + } + + src_buf += src_size; + } + + *sp_count = count; + +out_release: + ffa_hyp_rx_release(); +out: + spin_unlock(&ffa_rx_buffer_lock); + return ret; +} + +void ffa_handle_partition_info_get(struct cpu_user_regs *regs) +{ + int32_t ret = FFA_RET_OK; struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; uint32_t flags = get_user_reg(regs, 5); @@ -75,8 +162,8 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) get_user_reg(regs, 3), get_user_reg(regs, 4), }; - uint32_t src_size, dst_size; - void *dst_buf; + uint32_t dst_size = 0; + void *dst_buf, *end_buf; uint32_t ffa_sp_count = 0; /* @@ -89,31 +176,26 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) else dst_size = sizeof(struct ffa_partition_info_1_1); - /* - * FF-A v1.0 has w5 MBZ while v1.1 allows - * FFA_PARTITION_INFO_GET_COUNT_FLAG to be non-zero. - * - * FFA_PARTITION_INFO_GET_COUNT is only using registers and not the - * rxtx buffer so do the partition_info_get directly. - */ - if ( flags == FFA_PARTITION_INFO_GET_COUNT_FLAG && - ctx->guest_vers == FFA_VERSION_1_1 ) + /* Only count requested */ + if ( flags ) { + /* + * FF-A v1.0 has w5 MBZ while v1.1 allows + * FFA_PARTITION_INFO_GET_COUNT_FLAG to be non-zero. + */ + if ( ctx->guest_vers == FFA_VERSION_1_0 || + flags != FFA_PARTITION_INFO_GET_COUNT_FLAG ) + { + ret = FFA_RET_INVALID_PARAMETERS; + goto out; + } + if ( ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) - ret = ffa_partition_info_get(uuid, flags, &ffa_sp_count, - &src_size); - else - ret = FFA_RET_OK; + ret = ffa_get_sp_count(uuid, &ffa_sp_count); goto out; } - if ( flags ) - { - ret = FFA_RET_INVALID_PARAMETERS; - goto out; - } - if ( !ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) { /* Just give an empty partition list to the caller */ @@ -121,80 +203,33 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) goto out; } + /* Get the RX buffer to write the list of partitions */ ret = ffa_rx_acquire(d); if ( ret != FFA_RET_OK ) goto out; dst_buf = ctx->rx; + end_buf = ctx->rx + ctx->page_count * FFA_PAGE_SIZE; - if ( !ffa_rx ) - { - ret = FFA_RET_DENIED; - goto out_rx_release; - } - - spin_lock(&ffa_rx_buffer_lock); - - ret = ffa_partition_info_get(uuid, 0, &ffa_sp_count, &src_size); - - if ( ret ) - goto out_rx_hyp_unlock; + /* An entry should be smaller than a page */ + BUILD_BUG_ON(sizeof(struct ffa_partition_info_1_1) > FFA_PAGE_SIZE); /* - * ffa_partition_info_get() succeeded so we now own the RX buffer we - * share with the SPMC. We must give it back using ffa_hyp_rx_release() - * once we've copied the content. + * Check for overflow and that we can at least store one entry. + * page_count cannot be 0 so we have at least one page. */ - - /* we cannot have a size smaller than 1.0 structure */ - if ( src_size < sizeof(struct ffa_partition_info_1_0) ) - { - ret = FFA_RET_NOT_SUPPORTED; - goto out_rx_hyp_release; - } - - if ( ctx->page_count * FFA_PAGE_SIZE < ffa_sp_count * dst_size ) + if ( dst_buf >= end_buf || dst_buf > (end_buf - dst_size) ) { - ret = FFA_RET_NO_MEMORY; - goto out_rx_hyp_release; + ret = FFA_RET_INVALID_PARAMETERS; + goto out_rx_release; } - if ( ffa_sp_count > 0 ) - { - uint32_t n, n_limit = ffa_sp_count; - void *src_buf = ffa_rx; - - /* copy the secure partitions info */ - for ( n = 0; n < n_limit; n++ ) - { - struct ffa_partition_info_1_1 *fpi = src_buf; - - /* filter out SP not following bit 15 convention if any */ - if ( FFA_ID_IS_SECURE(fpi->id) ) - { - memcpy(dst_buf, src_buf, dst_size); - dst_buf += dst_size; - } - else - ffa_sp_count--; + ret = ffa_get_sp_partinfo(uuid, &ffa_sp_count, dst_buf, end_buf, + dst_size); - src_buf += src_size; - } - } -out_rx_hyp_release: - ffa_hyp_rx_release(); -out_rx_hyp_unlock: - spin_unlock(&ffa_rx_buffer_lock); out_rx_release: - /* - * The calling VM RX buffer only contains data to be used by the VM if the - * call was successful, in which case the VM has to release the buffer - * once it has used the data. - * If something went wrong during the call, we have to release the RX - * buffer back to the SPMC as the VM will not do it. - */ - if ( ret != FFA_RET_OK ) + if ( ret ) ffa_rx_release(d); out: if ( ret ) @@ -353,9 +388,10 @@ bool ffa_partinfo_init(void) goto out; } - if ( count >= UINT16_MAX ) + if ( count >= FFA_MAX_NUM_SP ) { - printk(XENLOG_ERR "ffa: Impossible number of SPs: %u\n", count); + printk(XENLOG_ERR "ffa: More SPs than the maximum supported: %u - %u\n", + count, FFA_MAX_NUM_SP); goto out; } diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index c4cd655389..0a9c1082db 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -6,15 +6,15 @@ #ifndef __FFA_PRIVATE_H__ #define __FFA_PRIVATE_H__ +#include #include -#include -#include -#include #include -#include +#include #include +#include +#include #include -#include +#include /* Error codes */ #define FFA_RET_OK 0 @@ -108,6 +108,14 @@ */ #define FFA_CTX_TEARDOWN_DELAY SECONDS(1) +/* + * The maximum number of Secure partitions we support for partinfo_get. + * This prevents holding the CPU during potentially to long time during + * a partinfo_get call. Value choosen seems realistic for any configuration + * but can be incremented here if needed. + */ +#define FFA_MAX_NUM_SP 64 + /* * We rely on the convention suggested but not mandated by the FF-A * specification that secure world endpoint identifiers have the bit 15 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079214.1440162 (Exim 4.92) (envelope-from ) id 1ulwxn-0007OG-Ee; Tue, 12 Aug 2025 21:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079214.1440162; Tue, 12 Aug 2025 21:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxn-0007O4-BU; Tue, 12 Aug 2025 21:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1079214; Tue, 12 Aug 2025 21:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxm-0007Nv-KV for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwxm-001sZQ-1H for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwxm-001kNq-1n for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=58vaXyVJeLXk3uYEUXrjAnKYENjVbgPByI8QNXrAodI=; b=E9rkwK+zU4x6FI8ynlCYnoipRi 4VzY+OuWlKKx8tl87XfSOEbo014onQj8V8RiyZOXIOy7p3MZ/itbOYOfdQ4IqulvEJesGW20CYm+o ieEsmRdIWuMPkBCAg/TjkTv8tKZGvoICJyfJbUsmCwoilE8N+qP43RFCeGxM8sTEfy6Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: Introduce VM to VM support Message-Id: Date: Tue, 12 Aug 2025 21:55:22 +0000 commit 09a201605f990a09d61d69fbb51c30ef10fd6468 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:34:59 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Introduce VM to VM support Create a CONFIG_FFA_VM_TO_VM parameter to activate FFA communication between VMs. When activated list VMs in the system with FF-A support in part_info_get. When VM to VM is activated, Xen will be tainted as Insecure and a message is displayed to the user during the boot as there is no filtering of VMs in FF-A so any VM can communicate or see any other VM in the system. WARNING: There is no filtering for now and all VMs are listed !! This patch is reorganizing the ffa_ctx structure to make clear which lock is protecting what parts. This patch is introducing a chain list of the ffa_ctx with a FFA Version negotiated allowing to create the partinfo results for VMs in parallel by using rwlock which only ensure addition/removal of entries are protected. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/Kconfig | 11 ++++ xen/arch/arm/tee/ffa.c | 49 ++++++++++++++++- xen/arch/arm/tee/ffa_partinfo.c | 100 ++++++++++++++++++++++++++++++---- xen/arch/arm/tee/ffa_private.h | 117 +++++++++++++++++++++++++++++++++------- 4 files changed, 245 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/tee/Kconfig b/xen/arch/arm/tee/Kconfig index c5b0f88d75..88a4c4c991 100644 --- a/xen/arch/arm/tee/Kconfig +++ b/xen/arch/arm/tee/Kconfig @@ -28,5 +28,16 @@ config FFA [1] https://developer.arm.com/documentation/den0077/latest +config FFA_VM_TO_VM + bool "Enable FF-A between VMs (UNSUPPORTED)" if UNSUPPORTED + default n + depends on FFA + help + This option enables to use FF-A between VMs. + This is experimental and there is no access control so any + guest can communicate with any other guest. + + If unsure, say N. + endmenu diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 3bbdd7168a..0eb6a0bda5 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -118,10 +118,18 @@ void *ffa_tx __read_mostly; DEFINE_SPINLOCK(ffa_rx_buffer_lock); DEFINE_SPINLOCK(ffa_tx_buffer_lock); +LIST_HEAD(ffa_ctx_head); +/* RW Lock to protect addition/removal and reading in ffa_ctx_head */ +DEFINE_RWLOCK(ffa_ctx_list_rwlock); + +#ifdef CONFIG_FFA_VM_TO_VM +atomic_t ffa_vm_count; +#endif /* Used to track domains that could not be torn down immediately. */ static struct timer ffa_teardown_timer; -static struct list_head ffa_teardown_head; + +static LIST_HEAD(ffa_teardown_head); static DEFINE_SPINLOCK(ffa_teardown_lock); static bool ffa_get_version(uint32_t *vers) @@ -151,6 +159,7 @@ static void handle_version(struct cpu_user_regs *regs) struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; uint32_t vers = get_user_reg(regs, 1); + uint32_t old_vers; /* * Guest will use the version it requested if it is our major and minor @@ -160,10 +169,23 @@ static void handle_version(struct cpu_user_regs *regs) */ if ( FFA_VERSION_MAJOR(vers) == FFA_MY_VERSION_MAJOR ) { + spin_lock(&ctx->lock); + old_vers = ctx->guest_vers; + if ( FFA_VERSION_MINOR(vers) > FFA_MY_VERSION_MINOR ) ctx->guest_vers = FFA_MY_VERSION; else ctx->guest_vers = vers; + spin_unlock(&ctx->lock); + + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !old_vers ) + { + /* One more VM with FF-A support available */ + inc_ffa_vm_count(); + write_lock(&ffa_ctx_list_rwlock); + list_add_tail(&ctx->ctx_list, &ffa_ctx_head); + write_unlock(&ffa_ctx_list_rwlock); + } } ffa_set_regs(regs, FFA_MY_VERSION, 0, 0, 0, 0, 0, 0, 0); } @@ -345,6 +367,10 @@ static int ffa_domain_init(struct domain *d) ctx->teardown_d = d; INIT_LIST_HEAD(&ctx->shm_list); + ctx->ffa_id = ffa_get_vm_id(d); + ctx->num_vcpus = d->max_vcpus; + ctx->is_64bit = is_64bit_domain(d); + /* * ffa_domain_teardown() will be called if ffa_domain_init() returns an * error, so no need for cleanup in this function. @@ -421,6 +447,14 @@ static int ffa_domain_teardown(struct domain *d) if ( !ctx ) return 0; + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) && ctx->guest_vers ) + { + dec_ffa_vm_count(); + write_lock(&ffa_ctx_list_rwlock); + list_del(&ctx->ctx_list); + write_unlock(&ffa_ctx_list_rwlock); + } + ffa_rxtx_domain_destroy(d); ffa_notif_domain_destroy(d); @@ -464,6 +498,18 @@ static bool ffa_probe(void) printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + { + /* + * When FFA VM to VM is enabled, the current implementation does not + * offer any way to limit which VM can communicate with which VM using + * FF-A. + * Signal this in the xen console and taint the system as insecure. + * TODO: Introduce a solution to limit what a VM can do through FFA. + */ + printk(XENLOG_ERR "ffa: VM to VM is enabled, system is insecure !!\n"); + add_taint(TAINT_MACHINE_INSECURE); + } /* * psci_init_smccc() updates this value with what's reported by EL-3 * or secure world. @@ -537,7 +583,6 @@ static bool ffa_probe(void) goto err_rxtx_destroy; ffa_notif_init(); - INIT_LIST_HEAD(&ffa_teardown_head); init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); return true; diff --git a/xen/arch/arm/tee/ffa_partinfo.c b/xen/arch/arm/tee/ffa_partinfo.c index dfa0b23eaf..fa56b1587e 100644 --- a/xen/arch/arm/tee/ffa_partinfo.c +++ b/xen/arch/arm/tee/ffa_partinfo.c @@ -150,6 +150,73 @@ out: return ret; } +static int32_t ffa_get_vm_partinfo(uint32_t *vm_count, void *dst_buf, + void *end_buf, uint32_t dst_size) +{ + struct ffa_ctx *curr_ctx = current->domain->arch.tee; + struct ffa_ctx *dest_ctx; + uint32_t count = 0; + int32_t ret = FFA_RET_OK; + + /* + * There could potentially be a lot of VMs in the system and we could + * hold the CPU for long here. + * Right now there is no solution in FF-A specification to split + * the work in this case. + * TODO: Check how we could delay the work or have preemption checks. + */ + read_lock(&ffa_ctx_list_rwlock); + list_for_each_entry(dest_ctx, &ffa_ctx_head, ctx_list) + { + /* + * Do not include an entry for the caller VM as the spec is not + * clearly mandating it and it is not supported by Linux. + */ + if ( dest_ctx != curr_ctx ) + { + /* + * We do not have UUID info for VMs so use + * the 1.0 structure so that we set UUIDs to + * zero using memset + */ + struct ffa_partition_info_1_0 info; + + if ( dst_buf > (end_buf - dst_size) ) + { + ret = FFA_RET_NO_MEMORY; + goto out; + } + + /* + * Context might has been removed since we go it or being removed + * right now so we might return information for a VM not existing + * anymore. This is acceptable as we return a view of the system + * which could change at any time. + */ + info.id = dest_ctx->ffa_id; + info.execution_context = dest_ctx->num_vcpus; + info.partition_properties = FFA_PART_VM_PROP; + if ( dest_ctx->is_64bit ) + info.partition_properties |= FFA_PART_PROP_AARCH64_STATE; + + memcpy(dst_buf, &info, MIN(sizeof(info), dst_size)); + + if ( dst_size > sizeof(info) ) + memset(dst_buf + sizeof(info), 0, + dst_size - sizeof(info)); + + dst_buf += dst_size; + count++; + } + } + *vm_count = count; + +out: + read_unlock(&ffa_ctx_list_rwlock); + + return ret; +} + void ffa_handle_partition_info_get(struct cpu_user_regs *regs) { int32_t ret = FFA_RET_OK; @@ -164,7 +231,7 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) }; uint32_t dst_size = 0; void *dst_buf, *end_buf; - uint32_t ffa_sp_count = 0; + uint32_t ffa_vm_count = 0, ffa_sp_count = 0; /* * If the guest is v1.0, he does not get back the entry size so we must @@ -191,15 +258,18 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) } if ( ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) + { ret = ffa_get_sp_count(uuid, &ffa_sp_count); + if ( ret ) + goto out; + } - goto out; - } + /* + * Do not count the caller VM as the spec is not clearly mandating it + * and it is not supported by Linux. + */ + ffa_vm_count = get_ffa_vm_count() - 1; - if ( !ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) - { - /* Just give an empty partition list to the caller */ - ret = FFA_RET_OK; goto out; } @@ -224,9 +294,19 @@ void ffa_handle_partition_info_get(struct cpu_user_regs *regs) goto out_rx_release; } - ret = ffa_get_sp_partinfo(uuid, &ffa_sp_count, dst_buf, end_buf, - dst_size); + if ( ffa_fw_supports_fid(FFA_PARTITION_INFO_GET) ) + { + ret = ffa_get_sp_partinfo(uuid, &ffa_sp_count, dst_buf, end_buf, + dst_size); + + if ( ret ) + goto out_rx_release; + + dst_buf += ffa_sp_count * dst_size; + } + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + ret = ffa_get_vm_partinfo(&ffa_vm_count, dst_buf, end_buf, dst_size); out_rx_release: if ( ret ) @@ -235,7 +315,7 @@ out: if ( ret ) ffa_set_regs_error(regs, ret); else - ffa_set_regs_success(regs, ffa_sp_count, dst_size); + ffa_set_regs_success(regs, ffa_sp_count + ffa_vm_count, dst_size); } static int32_t ffa_direct_req_send_vm(uint16_t sp_id, uint16_t vm_id, diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 0a9c1082db..5cb2b51714 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -195,6 +195,18 @@ */ #define FFA_PARTITION_INFO_GET_COUNT_FLAG BIT(0, U) +/* + * Partition properties we give for a normal world VM: + * - can send direct message but not receive them + * - can handle indirect messages + * - can receive notifications + * 32/64 bit flag is set depending on the VM + */ +#define FFA_PART_VM_PROP (FFA_PART_PROP_DIRECT_REQ_SEND | \ + FFA_PART_PROP_INDIRECT_MSGS | \ + FFA_PART_PROP_RECV_NOTIF | \ + FFA_PART_PROP_IS_PE_ID) + /* Flags used in calls to FFA_NOTIFICATION_GET interface */ #define FFA_NOTIF_FLAG_BITMAP_SP BIT(0, U) #define FFA_NOTIF_FLAG_BITMAP_VM BIT(1, U) @@ -297,36 +309,72 @@ struct ffa_ctx_notif { }; struct ffa_ctx { - void *rx; - const void *tx; - struct page_info *rx_pg; - struct page_info *tx_pg; + /* + * Chain list of all FF-A contexts. + * As we might have several read from the list of context through parallel + * partinfo_get but fewer additions/removal as those happen only during a + * version negotiation or guest shutdown, access to this list is protected + * through a rwlock (addition/removal with write lock, reading through a + * read lock). + */ + struct list_head ctx_list; /* chain list of all FF-A contexts */ + + /* + * Data access unlocked (mainly for part_info_get in VM to VM). + * Those should be set before the ctx is added in the list. + */ + /* FF-A Endpoint ID */ + uint16_t ffa_id; + uint16_t num_vcpus; + bool is_64bit; + + /* + * Global data accessed atomically or using ACCES_ONCE. + */ + struct ffa_ctx_notif notif; + + /* + * Global data accessed with lock locked. + */ + spinlock_t lock; + /* + * FF-A version negotiated by the guest, only modifications to + * this field are done with the lock held as this is expected to + * be done once at init by a guest. + */ + uint32_t guest_vers; /* Number of 4kB pages in each of rx/rx_pg and tx/tx_pg */ unsigned int page_count; - /* FF-A version used by the guest */ - uint32_t guest_vers; - bool rx_is_free; - /* Used shared memory objects, struct ffa_shm_mem */ - struct list_head shm_list; /* Number of allocated shared memory object */ unsigned int shm_count; - struct ffa_ctx_notif notif; + /* Used shared memory objects, struct ffa_shm_mem */ + struct list_head shm_list; + /* - * tx_lock is used to serialize access to tx - * rx_lock is used to serialize access to rx_is_free - * lock is used for the rest in this struct + * Rx buffer, accessed with rx_lock locked. + * rx_is_free is used to serialize access. */ - spinlock_t tx_lock; spinlock_t rx_lock; - spinlock_t lock; - /* Used if domain can't be torn down immediately */ + bool rx_is_free; + void *rx; + struct page_info *rx_pg; + + /* + * Tx buffer, access with tx_lock locked. + */ + spinlock_t tx_lock; + const void *tx; + struct page_info *tx_pg; + + + /* + * Domain teardown handling if data shared or used by other domains + * do not allow to teardown the domain immediately. + */ struct domain *teardown_d; struct list_head teardown_list; s_time_t teardown_expire; - /* - * Used for ffa_domain_teardown() to keep track of which SPs should be - * notified that this guest is being destroyed. - */ + /* Keep track of SPs that should be notified of VM destruction */ unsigned long *vm_destroy_bitmap; }; @@ -336,6 +384,12 @@ extern spinlock_t ffa_rx_buffer_lock; extern spinlock_t ffa_tx_buffer_lock; extern DECLARE_BITMAP(ffa_fw_abi_supported, FFA_ABI_BITMAP_SIZE); +extern struct list_head ffa_ctx_head; +extern rwlock_t ffa_ctx_list_rwlock; +#ifdef CONFIG_FFA_VM_TO_VM +extern atomic_t ffa_vm_count; +#endif + bool ffa_shm_domain_destroy(struct domain *d); void ffa_handle_mem_share(struct cpu_user_regs *regs); int ffa_handle_mem_reclaim(uint64_t handle, uint32_t flags); @@ -368,6 +422,29 @@ int ffa_handle_notification_set(struct cpu_user_regs *regs); void ffa_handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t fid); int32_t ffa_handle_msg_send2(struct cpu_user_regs *regs); +#ifdef CONFIG_FFA_VM_TO_VM +static inline uint16_t get_ffa_vm_count(void) +{ + return atomic_read(&ffa_vm_count); +} + +static inline void inc_ffa_vm_count(void) +{ + atomic_inc(&ffa_vm_count); +} + +static inline void dec_ffa_vm_count(void) +{ + ASSERT(atomic_read(&ffa_vm_count) > 0); + atomic_dec(&ffa_vm_count); +} +#else +/* Only count the caller VM */ +#define get_ffa_vm_count() ((uint16_t)1UL) +#define inc_ffa_vm_count() do {} while(0) +#define dec_ffa_vm_count() do {} while(0) +#endif + static inline uint16_t ffa_get_vm_id(const struct domain *d) { /* +1 since 0 is reserved for the hypervisor in FF-A */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079215.1440166 (Exim 4.92) (envelope-from ) id 1ulwxx-0007RC-Gr; Tue, 12 Aug 2025 21:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079215.1440166; Tue, 12 Aug 2025 21:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxx-0007R3-EI; Tue, 12 Aug 2025 21:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1079215; Tue, 12 Aug 2025 21:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwxw-0007Qt-OC for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwxw-001sZX-1c for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwxw-001kON-28 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9EUtnVlO/cwbMAzhSArSpfcaVN8K9KdbkMlshgy0Bvc=; b=5097Zgoiy8dJvPX4S7zn1xn7nA BowXfNu18A6BSFb961n1C6WuzvU2YAZq3YSLvFNH8L6+EE73WiXdLKb85F1MvWB94Zyx4m1gMA3un 9o73x1W4ECHhlrKYgQVk6g9NqS1LwfR8YeuR6Cyvs05icH077N0gtjfCX42xqpmncFMY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: Add buffer full notification support Message-Id: Date: Tue, 12 Aug 2025 21:55:32 +0000 commit 3935c705688e5958bb30d3f061fca660191be693 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:35:00 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Add buffer full notification support Add support to raise a Rx buffer full notification to a VM. This function will be used for indirect message support between VM and is only activated if CONFIG_FFA_VM_TO_VM is selected. Even if there are 32 framework notifications possible, right now only one is defined so the implementation is simplified to only handle the buffer full notification using a boolean. If other framework notifications have to be supported one day, the design will have to be modified to handle it properly. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa_notif.c | 36 ++++++++++++++++++++++++++++++------ xen/arch/arm/tee/ffa_private.h | 23 ++++++++++++++++++++++- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c index 00efaf8f73..f6df2f15bb 100644 --- a/xen/arch/arm/tee/ffa_notif.c +++ b/xen/arch/arm/tee/ffa_notif.c @@ -69,6 +69,7 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) { struct domain *d = current->domain; struct ffa_ctx *ctx = d->arch.tee; + bool notif_pending; if ( !notif_enabled ) { @@ -76,7 +77,11 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) return; } - if ( test_and_clear_bool(ctx->notif.secure_pending) ) + notif_pending = test_and_clear_bool(ctx->notif.secure_pending); + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + notif_pending |= test_and_clear_bool(ctx->notif.vm_pending); + + if ( notif_pending ) { /* A pending global notification for the guest */ ffa_set_regs(regs, FFA_SUCCESS_64, 0, @@ -93,6 +98,7 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) void ffa_handle_notification_get(struct cpu_user_regs *regs) { struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; uint32_t recv = get_user_reg(regs, 1); uint32_t flags = get_user_reg(regs, 2); uint32_t w2 = 0; @@ -132,11 +138,7 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) */ if ( ( flags & FFA_NOTIF_FLAG_BITMAP_SP ) && ( flags & FFA_NOTIF_FLAG_BITMAP_SPM ) ) - { - struct ffa_ctx *ctx = d->arch.tee; - - ACCESS_ONCE(ctx->notif.secure_pending) = false; - } + ACCESS_ONCE(ctx->notif.secure_pending) = false; arm_smccc_1_2_smc(&arg, &resp); e = ffa_get_ret_code(&resp); @@ -156,6 +158,14 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) w6 = resp.a6; } + if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) && + flags & FFA_NOTIF_FLAG_BITMAP_HYP && + test_and_clear_bool(ctx->notif.buff_full_pending) ) + { + ACCESS_ONCE(ctx->notif.vm_pending) = false; + w7 = FFA_NOTIF_RX_BUFFER_FULL; + } + ffa_set_regs(regs, FFA_SUCCESS_32, 0, w2, w3, w4, w5, w6, w7); } @@ -178,6 +188,20 @@ int ffa_handle_notification_set(struct cpu_user_regs *regs) bitmap_hi); } +#ifdef CONFIG_FFA_VM_TO_VM +void ffa_raise_rx_buffer_full(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + + if ( !ctx ) + return; + + ACCESS_ONCE(ctx->notif.buff_full_pending) = true; + if ( !test_and_set_bool(ctx->notif.vm_pending) ) + vgic_inject_irq(d, d->vcpu[0], GUEST_FFA_NOTIF_PEND_INTR_ID, true); +} +#endif + /* * Extract a 16-bit ID (index n) from the successful return value from * FFA_NOTIFICATION_INFO_GET_64 or FFA_NOTIFICATION_INFO_GET_32. IDs are diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h index 5cb2b51714..6dbdb200d8 100644 --- a/xen/arch/arm/tee/ffa_private.h +++ b/xen/arch/arm/tee/ffa_private.h @@ -218,6 +218,8 @@ #define FFA_NOTIF_INFO_GET_ID_COUNT_SHIFT 7 #define FFA_NOTIF_INFO_GET_ID_COUNT_MASK 0x1F +#define FFA_NOTIF_RX_BUFFER_FULL BIT(0, U) + /* Feature IDs used with FFA_FEATURES */ #define FFA_FEATURE_NOTIF_PEND_INTR 0x1U #define FFA_FEATURE_SCHEDULE_RECV_INTR 0x2U @@ -303,9 +305,20 @@ struct ffa_mem_region { struct ffa_ctx_notif { /* * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have - * pending global notifications. + * pending notifications from the secure world. */ bool secure_pending; + + /* + * True if domain is reported by FFA_NOTIFICATION_INFO_GET to have + * pending notifications from VMs (including framework ones). + */ + bool vm_pending; + + /* + * True if domain has buffer full notification pending + */ + bool buff_full_pending; }; struct ffa_ctx { @@ -419,6 +432,14 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs); void ffa_handle_notification_get(struct cpu_user_regs *regs); int ffa_handle_notification_set(struct cpu_user_regs *regs); +#ifdef CONFIG_FFA_VM_TO_VM +void ffa_raise_rx_buffer_full(struct domain *d); +#else +static inline void ffa_raise_rx_buffer_full(struct domain *d) +{ +} +#endif + void ffa_handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t fid); int32_t ffa_handle_msg_send2(struct cpu_user_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079216.1440170 (Exim 4.92) (envelope-from ) id 1ulwy7-0007UB-IJ; Tue, 12 Aug 2025 21:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079216.1440170; Tue, 12 Aug 2025 21:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwy7-0007U3-Fh; Tue, 12 Aug 2025 21:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1079216; Tue, 12 Aug 2025 21:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwy6-0007Tt-Qw for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwy6-001sZb-1v for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwy6-001kOl-2S for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/VqN34w5EiIg/RVd6cOmr5q5iRSZX6sbYaa99hAVPqA=; b=0awYBTx831hOIOLpjDt6Yd4dlJ mLktU177GiF634GDLZISoiriKlhiVwMt2ziGBznM3v7ZAzf9EDtp0N/Af+VXaI7IE6dKJjOurSHtE 7o65x8SjGq6bXSvMK7VRMA+7PUMSDoNXob0AJgn3BFYAk4fmZ36Tg8PztI81Hq9xi6sk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: Add indirect message between VM Message-Id: Date: Tue, 12 Aug 2025 21:55:42 +0000 commit 98af565b1e614dd14631199826f385f2ab77ed53 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:35:01 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Add indirect message between VM Add support for indirect messages between VMs. This is only enabled if CONFIG_FFA_VM_TO_VM is selected. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa_msg.c | 117 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/tee/ffa_msg.c b/xen/arch/arm/tee/ffa_msg.c index ee594e737f..c20c5bec0f 100644 --- a/xen/arch/arm/tee/ffa_msg.c +++ b/xen/arch/arm/tee/ffa_msg.c @@ -88,43 +88,130 @@ out: resp.a7 & mask); } +static int32_t ffa_msg_send2_vm(uint16_t dst_id, const void *src_buf, + struct ffa_part_msg_rxtx *src_msg) +{ + struct domain *dst_d; + struct ffa_ctx *dst_ctx; + struct ffa_part_msg_rxtx *dst_msg; + int err; + int32_t ret; + + if ( dst_id == 0 ) + /* FF-A ID 0 is the hypervisor, this is not valid */ + return FFA_RET_INVALID_PARAMETERS; + + /* This is also checking that dest is not src */ + err = rcu_lock_live_remote_domain_by_id(dst_id - 1, &dst_d); + if ( err ) + return FFA_RET_INVALID_PARAMETERS; + + if ( dst_d->arch.tee == NULL ) + { + ret = FFA_RET_INVALID_PARAMETERS; + goto out_unlock; + } + + dst_ctx = dst_d->arch.tee; + if ( !dst_ctx->guest_vers ) + { + ret = FFA_RET_INVALID_PARAMETERS; + goto out_unlock; + } + + /* This also checks that destination has set a Rx buffer */ + ret = ffa_rx_acquire(dst_d); + if ( ret ) + goto out_unlock; + + /* we need to have enough space in the destination buffer */ + if ( (dst_ctx->page_count * FFA_PAGE_SIZE - + sizeof(struct ffa_part_msg_rxtx)) < src_msg->msg_size ) + { + ret = FFA_RET_NO_MEMORY; + ffa_rx_release(dst_d); + goto out_unlock; + } + + dst_msg = dst_ctx->rx; + + /* prepare destination header */ + dst_msg->flags = 0; + dst_msg->reserved = 0; + dst_msg->msg_offset = sizeof(struct ffa_part_msg_rxtx); + dst_msg->send_recv_id = src_msg->send_recv_id; + dst_msg->msg_size = src_msg->msg_size; + + memcpy(dst_ctx->rx + sizeof(struct ffa_part_msg_rxtx), + src_buf + src_msg->msg_offset, src_msg->msg_size); + + /* receiver rx buffer will be released by the receiver*/ + +out_unlock: + rcu_unlock_domain(dst_d); + if ( !ret ) + ffa_raise_rx_buffer_full(dst_d); + + return ret; +} + int32_t ffa_handle_msg_send2(struct cpu_user_regs *regs) { struct domain *src_d = current->domain; struct ffa_ctx *src_ctx = src_d->arch.tee; - const struct ffa_part_msg_rxtx *src_msg; + struct ffa_part_msg_rxtx src_msg; uint16_t dst_id, src_id; int32_t ret; - if ( !ffa_fw_supports_fid(FFA_MSG_SEND2) ) - return FFA_RET_NOT_SUPPORTED; + BUILD_BUG_ON(sizeof(struct ffa_part_msg_rxtx) >= FFA_PAGE_SIZE); if ( !spin_trylock(&src_ctx->tx_lock) ) return FFA_RET_BUSY; - src_msg = src_ctx->tx; - src_id = src_msg->send_recv_id >> 16; - dst_id = src_msg->send_recv_id & GENMASK(15,0); + /* create a copy of the message header */ + memcpy(&src_msg, src_ctx->tx, sizeof(src_msg)); - if ( src_id != ffa_get_vm_id(src_d) || !FFA_ID_IS_SECURE(dst_id) ) + src_id = src_msg.send_recv_id >> 16; + dst_id = src_msg.send_recv_id & GENMASK(15,0); + + if ( src_id != ffa_get_vm_id(src_d) ) { ret = FFA_RET_INVALID_PARAMETERS; - goto out_unlock_tx; + goto out; } /* check source message fits in buffer */ - if ( src_ctx->page_count * FFA_PAGE_SIZE < - src_msg->msg_offset + src_msg->msg_size || - src_msg->msg_offset < sizeof(struct ffa_part_msg_rxtx) ) + if ( src_msg.msg_offset < sizeof(struct ffa_part_msg_rxtx) || + src_msg.msg_size == 0 || + src_msg.msg_offset > src_ctx->page_count * FFA_PAGE_SIZE || + src_msg.msg_size > (src_ctx->page_count * FFA_PAGE_SIZE - + src_msg.msg_offset) ) { ret = FFA_RET_INVALID_PARAMETERS; - goto out_unlock_tx; + goto out; } - ret = ffa_simple_call(FFA_MSG_SEND2, - ((uint32_t)ffa_get_vm_id(src_d)) << 16, 0, 0, 0); + if ( FFA_ID_IS_SECURE(dst_id) ) + { + /* Message for a secure partition */ + if ( !ffa_fw_supports_fid(FFA_MSG_SEND2) ) + { + ret = FFA_RET_NOT_SUPPORTED; + goto out; + } + + ret = ffa_simple_call(FFA_MSG_SEND2, + ((uint32_t)ffa_get_vm_id(src_d)) << 16, 0, 0, 0); + } + else if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + { + /* Message for a VM */ + ret = ffa_msg_send2_vm(dst_id, src_ctx->tx, &src_msg); + } + else + ret = FFA_RET_INVALID_PARAMETERS; -out_unlock_tx: +out: spin_unlock(&src_ctx->tx_lock); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:55:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079217.1440174 (Exim 4.92) (envelope-from ) id 1ulwyH-0007WN-KU; Tue, 12 Aug 2025 21:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079217.1440174; Tue, 12 Aug 2025 21:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyH-0007WF-HK; Tue, 12 Aug 2025 21:55:53 +0000 Received: by outflank-mailman (input) for mailman id 1079217; Tue, 12 Aug 2025 21:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyG-0007W5-UF for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwyG-001sa3-2F for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwyG-001kPN-2m for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qW1QHFX2EoS36AuPpSHHFDATZkx5JlC0+P6jiSs1bx8=; b=SCWO0mw0Uo2hLXcFg0JIPhdW3D zAUl2CI98ZqJsP7Xa80uqU1ig0Y6IsoT5+xb8Ey9eizJLT1YJkmsKWy9Cl9jRkVuqCC6b1c3aKGAp I7Or5iofjGuE/CoxFH/NjlZqRK+avhkAWt+WTlYfWg3gWeMNoGlwxtu7/nug0aIjj2Vc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: Enable VM to VM without firmware Message-Id: Date: Tue, 12 Aug 2025 21:55:52 +0000 commit 911b305e7bdab15ddf73667611091ef82edd5181 Author: Bertrand Marquis AuthorDate: Mon Aug 11 15:35:02 2025 +0200 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: ffa: Enable VM to VM without firmware When VM to VM support is activated and there is no suitable FF-A support in the firmware, enable FF-A support for VMs to allow using it for VM to VM communications. If there is OP-TEE running in the secure world and using the non FF-A communication system, having CONFIG_FFA_VM_TO_VM could be non functional (if optee is probed first) or OP-TEE could be non functional (if FF-A is probed first) so it is not recommended to activate the configuration option for such systems. To make buffer full notification work between VMs when there is no firmware, rework the notification handling and modify the global flag to only be used as check for firmware notification support instead. Also split probe function into one for firmware and one for vm to vm to make the implementation clearer. Signed-off-by: Bertrand Marquis Reviewed-by: Jens Wiklander Acked-by: Julien Grall --- xen/arch/arm/tee/ffa.c | 87 ++++++++++++++++++++++-------------- xen/arch/arm/tee/ffa_notif.c | 104 ++++++++++++++++++++----------------------- 2 files changed, 101 insertions(+), 90 deletions(-) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 0eb6a0bda5..1d0239cf69 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -346,8 +346,9 @@ static int ffa_domain_init(struct domain *d) struct ffa_ctx *ctx; int ret; - if ( !ffa_fw_version ) + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !ffa_fw_version ) return -ENODEV; + /* * We are using the domain_id + 1 as the FF-A ID for VMs as FF-A ID 0 is * reserved for the hypervisor and we only support secure endpoints using @@ -478,38 +479,12 @@ static void ffa_init_secondary(void) ffa_notif_init_interrupt(); } -static bool ffa_probe(void) +static bool ffa_probe_fw(void) { uint32_t vers; unsigned int major_vers; unsigned int minor_vers; - /* - * FF-A often works in units of 4K pages and currently it's assumed - * that we can map memory using that granularity. See also the comment - * above the FFA_PAGE_SIZE define. - * - * It is possible to support a PAGE_SIZE larger than 4K in Xen, but - * until that is fully handled in this code make sure that we only use - * 4K page sizes. - */ - BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); - - printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", - FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); - - if ( IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) - { - /* - * When FFA VM to VM is enabled, the current implementation does not - * offer any way to limit which VM can communicate with which VM using - * FF-A. - * Signal this in the xen console and taint the system as insecure. - * TODO: Introduce a solution to limit what a VM can do through FFA. - */ - printk(XENLOG_ERR "ffa: VM to VM is enabled, system is insecure !!\n"); - add_taint(TAINT_MACHINE_INSECURE); - } /* * psci_init_smccc() updates this value with what's reported by EL-3 * or secure world. @@ -528,11 +503,6 @@ static bool ffa_probe(void) goto err_no_fw; } - /* Some sanity check in case we update the version we support */ - BUILD_BUG_ON(FFA_MIN_SPMC_VERSION > FFA_MY_VERSION); - BUILD_BUG_ON(FFA_VERSION_MAJOR(FFA_MIN_SPMC_VERSION) != - FFA_MY_VERSION_MAJOR); - major_vers = FFA_VERSION_MAJOR(vers); minor_vers = FFA_VERSION_MINOR(vers); @@ -583,7 +553,6 @@ static bool ffa_probe(void) goto err_rxtx_destroy; ffa_notif_init(); - init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); return true; @@ -597,6 +566,56 @@ err_no_fw: return false; } +static bool ffa_probe_vm_to_vm(void) +{ + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) ) + return false; + + /* + * When FFA VM to VM is enabled, the current implementation does not + * offer any way to limit which VM can communicate with which VM using + * FF-A. + * Signal this in the xen console and taint the system as insecure. + * TODO: Introduce a solution to limit what a VM can do through FFA. + */ + printk(XENLOG_ERR "ffa: VM to VM is enabled, system is insecure !!\n"); + add_taint(TAINT_MACHINE_INSECURE); + + return true; +} + +static bool ffa_probe(void) +{ + /* + * FF-A often works in units of 4K pages and currently it's assumed + * that we can map memory using that granularity. See also the comment + * above the FFA_PAGE_SIZE define. + * + * It is possible to support a PAGE_SIZE larger than 4K in Xen, but + * until that is fully handled in this code make sure that we only use + * 4K page sizes. + */ + BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); + + /* Some sanity check in case we update the version we support */ + BUILD_BUG_ON(FFA_MIN_SPMC_VERSION > FFA_MY_VERSION); + BUILD_BUG_ON(FFA_VERSION_MAJOR(FFA_MIN_SPMC_VERSION) != + FFA_MY_VERSION_MAJOR); + + printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", + FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); + + if ( !ffa_probe_fw() && !ffa_probe_vm_to_vm() ) + return false; + + if ( !ffa_fw_version ) + printk(XENLOG_INFO "ARM FF-A only available between VMs\n"); + + init_timer(&ffa_teardown_timer, ffa_teardown_timer_callback, NULL, 0); + + return true; +} + static const struct tee_mediator_ops ffa_ops = { .probe = ffa_probe, diff --git a/xen/arch/arm/tee/ffa_notif.c b/xen/arch/arm/tee/ffa_notif.c index f6df2f15bb..86bef6b3b2 100644 --- a/xen/arch/arm/tee/ffa_notif.c +++ b/xen/arch/arm/tee/ffa_notif.c @@ -16,7 +16,7 @@ #include "ffa_private.h" -static bool __ro_after_init notif_enabled; +static bool __ro_after_init fw_notif_enabled; static unsigned int __ro_after_init notif_sri_irq; int ffa_handle_notification_bind(struct cpu_user_regs *regs) @@ -27,21 +27,17 @@ int ffa_handle_notification_bind(struct cpu_user_regs *regs) uint32_t bitmap_lo = get_user_reg(regs, 3); uint32_t bitmap_hi = get_user_reg(regs, 4); - if ( !notif_enabled ) - return FFA_RET_NOT_SUPPORTED; - if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) return FFA_RET_INVALID_PARAMETERS; if ( flags ) /* Only global notifications are supported */ return FFA_RET_DENIED; - /* - * We only support notifications from SP so no need to check the sender - * endpoint ID, the SPMC will take care of that for us. - */ - return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, bitmap_lo, - bitmap_hi); + if ( FFA_ID_IS_SECURE(src_dst >> 16) && fw_notif_enabled ) + return ffa_simple_call(FFA_NOTIFICATION_BIND, src_dst, flags, + bitmap_lo, bitmap_hi); + + return FFA_RET_NOT_SUPPORTED; } int ffa_handle_notification_unbind(struct cpu_user_regs *regs) @@ -51,18 +47,14 @@ int ffa_handle_notification_unbind(struct cpu_user_regs *regs) uint32_t bitmap_lo = get_user_reg(regs, 3); uint32_t bitmap_hi = get_user_reg(regs, 4); - if ( !notif_enabled ) - return FFA_RET_NOT_SUPPORTED; - if ( (src_dst & 0xFFFFU) != ffa_get_vm_id(d) ) return FFA_RET_INVALID_PARAMETERS; - /* - * We only support notifications from SP so no need to check the - * destination endpoint ID, the SPMC will take care of that for us. - */ - return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_lo, - bitmap_hi); + if ( FFA_ID_IS_SECURE(src_dst >> 16) && fw_notif_enabled ) + return ffa_simple_call(FFA_NOTIFICATION_UNBIND, src_dst, 0, bitmap_lo, + bitmap_hi); + + return FFA_RET_NOT_SUPPORTED; } void ffa_handle_notification_info_get(struct cpu_user_regs *regs) @@ -71,7 +63,7 @@ void ffa_handle_notification_info_get(struct cpu_user_regs *regs) struct ffa_ctx *ctx = d->arch.tee; bool notif_pending; - if ( !notif_enabled ) + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !fw_notif_enabled ) { ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return; @@ -108,7 +100,7 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) uint32_t w6 = 0; uint32_t w7 = 0; - if ( !notif_enabled ) + if ( !IS_ENABLED(CONFIG_FFA_VM_TO_VM) && !fw_notif_enabled ) { ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED); return; @@ -120,7 +112,8 @@ void ffa_handle_notification_get(struct cpu_user_regs *regs) return; } - if ( flags & ( FFA_NOTIF_FLAG_BITMAP_SP | FFA_NOTIF_FLAG_BITMAP_SPM ) ) + if ( fw_notif_enabled && (flags & ( FFA_NOTIF_FLAG_BITMAP_SP | + FFA_NOTIF_FLAG_BITMAP_SPM )) ) { struct arm_smccc_1_2_regs arg = { .a0 = FFA_NOTIFICATION_GET, @@ -177,15 +170,14 @@ int ffa_handle_notification_set(struct cpu_user_regs *regs) uint32_t bitmap_lo = get_user_reg(regs, 3); uint32_t bitmap_hi = get_user_reg(regs, 4); - if ( !notif_enabled ) - return FFA_RET_NOT_SUPPORTED; - if ( (src_dst >> 16) != ffa_get_vm_id(d) ) return FFA_RET_INVALID_PARAMETERS; - /* Let the SPMC check the destination of the notification */ - return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, - bitmap_hi); + if ( FFA_ID_IS_SECURE(src_dst >> 16) && fw_notif_enabled ) + return ffa_simple_call(FFA_NOTIFICATION_SET, src_dst, flags, bitmap_lo, + bitmap_hi); + + return FFA_RET_NOT_SUPPORTED; } #ifdef CONFIG_FFA_VM_TO_VM @@ -371,7 +363,7 @@ void ffa_notif_init_interrupt(void) { int ret; - if ( notif_enabled && notif_sri_irq < NR_GIC_SGI ) + if ( fw_notif_enabled && notif_sri_irq < NR_GIC_SGI ) { /* * An error here is unlikely since the primary CPU has already @@ -402,41 +394,41 @@ void ffa_notif_init(void) int ret; /* Only enable fw notification if all ABIs we need are supported */ - if ( !(ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_CREATE) && - ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_DESTROY) && - ffa_fw_supports_fid(FFA_NOTIFICATION_GET) && - ffa_fw_supports_fid(FFA_NOTIFICATION_INFO_GET_64)) ) - return; - - arm_smccc_1_2_smc(&arg, &resp); - if ( resp.a0 != FFA_SUCCESS_32 ) - return; - - irq = resp.a2; - notif_sri_irq = irq; - if ( irq >= NR_GIC_SGI ) - irq_set_type(irq, IRQ_TYPE_EDGE_RISING); - ret = request_irq(irq, 0, notif_irq_handler, "FF-A notif", NULL); - if ( ret ) + if ( ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_CREATE) && + ffa_fw_supports_fid(FFA_NOTIFICATION_BITMAP_DESTROY) && + ffa_fw_supports_fid(FFA_NOTIFICATION_GET) && + ffa_fw_supports_fid(FFA_NOTIFICATION_INFO_GET_64) ) { - printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", - irq, ret); - return; - } + arm_smccc_1_2_smc(&arg, &resp); + if ( resp.a0 != FFA_SUCCESS_32 ) + return; - notif_enabled = true; + irq = resp.a2; + notif_sri_irq = irq; + if ( irq >= NR_GIC_SGI ) + irq_set_type(irq, IRQ_TYPE_EDGE_RISING); + ret = request_irq(irq, 0, notif_irq_handler, "FF-A notif", NULL); + if ( ret ) + { + printk(XENLOG_ERR "ffa: request_irq irq %u failed: error %d\n", + irq, ret); + return; + } + fw_notif_enabled = true; + } } int ffa_notif_domain_init(struct domain *d) { int32_t res; - if ( !notif_enabled ) - return 0; + if ( fw_notif_enabled ) + { - res = ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); - if ( res ) - return -ENOMEM; + res = ffa_notification_bitmap_create(ffa_get_vm_id(d), d->max_vcpus); + if ( res ) + return -ENOMEM; + } return 0; } @@ -447,6 +439,6 @@ void ffa_notif_domain_destroy(struct domain *d) * Call bitmap_destroy even if bitmap create failed as the SPMC will * return a DENIED error that we will ignore. */ - if ( notif_enabled ) + if ( fw_notif_enabled ) ffa_notification_bitmap_destroy(ffa_get_vm_id(d)); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:56:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079218.1440178 (Exim 4.92) (envelope-from ) id 1ulwyR-0007Yh-Lk; Tue, 12 Aug 2025 21:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079218.1440178; Tue, 12 Aug 2025 21:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyR-0007YZ-In; Tue, 12 Aug 2025 21:56:03 +0000 Received: by outflank-mailman (input) for mailman id 1079218; Tue, 12 Aug 2025 21:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyR-0007YP-0o for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwyQ-001saQ-2X for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwyQ-001kRb-37 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0xtV+JzyVB/ONIWpQ4dtwXo9hV3PtN6TvpKr4v+1dS4=; b=7EUs6oe00D6dcedyvOmTOeskIO pR91Bzrbur7MVt8JHTHKT87nr6qwEqgTvonSUngEP9j0F0t3Oiy2XCvZgozreEy0Gf7ZKNdSsmmbk G6W7lYk2Em2IL5PiQ5I2lNMlWJLWLjfeopqf2Bi0XqZrCbTzLffRZMR38W/dzPlD9PjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: irq: add missing spin_unlock() in init_local_irq_data() error path Message-Id: Date: Tue, 12 Aug 2025 21:56:02 +0000 commit 4c3aa6e93d3fc760bdcb9cf268f506c06c0639b2 Author: Mykola Kvach AuthorDate: Mon Aug 11 11:45:20 2025 +0300 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: irq: add missing spin_unlock() in init_local_irq_data() error path If init_one_irq_desc() fails, init_local_irq_data() returns without releasing local_irqs_type_lock, leading to a possible deadlock. Release the lock before returning to ensure proper cleanup. Fixes: 2bb32b809250 ("xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()") Signed-off-by: Mykola Kvach Reviewed-by: Denis Mukhin Acked-by: Julien Grall --- xen/arch/arm/irq.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 4bbf0b0664..02ca82c089 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -94,7 +94,10 @@ static int init_local_irq_data(unsigned int cpu) int rc = init_one_irq_desc(desc); if ( rc ) + { + spin_unlock(&local_irqs_type_lock); return rc; + } desc->irq = irq; desc->action = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:56:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079219.1440182 (Exim 4.92) (envelope-from ) id 1ulwyc-0007d4-O8; Tue, 12 Aug 2025 21:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079219.1440182; Tue, 12 Aug 2025 21:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyc-0007cw-LY; Tue, 12 Aug 2025 21:56:14 +0000 Received: by outflank-mailman (input) for mailman id 1079219; Tue, 12 Aug 2025 21:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyb-0007bG-4H for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwya-001saW-2q for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwyb-001kSB-0C for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q4KvHYZPhfTvhbWYZJb7OdInsB83nRQpw1/aqxJI1OY=; b=Pk2+foPsJS2fXJeNZjZbWb/fAh LB6VtQHR1nWY6XBZSJYBYNJStDGQKEZ/7NLbFSiC/WlSQQnYq4pErnmQ9pBpNeZAOAVB/EA6sDGK8 7zJrLmK/6z8xAVG2ZyunoWZylCdPwQKuzIsLUFws7whOnMXwpzqd/Gv5oGwUy5Z/YtPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/dom0less: arm: fix hwdom 1:1 low memory allocation Message-Id: Date: Tue, 12 Aug 2025 21:56:13 +0000 commit 2f6f9c7ae9de563764b0aaffa1abefc65c560a7a Author: Grygorii Strashko AuthorDate: Thu Aug 7 10:03:25 2025 +0000 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/dom0less: arm: fix hwdom 1:1 low memory allocation Call stack for dom0less hwdom case (1:1) memory: create_domUs |-construct_domU |-construct_hwdom() |-allocate_memory_11() And allocate_memory_11() uses "dom0_mem" as: min_low_order = get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); In case of dom0less boot the "dom0_mem" is not used and defaulted to 0, which causes min_low_order to get high value > order and so no allocations happens from low memory. Fix it, by using kinfo->unassigned_mem instead of "dom0_mem" which has correct memory size in both cases: regular dom0 boot and dom0less boot. Fixes: 52cb53f1816a ("xen/arm: dom0less hwdom construction") Signed-off-by: Grygorii Strashko Reviewed-by: Denis Mukhin Reviewed-by: Jason Andryuk Acked-by: Julien Grall --- docs/misc/xen-command-line.pandoc | 3 ++- xen/arch/arm/domain_build.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a28a1b172b..a75b6c9301 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1035,7 +1035,8 @@ For example, with `dom0_max_vcpus=4-8`: > `= ` Set the amount of memory for the initial domain (dom0). It must be -greater than zero. This parameter is required. +greater than zero. This parameter is required (and only used) when the initial +domain is not described in the Device-Tree. ### dom0_mem (x86) > `= List of ( min: | max: | )` diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 463ae4474d..a9e4153e3c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -249,7 +249,7 @@ fail: * * We first allocate the largest allocation we can as low as we * can. This then becomes the first bank. This bank must be at least - * 128MB (or dom0_mem if that is smaller). + * 128MB (or memory size requested for domain if that is smaller). * * Then we start allocating more memory, trying to allocate the * largest possible size and trying smaller sizes until we @@ -278,7 +278,7 @@ static void __init allocate_memory_11(struct domain *d, struct kernel_info *kinfo) { const unsigned int min_low_order = - get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); + get_order_from_bytes(min_t(paddr_t, kinfo->unassigned_mem, MB(128))); const unsigned int min_order = get_order_from_bytes(MB(4)); struct membanks *mem = kernel_info_get_mem(kinfo); struct page_info *pg; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:56:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079220.1440185 (Exim 4.92) (envelope-from ) id 1ulwym-0007fW-PW; Tue, 12 Aug 2025 21:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079220.1440185; Tue, 12 Aug 2025 21:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwym-0007fO-Mu; Tue, 12 Aug 2025 21:56:24 +0000 Received: by outflank-mailman (input) for mailman id 1079220; Tue, 12 Aug 2025 21:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyl-0007f8-6S for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwyk-001saa-36 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwyl-001kSY-0T for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z0gaKlcqll1FQmX0Fij+dy1pMbZasZ2RnUebQ7YDkiA=; b=pOTZ/ns7zl9+3tNyA2fXhF7Gha DRYrx4HgiPKWrh/wAOGNKyL795lYcIT90IJCZ0bjLKDExAL/s4HKQXenUbJDr+2DxGuDJOH3/0Jsd +eE8b+uE9o4WUCJJmlMYOaanCkw+ef3tBN/wauHTTtxE2IgRh+UFVtcj6oSaepbBQB/s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: fix arm_iommu_map_page after f9f6b22abf1d Message-Id: Date: Tue, 12 Aug 2025 21:56:23 +0000 commit 53d60d759dd43a462d1b4d0b428faafaf0cf28d3 Author: Stefano Stabellini AuthorDate: Fri Jul 25 10:01:25 2025 -0400 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: fix arm_iommu_map_page after f9f6b22abf1d Up until f9f6b22abf1d "xen/arm: Map ITS doorbell register to IOMMU page tables" the only caller of iommu_map on ARM was grant_table.c which has a specific usage model and restrictions as described by the in-code comment in arm_iommu_map_page. f9f6b22abf1d introduced a second caller to iommu_map on ARM: vgic_v3_its_init_virtual. This specific statement in the f9f6b22abf1d commit message is partially wrong: "Note that the 1:1 check in arm_iommu_map_page remains for now, as virtual ITSes are currently only created for hwdom where the doorbell mapping is always 1:1." Leading to crashes any time the hardware domain is not direct-mapped (e.g. cache coloring and non-Dom0 hardware domain): (XEN) Xen BUG at drivers/passthrough/arm/iommu_helpers.c:47 [...] (XEN) Xen call trace: (XEN) [<00000a000024c758>] arm_iommu_map_page+0x80/0x90 (PC) (XEN) [<00000a000024c750>] arm_iommu_map_page+0x78/0x90 (LR) (XEN) [<00000a0000250884>] iommu_map+0xcc/0x29c (XEN) [<00000a0000288024>] vgic_v3_its_init_domain+0x18c/0x1e8 (XEN) [<00000a0000285228>] vgic-v3.c#vgic_v3_domain_init+0x168/0x21c (XEN) [<00000a0000281dcc>] domain_vgic_init+0x14c/0x210 (XEN) [<00000a00002705a4>] arch_domain_create+0x150/0x1f0 (XEN) [<00000a00002055e8>] domain_create+0x47c/0x6c0 (XEN) [<00000a00002cf090>] create_domUs+0x7f8/0x8cc (XEN) [<00000a00002eb588>] start_xen+0x8f4/0x998 (XEN) [<00000a000020018c>] head.o#primary_switched+0x4/0x10 Specifically, non-1:1 hardware domain exists with cache coloring enabled. For that, is_domain_direct_mapped(d) is false but domain_use_host_layout(d) is true. Change the is_domain_direct_mapped(d) checks in arm_iommu_map_page and arm_iommu_unmap_page into domain_use_host_layout(d) checks. Drop stale in-code comment specific to grant table mappings. Fixes: f9f6b22abf1d ("xen/arm: Map ITS doorbell register to IOMMU page tables") Signed-off-by: Stefano Stabellini Signed-off-by: Stewart Hildebrand Tested-by: Jason Andryuk Reviewed-by: Julien Grall --- xen/drivers/passthrough/arm/iommu_helpers.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/xen/drivers/passthrough/arm/iommu_helpers.c b/xen/drivers/passthrough/arm/iommu_helpers.c index 5cb1987481..bdb271584b 100644 --- a/xen/drivers/passthrough/arm/iommu_helpers.c +++ b/xen/drivers/passthrough/arm/iommu_helpers.c @@ -36,15 +36,7 @@ int __must_check arm_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, { p2m_type_t t; - /* - * Grant mappings can be used for DMA requests. The dev_bus_addr - * returned by the hypercall is the MFN (not the IPA). For device - * protected by an IOMMU, Xen needs to add a 1:1 mapping in the domain - * p2m to allow DMA request to work. - * This is only valid when the domain is directed mapped. Hence this - * function should only be used by gnttab code with gfn == mfn == dfn. - */ - BUG_ON(!is_domain_direct_mapped(d)); + BUG_ON(!domain_use_host_layout(d)); BUG_ON(mfn_x(mfn) != dfn_x(dfn)); /* We only support readable and writable flags */ @@ -66,11 +58,7 @@ int __must_check arm_iommu_unmap_page(struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags) { - /* - * This function should only be used by gnttab code when the domain - * is direct mapped (i.e. gfn == mfn == dfn). - */ - if ( !is_domain_direct_mapped(d) ) + if ( !domain_use_host_layout(d) ) return -EINVAL; return guest_physmap_remove_page(d, _gfn(dfn_x(dfn)), _mfn(dfn_x(dfn)), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:56:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079221.1440189 (Exim 4.92) (envelope-from ) id 1ulwyw-0007he-Qt; Tue, 12 Aug 2025 21:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079221.1440189; Tue, 12 Aug 2025 21:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyw-0007hW-ON; Tue, 12 Aug 2025 21:56:34 +0000 Received: by outflank-mailman (input) for mailman id 1079221; Tue, 12 Aug 2025 21:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwyv-0007hO-92 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwyv-001saf-08 for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwyv-001kT2-0i for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hS2hVZwtNt+DjeZrSjSWcWbkSrjTOJA8j15hFWV4k/w=; b=RsK5q2GZuTZzq79mEk1PCGOTZk zetJGZIw+BBLKwyo45Xp0NHuacV3Hg5GNS3BR+67MLqndVT//CRoXz6TlmyPyy4OM3QE6+8bBG+Yd FDoVTZnxAE/pZe1+7PI7Rr6CMbs0N14Sl/1TJiZjDH5xyKFQTAcoobHXqd28dT75TJ+c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: allow translated iommu mappings Message-Id: Date: Tue, 12 Aug 2025 21:56:33 +0000 commit 4cde4a552ed35f3cc74df877d5a7cfbbfced8fb3 Author: Stefano Stabellini AuthorDate: Fri Jul 25 10:01:26 2025 -0400 Commit: Julien Grall CommitDate: Tue Aug 12 12:04:41 2025 +0100 xen/arm: allow translated iommu mappings In preparation of exposing vITS to domUs, generalize arm_iommu_map_page and arm_iommu_unmap_page to allow ITS doorbell mappings with dfn != mfn. The mfn does not need to be passed to guest_physmap_remove_page since there is no mfn checking on the p2m_iommu_map_{rw,ro} p2m types during unmap. Pass INVALID_MFN to guest_physmap_remove_page. Signed-off-by: Stefano Stabellini Signed-off-by: Stewart Hildebrand Tested-by: Jason Andryuk Reviewed-by: Julien Grall --- xen/drivers/passthrough/arm/iommu_helpers.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/arm/iommu_helpers.c b/xen/drivers/passthrough/arm/iommu_helpers.c index bdb271584b..a3e3cafb87 100644 --- a/xen/drivers/passthrough/arm/iommu_helpers.c +++ b/xen/drivers/passthrough/arm/iommu_helpers.c @@ -36,9 +36,6 @@ int __must_check arm_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, { p2m_type_t t; - BUG_ON(!domain_use_host_layout(d)); - BUG_ON(mfn_x(mfn) != dfn_x(dfn)); - /* We only support readable and writable flags */ if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) return -EINVAL; @@ -49,7 +46,7 @@ int __must_check arm_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, * The function guest_physmap_add_entry replaces the current mapping * if there is already one... */ - return guest_physmap_add_entry(d, _gfn(dfn_x(dfn)), _mfn(dfn_x(dfn)), + return guest_physmap_add_entry(d, _gfn(dfn_x(dfn)), mfn, IOMMUF_order(flags), t); } @@ -58,11 +55,7 @@ int __must_check arm_iommu_unmap_page(struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags) { - if ( !domain_use_host_layout(d) ) - return -EINVAL; - - return guest_physmap_remove_page(d, _gfn(dfn_x(dfn)), _mfn(dfn_x(dfn)), - order); + return guest_physmap_remove_page(d, _gfn(dfn_x(dfn)), INVALID_MFN, order); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 12 21:56:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2025 21:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079222.1440194 (Exim 4.92) (envelope-from ) id 1ulwz6-0007ja-SH; Tue, 12 Aug 2025 21:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079222.1440194; Tue, 12 Aug 2025 21:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwz6-0007jS-Pi; Tue, 12 Aug 2025 21:56:44 +0000 Received: by outflank-mailman (input) for mailman id 1079222; Tue, 12 Aug 2025 21:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulwz5-0007jK-Bd for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ulwz5-001sb6-0P for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ulwz5-001kTQ-0z for xen-changelog@lists.xenproject.org; Tue, 12 Aug 2025 21:56:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IkKNMfmMbO19+swhm6u/3cPxJ7IFok53Xa4kw5UHqQI=; b=JT6WDngNivsJfzMROop8AIxR+Y PqhD9GnMpe1HspkfON4zrLO5pIhNmjqR6ttvRzKbD8ii1VfHzOAnxaL4SqMjt1xGtUMlU352bLoPm i2vFRPBqI84Qeo5WojAofFomr3LdOQ+VmQj4RMT8HjAr6HY3g/wna0xWWGJT+aYuXpxA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Turn debian/12-x86_64 into a non-root container Message-Id: Date: Tue, 12 Aug 2025 21:56:43 +0000 commit 93f4d2da2221d1d8b39b2c0998b625f4c68ef769 Author: Javi Merino AuthorDate: Tue Aug 12 16:47:34 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 12 20:17:25 2025 +0100 CI: Turn debian/12-x86_64 into a non-root container Since commit 4611ae6fb8f9 ("CI: save toolstack artifact as cpio.gz"), the various automation/scripts/* no longer need to be root to correctly repack the initrd for test. Signed-off-by: Javi Merino Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- automation/build/debian/12-x86_64.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile index e26a19079e..3cf99c730b 100644 --- a/automation/build/debian/12-x86_64.dockerfile +++ b/automation/build/debian/12-x86_64.dockerfile @@ -9,6 +9,8 @@ RUN < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 12:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079832.1440509 (Exim 4.92) (envelope-from ) id 1umAUV-0001WT-G7; Wed, 13 Aug 2025 12:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079832.1440509; Wed, 13 Aug 2025 12:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umAUV-0001WL-DW; Wed, 13 Aug 2025 12:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1079832; Wed, 13 Aug 2025 12:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umAUU-0001WF-N4 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umAUU-003M9i-0f for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umAUU-002PSQ-1C for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mLZj6a/Ztq3o+7DMwSeq+YyEq2Nh1gwsq/95upZ4Ulw=; b=XztThz5FcM0nqW6SinLOunN0Wo Fu+pgWlJ4o+p7s1ou8P8L8QqH5HQzsQWCyzvPb0mlGrwIagW7/uehdTHlt20w4K4uTAy2PAFoTp6h 7Waj3LNW7FQp7R1K3uU/fSQHvSJvVSnmSBEDo9xao0lIovNbkPO4+ZbYffYSIrJXdns8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Rename MSR_INTERRUPT_SSP_TABLE to MSR_ISST Message-Id: Date: Wed, 13 Aug 2025 12:22:02 +0000 commit bd92e2151c19a01a237d7e447dc77210c2242840 Author: Andrew Cooper AuthorDate: Tue Dec 24 14:03:49 2024 +0000 Commit: Andrew Cooper CommitDate: Wed Aug 13 13:13:08 2025 +0100 x86/msr: Rename MSR_INTERRUPT_SSP_TABLE to MSR_ISST AMD call this whole structure the ISST, which is a better association with IST than the long form (which becomes ambiguous when abbreviated). No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/include/asm/msr-index.h | 2 +- xen/arch/x86/msr.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 97bdda1d4a..f6ec5c9df5 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -933,7 +933,7 @@ void load_system_tables(void) wrss(df_ssp, _p(df_ssp)); } - wrmsrl(MSR_INTERRUPT_SSP_TABLE, (unsigned long)ist_ssp); + wrmsrl(MSR_ISST, (unsigned long)ist_ssp); } BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 2e7e2aff9a..428d993ee8 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -157,7 +157,7 @@ #define MSR_PL1_SSP 0x000006a5 #define MSR_PL2_SSP 0x000006a6 #define MSR_PL3_SSP 0x000006a7 -#define MSR_INTERRUPT_SSP_TABLE 0x000006a8 +#define MSR_ISST 0x000006a8 #define MSR_PKRS 0x000006e1 diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 2cd46b6c8a..1bf117cbd8 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -138,7 +138,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_RTIT_OUTPUT_BASE ... MSR_RTIT_ADDR_B(7): case MSR_U_CET: case MSR_S_CET: - case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: + case MSR_PL0_SSP ... MSR_ISST: case MSR_AMD64_LWP_CFG: case MSR_AMD64_LWP_CBADDR: case MSR_PPIN_CTL: @@ -442,7 +442,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) case MSR_RTIT_OUTPUT_BASE ... MSR_RTIT_ADDR_B(7): case MSR_U_CET: case MSR_S_CET: - case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: + case MSR_PL0_SSP ... MSR_ISST: case MSR_AMD64_LWP_CFG: case MSR_AMD64_LWP_CBADDR: case MSR_PPIN_CTL: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 12:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 12:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079833.1440512 (Exim 4.92) (envelope-from ) id 1umAUf-0001YF-HW; Wed, 13 Aug 2025 12:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079833.1440512; Wed, 13 Aug 2025 12:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umAUf-0001Y7-Eu; Wed, 13 Aug 2025 12:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1079833; Wed, 13 Aug 2025 12:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umAUe-0001Xx-JH for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umAUe-003M9m-19 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umAUe-002PSz-1W for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W0k0dKABj13xja983SPfq3DiKldkmDQltAJ9jM1k9sI=; b=Sui7Y7R54cQeBXONaPxr5HM4h0 TUyMQ5K6D8hQn6dnXW5LZ1QudyVtmNi7S/O4hzhebFm6aMNyamleIivuVvcCcdEImRpWtL6wqa7n1 uht66HOVNTR/sVbiv2RKsjJYKI1DYIF2AZFKGHJI1bW4eSIi6KepZBHyAmsnUfdypCcE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Rename wrmsr_ns() to wrmsrns(), and take 64bit value Message-Id: Date: Wed, 13 Aug 2025 12:22:12 +0000 commit 64d6d5cbf9484ff214bf9598ab885906211778c8 Author: Andrew Cooper AuthorDate: Thu Aug 7 13:36:24 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Aug 13 13:13:08 2025 +0100 x86/msr: Rename wrmsr_ns() to wrmsrns(), and take 64bit value In hindsight, having the wrapper name not be the instruction mnemonic was a poor choice. Also, PKRS turns out to be quite rare in wanting a split value. Switch to using a single 64bit value ahead of introducing new users. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 4 +++- xen/arch/x86/include/asm/prot-key.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 4c4f18b3a5..e185db0967 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -39,8 +39,10 @@ static inline void wrmsrl(unsigned int msr, uint64_t val) } /* Non-serialising WRMSR, when available. Falls back to a serialising WRMSR. */ -static inline void wrmsr_ns(uint32_t msr, uint32_t lo, uint32_t hi) +static inline void wrmsrns(uint32_t msr, uint64_t val) { + uint32_t lo = val, hi = val >> 32; + /* * WRMSR is 2 bytes. WRMSRNS is 3 bytes. Pad WRMSR with a redundant CS * prefix to avoid a trailing NOP. diff --git a/xen/arch/x86/include/asm/prot-key.h b/xen/arch/x86/include/asm/prot-key.h index 0cbecc2df4..3e9c2eaef4 100644 --- a/xen/arch/x86/include/asm/prot-key.h +++ b/xen/arch/x86/include/asm/prot-key.h @@ -72,14 +72,14 @@ static inline void wrpkrs(uint32_t pkrs) { *this_pkrs = pkrs; - wrmsr_ns(MSR_PKRS, pkrs, 0); + wrmsrns(MSR_PKRS, pkrs); } } static inline void wrpkrs_and_cache(uint32_t pkrs) { this_cpu(pkrs) = pkrs; - wrmsr_ns(MSR_PKRS, pkrs, 0); + wrmsrns(MSR_PKRS, pkrs); } #endif /* ASM_PROT_KEY_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 12:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 12:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079834.1440516 (Exim 4.92) (envelope-from ) id 1umAUp-0001ab-In; Wed, 13 Aug 2025 12:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079834.1440516; Wed, 13 Aug 2025 12:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umAUp-0001aT-GI; Wed, 13 Aug 2025 12:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1079834; Wed, 13 Aug 2025 12:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umAUo-0001aH-M2 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umAUo-003M9x-1R for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umAUo-002PTg-20 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 12:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iLjUkWXh9vCPJ1dYT8hytVTImP49hVxf+I8eqsZ8Pdk=; b=q32KvCKchnegamD2//X/LjZogw xOJw/YkfUZkBJRvHIKVZYMtfnAEr7EInHDF6BSpqB/Lpmj8bEjk0kg1kLzX2lwgKm1LB7fRgD3wID YNKKnbt9WUO9D0pxG0hw3ovXEbJfVnuPtffutCBSbMq5RAetpon+qAWLBvO0t2KjcURA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/idt: Minor improvements to _update_gate_addr_lower() Message-Id: Date: Wed, 13 Aug 2025 12:22:22 +0000 commit cf8fdef99f88cf36e19b065761f8bb8aedd28b92 Author: Andrew Cooper AuthorDate: Fri Mar 14 13:32:12 2025 +0000 Commit: Andrew Cooper CommitDate: Wed Aug 13 13:13:08 2025 +0100 x86/idt: Minor improvements to _update_gate_addr_lower() After some experimentation, using .a/.b makes far better logic than using the named fields, as both Clang and GCC spill idte to the stack when named fields are used. GCC seems to do something very daft for the addr1 field. It takes addr, shifts it by 32, then ANDs with 0xffff0000000000000UL, which requires manifesting a MOVABS. Clang follows the C, whereby it ANDs with $imm32, then shifts, avoiding the MOVABS entirely. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/idt.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/idt.h b/xen/arch/x86/include/asm/idt.h index f613d5693e..acb3613474 100644 --- a/xen/arch/x86/include/asm/idt.h +++ b/xen/arch/x86/include/asm/idt.h @@ -92,15 +92,16 @@ static inline void _set_gate_lower(idt_entry_t *gate, unsigned long type, * Update the lower half handler of an IDT entry, without changing any other * configuration. */ -static inline void _update_gate_addr_lower(idt_entry_t *gate, void *addr) +static inline void _update_gate_addr_lower(idt_entry_t *gate, void *_addr) { + unsigned long addr = (unsigned long)_addr; + unsigned int addr1 = addr & 0xffff0000U; /* GCC: force better codegen. */ idt_entry_t idte; - idte.a = gate->a; - idte.b = ((unsigned long)(addr) >> 32); - idte.a &= 0x0000FFFFFFFF0000ULL; - idte.a |= (((unsigned long)(addr) & 0xFFFF0000UL) << 32) | - ((unsigned long)(addr) & 0xFFFFUL); + idte.b = addr >> 32; + idte.a = gate->a & 0x0000ffffffff0000UL; + idte.a |= (unsigned long)addr1 << 32; + idte.a |= addr & 0xffff; _write_gate_lower(gate, &idte); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 13:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 13:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1079958.1440622 (Exim 4.92) (envelope-from ) id 1umBbE-0005GX-9n; Wed, 13 Aug 2025 13:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1079958.1440622; Wed, 13 Aug 2025 13:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umBbE-0005GP-7E; Wed, 13 Aug 2025 13:33:04 +0000 Received: by outflank-mailman (input) for mailman id 1079958; Wed, 13 Aug 2025 13:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umBbC-0005Fl-6R for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 13:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umBbB-003NTD-2j for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 13:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umBbC-002Smj-03 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 13:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qpjZ10hpQGT85t2DMG1yQapxNoJM9c6E6jDPsc6dKes=; b=Nzs7wvug5s2mCk9ErTz8sCf0S8 wRs0iPT/zYwiZwBKo5i6itBNpS7/5MX2nU9GNtKk4zAcs1cANKXBSyiDP3ismu83InyrEE4HRixso jghuFItaT3JC5CkkM3SqLJFhDXmXPi0YaboCgGxv0JIkm7PJcaeJz1yvOWoZPQm7oOgo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pdx: cast PAGE_SIZE value ahead of shifting Message-Id: Date: Wed, 13 Aug 2025 13:33:02 +0000 commit 4dd323029094d93dbc8d174fe744fd7f54f0a7a4 Author: Roger Pau Monne AuthorDate: Wed Aug 13 14:48:08 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Aug 13 15:03:19 2025 +0200 pdx: cast PAGE_SIZE value ahead of shifting Coverity complains that: In expression 0x1000 << bottom_shift, left shifting by more than 31 bits has undefined behavior. The shift amount, bottom_shift, is as much as 63. Cast PAGE_SIZE to paddr_t so it has the right width. Reported-by: Andrew Cooper Coverity ID: 1662707 Fixes: bac2000063ba ('x86-64: reduce range spanned by 1:1 mapping and frame table indexes') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/common/pdx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 9e6b36086f..06536cc639 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -274,7 +274,7 @@ bool __init pfn_pdx_compression_setup(paddr_t base) pfn_pdx_hole_shift = hole_shift; pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; + ma_va_bottom_mask = ((paddr_t)PAGE_SIZE << bottom_shift) - 1; pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 15:00:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 15:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1080018.1440636 (Exim 4.92) (envelope-from ) id 1umCxP-0006qR-FB; Wed, 13 Aug 2025 15:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1080018.1440636; Wed, 13 Aug 2025 15:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxP-0006q5-CX; Wed, 13 Aug 2025 15:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1080018; Wed, 13 Aug 2025 15:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxO-0006WF-CV for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umCxN-003PCG-2I for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umCxN-002X7M-2q for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+7zDW3TJAR1WT5C982jB2szDNkzsvQWv+lZFSDNnk3U=; b=lXFeGsJbjwhHGQ1R0lFXtUsY7k g4Mw+bpjP9pv6rcJORf+VUDTKQ28LAnVhjN806EKmYdSQfk0kLf8ockx9G7Ba+di0O/9dT9HVMn55 lbB3sWxvQfIIbTdgutvkBl6RQa+VU84rji4/9fc6iFXp1X/Q486koy8S8NR4tl7dzf2Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Rename MSR_INTERRUPT_SSP_TABLE to MSR_ISST Message-Id: Date: Wed, 13 Aug 2025 15:00:01 +0000 commit bd92e2151c19a01a237d7e447dc77210c2242840 Author: Andrew Cooper AuthorDate: Tue Dec 24 14:03:49 2024 +0000 Commit: Andrew Cooper CommitDate: Wed Aug 13 13:13:08 2025 +0100 x86/msr: Rename MSR_INTERRUPT_SSP_TABLE to MSR_ISST AMD call this whole structure the ISST, which is a better association with IST than the long form (which becomes ambiguous when abbreviated). No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/include/asm/msr-index.h | 2 +- xen/arch/x86/msr.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 97bdda1d4a..f6ec5c9df5 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -933,7 +933,7 @@ void load_system_tables(void) wrss(df_ssp, _p(df_ssp)); } - wrmsrl(MSR_INTERRUPT_SSP_TABLE, (unsigned long)ist_ssp); + wrmsrl(MSR_ISST, (unsigned long)ist_ssp); } BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 2e7e2aff9a..428d993ee8 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -157,7 +157,7 @@ #define MSR_PL1_SSP 0x000006a5 #define MSR_PL2_SSP 0x000006a6 #define MSR_PL3_SSP 0x000006a7 -#define MSR_INTERRUPT_SSP_TABLE 0x000006a8 +#define MSR_ISST 0x000006a8 #define MSR_PKRS 0x000006e1 diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 2cd46b6c8a..1bf117cbd8 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -138,7 +138,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_RTIT_OUTPUT_BASE ... MSR_RTIT_ADDR_B(7): case MSR_U_CET: case MSR_S_CET: - case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: + case MSR_PL0_SSP ... MSR_ISST: case MSR_AMD64_LWP_CFG: case MSR_AMD64_LWP_CBADDR: case MSR_PPIN_CTL: @@ -442,7 +442,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) case MSR_RTIT_OUTPUT_BASE ... MSR_RTIT_ADDR_B(7): case MSR_U_CET: case MSR_S_CET: - case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: + case MSR_PL0_SSP ... MSR_ISST: case MSR_AMD64_LWP_CFG: case MSR_AMD64_LWP_CBADDR: case MSR_PPIN_CTL: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 15:00:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 15:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1080019.1440640 (Exim 4.92) (envelope-from ) id 1umCxY-0007N7-GL; Wed, 13 Aug 2025 15:00:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1080019.1440640; Wed, 13 Aug 2025 15:00:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxY-0007Mz-Ds; Wed, 13 Aug 2025 15:00:12 +0000 Received: by outflank-mailman (input) for mailman id 1080019; Wed, 13 Aug 2025 15:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxY-0007Mr-1e for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umCxX-003PCN-2c for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umCxX-002X8Z-39 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GsUEOIe87+82RX0+n+hsKuxJQXRbXvc8sTZXMplB6Mo=; b=UoWpaDCE9vlgCJjNBmUCUI6XIt TTcFOK0MhVOjTfzjK/vbWRP3LQ0xbITwEmDlDsLBrh8/zdI2V1Xh+bN8RSbLLCKsWmQ6zXkN07nEm mL2g+Hz7r6H/M1Y0O97sNMLpd5xDfqsLLrDbRZfdlTKTRZDoODIiJqX8Rpc6HHMEx+Ms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Rename wrmsr_ns() to wrmsrns(), and take 64bit value Message-Id: Date: Wed, 13 Aug 2025 15:00:11 +0000 commit 64d6d5cbf9484ff214bf9598ab885906211778c8 Author: Andrew Cooper AuthorDate: Thu Aug 7 13:36:24 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Aug 13 13:13:08 2025 +0100 x86/msr: Rename wrmsr_ns() to wrmsrns(), and take 64bit value In hindsight, having the wrapper name not be the instruction mnemonic was a poor choice. Also, PKRS turns out to be quite rare in wanting a split value. Switch to using a single 64bit value ahead of introducing new users. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 4 +++- xen/arch/x86/include/asm/prot-key.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 4c4f18b3a5..e185db0967 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -39,8 +39,10 @@ static inline void wrmsrl(unsigned int msr, uint64_t val) } /* Non-serialising WRMSR, when available. Falls back to a serialising WRMSR. */ -static inline void wrmsr_ns(uint32_t msr, uint32_t lo, uint32_t hi) +static inline void wrmsrns(uint32_t msr, uint64_t val) { + uint32_t lo = val, hi = val >> 32; + /* * WRMSR is 2 bytes. WRMSRNS is 3 bytes. Pad WRMSR with a redundant CS * prefix to avoid a trailing NOP. diff --git a/xen/arch/x86/include/asm/prot-key.h b/xen/arch/x86/include/asm/prot-key.h index 0cbecc2df4..3e9c2eaef4 100644 --- a/xen/arch/x86/include/asm/prot-key.h +++ b/xen/arch/x86/include/asm/prot-key.h @@ -72,14 +72,14 @@ static inline void wrpkrs(uint32_t pkrs) { *this_pkrs = pkrs; - wrmsr_ns(MSR_PKRS, pkrs, 0); + wrmsrns(MSR_PKRS, pkrs); } } static inline void wrpkrs_and_cache(uint32_t pkrs) { this_cpu(pkrs) = pkrs; - wrmsr_ns(MSR_PKRS, pkrs, 0); + wrmsrns(MSR_PKRS, pkrs); } #endif /* ASM_PROT_KEY_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 15:00:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 15:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1080020.1440645 (Exim 4.92) (envelope-from ) id 1umCxj-0007PX-IT; Wed, 13 Aug 2025 15:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1080020.1440645; Wed, 13 Aug 2025 15:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxj-0007PP-FM; Wed, 13 Aug 2025 15:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1080020; Wed, 13 Aug 2025 15:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxi-0007PF-6P for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umCxh-003PCW-36 for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umCxi-002X98-0F for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hknZ96cEh7rKnPmbgO9PLH0cdo0MoEKilU1VncBB6Js=; b=MxT3DwlmW7Q8/NVkGukB5f1elN GekBiQvQDGKWu9yqiJtHK/QXuvY4kryGJit+cYAHhecIeig52GAKrTVmvP1JPseU5tTcmA6fh8Xhj oL4gP+eFYIX/5Ez37IS27XVfPyUv6Irmk4QLbOPHMKdCsmY1Zt9g29vThymwfmGri5OY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/idt: Minor improvements to _update_gate_addr_lower() Message-Id: Date: Wed, 13 Aug 2025 15:00:22 +0000 commit cf8fdef99f88cf36e19b065761f8bb8aedd28b92 Author: Andrew Cooper AuthorDate: Fri Mar 14 13:32:12 2025 +0000 Commit: Andrew Cooper CommitDate: Wed Aug 13 13:13:08 2025 +0100 x86/idt: Minor improvements to _update_gate_addr_lower() After some experimentation, using .a/.b makes far better logic than using the named fields, as both Clang and GCC spill idte to the stack when named fields are used. GCC seems to do something very daft for the addr1 field. It takes addr, shifts it by 32, then ANDs with 0xffff0000000000000UL, which requires manifesting a MOVABS. Clang follows the C, whereby it ANDs with $imm32, then shifts, avoiding the MOVABS entirely. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/idt.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/idt.h b/xen/arch/x86/include/asm/idt.h index f613d5693e..acb3613474 100644 --- a/xen/arch/x86/include/asm/idt.h +++ b/xen/arch/x86/include/asm/idt.h @@ -92,15 +92,16 @@ static inline void _set_gate_lower(idt_entry_t *gate, unsigned long type, * Update the lower half handler of an IDT entry, without changing any other * configuration. */ -static inline void _update_gate_addr_lower(idt_entry_t *gate, void *addr) +static inline void _update_gate_addr_lower(idt_entry_t *gate, void *_addr) { + unsigned long addr = (unsigned long)_addr; + unsigned int addr1 = addr & 0xffff0000U; /* GCC: force better codegen. */ idt_entry_t idte; - idte.a = gate->a; - idte.b = ((unsigned long)(addr) >> 32); - idte.a &= 0x0000FFFFFFFF0000ULL; - idte.a |= (((unsigned long)(addr) & 0xFFFF0000UL) << 32) | - ((unsigned long)(addr) & 0xFFFFUL); + idte.b = addr >> 32; + idte.a = gate->a & 0x0000ffffffff0000UL; + idte.a |= (unsigned long)addr1 << 32; + idte.a |= addr & 0xffff; _write_gate_lower(gate, &idte); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 13 15:00:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Aug 2025 15:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1080021.1440648 (Exim 4.92) (envelope-from ) id 1umCxt-0007SK-JN; Wed, 13 Aug 2025 15:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1080021.1440648; Wed, 13 Aug 2025 15:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxt-0007SC-Gn; Wed, 13 Aug 2025 15:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1080021; Wed, 13 Aug 2025 15:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umCxs-0007Rn-Cd for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umCxs-003PCf-0J for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umCxs-002X9d-0i for xen-changelog@lists.xenproject.org; Wed, 13 Aug 2025 15:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zyZPLM37LyAgTo50RDeXqd5/8N7CTLyYuTrnJPksPy4=; b=n31Wp+ceSJg6Y1xJKN9Ti2alUN awpkX5AD1KNx0bRsG/AuUuc8RTfao4um6/0WQFBldATA2eYDionnKAgfSP6fAW6Ct1nbf+jR4oZc8 YN4BMRl3gF1RQIydCFdSUwMkCMKqBgu0Km1JuUNQQ0S3WWcpUN4y5vVFwBZZ1xhcn1wM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pdx: cast PAGE_SIZE value ahead of shifting Message-Id: Date: Wed, 13 Aug 2025 15:00:32 +0000 commit 4dd323029094d93dbc8d174fe744fd7f54f0a7a4 Author: Roger Pau Monne AuthorDate: Wed Aug 13 14:48:08 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Aug 13 15:03:19 2025 +0200 pdx: cast PAGE_SIZE value ahead of shifting Coverity complains that: In expression 0x1000 << bottom_shift, left shifting by more than 31 bits has undefined behavior. The shift amount, bottom_shift, is as much as 63. Cast PAGE_SIZE to paddr_t so it has the right width. Reported-by: Andrew Cooper Coverity ID: 1662707 Fixes: bac2000063ba ('x86-64: reduce range spanned by 1:1 mapping and frame table indexes') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/common/pdx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 9e6b36086f..06536cc639 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -274,7 +274,7 @@ bool __init pfn_pdx_compression_setup(paddr_t base) pfn_pdx_hole_shift = hole_shift; pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; + ma_va_bottom_mask = ((paddr_t)PAGE_SIZE << bottom_shift) - 1; pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 12:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 12:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081666.1441672 (Exim 4.92) (envelope-from ) id 1umXTz-00051v-2H; Thu, 14 Aug 2025 12:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081666.1441672; Thu, 14 Aug 2025 12:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXTy-00051n-W2; Thu, 14 Aug 2025 12:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1081666; Thu, 14 Aug 2025 12:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXTy-00051h-Gk for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umXTy-0052kH-06 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umXTy-003YV9-0Q for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nkEHI0TATLZ+0Apx2AllP7VVdsnly+xs1AXFWQ9fOFE=; b=lVyk/ngvyUbrlknMAuMijOvrJh QAJVJXwyzbW9ellSZ0u74Q3qe4Xmo6pQO7xPDWgMxgfLZi9ypYv1qNX5VUbJUgBR5P1RhW9dyFg7a pdcWW3MxjkLTRTg2DLaFm+K8SlMJEyoef5ChImrl56VQO+BwrDjpgNKJB9CLLC6eCBvg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: drop detection of ld supporting SORT_BY_INIT_PRIORITY() Message-Id: Date: Thu, 14 Aug 2025 12:55:02 +0000 commit e0de9ceb068978ee13d9c2193a4202e2e859f489 Author: Jan Beulich AuthorDate: Thu Aug 14 11:34:56 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:34:56 2025 +0200 x86: drop detection of ld supporting SORT_BY_INIT_PRIORITY() GNU ld 2.25 supports this, and we already assume all lld versions do. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/arch.mk | 10 ---------- xen/arch/x86/xen.lds.S | 4 ---- 2 files changed, 14 deletions(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 2c17dba754..16368a498b 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -72,16 +72,6 @@ ifeq ($(CONFIG_UBSAN),y) $(call cc-option-add,CFLAGS_UBSAN,CC,-fno-sanitize=alignment) endif -ifeq ($(CONFIG_LD_IS_GNU),y) -# While not much better than going by raw GNU ld version, utilize that the -# feature we're after has appeared in the same release as the -# --print-output-format command line option. -AFLAGS-$(call ld-option,--print-output-format) += -DHAVE_LD_SORT_BY_INIT_PRIORITY -else -# Assume all versions of LLD support this. -AFLAGS += -DHAVE_LD_SORT_BY_INIT_PRIORITY -endif - ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) efi-check := arch/x86/efi/check diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8e9cac75b0..966e514f20 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -35,10 +35,6 @@ ENTRY(start_pa) # define SECTION_ALIGN PAGE_SIZE #endif -#ifndef HAVE_LD_SORT_BY_INIT_PRIORITY -# define SORT_BY_INIT_PRIORITY SORT -#endif - OUTPUT_FORMAT(FORMAT, FORMAT, FORMAT) OUTPUT_ARCH(i386:x86-64) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 12:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 12:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081667.1441676 (Exim 4.92) (envelope-from ) id 1umXU9-00053N-3a; Thu, 14 Aug 2025 12:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081667.1441676; Thu, 14 Aug 2025 12:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXU9-00053F-15; Thu, 14 Aug 2025 12:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1081667; Thu, 14 Aug 2025 12:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXU8-000537-C2 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umXU8-0052kL-0Q for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umXU8-003YVV-0x for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lt4fjjRQL0lwHlvl1JS6HpFSrMxWZAOqKWVMdLJSvfA=; b=Mg7NLWnQ7OvdrICXfKbPjnHl0P osa4wm8weDCrb/QAyNyU7ViHxccPf1+ndXwL6x9QNV5Ag/topxnaQOoti7I80AFawBLmEN8n5eHOR Ur0vZM49s5ivT511q7NSRom0D0/e6m0+oC0IOQwO7glW+Tr9TSuMXCpXElF9yxj7HKzc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Remove unused symbols from linker script Message-Id: Date: Thu, 14 Aug 2025 12:55:12 +0000 commit 2c0ca5956f9c2b421f8ae9c73040ab6b55443f9b Author: Frediano Ziglio AuthorDate: Thu Aug 14 11:36:10 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:36:10 2025 +0200 x86/boot: Remove unused symbols from linker script The symbols declared with DECLARE_IMPORT are meant to be used by the 32 bit code. The __base_relocs_{start,end} symbols were not used by the code. No functional changes. Reported-by: Jan Beulich Signed-off-by: Frediano Ziglio Reviewed-by: Andrew Cooper --- xen/arch/x86/boot/build32.lds.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/x86/boot/build32.lds.S b/xen/arch/x86/boot/build32.lds.S index 1e59732edd..e4f7c7fc2f 100644 --- a/xen/arch/x86/boot/build32.lds.S +++ b/xen/arch/x86/boot/build32.lds.S @@ -43,8 +43,6 @@ SECTIONS * Attention should be paid to pointers taking care of possible later * relocation. */ - DECLARE_IMPORT(__base_relocs_start); - DECLARE_IMPORT(__base_relocs_end); DECLARE_IMPORT(__trampoline_rel_start); DECLARE_IMPORT(__trampoline_rel_stop); DECLARE_IMPORT(__trampoline_seg_start); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 12:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 12:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081668.1441681 (Exim 4.92) (envelope-from ) id 1umXUJ-00055o-56; Thu, 14 Aug 2025 12:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081668.1441681; Thu, 14 Aug 2025 12:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXUJ-00055g-2R; Thu, 14 Aug 2025 12:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1081668; Thu, 14 Aug 2025 12:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXUI-00055a-FP for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umXUI-0052ki-0j for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umXUI-003YWW-1G for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rljSC7snBMcqBiVFfVzk2BxODxZqfYdmGFfG6HP1A8Q=; b=KVbKutcjT0Ki01dOuSvEYzaNmK LDTc09Qa9WtF2iuEi8KR1op7rXGRC4iBjHKI9NWYREy+r0cjYCSUVa4FxN5a0vyE5Rhqx7pt91kf9 /nMGlyedzfBooEnFzNdB72P/rQlWhFEpOldXFMp5fhg1p1Bn5NGuTviyq/1u4lMGo2NM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/compiler: drop alternative unreachable() definition for older GCC Message-Id: Date: Thu, 14 Aug 2025 12:55:22 +0000 commit 900d422775720dfd659834bdaf52db4b98ba4529 Author: Nicola Vetrini AuthorDate: Thu Aug 14 11:36:27 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:36:27 2025 +0200 xen/compiler: drop alternative unreachable() definition for older GCC The GCC baseline version is 5.1, which supports __builtin_unreachable(), therefore the alternative definition can be dropped Signed-off-by: Nicola Vetrini Reviewed-by: Andrew Cooper --- xen/include/xen/compiler.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 735c844d2d..88bf26bc51 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -47,11 +47,7 @@ # define cf_check #endif -#if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) -#define unreachable() do {} while (1) -#else #define unreachable() __builtin_unreachable() -#endif /* * Compilers estimate the size of an asm() block for inlining purposes. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 12:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 12:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081669.1441685 (Exim 4.92) (envelope-from ) id 1umXUT-00058I-6X; Thu, 14 Aug 2025 12:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081669.1441685; Thu, 14 Aug 2025 12:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXUT-00058B-3r; Thu, 14 Aug 2025 12:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1081669; Thu, 14 Aug 2025 12:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umXUS-000584-K2 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umXUS-0052km-10 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umXUS-003YX7-1a for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 12:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=30YgLl0+BCyDnZq/KnFdn9rK6mKDMr6aYHx32pN5ZQg=; b=nAnvtmHqDw0F+DGbyZKgbTzBXp bkNJjBfSKJl8pzbVde1+oBB+CsGGss9DdKD4HBLSuf3MFZbcvBhPLB5NZOAPMiUhB8Po9sCQYCDcA xDhovUakVGJIvJqCyylxBGv17BhoveMCBzoiskUIErkiDYVTVAwIJAFwmUxQ85MNOrSs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/macros: Drop alternative definition of BUILD_BUG_ON(_ZERO)? for old GCC Message-Id: Date: Thu, 14 Aug 2025 12:55:32 +0000 commit b979189a67637a6a6553ddfb81bea9741bfe9b6a Author: Nicola Vetrini AuthorDate: Thu Aug 14 11:36:44 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:36:44 2025 +0200 xen/macros: Drop alternative definition of BUILD_BUG_ON(_ZERO)? for old GCC The toolchain baseline for GCC is 5.1, which supports _Static_assert in c99 mode No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Andrew Cooper --- xen/include/xen/macros.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index cd528fbdb1..f9ccde86fb 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -40,9 +40,6 @@ #ifndef __ASSEMBLY__ -/* All clang versions supported by Xen have _Static_assert. */ -#if defined(__clang__) || \ - (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* Force a compilation error if condition is true */ #define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) @@ -54,11 +51,6 @@ */ #define BUILD_BUG_ON_ZERO(cond) \ (sizeof(struct { char c; _Static_assert(!(cond), "!(" #cond ")"); }) & 0) -#else -#define BUILD_BUG_ON_ZERO(cond) \ - (sizeof(struct { unsigned u : !(cond); }) & 0) -#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) -#endif /* * Force a compilation error. This is for code which, in the normal case, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 15:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 15:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081945.1441897 (Exim 4.92) (envelope-from ) id 1umZmF-0001S5-Vq; Thu, 14 Aug 2025 15:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081945.1441897; Thu, 14 Aug 2025 15:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmF-0001Rx-TB; Thu, 14 Aug 2025 15:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1081945; Thu, 14 Aug 2025 15:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmE-0001Rn-KX for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umZmE-0055ae-0d for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umZmE-003fF5-1B for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tjiHfI2UPVsu5eFAbRVoF2a6w7Wz2o4G8lpVrsqIllg=; b=BKtFPJW8CFDMg4DxZF84DtkaFo oZD0nSd40NUAW9aK6h/KBTIH0sLSK7E6ENyK+yMmivzyE72f1M3PmA9f7/A2k3zbMEyrm1XijrDGU SNlQoHjiQEIUIINpldROUhFXewdwfADR3X9cpgtQQP0PmMO7dar6BsL0+HFe8PeZwiNY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop detection of ld supporting SORT_BY_INIT_PRIORITY() Message-Id: Date: Thu, 14 Aug 2025 15:22:02 +0000 commit e0de9ceb068978ee13d9c2193a4202e2e859f489 Author: Jan Beulich AuthorDate: Thu Aug 14 11:34:56 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:34:56 2025 +0200 x86: drop detection of ld supporting SORT_BY_INIT_PRIORITY() GNU ld 2.25 supports this, and we already assume all lld versions do. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/arch.mk | 10 ---------- xen/arch/x86/xen.lds.S | 4 ---- 2 files changed, 14 deletions(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 2c17dba754..16368a498b 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -72,16 +72,6 @@ ifeq ($(CONFIG_UBSAN),y) $(call cc-option-add,CFLAGS_UBSAN,CC,-fno-sanitize=alignment) endif -ifeq ($(CONFIG_LD_IS_GNU),y) -# While not much better than going by raw GNU ld version, utilize that the -# feature we're after has appeared in the same release as the -# --print-output-format command line option. -AFLAGS-$(call ld-option,--print-output-format) += -DHAVE_LD_SORT_BY_INIT_PRIORITY -else -# Assume all versions of LLD support this. -AFLAGS += -DHAVE_LD_SORT_BY_INIT_PRIORITY -endif - ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) efi-check := arch/x86/efi/check diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8e9cac75b0..966e514f20 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -35,10 +35,6 @@ ENTRY(start_pa) # define SECTION_ALIGN PAGE_SIZE #endif -#ifndef HAVE_LD_SORT_BY_INIT_PRIORITY -# define SORT_BY_INIT_PRIORITY SORT -#endif - OUTPUT_FORMAT(FORMAT, FORMAT, FORMAT) OUTPUT_ARCH(i386:x86-64) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 15:22:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 15:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081946.1441901 (Exim 4.92) (envelope-from ) id 1umZmQ-0001Tq-17; Thu, 14 Aug 2025 15:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081946.1441901; Thu, 14 Aug 2025 15:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmP-0001Tj-Ui; Thu, 14 Aug 2025 15:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1081946; Thu, 14 Aug 2025 15:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmO-0001TZ-Gz for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umZmO-0055aj-0v for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umZmO-003fFg-1T for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PDfa9dwQYnWTYuIFiTq3mhssr8fMG96N7k17ipSWVDc=; b=Q1jQfw5Eqag+Jue56HFx0NGlDe Q1IERFKU52Vp0ZdNJJJxG27b8B/r4Up2wpGmXKnvtfSy6CdgADbib7nJtlUV6bgMfyxOdU+bNakDp 3VlAI2GYV2xs78UKRcrueFsDwp8QQPw9Amx3OqXWiJzy9ILKqzjHPqwFAnclMgKHJIsM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Remove unused symbols from linker script Message-Id: Date: Thu, 14 Aug 2025 15:22:12 +0000 commit 2c0ca5956f9c2b421f8ae9c73040ab6b55443f9b Author: Frediano Ziglio AuthorDate: Thu Aug 14 11:36:10 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:36:10 2025 +0200 x86/boot: Remove unused symbols from linker script The symbols declared with DECLARE_IMPORT are meant to be used by the 32 bit code. The __base_relocs_{start,end} symbols were not used by the code. No functional changes. Reported-by: Jan Beulich Signed-off-by: Frediano Ziglio Reviewed-by: Andrew Cooper --- xen/arch/x86/boot/build32.lds.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/x86/boot/build32.lds.S b/xen/arch/x86/boot/build32.lds.S index 1e59732edd..e4f7c7fc2f 100644 --- a/xen/arch/x86/boot/build32.lds.S +++ b/xen/arch/x86/boot/build32.lds.S @@ -43,8 +43,6 @@ SECTIONS * Attention should be paid to pointers taking care of possible later * relocation. */ - DECLARE_IMPORT(__base_relocs_start); - DECLARE_IMPORT(__base_relocs_end); DECLARE_IMPORT(__trampoline_rel_start); DECLARE_IMPORT(__trampoline_rel_stop); DECLARE_IMPORT(__trampoline_seg_start); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 15:22:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 15:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081947.1441904 (Exim 4.92) (envelope-from ) id 1umZma-0001W7-2j; Thu, 14 Aug 2025 15:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081947.1441904; Thu, 14 Aug 2025 15:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZma-0001Vz-01; Thu, 14 Aug 2025 15:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1081947; Thu, 14 Aug 2025 15:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmY-0001Vn-JX for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umZmY-0055bG-1B for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umZmY-003fGA-1l for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=S7G1VsV/xbWAz5LOikO5dXrbldBOdPXaMqKiYS7WowM=; b=yw606up2UiHVXcWmyNZ1B7HUAI WZWBjdsMQVMQzSqG0g7AAF950yNirIzKWlCrqYQBljA8clTpWBomUSbCMylRarVc77WrFk00ELTdt HwkY4g/sWFcoSprES1sm3+N7TZVDLUAmRidAOLahpVFPYDaJ+434n3tW4NnZGEUICmYI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/compiler: drop alternative unreachable() definition for older GCC Message-Id: Date: Thu, 14 Aug 2025 15:22:22 +0000 commit 900d422775720dfd659834bdaf52db4b98ba4529 Author: Nicola Vetrini AuthorDate: Thu Aug 14 11:36:27 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:36:27 2025 +0200 xen/compiler: drop alternative unreachable() definition for older GCC The GCC baseline version is 5.1, which supports __builtin_unreachable(), therefore the alternative definition can be dropped Signed-off-by: Nicola Vetrini Reviewed-by: Andrew Cooper --- xen/include/xen/compiler.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 735c844d2d..88bf26bc51 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -47,11 +47,7 @@ # define cf_check #endif -#if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) -#define unreachable() do {} while (1) -#else #define unreachable() __builtin_unreachable() -#endif /* * Compilers estimate the size of an asm() block for inlining purposes. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 15:22:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 15:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081948.1441909 (Exim 4.92) (envelope-from ) id 1umZmk-0001Yb-4C; Thu, 14 Aug 2025 15:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081948.1441909; Thu, 14 Aug 2025 15:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmk-0001YT-1L; Thu, 14 Aug 2025 15:22:34 +0000 Received: by outflank-mailman (input) for mailman id 1081948; Thu, 14 Aug 2025 15:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umZmi-0001YH-MI for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umZmi-0055bK-1S for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umZmi-003fGa-22 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OqPWA7UPKqtStSFgAZaVblPsd9Eg+6Iz4cMQ7jA4U/Q=; b=J+w6LSZXxUHR2IOzcYS0QRROLO iN71jIeR1QSRBjO6Ci6evtvQYwlNtC9nEWBR/QvMy4+qdwxQkYO6QsUKbwz12tCdET0Z3S+E/zav/ TtoY6DyHjhoTdXd8wUvs8t9bb0q+Il76saEiGNLIoTzr+BdFvb5Ysltmc87Omz6FiQ/s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/macros: Drop alternative definition of BUILD_BUG_ON(_ZERO)? for old GCC Message-Id: Date: Thu, 14 Aug 2025 15:22:32 +0000 commit b979189a67637a6a6553ddfb81bea9741bfe9b6a Author: Nicola Vetrini AuthorDate: Thu Aug 14 11:36:44 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 14 11:36:44 2025 +0200 xen/macros: Drop alternative definition of BUILD_BUG_ON(_ZERO)? for old GCC The toolchain baseline for GCC is 5.1, which supports _Static_assert in c99 mode No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Andrew Cooper --- xen/include/xen/macros.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index cd528fbdb1..f9ccde86fb 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -40,9 +40,6 @@ #ifndef __ASSEMBLY__ -/* All clang versions supported by Xen have _Static_assert. */ -#if defined(__clang__) || \ - (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* Force a compilation error if condition is true */ #define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) @@ -54,11 +51,6 @@ */ #define BUILD_BUG_ON_ZERO(cond) \ (sizeof(struct { char c; _Static_assert(!(cond), "!(" #cond ")"); }) & 0) -#else -#define BUILD_BUG_ON_ZERO(cond) \ - (sizeof(struct { unsigned u : !(cond); }) & 0) -#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) -#endif /* * Force a compilation error. This is for code which, in the normal case, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 15:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 15:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1081961.1441923 (Exim 4.92) (envelope-from ) id 1umaIB-0006uK-ID; Thu, 14 Aug 2025 15:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1081961.1441923; Thu, 14 Aug 2025 15:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umaIB-0006uC-FS; Thu, 14 Aug 2025 15:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1081961; Thu, 14 Aug 2025 15:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umaI9-0006u3-RQ for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umaI9-0056Cp-1R for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umaI9-003gta-1s for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 15:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GyNgVaIydfkiGdHoPP/2n08mMb8nd748fM/zXK/GIA0=; b=R1QwqarRmm+6Vh1STausT7PkKZ zZNzy/4ZInfCGFhWw97O2BwFEM04N7eXz98sQHkCJc7C6dnRKVwRMN6R579lS7MS1UwhV/SwiVJST H+fFJpemW3C2q8Z0xUq5MSOAoic+wpL7KC//qjfQpXNTlgKfK4/saXQ/62NpO8+Q5D2k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tests/pdx: define PAGE_SIZE as long Message-Id: Date: Thu, 14 Aug 2025 15:55:01 +0000 commit 477c66424129d71e7a0a4d63fcdae64751992546 Author: Roger Pau Monne AuthorDate: Thu Aug 14 16:06:14 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu Aug 14 17:51:13 2025 +0200 tests/pdx: define PAGE_SIZE as long Otherwise Coverity complains about possibly shifting an integer more than 31 bits. This also reverts the previous attempt to fix this Coverity reported issue, commit 4dd323029094d93dbc8d174fe744fd7f54f0a7a4. Suggested-by: Jan Beulich Coverity ID: 1662707 Fixes: cb50e4033717 ('test/pdx: add PDX compression unit tests') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- tools/tests/pdx/harness.h | 2 +- xen/common/pdx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h index 5bef7df650..a8852ac453 100644 --- a/tools/tests/pdx/harness.h +++ b/tools/tests/pdx/harness.h @@ -33,7 +33,7 @@ #define PAGE_SHIFT 12 /* Some libcs define PAGE_SIZE in limits.h. */ #undef PAGE_SIZE -#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_SIZE (1L << PAGE_SHIFT) #define MAX_ORDER 18 /* 2 * PAGETABLE_ORDER (9) */ #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 06536cc639..9e6b36086f 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -274,7 +274,7 @@ bool __init pfn_pdx_compression_setup(paddr_t base) pfn_pdx_hole_shift = hole_shift; pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = ((paddr_t)PAGE_SIZE << bottom_shift) - 1; + ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 17:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 17:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1082100.1442006 (Exim 4.92) (envelope-from ) id 1umbeM-0005pS-RA; Thu, 14 Aug 2025 17:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1082100.1442006; Thu, 14 Aug 2025 17:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umbeM-0005pJ-OV; Thu, 14 Aug 2025 17:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1082100; Thu, 14 Aug 2025 17:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umbeL-0005pD-H3 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 17:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umbeL-0058Rj-0W for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 17:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umbeL-003q29-11 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 17:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/VcHenCJHN9yROVbmALrrMjJQcLJEAbMtUYaCzeC8us=; b=oUo98HLBHFv2naAutF7GONJu3W zQwcPyE+JVqqWNbGuEijApWzO23xUaEZDWxyNpoAzmeXWGIu+FrA6fHiwxofq07yr/Su9P276fTJP QHrM6/cxF5LoocmOXNak9PP9KKYF1YgSwi14g6ZRr+JJW1biqvkDz3v+EpGWoEGh6Zpc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tests/pdx: define PAGE_SIZE as long Message-Id: Date: Thu, 14 Aug 2025 17:22:01 +0000 commit 477c66424129d71e7a0a4d63fcdae64751992546 Author: Roger Pau Monne AuthorDate: Thu Aug 14 16:06:14 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu Aug 14 17:51:13 2025 +0200 tests/pdx: define PAGE_SIZE as long Otherwise Coverity complains about possibly shifting an integer more than 31 bits. This also reverts the previous attempt to fix this Coverity reported issue, commit 4dd323029094d93dbc8d174fe744fd7f54f0a7a4. Suggested-by: Jan Beulich Coverity ID: 1662707 Fixes: cb50e4033717 ('test/pdx: add PDX compression unit tests') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- tools/tests/pdx/harness.h | 2 +- xen/common/pdx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h index 5bef7df650..a8852ac453 100644 --- a/tools/tests/pdx/harness.h +++ b/tools/tests/pdx/harness.h @@ -33,7 +33,7 @@ #define PAGE_SHIFT 12 /* Some libcs define PAGE_SIZE in limits.h. */ #undef PAGE_SIZE -#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_SIZE (1L << PAGE_SHIFT) #define MAX_ORDER 18 /* 2 * PAGETABLE_ORDER (9) */ #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 06536cc639..9e6b36086f 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -274,7 +274,7 @@ bool __init pfn_pdx_compression_setup(paddr_t base) pfn_pdx_hole_shift = hole_shift; pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = ((paddr_t)PAGE_SIZE << bottom_shift) - 1; + ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 20:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 20:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1082555.1442351 (Exim 4.92) (envelope-from ) id 1umeyW-00047G-2F; Thu, 14 Aug 2025 20:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1082555.1442351; Thu, 14 Aug 2025 20:55:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeyV-000478-Va; Thu, 14 Aug 2025 20:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1082555; Thu, 14 Aug 2025 20:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeyU-000472-Fy for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umeyT-005Cx5-2t for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umeyU-003zKR-0A for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Lw9HZmkUnW90PLzngC5SFv7SYubligfNSi1Y9jDsvDk=; b=m7QXDcRhtCjDmxnC+M0oC8SRDU MFsYHqzdBmtkYA+Ws/i7sxGoy8b3o4nwOB/moIfsaWficMzM1v9efEKMsydxaAAAkKyJgwCiaFJ7H Pxierdw54pDVdEqK4OvULhPGd7F16n3DGJXxCAydEXSMWZDNlzD6zspZkYVdMWR5GvNg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Drop incorrect BUILD_BUG_ON() and comment in load_system_tables() Message-Id: Date: Thu, 14 Aug 2025 20:55:02 +0000 commit 0630cde32fe5e0e2557410f201da8c35e5487c52 Author: Andrew Cooper AuthorDate: Mon Jan 6 10:59:19 2025 +0000 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/traps: Drop incorrect BUILD_BUG_ON() and comment in load_system_tables() This was added erroneously by me. Hardware task switching does demand a TSS of at least 0x67 bytes, but that's not relevant in 64bit, and not relevant for Xen since commit 5d1181a5ea5e ("xen: Remove x86_32 build target.") in 2012. We already load a 0-length TSS in early_traps_init() demonstrating that it's possible. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f6ec5c9df5..cdc41248d4 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -936,8 +936,6 @@ void load_system_tables(void) wrmsrl(MSR_ISST, (unsigned long)ist_ssp); } - BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ - _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_avail); if ( IS_ENABLED(CONFIG_PV32) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 20:55:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 20:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1082556.1442356 (Exim 4.92) (envelope-from ) id 1umeyg-000496-3i; Thu, 14 Aug 2025 20:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1082556.1442356; Thu, 14 Aug 2025 20:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeyg-00048y-0j; Thu, 14 Aug 2025 20:55:14 +0000 Received: by outflank-mailman (input) for mailman id 1082556; Thu, 14 Aug 2025 20:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeye-00048c-7i for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umeye-005CxB-00 for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umeye-003zKn-0W for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tmwqzyraPty4KVB6aWCE8BmJRWIkorIJhC2s9wNHt6E=; b=pvPoo1LxKBR0XkH0mqlQ/x1tvZ iqI/BUyEQISIIK232xkExQFGnMXvwN5cL2dMLvGaf63uM0QZkuWwUKcMBKYEpUlpGAqDkHegUpRGc G797ersPK7ckfDaIEuLPZddYt8bTfqe9funia0xaM8g5T1RPuWJtF+i9u3/cPZERiSU0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Rename early_traps_init() to bsp_early_traps_init() Message-Id: Date: Thu, 14 Aug 2025 20:55:12 +0000 commit f4ef9e3d032c96bc6e5232fc2bfdb4b3a2e25662 Author: Andrew Cooper AuthorDate: Fri May 23 13:40:01 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/traps: Rename early_traps_init() to bsp_early_traps_init() We're going to want to introduce a percpu version shortly. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/traps.h | 2 +- xen/arch/x86/setup.c | 2 +- xen/arch/x86/traps-setup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 72c33a33e2..7414420e57 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -7,7 +7,7 @@ #ifndef ASM_TRAP_H #define ASM_TRAP_H -void early_traps_init(void); +void bsp_early_traps_init(void); void traps_init(void); void percpu_traps_init(void); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 1543dd251c..64f02699e1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1134,7 +1134,7 @@ void asmlinkage __init noreturn __start_xen(void) percpu_init_areas(); - early_traps_init(); + bsp_early_traps_init(); smp_prepare_boot_cpu(); sort_exception_tables(); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index a8385b26ae..7713f427d3 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -62,7 +62,7 @@ static void __init init_ler(void) * boot_gdt is already loaded, and bsp_idt[] is constructed without IST * settings, so we don't need a TSS configured yet. */ -void __init early_traps_init(void) +void __init bsp_early_traps_init(void) { const struct desc_ptr idtr = { .base = (unsigned long)bsp_idt, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 20:55:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 20:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1082558.1442369 (Exim 4.92) (envelope-from ) id 1umeyq-0004PL-Bg; Thu, 14 Aug 2025 20:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1082558.1442369; Thu, 14 Aug 2025 20:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeyq-0004PC-8f; Thu, 14 Aug 2025 20:55:24 +0000 Received: by outflank-mailman (input) for mailman id 1082558; Thu, 14 Aug 2025 20:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeyo-0004B4-Ae for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umeyo-005CxJ-0I for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umeyo-003zLC-0s for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/cFxCKohe4GcklGIV0iiCV8EhTC+wuOL8fre9LgVk98=; b=WgmExGSQrJvG04bA5O8ZUgbnVe wdVQNm0vFV6sBfbI52OEORklN+cgJyxBMANkXJExZvkuq538ixYFZHt8pm4WyPvkQABS/0OJhnuH/ BUs360ChfP/tElFnkwjQ0z1vBMcnIRtLtlPrBeygZtxc1PspVVDQOUXgR6bTIQDDB9Iw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Introduce bsp_traps_reinit() Message-Id: Date: Thu, 14 Aug 2025 20:55:22 +0000 commit be90b7a77f444892e8e9bd3d2024ecf04da05aaf Author: Andrew Cooper AuthorDate: Fri Aug 8 15:01:56 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/traps: Introduce bsp_traps_reinit() ... to abstract away updating the refereces to the old BSP stack. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/traps.h | 1 + xen/arch/x86/setup.c | 6 +----- xen/arch/x86/traps-setup.c | 9 +++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 7414420e57..6ae451d3fc 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -9,6 +9,7 @@ void bsp_early_traps_init(void); void traps_init(void); +void bsp_traps_reinit(void); void percpu_traps_init(void); extern unsigned int ler_msr; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 64f02699e1..c8c408e024 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -902,11 +902,7 @@ static void __init noreturn reinit_bsp_stack(void) unsigned long *stack = (void*)(get_stack_bottom() & ~(STACK_SIZE - 1)); int rc; - /* Update TSS and ISTs */ - load_system_tables(); - - /* Update SYSCALL trampolines */ - percpu_traps_init(); + bsp_traps_reinit(); stack_base[0] = stack; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 7713f427d3..99257bbb16 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -107,6 +107,15 @@ void __init traps_init(void) percpu_traps_init(); } +/* + * Re-initialise all state referencing the early-boot stack. + */ +void __init bsp_traps_reinit(void) +{ + load_system_tables(); + percpu_traps_init(); +} + /* * Set up per-CPU linkage registers for exception, interrupt and syscall * handling. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 14 20:55:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Aug 2025 20:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1082560.1442372 (Exim 4.92) (envelope-from ) id 1umez0-0004Uf-CS; Thu, 14 Aug 2025 20:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1082560.1442372; Thu, 14 Aug 2025 20:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umez0-0004UX-9x; Thu, 14 Aug 2025 20:55:34 +0000 Received: by outflank-mailman (input) for mailman id 1082560; Thu, 14 Aug 2025 20:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umeyy-0004Th-DX for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umeyy-005Cxl-0a for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umeyy-003zLh-1A for xen-changelog@lists.xenproject.org; Thu, 14 Aug 2025 20:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2WJ/sZWUm407vydAjv+9JOMslF88SPidzOml+EFM6+c=; b=3vv5aISka8ZPOC65VK97o82qgc 1EpEVv/jHKo4Tn4Ux8UCOKeQc84cf4k0kveaYlxnAMKT+uDTEICKtZBYxv6XLFeYX9gRy+Km66Fso aZlJWO9gMyqKxgeL1tHVo1ge48/rLztzfi5jb9W9qc27Ub6Nw84VAgqwOqxJm3fVqy4E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/current: Annotate get_cpu_info() as attr_const Message-Id: Date: Thu, 14 Aug 2025 20:55:32 +0000 commit b2c0dc44b37516b758c38de04c61ad295ac0dff2 Author: Andrew Cooper AuthorDate: Tue Aug 12 11:25:36 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/current: Annotate get_cpu_info() as attr_const The result of this calculation will always be identical, even across context switch in x86. Tell the compiler. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/current.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index a7c9473428..fd30422707 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -83,7 +83,7 @@ static inline struct cpu_info *get_cpu_info_from_stack(unsigned long sp) return (struct cpu_info *)((sp | (STACK_SIZE - 1)) + 1) - 1; } -static inline struct cpu_info *get_cpu_info(void) +static inline attr_const struct cpu_info *get_cpu_info(void) { #ifdef __clang__ /* Clang complains that sp in the else case is not initialised. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 10:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 10:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083254.1442888 (Exim 4.92) (envelope-from ) id 1umrk7-0001Je-2W; Fri, 15 Aug 2025 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083254.1442888; Fri, 15 Aug 2025 10:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrk6-0001JV-Vb; Fri, 15 Aug 2025 10:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1083254; Fri, 15 Aug 2025 10:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrk5-0001Iv-VE for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umrk5-006g5Y-1u for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umrk5-004ZEH-2T for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lX+5VfPmHdC8uOQITfbZw3Fl6A0WzemFFv4Ncf03VrY=; b=MQRWGxzX2qsHZhqEWdSh+hgAFB up0lKexhGpmdkzkjVtrn+Eaff/x4jZC2WUaTU3dfb22o+tUh4ij56H6hX4jpyV2874UKE8QJAmQCR aKJ45sbpvUlsGsPB7ooqXPQBEn6oOqJoo1riLl9La/z0H2Xoj2KPUgrASFTDNy1P95GQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Drop incorrect BUILD_BUG_ON() and comment in load_system_tables() Message-Id: Date: Fri, 15 Aug 2025 10:33:01 +0000 commit 0630cde32fe5e0e2557410f201da8c35e5487c52 Author: Andrew Cooper AuthorDate: Mon Jan 6 10:59:19 2025 +0000 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/traps: Drop incorrect BUILD_BUG_ON() and comment in load_system_tables() This was added erroneously by me. Hardware task switching does demand a TSS of at least 0x67 bytes, but that's not relevant in 64bit, and not relevant for Xen since commit 5d1181a5ea5e ("xen: Remove x86_32 build target.") in 2012. We already load a 0-length TSS in early_traps_init() demonstrating that it's possible. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f6ec5c9df5..cdc41248d4 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -936,8 +936,6 @@ void load_system_tables(void) wrmsrl(MSR_ISST, (unsigned long)ist_ssp); } - BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ - _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_avail); if ( IS_ENABLED(CONFIG_PV32) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 10:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083257.1442890 (Exim 4.92) (envelope-from ) id 1umrkH-0001T7-3Z; Fri, 15 Aug 2025 10:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083257.1442890; Fri, 15 Aug 2025 10:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrkH-0001Sb-0j; Fri, 15 Aug 2025 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1083257; Fri, 15 Aug 2025 10:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrkF-0001Qj-VT for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umrkF-006g5o-2N for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umrkF-004ZEo-2l for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QnyovyEqPwboBKZ1ThA2jBei/TSD5MhYokJw0FK6Edc=; b=41YGKbdirk+rhY9f6djPKFPWsP ojNeEV+WxX9B/+bbmrWb91YdtNKjAMmUjtYN2ITkegZ2MdTodQBgjqZUGAxcM+gOxVDiK6t63/yn6 +sR87cgC7GLRJSfPhVZJmHnHXLOHzhVI0si7l+Y9mvey8N9YvdhaTRyHQ2cXyeuqcD0U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Rename early_traps_init() to bsp_early_traps_init() Message-Id: Date: Fri, 15 Aug 2025 10:33:11 +0000 commit f4ef9e3d032c96bc6e5232fc2bfdb4b3a2e25662 Author: Andrew Cooper AuthorDate: Fri May 23 13:40:01 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/traps: Rename early_traps_init() to bsp_early_traps_init() We're going to want to introduce a percpu version shortly. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/traps.h | 2 +- xen/arch/x86/setup.c | 2 +- xen/arch/x86/traps-setup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 72c33a33e2..7414420e57 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -7,7 +7,7 @@ #ifndef ASM_TRAP_H #define ASM_TRAP_H -void early_traps_init(void); +void bsp_early_traps_init(void); void traps_init(void); void percpu_traps_init(void); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 1543dd251c..64f02699e1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1134,7 +1134,7 @@ void asmlinkage __init noreturn __start_xen(void) percpu_init_areas(); - early_traps_init(); + bsp_early_traps_init(); smp_prepare_boot_cpu(); sort_exception_tables(); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index a8385b26ae..7713f427d3 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -62,7 +62,7 @@ static void __init init_ler(void) * boot_gdt is already loaded, and bsp_idt[] is constructed without IST * settings, so we don't need a TSS configured yet. */ -void __init early_traps_init(void) +void __init bsp_early_traps_init(void) { const struct desc_ptr idtr = { .base = (unsigned long)bsp_idt, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 10:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 10:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083263.1442895 (Exim 4.92) (envelope-from ) id 1umrkR-0001YO-4x; Fri, 15 Aug 2025 10:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083263.1442895; Fri, 15 Aug 2025 10:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrkR-0001YE-2B; Fri, 15 Aug 2025 10:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1083263; Fri, 15 Aug 2025 10:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrkQ-0001Xz-3z for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umrkP-006g5u-2r for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umrkQ-004ZFC-00 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xB0j1Un9S6Wv/NyfoMq5gBSS3sr46/JXg/HnfgnhQX0=; b=Mv8Y6cMrKu7vtI0j/poChmbo9l XrUKMVvd9nMkyK4OMINcfp4vHvtyxGvDtR1R1B7MvSCgrh6XLhVZa4dyzutkGw5gSzlysqHIhSxno 1k2+JDqJXV1dmgL5x4x7XUHVpnrCJL9pBiH8vLkUnp7DeJrCq3q13SHFqrCopgiPM94c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Introduce bsp_traps_reinit() Message-Id: Date: Fri, 15 Aug 2025 10:33:22 +0000 commit be90b7a77f444892e8e9bd3d2024ecf04da05aaf Author: Andrew Cooper AuthorDate: Fri Aug 8 15:01:56 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/traps: Introduce bsp_traps_reinit() ... to abstract away updating the refereces to the old BSP stack. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/traps.h | 1 + xen/arch/x86/setup.c | 6 +----- xen/arch/x86/traps-setup.c | 9 +++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 7414420e57..6ae451d3fc 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -9,6 +9,7 @@ void bsp_early_traps_init(void); void traps_init(void); +void bsp_traps_reinit(void); void percpu_traps_init(void); extern unsigned int ler_msr; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 64f02699e1..c8c408e024 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -902,11 +902,7 @@ static void __init noreturn reinit_bsp_stack(void) unsigned long *stack = (void*)(get_stack_bottom() & ~(STACK_SIZE - 1)); int rc; - /* Update TSS and ISTs */ - load_system_tables(); - - /* Update SYSCALL trampolines */ - percpu_traps_init(); + bsp_traps_reinit(); stack_base[0] = stack; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 7713f427d3..99257bbb16 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -107,6 +107,15 @@ void __init traps_init(void) percpu_traps_init(); } +/* + * Re-initialise all state referencing the early-boot stack. + */ +void __init bsp_traps_reinit(void) +{ + load_system_tables(); + percpu_traps_init(); +} + /* * Set up per-CPU linkage registers for exception, interrupt and syscall * handling. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 10:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 10:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083265.1442899 (Exim 4.92) (envelope-from ) id 1umrkb-0001co-7P; Fri, 15 Aug 2025 10:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083265.1442899; Fri, 15 Aug 2025 10:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrkb-0001ce-4g; Fri, 15 Aug 2025 10:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1083265; Fri, 15 Aug 2025 10:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umrka-0001cQ-6g for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umrkZ-006g60-38 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umrka-004ZFd-0T for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 10:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QaJigLJbOMNsjwZZc4tdZNC9pRuqC2doX0UHuhzvFaQ=; b=4ULhDEUoABnXbp/GmfoEXcREmF C2AbFZ/rea2+Yiwe/IiDl2a92kVHbx59xTSWOJNNc3u2cW2vQsPvJi6zM1c+7TJJRVdUgOi8Jj6aT krivoBPcVNh7HVRL1Sd2F5xJZyoOcRXvnbxbqZO78xU837POo9Ck15k39vqZSHeUvqeQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/current: Annotate get_cpu_info() as attr_const Message-Id: Date: Fri, 15 Aug 2025 10:33:32 +0000 commit b2c0dc44b37516b758c38de04c61ad295ac0dff2 Author: Andrew Cooper AuthorDate: Tue Aug 12 11:25:36 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 14 21:49:27 2025 +0100 x86/current: Annotate get_cpu_info() as attr_const The result of this calculation will always be identical, even across context switch in x86. Tell the compiler. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/current.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index a7c9473428..fd30422707 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -83,7 +83,7 @@ static inline struct cpu_info *get_cpu_info_from_stack(unsigned long sp) return (struct cpu_info *)((sp | (STACK_SIZE - 1)) + 1) - 1; } -static inline struct cpu_info *get_cpu_info(void) +static inline attr_const struct cpu_info *get_cpu_info(void) { #ifdef __clang__ /* Clang complains that sp in the else case is not initialised. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 11:33:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 11:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083324.1442933 (Exim 4.92) (envelope-from ) id 1umsgD-0002S4-1f; Fri, 15 Aug 2025 11:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083324.1442933; Fri, 15 Aug 2025 11:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgC-0002Rw-VM; Fri, 15 Aug 2025 11:33:04 +0000 Received: by outflank-mailman (input) for mailman id 1083324; Fri, 15 Aug 2025 11:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgA-0002Rq-RK for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umsgA-006hJL-12 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umsgA-004bw7-1W for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=skkJ7EV7WZt/anEbrXgEJQLTuHAry8StuwAqQ9QKFHk=; b=hoQ6pIyXKJ0oTb6Kl/3UONJIWO Ep6bFxwgKs7DCxBva7vhj8psUYh23y1wAw+pJ1iNAdJMu0WhK7jreFY6tTQz+VlIf/3F/t4f8r8gn mqmfrXYkA+dBL47/DHF+Kla549o7TjRM+8CskSvmY1VJwa7tQ+zpD9P2mzM0wdxEfYBs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/spec-ctrl: Rework init_shadow_spec_ctrl_state() to take an info pointer Message-Id: Date: Fri, 15 Aug 2025 11:33:02 +0000 commit 7f69bf4898de5919dfd3affa78baafcc3fd75aca Author: Andrew Cooper AuthorDate: Thu Aug 7 19:48:51 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/spec-ctrl: Rework init_shadow_spec_ctrl_state() to take an info pointer We're going to want to reuse it for a remote stack shortly. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl.h | 4 +--- xen/arch/x86/setup.c | 2 +- xen/arch/x86/smpboot.c | 2 +- xen/arch/x86/spec_ctrl.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl.h b/xen/arch/x86/include/asm/spec_ctrl.h index 6724d38120..3d92928f94 100644 --- a/xen/arch/x86/include/asm/spec_ctrl.h +++ b/xen/arch/x86/include/asm/spec_ctrl.h @@ -99,10 +99,8 @@ extern bool opt_bp_spec_reduce; */ extern paddr_t l1tf_addr_mask, l1tf_safe_maddr; -static inline void init_shadow_spec_ctrl_state(void) +static inline void init_shadow_spec_ctrl_state(struct cpu_info *info) { - struct cpu_info *info = get_cpu_info(); - info->shadow_spec_ctrl = 0; info->xen_spec_ctrl = default_xen_spec_ctrl; info->scf = default_scf; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c8c408e024..6fb42c5a5f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1126,7 +1126,7 @@ void asmlinkage __init noreturn __start_xen(void) /* Critical region without exception handling. Any fault is deadly! */ - init_shadow_spec_ctrl_state(); + init_shadow_spec_ctrl_state(info); percpu_init_areas(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 302be4341b..ce4862dde5 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -332,7 +332,7 @@ void asmlinkage start_secondary(void) set_current(idle_vcpu[cpu]); this_cpu(curr_vcpu) = idle_vcpu[cpu]; rdmsrl(MSR_EFER, this_cpu(efer)); - init_shadow_spec_ctrl_state(); + init_shadow_spec_ctrl_state(info); /* * Just as during early bootstrap, it is convenient here to disable diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index feae0d710f..1ff3d6835d 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -2226,7 +2226,7 @@ void __init init_speculation_mitigations(void) opt_eager_fpu = should_use_eager_fpu(); /* (Re)init BSP state now that default_scf has been calculated. */ - init_shadow_spec_ctrl_state(); + init_shadow_spec_ctrl_state(get_cpu_info()); /* * For microcoded IBRS only (i.e. Intel, pre eIBRS), it is recommended to -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 11:33:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 11:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083325.1442936 (Exim 4.92) (envelope-from ) id 1umsgM-0002TV-2v; Fri, 15 Aug 2025 11:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083325.1442936; Fri, 15 Aug 2025 11:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgM-0002TN-0O; Fri, 15 Aug 2025 11:33:14 +0000 Received: by outflank-mailman (input) for mailman id 1083325; Fri, 15 Aug 2025 11:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgK-0002TF-L9 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umsgK-006hJQ-1L for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umsgK-004bwT-1s for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1TQfaP4w582DYnIsh1LlUddthN3uqYpQtZJuCoh8d4U=; b=HxsXu/cY8ZeTMnLA8mT+qpiE+M ACFNRFs04FQYErVEityOcVqFZB8C5d+QPUvE0hlXkKm3Hbe5R/p6ZR8TtbEKaHQey8u3zYkGNSyxM hO+CdT7ZuhqLTiZ1HpwhMiJhb/s1S9aFHTNDSbACtJBDWojUtfwsl23Ig+8G9vBdPwzg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Introduce percpu_early_traps_init() and set up exception handling earlier Message-Id: Date: Fri, 15 Aug 2025 11:33:12 +0000 commit 30860ae72d921f285eb5ab1cd8dec874ffb51cd5 Author: Andrew Cooper AuthorDate: Fri May 23 14:28:37 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/traps: Introduce percpu_early_traps_init() and set up exception handling earlier As things stand, we set up AP/S3 exception handling marginally after the fragile activity of setting up shadow stacks. Shadow stack setup is going to get more complicated under FRED. Introduce percpu_early_traps_init() and call it ahead of setting up shadow stacks. To start with, call load_system_tables() which is sufficient to set up full exception handling. In order to handle exceptions, current and the speculation controls needs to work. cpu_smpboot_alloc() already constructs some of the AP's top-of-stack block, so have it set up a little more. Zero the whole structure to subsume other misc setup. This gets us complete exception coverage of setting up shadow stacks, rather than dying with a triple fault. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 5 +++-- xen/arch/x86/boot/x86_64.S | 5 ++++- xen/arch/x86/smpboot.c | 19 ++++++------------- xen/arch/x86/traps-setup.c | 12 ++++++++++++ 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 92af6230b3..cc40fddc38 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -63,6 +63,9 @@ LABEL(s3_resume) pushq %rax lretq 1: + /* Set up early exceptions and CET before entering C properly. */ + call percpu_early_traps_init + #if defined(CONFIG_XEN_SHSTK) || defined(CONFIG_XEN_IBT) call xen_msr_s_cet_value test %eax, %eax @@ -117,8 +120,6 @@ LABEL(s3_resume) .L_cet_done: #endif /* CONFIG_XEN_SHSTK || CONFIG_XEN_IBT */ - call load_system_tables - /* Restore CR4 from the cpuinfo block. */ GET_STACK_END(bx) mov STACK_CPUINFO_FIELD(cr4)(%rbx), %rax diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 95a6b6cf63..d0e7449a14 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -30,7 +30,10 @@ ENTRY(__high_start) test %ebx,%ebx jz .L_bsp - /* APs. Set up CET before entering C properly. */ + /* APs. Set up early exceptions and CET before entering C properly. */ + + call percpu_early_traps_init + #if defined(CONFIG_XEN_SHSTK) || defined(CONFIG_XEN_IBT) call xen_msr_s_cet_value test %eax, %eax diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index ce4862dde5..efb5adb3a1 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -327,12 +327,7 @@ void asmlinkage start_secondary(void) struct cpu_info *info = get_cpu_info(); unsigned int cpu = smp_processor_id(); - /* Critical region without IDT or TSS. Any fault is deadly! */ - - set_current(idle_vcpu[cpu]); - this_cpu(curr_vcpu) = idle_vcpu[cpu]; rdmsrl(MSR_EFER, this_cpu(efer)); - init_shadow_spec_ctrl_state(info); /* * Just as during early bootstrap, it is convenient here to disable @@ -352,14 +347,6 @@ void asmlinkage start_secondary(void) */ spin_debug_disable(); - get_cpu_info()->use_pv_cr3 = false; - get_cpu_info()->xen_cr3 = 0; - get_cpu_info()->pv_cr3 = 0; - - load_system_tables(); - - /* Full exception support from here on in. */ - if ( cpu_has_pks ) wrpkrs_and_cache(0); /* Must be before setting CR4.PKS */ @@ -1064,9 +1051,15 @@ static int cpu_smpboot_alloc(unsigned int cpu) goto out; info = get_cpu_info_from_stack((unsigned long)stack_base[cpu]); + memset(info, 0, sizeof(*info)); info->processor_id = cpu; info->per_cpu_offset = __per_cpu_offset[cpu]; + init_shadow_spec_ctrl_state(info); + + info->current_vcpu = idle_vcpu[cpu]; /* set_current() */ + per_cpu(curr_vcpu, cpu) = idle_vcpu[cpu]; + gdt = per_cpu(gdt, cpu) ?: alloc_xenheap_pages(0, memflags); if ( gdt == NULL ) goto out; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 99257bbb16..758c67b335 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -127,3 +127,15 @@ void percpu_traps_init(void) if ( cpu_has_xen_lbr ) wrmsrl(MSR_IA32_DEBUGCTLMSR, IA32_DEBUGCTLMSR_LBR); } + +/* + * Configure exception handling on APs and S3. Called before entering C + * properly, and before shadow stacks are activated. + * + * boot_gdt is currently loaded, and we must switch to our local GDT. The + * local IDT has unknown IST-ness. + */ +void asmlinkage percpu_early_traps_init(void) +{ + load_system_tables(); +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 11:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 11:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083326.1442940 (Exim 4.92) (envelope-from ) id 1umsgV-0002Vk-4L; Fri, 15 Aug 2025 11:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083326.1442940; Fri, 15 Aug 2025 11:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgV-0002Vd-1m; Fri, 15 Aug 2025 11:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1083326; Fri, 15 Aug 2025 11:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgU-0002VX-O6 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umsgU-006hJU-1d for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umsgU-004bwp-2C for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=22TqQGl6c9Tz9gdNHD9NvtLbkIOSjyyJuCxfzBRPYJ4=; b=zbfQpeVGovMwrYDW944amMc0zA hgGgtUNOheV2iNbXqEYT/JTVp3bPBSL/51F0bgYgqu2h1W36ZD/Cfk0vhr2yaGBVxZNm0tAWll740 AFyDl7GrK5E4BNvC+hixLDcmgbupy1yqAZ75+o/1WhozVMk6wqAzBbI2QrueTvSwYE/E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Move load_system_tables() into traps-setup.c Message-Id: Date: Fri, 15 Aug 2025 11:33:22 +0000 commit 5222af8bb213e3068c9cf4939ed3dc42b62cf227 Author: Andrew Cooper AuthorDate: Wed Jan 1 15:16:33 2025 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/traps: Move load_system_tables() into traps-setup.c Switch it to Xen coding style and fix MISRA violations (ul -> UL). Make it static as there are no external caller now. Since commit a35816b5cae8 ("x86/traps: Introduce early_traps_init() and simplify setup"), load_system_tables() is called later on the BSP, so the SYS_STATE_early_boot check can be dropped from the safety BUG_ON(). Move the BUILD_BUG_ON() into build_assertions(), and introduce an endof_field() helper to make the expression clearer. Swap wrmsrl(MSR_ISST, ...) for wrmsrns(). No serialisation is needed at this point. Drop the comment about Clang 3.5. It's no longer a supported toolchain, and while the comment is true, the code should have been written with a local pointer anyway. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 118 ----------------------------------- xen/arch/x86/include/asm/system.h | 1 - xen/arch/x86/traps-setup.c | 126 ++++++++++++++++++++++++++++++++++++++ xen/include/xen/macros.h | 2 + 4 files changed, 128 insertions(+), 119 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index cdc41248d4..da05015578 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -843,124 +843,6 @@ void print_cpu_info(unsigned int cpu) static cpumask_t cpu_initialized; -/* - * Sets up system tables and descriptors. - * - * - Sets up TSS with stack pointers, including ISTs - * - Inserts TSS selector into regular and compat GDTs - * - Loads GDT, IDT, TR then null LDT - * - Sets up IST references in the IDT - */ -void load_system_tables(void) -{ - unsigned int i, cpu = smp_processor_id(); - unsigned long stack_bottom = get_stack_bottom(), - stack_top = stack_bottom & ~(STACK_SIZE - 1); - /* - * NB: define tss_page as a local variable because clang 3.5 doesn't - * support using ARRAY_SIZE against per-cpu variables. - */ - struct tss_page *tss_page = &this_cpu(tss_page); - idt_entry_t *idt = this_cpu(idt); - - /* The TSS may be live. Disuade any clever optimisations. */ - volatile struct tss64 *tss = &tss_page->tss; - seg_desc_t *gdt = - this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; - - const struct desc_ptr gdtr = { - .base = (unsigned long)gdt, - .limit = LAST_RESERVED_GDT_BYTE, - }; - const struct desc_ptr idtr = { - .base = (unsigned long)idt, - .limit = sizeof(bsp_idt) - 1, - }; - - /* - * Set up the TSS. Warning - may be live, and the NMI/#MC must remain - * valid on every instruction boundary. (Note: these are all - * semantically ACCESS_ONCE() due to tss's volatile qualifier.) - * - * rsp0 refers to the primary stack. #MC, NMI, #DB and #DF handlers - * each get their own stacks. No IO Bitmap. - */ - tss->rsp0 = stack_bottom; - tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; - tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; - tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; - tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; - tss->bitmap = IOBMP_INVALID_OFFSET; - - /* All other stack pointers poisioned. */ - for ( i = IST_MAX; i < ARRAY_SIZE(tss->ist); ++i ) - tss->ist[i] = 0x8600111111111111ul; - tss->rsp1 = 0x8600111111111111ul; - tss->rsp2 = 0x8600111111111111ul; - - /* - * Set up the shadow stack IST. Used entries must point at the - * supervisor stack token. Unused entries are poisoned. - * - * This IST Table may be live, and the NMI/#MC entries must - * remain valid on every instruction boundary, hence the - * volatile qualifier. - */ - if (cpu_has_xen_shstk) { - volatile uint64_t *ist_ssp = tss_page->ist_ssp; - unsigned long - mce_ssp = stack_top + (IST_MCE * IST_SHSTK_SIZE) - 8, - nmi_ssp = stack_top + (IST_NMI * IST_SHSTK_SIZE) - 8, - db_ssp = stack_top + (IST_DB * IST_SHSTK_SIZE) - 8, - df_ssp = stack_top + (IST_DF * IST_SHSTK_SIZE) - 8; - - ist_ssp[0] = 0x8600111111111111ul; - ist_ssp[IST_MCE] = mce_ssp; - ist_ssp[IST_NMI] = nmi_ssp; - ist_ssp[IST_DB] = db_ssp; - ist_ssp[IST_DF] = df_ssp; - for ( i = IST_DF + 1; i < ARRAY_SIZE(tss_page->ist_ssp); ++i ) - ist_ssp[i] = 0x8600111111111111ul; - - if (IS_ENABLED(CONFIG_XEN_SHSTK) && rdssp() != SSP_NO_SHSTK) { - /* - * Rewrite supervisor tokens when shadow stacks are - * active. This resets any busy bits left across S3. - */ - wrss(mce_ssp, _p(mce_ssp)); - wrss(nmi_ssp, _p(nmi_ssp)); - wrss(db_ssp, _p(db_ssp)); - wrss(df_ssp, _p(df_ssp)); - } - - wrmsrl(MSR_ISST, (unsigned long)ist_ssp); - } - - _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, - sizeof(*tss) - 1, SYS_DESC_tss_avail); - if ( IS_ENABLED(CONFIG_PV32) ) - _set_tssldt_desc( - this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY, - (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy); - - per_cpu(full_gdt_loaded, cpu) = false; - lgdt(&gdtr); - lidt(&idtr); - ltr(TSS_SELECTOR); - lldt(0); - - enable_each_ist(idt); - - /* - * Bottom-of-stack must be 16-byte aligned! - * - * Defer checks until exception support is sufficiently set up. - */ - BUILD_BUG_ON((sizeof(struct cpu_info) - - sizeof(struct cpu_user_regs)) & 0xf); - BUG_ON(system_state != SYS_STATE_early_boot && (stack_bottom & 0xf)); -} - static void skinit_enable_intr(void) { uint64_t val; diff --git a/xen/arch/x86/include/asm/system.h b/xen/arch/x86/include/asm/system.h index 57446c5b46..3cdc56e4ba 100644 --- a/xen/arch/x86/include/asm/system.h +++ b/xen/arch/x86/include/asm/system.h @@ -256,7 +256,6 @@ static inline int local_irq_is_enabled(void) #define BROKEN_ACPI_Sx 0x0001 #define BROKEN_INIT_AFTER_S1 0x0002 -void load_system_tables(void); void subarch_percpu_traps_init(void); #endif diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 758c67b335..d089833121 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -19,6 +20,118 @@ boolean_param("ler", opt_ler); void nocall entry_PF(void); +/* + * Sets up system tables and descriptors for IDT devliery. + * + * - Sets up TSS with stack pointers, including ISTs + * - Inserts TSS selector into regular and compat GDTs + * - Loads GDT, IDT, TR then null LDT + * - Sets up IST references in the IDT + */ +static void load_system_tables(void) +{ + unsigned int i, cpu = smp_processor_id(); + unsigned long stack_bottom = get_stack_bottom(), + stack_top = stack_bottom & ~(STACK_SIZE - 1); + struct tss_page *tss_page = &this_cpu(tss_page); + idt_entry_t *idt = this_cpu(idt); + + /* The TSS may be live. Disuade any clever optimisations. */ + volatile struct tss64 *tss = &tss_page->tss; + seg_desc_t *gdt = + this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; + + const struct desc_ptr gdtr = { + .base = (unsigned long)gdt, + .limit = LAST_RESERVED_GDT_BYTE, + }; + const struct desc_ptr idtr = { + .base = (unsigned long)idt, + .limit = sizeof(bsp_idt) - 1, + }; + + /* + * Set up the TSS. Warning - may be live, and the NMI/#MC must remain + * valid on every instruction boundary. (Note: these are all + * semantically ACCESS_ONCE() due to tss's volatile qualifier.) + * + * rsp0 refers to the primary stack. #MC, NMI, #DB and #DF handlers + * each get their own stacks. No IO Bitmap. + */ + tss->rsp0 = stack_bottom; + tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; + tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; + tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; + tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; + tss->bitmap = IOBMP_INVALID_OFFSET; + + /* All other stack pointers poisioned. */ + for ( i = IST_MAX; i < ARRAY_SIZE(tss->ist); ++i ) + tss->ist[i] = 0x8600111111111111UL; + tss->rsp1 = 0x8600111111111111UL; + tss->rsp2 = 0x8600111111111111UL; + + /* + * Set up the shadow stack IST. Used entries must point at the + * supervisor stack token. Unused entries are poisoned. + * + * This IST Table may be live, and the NMI/#MC entries must + * remain valid on every instruction boundary, hence the + * volatile qualifier. + */ + if ( cpu_has_xen_shstk ) + { + volatile uint64_t *ist_ssp = tss_page->ist_ssp; + unsigned long + mce_ssp = stack_top + (IST_MCE * IST_SHSTK_SIZE) - 8, + nmi_ssp = stack_top + (IST_NMI * IST_SHSTK_SIZE) - 8, + db_ssp = stack_top + (IST_DB * IST_SHSTK_SIZE) - 8, + df_ssp = stack_top + (IST_DF * IST_SHSTK_SIZE) - 8; + + ist_ssp[0] = 0x8600111111111111UL; + ist_ssp[IST_MCE] = mce_ssp; + ist_ssp[IST_NMI] = nmi_ssp; + ist_ssp[IST_DB] = db_ssp; + ist_ssp[IST_DF] = df_ssp; + for ( i = IST_DF + 1; i < ARRAY_SIZE(tss_page->ist_ssp); ++i ) + ist_ssp[i] = 0x8600111111111111UL; + + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && rdssp() != SSP_NO_SHSTK ) + { + /* + * Rewrite supervisor tokens when shadow stacks are + * active. This resets any busy bits left across S3. + */ + wrss(mce_ssp, _p(mce_ssp)); + wrss(nmi_ssp, _p(nmi_ssp)); + wrss(db_ssp, _p(db_ssp)); + wrss(df_ssp, _p(df_ssp)); + } + + wrmsrns(MSR_ISST, (unsigned long)ist_ssp); + } + + _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, + sizeof(*tss) - 1, SYS_DESC_tss_avail); + if ( IS_ENABLED(CONFIG_PV32) ) + _set_tssldt_desc( + this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY, + (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy); + + per_cpu(full_gdt_loaded, cpu) = false; + lgdt(&gdtr); + lidt(&idtr); + ltr(TSS_SELECTOR); + lldt(0); + + enable_each_ist(idt); + + /* + * tss->rsp0 must be 16-byte aligned. + */ + BUG_ON(stack_bottom & 15); +} + static void __init init_ler(void) { unsigned int msr = 0; @@ -139,3 +252,16 @@ void asmlinkage percpu_early_traps_init(void) { load_system_tables(); } + +static void __init __maybe_unused build_assertions(void) +{ + /* + * This is best-effort (it doesn't cover some padding corner cases), but + * is preferable to hitting the check at boot time. + * + * tss->rsp0, pointing at the end of cpu_info.guest_cpu_user_regs, must be + * 16-byte aligned. + */ + BUILD_BUG_ON((sizeof(struct cpu_info) - + endof_field(struct cpu_info, guest_cpu_user_regs)) & 15); +} diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index f9ccde86fb..6b4a8dc8b7 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -94,6 +94,8 @@ */ #define sizeof_field(type, member) sizeof(((type *)NULL)->member) +#define endof_field(type, member) (offsetof(type, member) + sizeof_field(type, member)) + /* Cast an arbitrary integer to a pointer. */ #define _p(x) ((void *)(unsigned long)(x)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 11:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 11:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083327.1442945 (Exim 4.92) (envelope-from ) id 1umsgf-0002Y4-68; Fri, 15 Aug 2025 11:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083327.1442945; Fri, 15 Aug 2025 11:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgf-0002Xw-3T; Fri, 15 Aug 2025 11:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1083327; Fri, 15 Aug 2025 11:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsge-0002Xq-R8 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umsge-006hJY-1v for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umsge-004bxC-2U for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VoTS7Az+DLu9v2OU2oK0S+qPr/+TXt5MactizjdKPe8=; b=doerrKECGAYyE7fsQDUzh6s209 wAniN8KY/pcEaKqwTuGzh0FC317vjlWTNU0ESgFb9X6XCpjOKHrDpBKvcVsDty6towvKQ1t8VnQxA /gmYiqckbxh12KX59pg7hhTo/cp9/NOr4j3yIs3X6fceg4wC0ZLxLJvKKh9R5rjzSEvc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Move subarch_percpu_traps_init() into traps-setup.c Message-Id: Date: Fri, 15 Aug 2025 11:33:32 +0000 commit 327ca0b54524de547417005e65ea168a6ed222be Author: Andrew Cooper AuthorDate: Wed Jan 8 11:51:06 2025 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/traps: Move subarch_percpu_traps_init() into traps-setup.c ... along with the supporting functions. Switch to Xen coding style, and make static as there are no external callers. Rename to legacy_syscall_init() as a more accurate name. Swap wrmsr{,l}() for wrmsrns(). No serialisation is needed at this point. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/system.h | 2 - xen/arch/x86/traps-setup.c | 97 ++++++++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/traps.c | 92 ------------------------------------- 3 files changed, 95 insertions(+), 96 deletions(-) diff --git a/xen/arch/x86/include/asm/system.h b/xen/arch/x86/include/asm/system.h index 3cdc56e4ba..6c2800d815 100644 --- a/xen/arch/x86/include/asm/system.h +++ b/xen/arch/x86/include/asm/system.h @@ -256,6 +256,4 @@ static inline int local_irq_is_enabled(void) #define BROKEN_ACPI_Sx 0x0001 #define BROKEN_INIT_AFTER_S1 0x0002 -void subarch_percpu_traps_init(void); - #endif diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index d089833121..25581acf11 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -2,13 +2,15 @@ /* * Configuration of event handling for all CPUs. */ +#include #include #include +#include #include #include #include -#include +#include #include DEFINE_PER_CPU_READ_MOSTLY(idt_entry_t *, idt); @@ -19,6 +21,8 @@ static bool __initdata opt_ler; boolean_param("ler", opt_ler); void nocall entry_PF(void); +void nocall lstar_enter(void); +void nocall cstar_enter(void); /* * Sets up system tables and descriptors for IDT devliery. @@ -132,6 +136,95 @@ static void load_system_tables(void) BUG_ON(stack_bottom & 15); } +static unsigned int write_stub_trampoline( + unsigned char *stub, unsigned long stub_va, + unsigned long stack_bottom, unsigned long target_va) +{ + unsigned char *p = stub; + + if ( cpu_has_xen_ibt ) + { + place_endbr64(p); + p += 4; + } + + /* Store guest %rax into %ss slot */ + /* movabsq %rax, stack_bottom - 8 */ + *p++ = 0x48; + *p++ = 0xa3; + *(uint64_t *)p = stack_bottom - 8; + p += 8; + + /* Store guest %rsp in %rax */ + /* movq %rsp, %rax */ + *p++ = 0x48; + *p++ = 0x89; + *p++ = 0xe0; + + /* Switch to Xen stack */ + /* movabsq $stack_bottom - 8, %rsp */ + *p++ = 0x48; + *p++ = 0xbc; + *(uint64_t *)p = stack_bottom - 8; + p += 8; + + /* jmp target_va */ + *p++ = 0xe9; + *(int32_t *)p = target_va - (stub_va + (p - stub) + 4); + p += 4; + + /* Round up to a multiple of 16 bytes. */ + return ROUNDUP(p - stub, 16); +} + +static void legacy_syscall_init(void) +{ + unsigned long stack_bottom = get_stack_bottom(); + unsigned long stub_va = this_cpu(stubs.addr); + unsigned char *stub_page; + unsigned int offset; + + /* No PV guests? No need to set up SYSCALL/SYSENTER infrastructure. */ + if ( !IS_ENABLED(CONFIG_PV) ) + return; + + stub_page = map_domain_page(_mfn(this_cpu(stubs.mfn))); + + /* + * Trampoline for SYSCALL entry from 64-bit mode. The VT-x HVM vcpu + * context switch logic relies on the SYSCALL trampoline being at the + * start of the stubs. + */ + wrmsrns(MSR_LSTAR, stub_va); + offset = write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)lstar_enter); + stub_va += offset; + + if ( cpu_has_sep ) + { + /* SYSENTER entry. */ + wrmsrns(MSR_IA32_SYSENTER_ESP, stack_bottom); + wrmsrns(MSR_IA32_SYSENTER_EIP, (unsigned long)sysenter_entry); + wrmsrns(MSR_IA32_SYSENTER_CS, __HYPERVISOR_CS); + } + + /* Trampoline for SYSCALL entry from compatibility mode. */ + wrmsrns(MSR_CSTAR, stub_va); + offset += write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)cstar_enter); + + /* Don't consume more than half of the stub space here. */ + ASSERT(offset <= STUB_BUF_SIZE / 2); + + unmap_domain_page(stub_page); + + /* Common SYSCALL parameters. */ + wrmsrns(MSR_STAR, XEN_MSR_STAR); + wrmsrns(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK); +} + static void __init init_ler(void) { unsigned int msr = 0; @@ -235,7 +328,7 @@ void __init bsp_traps_reinit(void) */ void percpu_traps_init(void) { - subarch_percpu_traps_init(); + legacy_syscall_init(); if ( cpu_has_xen_lbr ) wrmsrl(MSR_IA32_DEBUGCTLMSR, IA32_DEBUGCTLMSR_LBR); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 34adf55e48..81e64466e4 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -311,98 +311,6 @@ void asmlinkage noreturn do_double_fault(struct cpu_user_regs *regs) panic("DOUBLE FAULT -- system shutdown\n"); } -static unsigned int write_stub_trampoline( - unsigned char *stub, unsigned long stub_va, - unsigned long stack_bottom, unsigned long target_va) -{ - unsigned char *p = stub; - - if ( cpu_has_xen_ibt ) - { - place_endbr64(p); - p += 4; - } - - /* Store guest %rax into %ss slot */ - /* movabsq %rax, stack_bottom - 8 */ - *p++ = 0x48; - *p++ = 0xa3; - *(uint64_t *)p = stack_bottom - 8; - p += 8; - - /* Store guest %rsp in %rax */ - /* movq %rsp, %rax */ - *p++ = 0x48; - *p++ = 0x89; - *p++ = 0xe0; - - /* Switch to Xen stack */ - /* movabsq $stack_bottom - 8, %rsp */ - *p++ = 0x48; - *p++ = 0xbc; - *(uint64_t *)p = stack_bottom - 8; - p += 8; - - /* jmp target_va */ - *p++ = 0xe9; - *(int32_t *)p = target_va - (stub_va + (p - stub) + 4); - p += 4; - - /* Round up to a multiple of 16 bytes. */ - return ROUNDUP(p - stub, 16); -} - -void nocall lstar_enter(void); -void nocall cstar_enter(void); - -void subarch_percpu_traps_init(void) -{ - unsigned long stack_bottom = get_stack_bottom(); - unsigned long stub_va = this_cpu(stubs.addr); - unsigned char *stub_page; - unsigned int offset; - - /* No PV guests? No need to set up SYSCALL/SYSENTER infrastructure. */ - if ( !IS_ENABLED(CONFIG_PV) ) - return; - - stub_page = map_domain_page(_mfn(this_cpu(stubs.mfn))); - - /* - * Trampoline for SYSCALL entry from 64-bit mode. The VT-x HVM vcpu - * context switch logic relies on the SYSCALL trampoline being at the - * start of the stubs. - */ - wrmsrl(MSR_LSTAR, stub_va); - offset = write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), - stub_va, stack_bottom, - (unsigned long)lstar_enter); - stub_va += offset; - - if ( cpu_has_sep ) - { - /* SYSENTER entry. */ - wrmsrl(MSR_IA32_SYSENTER_ESP, stack_bottom); - wrmsrl(MSR_IA32_SYSENTER_EIP, (unsigned long)sysenter_entry); - wrmsr(MSR_IA32_SYSENTER_CS, __HYPERVISOR_CS, 0); - } - - /* Trampoline for SYSCALL entry from compatibility mode. */ - wrmsrl(MSR_CSTAR, stub_va); - offset += write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), - stub_va, stack_bottom, - (unsigned long)cstar_enter); - - /* Don't consume more than half of the stub space here. */ - ASSERT(offset <= STUB_BUF_SIZE / 2); - - unmap_domain_page(stub_page); - - /* Common SYSCALL parameters. */ - wrmsrl(MSR_STAR, XEN_MSR_STAR); - wrmsrl(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK); -} - /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 11:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 11:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083328.1442949 (Exim 4.92) (envelope-from ) id 1umsgq-0002b3-9F; Fri, 15 Aug 2025 11:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083328.1442949; Fri, 15 Aug 2025 11:33:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgq-0002av-6Y; Fri, 15 Aug 2025 11:33:44 +0000 Received: by outflank-mailman (input) for mailman id 1083328; Fri, 15 Aug 2025 11:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgo-0002al-Tu for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umsgo-006hJs-2D for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umsgo-004bxh-2m for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=K4XY/hWV6OgnDi57S92oN47MgsdYuKym8WPKyGY9dCE=; b=RvYeDhu0yJgIXAovw4hYnSMiT3 dXlWZ+xqkrMnRY8IvjvI56sWBIidZAM5bi1LISV3wLeKvwgM5uW1Z99dZwn2+JvpGGHy+Ce8ecoeh YY8IVgSCFLkD7kit1EeYfTtuMYHjcQnmFB7BPjRUTaAvHvef1/ML65jm2f9LUMiR9NoE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Fold x86_64/traps.c into traps.c Message-Id: Date: Fri, 15 Aug 2025 11:33:42 +0000 commit 16376dece87d3ab21dc43752ab52dc2cfc806229 Author: Andrew Cooper AuthorDate: Mon May 26 19:37:31 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:42 2025 +0100 x86/traps: Fold x86_64/traps.c into traps.c It's now just the double fault handler and various state dumping functions. Swap u64 for uint64_t, and fix a few other minor style issues. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 291 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/Makefile | 1 - xen/arch/x86/x86_64/traps.c | 322 ------------------------------------------- 3 files changed, 291 insertions(+), 323 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 238d923dd1..ab8ff36acf 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -87,6 +88,272 @@ const unsigned int nmi_cpu; #define stack_words_per_line 4 #define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)(regs)->rsp) +struct extra_state +{ + unsigned long cr0, cr2, cr3, cr4; + unsigned long fsb, gsb, gss; + uint16_t ds, es, fs, gs; +}; + +static void print_xen_info(void) +{ + char taint_str[TAINT_STRING_MAX_LEN]; + + printk("----[ Xen-%d.%d%s x86_64 %s %s ]----\n", + xen_major_version(), xen_minor_version(), xen_extra_version(), + xen_build_info(), print_tainted(taint_str)); +} + +enum context { + CTXT_hypervisor, + CTXT_pv_guest, + CTXT_hvm_guest, +}; + +static void read_registers(struct extra_state *state) +{ + state->cr0 = read_cr0(); + state->cr2 = read_cr2(); + state->cr3 = read_cr3(); + state->cr4 = read_cr4(); + + state->fsb = read_fs_base(); + state->gsb = read_gs_base(); + state->gss = read_gs_shadow(); + + asm ( "mov %%ds, %0" : "=m" (state->ds) ); + asm ( "mov %%es, %0" : "=m" (state->es) ); + asm ( "mov %%fs, %0" : "=m" (state->fs) ); + asm ( "mov %%gs, %0" : "=m" (state->gs) ); +} + +static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, + struct extra_state *state) +{ + struct segment_register sreg; + + state->cr0 = v->arch.hvm.guest_cr[0]; + state->cr2 = v->arch.hvm.guest_cr[2]; + state->cr3 = v->arch.hvm.guest_cr[3]; + state->cr4 = v->arch.hvm.guest_cr[4]; + + hvm_get_segment_register(v, x86_seg_cs, &sreg); + regs->cs = sreg.sel; + + hvm_get_segment_register(v, x86_seg_ds, &sreg); + state->ds = sreg.sel; + + hvm_get_segment_register(v, x86_seg_es, &sreg); + state->es = sreg.sel; + + hvm_get_segment_register(v, x86_seg_fs, &sreg); + state->fs = sreg.sel; + state->fsb = sreg.base; + + hvm_get_segment_register(v, x86_seg_gs, &sreg); + state->gs = sreg.sel; + state->gsb = sreg.base; + + hvm_get_segment_register(v, x86_seg_ss, &sreg); + regs->ss = sreg.sel; + + state->gss = hvm_get_reg(v, MSR_SHADOW_GS_BASE); +} + +static void _show_registers( + const struct cpu_user_regs *regs, const struct extra_state *state, + enum context context, const struct vcpu *v) +{ + static const char *const context_names[] = { + [CTXT_hypervisor] = "hypervisor", + [CTXT_pv_guest] = "pv guest", + [CTXT_hvm_guest] = "hvm guest", + }; + + printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); + if ( context == CTXT_hypervisor ) + printk(" %pS", _p(regs->rip)); + printk("\nRFLAGS: %016lx ", regs->rflags); + if ( (context == CTXT_pv_guest) && v && v->vcpu_info_area.map ) + printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); + printk("CONTEXT: %s", context_names[context]); + if ( v && !is_idle_vcpu(v) ) + printk(" (%pv)", v); + + printk("\nrax: %016lx rbx: %016lx rcx: %016lx\n", + regs->rax, regs->rbx, regs->rcx); + printk("rdx: %016lx rsi: %016lx rdi: %016lx\n", + regs->rdx, regs->rsi, regs->rdi); + printk("rbp: %016lx rsp: %016lx r8: %016lx\n", + regs->rbp, regs->rsp, regs->r8); + printk("r9: %016lx r10: %016lx r11: %016lx\n", + regs->r9, regs->r10, regs->r11); + printk("r12: %016lx r13: %016lx r14: %016lx\n", + regs->r12, regs->r13, regs->r14); + printk("r15: %016lx cr0: %016lx cr4: %016lx\n", + regs->r15, state->cr0, state->cr4); + printk("cr3: %016lx cr2: %016lx\n", state->cr3, state->cr2); + printk("fsb: %016lx gsb: %016lx gss: %016lx\n", + state->fsb, state->gsb, state->gss); + printk("ds: %04x es: %04x fs: %04x gs: %04x ss: %04x cs: %04x\n", + state->ds, state->es, state->fs, + state->gs, regs->ss, regs->cs); +} + +void show_registers(const struct cpu_user_regs *regs) +{ + struct cpu_user_regs fault_regs = *regs; + struct extra_state fault_state; + enum context context; + struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; + + if ( guest_mode(regs) && is_hvm_vcpu(v) ) + { + get_hvm_registers(v, &fault_regs, &fault_state); + context = CTXT_hvm_guest; + } + else + { + read_registers(&fault_state); + + if ( guest_mode(regs) ) + { + context = CTXT_pv_guest; + fault_state.cr2 = arch_get_cr2(v); + } + else + { + context = CTXT_hypervisor; + } + } + + print_xen_info(); + printk("CPU: %d\n", smp_processor_id()); + _show_registers(&fault_regs, &fault_state, context, v); + + if ( ler_msr && !guest_mode(regs) ) + { + uint64_t from, to; + + rdmsrl(ler_msr, from); + rdmsrl(ler_msr + 1, to); + + /* Upper bits may store metadata. Re-canonicalise for printing. */ + printk("ler: from %016"PRIx64" [%ps]\n", + from, _p(canonicalise_addr(from))); + printk(" to %016"PRIx64" [%ps]\n", + to, _p(canonicalise_addr(to))); + } +} + +void vcpu_show_registers(struct vcpu *v) +{ + const struct cpu_user_regs *regs = &v->arch.user_regs; + struct cpu_user_regs aux_regs; + struct extra_state state; + enum context context; + + if ( is_hvm_vcpu(v) ) + { + aux_regs = *regs; + get_hvm_registers(v, &aux_regs, &state); + regs = &aux_regs; + context = CTXT_hvm_guest; + } + else + { + bool kernel = guest_kernel_mode(v, regs); + unsigned long gsb, gss; + + state.cr0 = v->arch.pv.ctrlreg[0]; + state.cr2 = arch_get_cr2(v); + state.cr3 = pagetable_get_paddr(kernel + ? v->arch.guest_table + : v->arch.guest_table_user); + state.cr4 = v->arch.pv.ctrlreg[4]; + + gsb = v->arch.pv.gs_base_user; + gss = v->arch.pv.gs_base_kernel; + if ( kernel ) + SWAP(gsb, gss); + + state.fsb = v->arch.pv.fs_base; + state.gsb = gsb; + state.gss = gss; + + state.ds = v->arch.pv.ds; + state.es = v->arch.pv.es; + state.fs = v->arch.pv.fs; + state.gs = v->arch.pv.gs; + + context = CTXT_pv_guest; + } + + _show_registers(regs, &state, context, v); +} + +void show_page_walk(unsigned long addr) +{ + unsigned long pfn, mfn = read_cr3() >> PAGE_SHIFT; + l4_pgentry_t l4e, *l4t; + l3_pgentry_t l3e, *l3t; + l2_pgentry_t l2e, *l2t; + l1_pgentry_t l1e, *l1t; + + printk("Pagetable walk from %016lx:\n", addr); + if ( !is_canonical_address(addr) ) + return; + + l4t = map_domain_page(_mfn(mfn)); + l4e = l4t[l4_table_offset(addr)]; + unmap_domain_page(l4t); + mfn = l4e_get_pfn(l4e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L4[0x%03lx] = %"PRIpte" %016lx\n", + l4_table_offset(addr), l4e_get_intpte(l4e), pfn); + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) || + !mfn_valid(_mfn(mfn)) ) + return; + + l3t = map_domain_page(_mfn(mfn)); + l3e = l3t[l3_table_offset(addr)]; + unmap_domain_page(l3t); + mfn = l3e_get_pfn(l3e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L3[0x%03lx] = %"PRIpte" %016lx%s\n", + l3_table_offset(addr), l3e_get_intpte(l3e), pfn, + (l3e_get_flags(l3e) & _PAGE_PSE) ? " (PSE)" : ""); + if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) || + (l3e_get_flags(l3e) & _PAGE_PSE) || + !mfn_valid(_mfn(mfn)) ) + return; + + l2t = map_domain_page(_mfn(mfn)); + l2e = l2t[l2_table_offset(addr)]; + unmap_domain_page(l2t); + mfn = l2e_get_pfn(l2e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L2[0x%03lx] = %"PRIpte" %016lx%s\n", + l2_table_offset(addr), l2e_get_intpte(l2e), pfn, + (l2e_get_flags(l2e) & _PAGE_PSE) ? " (PSE)" : ""); + if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) || + (l2e_get_flags(l2e) & _PAGE_PSE) || + !mfn_valid(_mfn(mfn)) ) + return; + + l1t = map_domain_page(_mfn(mfn)); + l1e = l1t[l1_table_offset(addr)]; + unmap_domain_page(l1t); + mfn = l1e_get_pfn(l1e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", + l1_table_offset(addr), l1e_get_intpte(l1e), pfn); +} + void show_code(const struct cpu_user_regs *regs) { unsigned char insns_before[8] = {}, insns_after[16] = {}; @@ -762,6 +1029,30 @@ const char *vector_name(unsigned int vec) return (vec < ARRAY_SIZE(names) && names[vec][0]) ? names[vec] : "???"; } +void asmlinkage do_double_fault(struct cpu_user_regs *regs) +{ + unsigned int cpu; + struct extra_state state; + + console_force_unlock(); + + asm ( "lsll %[sel], %[limit]" : [limit] "=r" (cpu) + : [sel] "r" (PER_CPU_SELECTOR) ); + + /* Find information saved during fault and dump it to the console. */ + printk("*** DOUBLE FAULT ***\n"); + print_xen_info(); + + read_registers(&state); + + printk("CPU: %d\n", cpu); + _show_registers(regs, &state, CTXT_hypervisor, NULL); + show_code(regs); + show_stack_overflow(cpu, regs); + + panic("DOUBLE FAULT -- system shutdown\n"); +} + /* * This is called for faults at very unexpected times (e.g., when interrupts * are disabled). In such situations we can't do much that is safe. We try to diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index 472b2bab52..f207630887 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -1,7 +1,6 @@ obj-$(CONFIG_PV32) += compat/ obj-bin-y += entry.o -obj-y += traps.o obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += pci.o obj-y += acpi_mmcfg.o diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c deleted file mode 100644 index 81e64466e4..0000000000 --- a/xen/arch/x86/x86_64/traps.c +++ /dev/null @@ -1,322 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct extra_state -{ - unsigned long cr0, cr2, cr3, cr4; - unsigned long fsb, gsb, gss; - uint16_t ds, es, fs, gs; -}; - -static void print_xen_info(void) -{ - char taint_str[TAINT_STRING_MAX_LEN]; - - printk("----[ Xen-%d.%d%s x86_64 %s %s ]----\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - xen_build_info(), print_tainted(taint_str)); -} - -enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; - -static void read_registers(struct extra_state *state) -{ - state->cr0 = read_cr0(); - state->cr2 = read_cr2(); - state->cr3 = read_cr3(); - state->cr4 = read_cr4(); - - state->fsb = read_fs_base(); - state->gsb = read_gs_base(); - state->gss = read_gs_shadow(); - - asm ( "mov %%ds, %0" : "=m" (state->ds) ); - asm ( "mov %%es, %0" : "=m" (state->es) ); - asm ( "mov %%fs, %0" : "=m" (state->fs) ); - asm ( "mov %%gs, %0" : "=m" (state->gs) ); -} - -static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, - struct extra_state *state) -{ - struct segment_register sreg; - - state->cr0 = v->arch.hvm.guest_cr[0]; - state->cr2 = v->arch.hvm.guest_cr[2]; - state->cr3 = v->arch.hvm.guest_cr[3]; - state->cr4 = v->arch.hvm.guest_cr[4]; - - hvm_get_segment_register(v, x86_seg_cs, &sreg); - regs->cs = sreg.sel; - - hvm_get_segment_register(v, x86_seg_ds, &sreg); - state->ds = sreg.sel; - - hvm_get_segment_register(v, x86_seg_es, &sreg); - state->es = sreg.sel; - - hvm_get_segment_register(v, x86_seg_fs, &sreg); - state->fs = sreg.sel; - state->fsb = sreg.base; - - hvm_get_segment_register(v, x86_seg_gs, &sreg); - state->gs = sreg.sel; - state->gsb = sreg.base; - - hvm_get_segment_register(v, x86_seg_ss, &sreg); - regs->ss = sreg.sel; - - state->gss = hvm_get_reg(v, MSR_SHADOW_GS_BASE); -} - -static void _show_registers( - const struct cpu_user_regs *regs, const struct extra_state *state, - enum context context, const struct vcpu *v) -{ - static const char *const context_names[] = { - [CTXT_hypervisor] = "hypervisor", - [CTXT_pv_guest] = "pv guest", - [CTXT_hvm_guest] = "hvm guest" - }; - - printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); - if ( context == CTXT_hypervisor ) - printk(" %pS", _p(regs->rip)); - printk("\nRFLAGS: %016lx ", regs->rflags); - if ( (context == CTXT_pv_guest) && v && v->vcpu_info_area.map ) - printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); - printk("CONTEXT: %s", context_names[context]); - if ( v && !is_idle_vcpu(v) ) - printk(" (%pv)", v); - - printk("\nrax: %016lx rbx: %016lx rcx: %016lx\n", - regs->rax, regs->rbx, regs->rcx); - printk("rdx: %016lx rsi: %016lx rdi: %016lx\n", - regs->rdx, regs->rsi, regs->rdi); - printk("rbp: %016lx rsp: %016lx r8: %016lx\n", - regs->rbp, regs->rsp, regs->r8); - printk("r9: %016lx r10: %016lx r11: %016lx\n", - regs->r9, regs->r10, regs->r11); - printk("r12: %016lx r13: %016lx r14: %016lx\n", - regs->r12, regs->r13, regs->r14); - printk("r15: %016lx cr0: %016lx cr4: %016lx\n", - regs->r15, state->cr0, state->cr4); - printk("cr3: %016lx cr2: %016lx\n", state->cr3, state->cr2); - printk("fsb: %016lx gsb: %016lx gss: %016lx\n", - state->fsb, state->gsb, state->gss); - printk("ds: %04x es: %04x fs: %04x gs: %04x " - "ss: %04x cs: %04x\n", - state->ds, state->es, state->fs, - state->gs, regs->ss, regs->cs); -} - -void show_registers(const struct cpu_user_regs *regs) -{ - struct cpu_user_regs fault_regs = *regs; - struct extra_state fault_state; - enum context context; - struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; - - if ( guest_mode(regs) && is_hvm_vcpu(v) ) - { - get_hvm_registers(v, &fault_regs, &fault_state); - context = CTXT_hvm_guest; - } - else - { - read_registers(&fault_state); - - if ( guest_mode(regs) ) - { - context = CTXT_pv_guest; - fault_state.cr2 = arch_get_cr2(v); - } - else - { - context = CTXT_hypervisor; - } - } - - print_xen_info(); - printk("CPU: %d\n", smp_processor_id()); - _show_registers(&fault_regs, &fault_state, context, v); - - if ( ler_msr && !guest_mode(regs) ) - { - u64 from, to; - - rdmsrl(ler_msr, from); - rdmsrl(ler_msr + 1, to); - - /* Upper bits may store metadata. Re-canonicalise for printing. */ - printk("ler: from %016"PRIx64" [%ps]\n", - from, _p(canonicalise_addr(from))); - printk(" to %016"PRIx64" [%ps]\n", - to, _p(canonicalise_addr(to))); - } -} - -void vcpu_show_registers(struct vcpu *v) -{ - const struct cpu_user_regs *regs = &v->arch.user_regs; - struct cpu_user_regs aux_regs; - struct extra_state state; - enum context context; - - if ( is_hvm_vcpu(v) ) - { - aux_regs = *regs; - get_hvm_registers(v, &aux_regs, &state); - regs = &aux_regs; - context = CTXT_hvm_guest; - } - else - { - bool kernel = guest_kernel_mode(v, regs); - unsigned long gsb, gss; - - state.cr0 = v->arch.pv.ctrlreg[0]; - state.cr2 = arch_get_cr2(v); - state.cr3 = pagetable_get_paddr(kernel - ? v->arch.guest_table - : v->arch.guest_table_user); - state.cr4 = v->arch.pv.ctrlreg[4]; - - gsb = v->arch.pv.gs_base_user; - gss = v->arch.pv.gs_base_kernel; - if ( kernel ) - SWAP(gsb, gss); - - state.fsb = v->arch.pv.fs_base; - state.gsb = gsb; - state.gss = gss; - - state.ds = v->arch.pv.ds; - state.es = v->arch.pv.es; - state.fs = v->arch.pv.fs; - state.gs = v->arch.pv.gs; - - context = CTXT_pv_guest; - } - - _show_registers(regs, &state, context, v); -} - -void show_page_walk(unsigned long addr) -{ - unsigned long pfn, mfn = read_cr3() >> PAGE_SHIFT; - l4_pgentry_t l4e, *l4t; - l3_pgentry_t l3e, *l3t; - l2_pgentry_t l2e, *l2t; - l1_pgentry_t l1e, *l1t; - - printk("Pagetable walk from %016lx:\n", addr); - if ( !is_canonical_address(addr) ) - return; - - l4t = map_domain_page(_mfn(mfn)); - l4e = l4t[l4_table_offset(addr)]; - unmap_domain_page(l4t); - mfn = l4e_get_pfn(l4e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L4[0x%03lx] = %"PRIpte" %016lx\n", - l4_table_offset(addr), l4e_get_intpte(l4e), pfn); - if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) || - !mfn_valid(_mfn(mfn)) ) - return; - - l3t = map_domain_page(_mfn(mfn)); - l3e = l3t[l3_table_offset(addr)]; - unmap_domain_page(l3t); - mfn = l3e_get_pfn(l3e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L3[0x%03lx] = %"PRIpte" %016lx%s\n", - l3_table_offset(addr), l3e_get_intpte(l3e), pfn, - (l3e_get_flags(l3e) & _PAGE_PSE) ? " (PSE)" : ""); - if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) || - (l3e_get_flags(l3e) & _PAGE_PSE) || - !mfn_valid(_mfn(mfn)) ) - return; - - l2t = map_domain_page(_mfn(mfn)); - l2e = l2t[l2_table_offset(addr)]; - unmap_domain_page(l2t); - mfn = l2e_get_pfn(l2e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L2[0x%03lx] = %"PRIpte" %016lx%s\n", - l2_table_offset(addr), l2e_get_intpte(l2e), pfn, - (l2e_get_flags(l2e) & _PAGE_PSE) ? " (PSE)" : ""); - if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) || - (l2e_get_flags(l2e) & _PAGE_PSE) || - !mfn_valid(_mfn(mfn)) ) - return; - - l1t = map_domain_page(_mfn(mfn)); - l1e = l1t[l1_table_offset(addr)]; - unmap_domain_page(l1t); - mfn = l1e_get_pfn(l1e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", - l1_table_offset(addr), l1e_get_intpte(l1e), pfn); -} - -void asmlinkage noreturn do_double_fault(struct cpu_user_regs *regs) -{ - unsigned int cpu; - struct extra_state state; - - console_force_unlock(); - - asm ( "lsll %[sel], %[limit]" : [limit] "=r" (cpu) - : [sel] "r" (PER_CPU_SELECTOR) ); - - /* Find information saved during fault and dump it to the console. */ - printk("*** DOUBLE FAULT ***\n"); - print_xen_info(); - - read_registers(&state); - - printk("CPU: %d\n", cpu); - _show_registers(regs, &state, CTXT_hypervisor, NULL); - show_code(regs); - show_stack_overflow(cpu, regs); - - panic("DOUBLE FAULT -- system shutdown\n"); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 11:33:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 11:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083329.1442953 (Exim 4.92) (envelope-from ) id 1umsh0-0002dB-AZ; Fri, 15 Aug 2025 11:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083329.1442953; Fri, 15 Aug 2025 11:33:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsh0-0002d3-83; Fri, 15 Aug 2025 11:33:54 +0000 Received: by outflank-mailman (input) for mailman id 1083329; Fri, 15 Aug 2025 11:33:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umsgz-0002cs-1C for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umsgy-006hJy-2Z for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umsgy-004byW-34 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 11:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oJdGT7Qqo+/S/bAxHTncsgzp+8NTFzyuRmr1UGP8Gtk=; b=4pgLUn8T32YodxNsy7aG6+tge8 wCYgbhVc9QuJ1TD973VDYpgBRaYPLgh7EswSQ1UiVkY6iII5LbnIluctmBjP2SO2obxIwq7oXg6IP BvMp3bTRqBodyA+P5rDK386GPWldUloI51NpbnmKqKqGrg41wbS3co+jZSK5QhTeKb1g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Unexport show_code() and show_stack_overflow() Message-Id: Date: Fri, 15 Aug 2025 11:33:52 +0000 commit 528efc7b6aa2ed66b494bbc648892e5338522a26 Author: Andrew Cooper AuthorDate: Mon May 26 19:59:17 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:42 2025 +0100 x86/traps: Unexport show_code() and show_stack_overflow() These can become static now the two traps.c have been merged. No fucntional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/processor.h | 2 -- xen/arch/x86/traps.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 2799d59e38..1342241742 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -333,8 +333,6 @@ extern void write_ptbase(struct vcpu *v); /* PAUSE (encoding: REP NOP) is a good thing to insert into busy-wait loops. */ #define cpu_relax() asm volatile ( "pause" ::: "memory" ) -void show_code(const struct cpu_user_regs *regs); -void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs); void show_registers(const struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index ab8ff36acf..270b93ed62 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -354,7 +354,7 @@ void show_page_walk(unsigned long addr) l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -void show_code(const struct cpu_user_regs *regs) +static void show_code(const struct cpu_user_regs *regs) { unsigned char insns_before[8] = {}, insns_after[16] = {}; unsigned int i, tmp, missing_before, missing_after; @@ -838,7 +838,7 @@ static void show_stack(const struct cpu_user_regs *regs) show_trace(regs); } -void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) +static void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) { unsigned long esp = regs->rsp; unsigned long curr_stack_base = esp & ~(STACK_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 13:55:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 13:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083481.1443067 (Exim 4.92) (envelope-from ) id 1umutb-0000hA-7z; Fri, 15 Aug 2025 13:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083481.1443067; Fri, 15 Aug 2025 13:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umutb-0000h2-5O; Fri, 15 Aug 2025 13:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1083481; Fri, 15 Aug 2025 13:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuta-0000gt-5S for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umutZ-006k36-2J for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umutZ-004iNV-2h for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PcELmipRrHfl1AfY6zyzCi4F2mms+ULBpWKKV1TvNaw=; b=GA6D935Q5m6Y/dcOI88G7npjer YaoRjhedRPH3/KlRPm6CBbwClVbRHgg5MVroKyopg+AjlpRf5pgK24lgZ/XmcU1QBpHb9RTGUk1zJ 6UQbJvHI32dLC5OWaasQR7/DeVvPCfxVYjaXItIwg4ASqkKyK962c2i8BcCAyGUlSA9k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Rework init_shadow_spec_ctrl_state() to take an info pointer Message-Id: Date: Fri, 15 Aug 2025 13:55:01 +0000 commit 7f69bf4898de5919dfd3affa78baafcc3fd75aca Author: Andrew Cooper AuthorDate: Thu Aug 7 19:48:51 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/spec-ctrl: Rework init_shadow_spec_ctrl_state() to take an info pointer We're going to want to reuse it for a remote stack shortly. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/spec_ctrl.h | 4 +--- xen/arch/x86/setup.c | 2 +- xen/arch/x86/smpboot.c | 2 +- xen/arch/x86/spec_ctrl.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/include/asm/spec_ctrl.h b/xen/arch/x86/include/asm/spec_ctrl.h index 6724d38120..3d92928f94 100644 --- a/xen/arch/x86/include/asm/spec_ctrl.h +++ b/xen/arch/x86/include/asm/spec_ctrl.h @@ -99,10 +99,8 @@ extern bool opt_bp_spec_reduce; */ extern paddr_t l1tf_addr_mask, l1tf_safe_maddr; -static inline void init_shadow_spec_ctrl_state(void) +static inline void init_shadow_spec_ctrl_state(struct cpu_info *info) { - struct cpu_info *info = get_cpu_info(); - info->shadow_spec_ctrl = 0; info->xen_spec_ctrl = default_xen_spec_ctrl; info->scf = default_scf; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index c8c408e024..6fb42c5a5f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1126,7 +1126,7 @@ void asmlinkage __init noreturn __start_xen(void) /* Critical region without exception handling. Any fault is deadly! */ - init_shadow_spec_ctrl_state(); + init_shadow_spec_ctrl_state(info); percpu_init_areas(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 302be4341b..ce4862dde5 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -332,7 +332,7 @@ void asmlinkage start_secondary(void) set_current(idle_vcpu[cpu]); this_cpu(curr_vcpu) = idle_vcpu[cpu]; rdmsrl(MSR_EFER, this_cpu(efer)); - init_shadow_spec_ctrl_state(); + init_shadow_spec_ctrl_state(info); /* * Just as during early bootstrap, it is convenient here to disable diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index feae0d710f..1ff3d6835d 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -2226,7 +2226,7 @@ void __init init_speculation_mitigations(void) opt_eager_fpu = should_use_eager_fpu(); /* (Re)init BSP state now that default_scf has been calculated. */ - init_shadow_spec_ctrl_state(); + init_shadow_spec_ctrl_state(get_cpu_info()); /* * For microcoded IBRS only (i.e. Intel, pre eIBRS), it is recommended to -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 13:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 13:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083482.1443071 (Exim 4.92) (envelope-from ) id 1umutl-0000im-9W; Fri, 15 Aug 2025 13:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083482.1443071; Fri, 15 Aug 2025 13:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umutl-0000ie-6m; Fri, 15 Aug 2025 13:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1083482; Fri, 15 Aug 2025 13:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umutk-0000iW-3C for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umutj-006k3C-2m for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umutj-004iNt-3A for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=i+JZZq9fDYEzVsWmnd5tlcmDuxd4pyn29KLgLvRZ51A=; b=5C9UJQkRyytIvCRoTXwrLT4pCQ zL2TmbXuG16oC1Dq7cAgQVrtVe2GGcxw0cAAqPY6IGaQzG3p4Tm7XhpbtfshzguTxaVmxOojXo2p3 30mvlKft5SGO+/nWBplihUK3lMoRgYSkWz9R/Zs/tuKmVKc24FJSYwEFFejz/WMFaQ5w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Introduce percpu_early_traps_init() and set up exception handling earlier Message-Id: Date: Fri, 15 Aug 2025 13:55:11 +0000 commit 30860ae72d921f285eb5ab1cd8dec874ffb51cd5 Author: Andrew Cooper AuthorDate: Fri May 23 14:28:37 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/traps: Introduce percpu_early_traps_init() and set up exception handling earlier As things stand, we set up AP/S3 exception handling marginally after the fragile activity of setting up shadow stacks. Shadow stack setup is going to get more complicated under FRED. Introduce percpu_early_traps_init() and call it ahead of setting up shadow stacks. To start with, call load_system_tables() which is sufficient to set up full exception handling. In order to handle exceptions, current and the speculation controls needs to work. cpu_smpboot_alloc() already constructs some of the AP's top-of-stack block, so have it set up a little more. Zero the whole structure to subsume other misc setup. This gets us complete exception coverage of setting up shadow stacks, rather than dying with a triple fault. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 5 +++-- xen/arch/x86/boot/x86_64.S | 5 ++++- xen/arch/x86/smpboot.c | 19 ++++++------------- xen/arch/x86/traps-setup.c | 12 ++++++++++++ 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 92af6230b3..cc40fddc38 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -63,6 +63,9 @@ LABEL(s3_resume) pushq %rax lretq 1: + /* Set up early exceptions and CET before entering C properly. */ + call percpu_early_traps_init + #if defined(CONFIG_XEN_SHSTK) || defined(CONFIG_XEN_IBT) call xen_msr_s_cet_value test %eax, %eax @@ -117,8 +120,6 @@ LABEL(s3_resume) .L_cet_done: #endif /* CONFIG_XEN_SHSTK || CONFIG_XEN_IBT */ - call load_system_tables - /* Restore CR4 from the cpuinfo block. */ GET_STACK_END(bx) mov STACK_CPUINFO_FIELD(cr4)(%rbx), %rax diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 95a6b6cf63..d0e7449a14 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -30,7 +30,10 @@ ENTRY(__high_start) test %ebx,%ebx jz .L_bsp - /* APs. Set up CET before entering C properly. */ + /* APs. Set up early exceptions and CET before entering C properly. */ + + call percpu_early_traps_init + #if defined(CONFIG_XEN_SHSTK) || defined(CONFIG_XEN_IBT) call xen_msr_s_cet_value test %eax, %eax diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index ce4862dde5..efb5adb3a1 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -327,12 +327,7 @@ void asmlinkage start_secondary(void) struct cpu_info *info = get_cpu_info(); unsigned int cpu = smp_processor_id(); - /* Critical region without IDT or TSS. Any fault is deadly! */ - - set_current(idle_vcpu[cpu]); - this_cpu(curr_vcpu) = idle_vcpu[cpu]; rdmsrl(MSR_EFER, this_cpu(efer)); - init_shadow_spec_ctrl_state(info); /* * Just as during early bootstrap, it is convenient here to disable @@ -352,14 +347,6 @@ void asmlinkage start_secondary(void) */ spin_debug_disable(); - get_cpu_info()->use_pv_cr3 = false; - get_cpu_info()->xen_cr3 = 0; - get_cpu_info()->pv_cr3 = 0; - - load_system_tables(); - - /* Full exception support from here on in. */ - if ( cpu_has_pks ) wrpkrs_and_cache(0); /* Must be before setting CR4.PKS */ @@ -1064,9 +1051,15 @@ static int cpu_smpboot_alloc(unsigned int cpu) goto out; info = get_cpu_info_from_stack((unsigned long)stack_base[cpu]); + memset(info, 0, sizeof(*info)); info->processor_id = cpu; info->per_cpu_offset = __per_cpu_offset[cpu]; + init_shadow_spec_ctrl_state(info); + + info->current_vcpu = idle_vcpu[cpu]; /* set_current() */ + per_cpu(curr_vcpu, cpu) = idle_vcpu[cpu]; + gdt = per_cpu(gdt, cpu) ?: alloc_xenheap_pages(0, memflags); if ( gdt == NULL ) goto out; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 99257bbb16..758c67b335 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -127,3 +127,15 @@ void percpu_traps_init(void) if ( cpu_has_xen_lbr ) wrmsrl(MSR_IA32_DEBUGCTLMSR, IA32_DEBUGCTLMSR_LBR); } + +/* + * Configure exception handling on APs and S3. Called before entering C + * properly, and before shadow stacks are activated. + * + * boot_gdt is currently loaded, and we must switch to our local GDT. The + * local IDT has unknown IST-ness. + */ +void asmlinkage percpu_early_traps_init(void) +{ + load_system_tables(); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 13:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 13:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083483.1443076 (Exim 4.92) (envelope-from ) id 1umutv-0000ky-BR; Fri, 15 Aug 2025 13:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083483.1443076; Fri, 15 Aug 2025 13:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umutv-0000kr-8B; Fri, 15 Aug 2025 13:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1083483; Fri, 15 Aug 2025 13:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umutu-0000kg-6r for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umutt-006k3H-39 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umutu-004iOJ-0P for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=20jXE1PRksfni+wEvZAPeUYoQgnbVbStKxMnqTMlRdk=; b=cOdikBFdSrjHCytNas5g16MRcu b2TzS6d5BULmao3TM7ZnCqsWmjimvl8mUCp3HY1tER6O6BWeQiQvAiyHIQncaHB71TcFs2PiG1ady gJCLhmyZCfzUS1kKv6vufof8DaKCXQ2opUQwuT4+7RM41ZPhjXycP8eiisOaQoW8/v7k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Move load_system_tables() into traps-setup.c Message-Id: Date: Fri, 15 Aug 2025 13:55:22 +0000 commit 5222af8bb213e3068c9cf4939ed3dc42b62cf227 Author: Andrew Cooper AuthorDate: Wed Jan 1 15:16:33 2025 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/traps: Move load_system_tables() into traps-setup.c Switch it to Xen coding style and fix MISRA violations (ul -> UL). Make it static as there are no external caller now. Since commit a35816b5cae8 ("x86/traps: Introduce early_traps_init() and simplify setup"), load_system_tables() is called later on the BSP, so the SYS_STATE_early_boot check can be dropped from the safety BUG_ON(). Move the BUILD_BUG_ON() into build_assertions(), and introduce an endof_field() helper to make the expression clearer. Swap wrmsrl(MSR_ISST, ...) for wrmsrns(). No serialisation is needed at this point. Drop the comment about Clang 3.5. It's no longer a supported toolchain, and while the comment is true, the code should have been written with a local pointer anyway. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 118 ----------------------------------- xen/arch/x86/include/asm/system.h | 1 - xen/arch/x86/traps-setup.c | 126 ++++++++++++++++++++++++++++++++++++++ xen/include/xen/macros.h | 2 + 4 files changed, 128 insertions(+), 119 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index cdc41248d4..da05015578 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -843,124 +843,6 @@ void print_cpu_info(unsigned int cpu) static cpumask_t cpu_initialized; -/* - * Sets up system tables and descriptors. - * - * - Sets up TSS with stack pointers, including ISTs - * - Inserts TSS selector into regular and compat GDTs - * - Loads GDT, IDT, TR then null LDT - * - Sets up IST references in the IDT - */ -void load_system_tables(void) -{ - unsigned int i, cpu = smp_processor_id(); - unsigned long stack_bottom = get_stack_bottom(), - stack_top = stack_bottom & ~(STACK_SIZE - 1); - /* - * NB: define tss_page as a local variable because clang 3.5 doesn't - * support using ARRAY_SIZE against per-cpu variables. - */ - struct tss_page *tss_page = &this_cpu(tss_page); - idt_entry_t *idt = this_cpu(idt); - - /* The TSS may be live. Disuade any clever optimisations. */ - volatile struct tss64 *tss = &tss_page->tss; - seg_desc_t *gdt = - this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; - - const struct desc_ptr gdtr = { - .base = (unsigned long)gdt, - .limit = LAST_RESERVED_GDT_BYTE, - }; - const struct desc_ptr idtr = { - .base = (unsigned long)idt, - .limit = sizeof(bsp_idt) - 1, - }; - - /* - * Set up the TSS. Warning - may be live, and the NMI/#MC must remain - * valid on every instruction boundary. (Note: these are all - * semantically ACCESS_ONCE() due to tss's volatile qualifier.) - * - * rsp0 refers to the primary stack. #MC, NMI, #DB and #DF handlers - * each get their own stacks. No IO Bitmap. - */ - tss->rsp0 = stack_bottom; - tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; - tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; - tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; - tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; - tss->bitmap = IOBMP_INVALID_OFFSET; - - /* All other stack pointers poisioned. */ - for ( i = IST_MAX; i < ARRAY_SIZE(tss->ist); ++i ) - tss->ist[i] = 0x8600111111111111ul; - tss->rsp1 = 0x8600111111111111ul; - tss->rsp2 = 0x8600111111111111ul; - - /* - * Set up the shadow stack IST. Used entries must point at the - * supervisor stack token. Unused entries are poisoned. - * - * This IST Table may be live, and the NMI/#MC entries must - * remain valid on every instruction boundary, hence the - * volatile qualifier. - */ - if (cpu_has_xen_shstk) { - volatile uint64_t *ist_ssp = tss_page->ist_ssp; - unsigned long - mce_ssp = stack_top + (IST_MCE * IST_SHSTK_SIZE) - 8, - nmi_ssp = stack_top + (IST_NMI * IST_SHSTK_SIZE) - 8, - db_ssp = stack_top + (IST_DB * IST_SHSTK_SIZE) - 8, - df_ssp = stack_top + (IST_DF * IST_SHSTK_SIZE) - 8; - - ist_ssp[0] = 0x8600111111111111ul; - ist_ssp[IST_MCE] = mce_ssp; - ist_ssp[IST_NMI] = nmi_ssp; - ist_ssp[IST_DB] = db_ssp; - ist_ssp[IST_DF] = df_ssp; - for ( i = IST_DF + 1; i < ARRAY_SIZE(tss_page->ist_ssp); ++i ) - ist_ssp[i] = 0x8600111111111111ul; - - if (IS_ENABLED(CONFIG_XEN_SHSTK) && rdssp() != SSP_NO_SHSTK) { - /* - * Rewrite supervisor tokens when shadow stacks are - * active. This resets any busy bits left across S3. - */ - wrss(mce_ssp, _p(mce_ssp)); - wrss(nmi_ssp, _p(nmi_ssp)); - wrss(db_ssp, _p(db_ssp)); - wrss(df_ssp, _p(df_ssp)); - } - - wrmsrl(MSR_ISST, (unsigned long)ist_ssp); - } - - _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, - sizeof(*tss) - 1, SYS_DESC_tss_avail); - if ( IS_ENABLED(CONFIG_PV32) ) - _set_tssldt_desc( - this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY, - (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy); - - per_cpu(full_gdt_loaded, cpu) = false; - lgdt(&gdtr); - lidt(&idtr); - ltr(TSS_SELECTOR); - lldt(0); - - enable_each_ist(idt); - - /* - * Bottom-of-stack must be 16-byte aligned! - * - * Defer checks until exception support is sufficiently set up. - */ - BUILD_BUG_ON((sizeof(struct cpu_info) - - sizeof(struct cpu_user_regs)) & 0xf); - BUG_ON(system_state != SYS_STATE_early_boot && (stack_bottom & 0xf)); -} - static void skinit_enable_intr(void) { uint64_t val; diff --git a/xen/arch/x86/include/asm/system.h b/xen/arch/x86/include/asm/system.h index 57446c5b46..3cdc56e4ba 100644 --- a/xen/arch/x86/include/asm/system.h +++ b/xen/arch/x86/include/asm/system.h @@ -256,7 +256,6 @@ static inline int local_irq_is_enabled(void) #define BROKEN_ACPI_Sx 0x0001 #define BROKEN_INIT_AFTER_S1 0x0002 -void load_system_tables(void); void subarch_percpu_traps_init(void); #endif diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 758c67b335..d089833121 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -19,6 +20,118 @@ boolean_param("ler", opt_ler); void nocall entry_PF(void); +/* + * Sets up system tables and descriptors for IDT devliery. + * + * - Sets up TSS with stack pointers, including ISTs + * - Inserts TSS selector into regular and compat GDTs + * - Loads GDT, IDT, TR then null LDT + * - Sets up IST references in the IDT + */ +static void load_system_tables(void) +{ + unsigned int i, cpu = smp_processor_id(); + unsigned long stack_bottom = get_stack_bottom(), + stack_top = stack_bottom & ~(STACK_SIZE - 1); + struct tss_page *tss_page = &this_cpu(tss_page); + idt_entry_t *idt = this_cpu(idt); + + /* The TSS may be live. Disuade any clever optimisations. */ + volatile struct tss64 *tss = &tss_page->tss; + seg_desc_t *gdt = + this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; + + const struct desc_ptr gdtr = { + .base = (unsigned long)gdt, + .limit = LAST_RESERVED_GDT_BYTE, + }; + const struct desc_ptr idtr = { + .base = (unsigned long)idt, + .limit = sizeof(bsp_idt) - 1, + }; + + /* + * Set up the TSS. Warning - may be live, and the NMI/#MC must remain + * valid on every instruction boundary. (Note: these are all + * semantically ACCESS_ONCE() due to tss's volatile qualifier.) + * + * rsp0 refers to the primary stack. #MC, NMI, #DB and #DF handlers + * each get their own stacks. No IO Bitmap. + */ + tss->rsp0 = stack_bottom; + tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; + tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; + tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; + tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; + tss->bitmap = IOBMP_INVALID_OFFSET; + + /* All other stack pointers poisioned. */ + for ( i = IST_MAX; i < ARRAY_SIZE(tss->ist); ++i ) + tss->ist[i] = 0x8600111111111111UL; + tss->rsp1 = 0x8600111111111111UL; + tss->rsp2 = 0x8600111111111111UL; + + /* + * Set up the shadow stack IST. Used entries must point at the + * supervisor stack token. Unused entries are poisoned. + * + * This IST Table may be live, and the NMI/#MC entries must + * remain valid on every instruction boundary, hence the + * volatile qualifier. + */ + if ( cpu_has_xen_shstk ) + { + volatile uint64_t *ist_ssp = tss_page->ist_ssp; + unsigned long + mce_ssp = stack_top + (IST_MCE * IST_SHSTK_SIZE) - 8, + nmi_ssp = stack_top + (IST_NMI * IST_SHSTK_SIZE) - 8, + db_ssp = stack_top + (IST_DB * IST_SHSTK_SIZE) - 8, + df_ssp = stack_top + (IST_DF * IST_SHSTK_SIZE) - 8; + + ist_ssp[0] = 0x8600111111111111UL; + ist_ssp[IST_MCE] = mce_ssp; + ist_ssp[IST_NMI] = nmi_ssp; + ist_ssp[IST_DB] = db_ssp; + ist_ssp[IST_DF] = df_ssp; + for ( i = IST_DF + 1; i < ARRAY_SIZE(tss_page->ist_ssp); ++i ) + ist_ssp[i] = 0x8600111111111111UL; + + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && rdssp() != SSP_NO_SHSTK ) + { + /* + * Rewrite supervisor tokens when shadow stacks are + * active. This resets any busy bits left across S3. + */ + wrss(mce_ssp, _p(mce_ssp)); + wrss(nmi_ssp, _p(nmi_ssp)); + wrss(db_ssp, _p(db_ssp)); + wrss(df_ssp, _p(df_ssp)); + } + + wrmsrns(MSR_ISST, (unsigned long)ist_ssp); + } + + _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, + sizeof(*tss) - 1, SYS_DESC_tss_avail); + if ( IS_ENABLED(CONFIG_PV32) ) + _set_tssldt_desc( + this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY, + (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy); + + per_cpu(full_gdt_loaded, cpu) = false; + lgdt(&gdtr); + lidt(&idtr); + ltr(TSS_SELECTOR); + lldt(0); + + enable_each_ist(idt); + + /* + * tss->rsp0 must be 16-byte aligned. + */ + BUG_ON(stack_bottom & 15); +} + static void __init init_ler(void) { unsigned int msr = 0; @@ -139,3 +252,16 @@ void asmlinkage percpu_early_traps_init(void) { load_system_tables(); } + +static void __init __maybe_unused build_assertions(void) +{ + /* + * This is best-effort (it doesn't cover some padding corner cases), but + * is preferable to hitting the check at boot time. + * + * tss->rsp0, pointing at the end of cpu_info.guest_cpu_user_regs, must be + * 16-byte aligned. + */ + BUILD_BUG_ON((sizeof(struct cpu_info) - + endof_field(struct cpu_info, guest_cpu_user_regs)) & 15); +} diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index f9ccde86fb..6b4a8dc8b7 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -94,6 +94,8 @@ */ #define sizeof_field(type, member) sizeof(((type *)NULL)->member) +#define endof_field(type, member) (offsetof(type, member) + sizeof_field(type, member)) + /* Cast an arbitrary integer to a pointer. */ #define _p(x) ((void *)(unsigned long)(x)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 13:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 13:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083484.1443080 (Exim 4.92) (envelope-from ) id 1umuu5-0000n0-E1; Fri, 15 Aug 2025 13:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083484.1443080; Fri, 15 Aug 2025 13:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuu5-0000mq-9n; Fri, 15 Aug 2025 13:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1083484; Fri, 15 Aug 2025 13:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuu4-0000mi-A2 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umuu4-006k3L-0E for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umuu4-004iPD-0m for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ztIWyF2Y9H5qh7bVIMQ/7dLmwhg1oG/4WYECTP3QEck=; b=X0CVwlOSqe6j4UzVaUk1xzA/iD 93x5LrQRGHY11oY888Hp5Iiwt9BQWsskQDY3jjWWMebWFbA8fY36wwU57MiIWAAgvNW8shLUokf+X smdpI4iRZa0MJsMsU9kJHb8+bbrsl8+mdQ5O0viP/6Ki5U3M9+zuQIFIX3+jKGfPVcVc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Move subarch_percpu_traps_init() into traps-setup.c Message-Id: Date: Fri, 15 Aug 2025 13:55:32 +0000 commit 327ca0b54524de547417005e65ea168a6ed222be Author: Andrew Cooper AuthorDate: Wed Jan 8 11:51:06 2025 +0000 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:41 2025 +0100 x86/traps: Move subarch_percpu_traps_init() into traps-setup.c ... along with the supporting functions. Switch to Xen coding style, and make static as there are no external callers. Rename to legacy_syscall_init() as a more accurate name. Swap wrmsr{,l}() for wrmsrns(). No serialisation is needed at this point. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/system.h | 2 - xen/arch/x86/traps-setup.c | 97 ++++++++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/traps.c | 92 ------------------------------------- 3 files changed, 95 insertions(+), 96 deletions(-) diff --git a/xen/arch/x86/include/asm/system.h b/xen/arch/x86/include/asm/system.h index 3cdc56e4ba..6c2800d815 100644 --- a/xen/arch/x86/include/asm/system.h +++ b/xen/arch/x86/include/asm/system.h @@ -256,6 +256,4 @@ static inline int local_irq_is_enabled(void) #define BROKEN_ACPI_Sx 0x0001 #define BROKEN_INIT_AFTER_S1 0x0002 -void subarch_percpu_traps_init(void); - #endif diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index d089833121..25581acf11 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -2,13 +2,15 @@ /* * Configuration of event handling for all CPUs. */ +#include #include #include +#include #include #include #include -#include +#include #include DEFINE_PER_CPU_READ_MOSTLY(idt_entry_t *, idt); @@ -19,6 +21,8 @@ static bool __initdata opt_ler; boolean_param("ler", opt_ler); void nocall entry_PF(void); +void nocall lstar_enter(void); +void nocall cstar_enter(void); /* * Sets up system tables and descriptors for IDT devliery. @@ -132,6 +136,95 @@ static void load_system_tables(void) BUG_ON(stack_bottom & 15); } +static unsigned int write_stub_trampoline( + unsigned char *stub, unsigned long stub_va, + unsigned long stack_bottom, unsigned long target_va) +{ + unsigned char *p = stub; + + if ( cpu_has_xen_ibt ) + { + place_endbr64(p); + p += 4; + } + + /* Store guest %rax into %ss slot */ + /* movabsq %rax, stack_bottom - 8 */ + *p++ = 0x48; + *p++ = 0xa3; + *(uint64_t *)p = stack_bottom - 8; + p += 8; + + /* Store guest %rsp in %rax */ + /* movq %rsp, %rax */ + *p++ = 0x48; + *p++ = 0x89; + *p++ = 0xe0; + + /* Switch to Xen stack */ + /* movabsq $stack_bottom - 8, %rsp */ + *p++ = 0x48; + *p++ = 0xbc; + *(uint64_t *)p = stack_bottom - 8; + p += 8; + + /* jmp target_va */ + *p++ = 0xe9; + *(int32_t *)p = target_va - (stub_va + (p - stub) + 4); + p += 4; + + /* Round up to a multiple of 16 bytes. */ + return ROUNDUP(p - stub, 16); +} + +static void legacy_syscall_init(void) +{ + unsigned long stack_bottom = get_stack_bottom(); + unsigned long stub_va = this_cpu(stubs.addr); + unsigned char *stub_page; + unsigned int offset; + + /* No PV guests? No need to set up SYSCALL/SYSENTER infrastructure. */ + if ( !IS_ENABLED(CONFIG_PV) ) + return; + + stub_page = map_domain_page(_mfn(this_cpu(stubs.mfn))); + + /* + * Trampoline for SYSCALL entry from 64-bit mode. The VT-x HVM vcpu + * context switch logic relies on the SYSCALL trampoline being at the + * start of the stubs. + */ + wrmsrns(MSR_LSTAR, stub_va); + offset = write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)lstar_enter); + stub_va += offset; + + if ( cpu_has_sep ) + { + /* SYSENTER entry. */ + wrmsrns(MSR_IA32_SYSENTER_ESP, stack_bottom); + wrmsrns(MSR_IA32_SYSENTER_EIP, (unsigned long)sysenter_entry); + wrmsrns(MSR_IA32_SYSENTER_CS, __HYPERVISOR_CS); + } + + /* Trampoline for SYSCALL entry from compatibility mode. */ + wrmsrns(MSR_CSTAR, stub_va); + offset += write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)cstar_enter); + + /* Don't consume more than half of the stub space here. */ + ASSERT(offset <= STUB_BUF_SIZE / 2); + + unmap_domain_page(stub_page); + + /* Common SYSCALL parameters. */ + wrmsrns(MSR_STAR, XEN_MSR_STAR); + wrmsrns(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK); +} + static void __init init_ler(void) { unsigned int msr = 0; @@ -235,7 +328,7 @@ void __init bsp_traps_reinit(void) */ void percpu_traps_init(void) { - subarch_percpu_traps_init(); + legacy_syscall_init(); if ( cpu_has_xen_lbr ) wrmsrl(MSR_IA32_DEBUGCTLMSR, IA32_DEBUGCTLMSR_LBR); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 34adf55e48..81e64466e4 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -311,98 +311,6 @@ void asmlinkage noreturn do_double_fault(struct cpu_user_regs *regs) panic("DOUBLE FAULT -- system shutdown\n"); } -static unsigned int write_stub_trampoline( - unsigned char *stub, unsigned long stub_va, - unsigned long stack_bottom, unsigned long target_va) -{ - unsigned char *p = stub; - - if ( cpu_has_xen_ibt ) - { - place_endbr64(p); - p += 4; - } - - /* Store guest %rax into %ss slot */ - /* movabsq %rax, stack_bottom - 8 */ - *p++ = 0x48; - *p++ = 0xa3; - *(uint64_t *)p = stack_bottom - 8; - p += 8; - - /* Store guest %rsp in %rax */ - /* movq %rsp, %rax */ - *p++ = 0x48; - *p++ = 0x89; - *p++ = 0xe0; - - /* Switch to Xen stack */ - /* movabsq $stack_bottom - 8, %rsp */ - *p++ = 0x48; - *p++ = 0xbc; - *(uint64_t *)p = stack_bottom - 8; - p += 8; - - /* jmp target_va */ - *p++ = 0xe9; - *(int32_t *)p = target_va - (stub_va + (p - stub) + 4); - p += 4; - - /* Round up to a multiple of 16 bytes. */ - return ROUNDUP(p - stub, 16); -} - -void nocall lstar_enter(void); -void nocall cstar_enter(void); - -void subarch_percpu_traps_init(void) -{ - unsigned long stack_bottom = get_stack_bottom(); - unsigned long stub_va = this_cpu(stubs.addr); - unsigned char *stub_page; - unsigned int offset; - - /* No PV guests? No need to set up SYSCALL/SYSENTER infrastructure. */ - if ( !IS_ENABLED(CONFIG_PV) ) - return; - - stub_page = map_domain_page(_mfn(this_cpu(stubs.mfn))); - - /* - * Trampoline for SYSCALL entry from 64-bit mode. The VT-x HVM vcpu - * context switch logic relies on the SYSCALL trampoline being at the - * start of the stubs. - */ - wrmsrl(MSR_LSTAR, stub_va); - offset = write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), - stub_va, stack_bottom, - (unsigned long)lstar_enter); - stub_va += offset; - - if ( cpu_has_sep ) - { - /* SYSENTER entry. */ - wrmsrl(MSR_IA32_SYSENTER_ESP, stack_bottom); - wrmsrl(MSR_IA32_SYSENTER_EIP, (unsigned long)sysenter_entry); - wrmsr(MSR_IA32_SYSENTER_CS, __HYPERVISOR_CS, 0); - } - - /* Trampoline for SYSCALL entry from compatibility mode. */ - wrmsrl(MSR_CSTAR, stub_va); - offset += write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), - stub_va, stack_bottom, - (unsigned long)cstar_enter); - - /* Don't consume more than half of the stub space here. */ - ASSERT(offset <= STUB_BUF_SIZE / 2); - - unmap_domain_page(stub_page); - - /* Common SYSCALL parameters. */ - wrmsrl(MSR_STAR, XEN_MSR_STAR); - wrmsrl(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK); -} - /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 13:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 13:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083485.1443083 (Exim 4.92) (envelope-from ) id 1umuuF-0000pc-GT; Fri, 15 Aug 2025 13:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083485.1443083; Fri, 15 Aug 2025 13:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuuF-0000pU-Dd; Fri, 15 Aug 2025 13:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1083485; Fri, 15 Aug 2025 13:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuuE-0000pK-D2 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umuuE-006k3j-0X for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umuuE-004iPl-15 for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=copQ4VTXNUM9CUfzrAl4yAHx9jyhZoFvTfUFox0WbZk=; b=U0rGkeJFMbS166qu3KKUz3faPT BFOmpAvtWAtKFVXZEvDSoNm6ge9PgmNTEey0K6j/hElVygIAo12LUONkt2NRV2XiniJ9Z5/Z8EvvQ I9pQH973RyG/I12I2pixo+o18i0TMTc607WL4pEDEiMLEQXM6dlherQzNQqlWc5TgiRU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Fold x86_64/traps.c into traps.c Message-Id: Date: Fri, 15 Aug 2025 13:55:42 +0000 commit 16376dece87d3ab21dc43752ab52dc2cfc806229 Author: Andrew Cooper AuthorDate: Mon May 26 19:37:31 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:42 2025 +0100 x86/traps: Fold x86_64/traps.c into traps.c It's now just the double fault handler and various state dumping functions. Swap u64 for uint64_t, and fix a few other minor style issues. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 291 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/Makefile | 1 - xen/arch/x86/x86_64/traps.c | 322 ------------------------------------------- 3 files changed, 291 insertions(+), 323 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 238d923dd1..ab8ff36acf 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -87,6 +88,272 @@ const unsigned int nmi_cpu; #define stack_words_per_line 4 #define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)(regs)->rsp) +struct extra_state +{ + unsigned long cr0, cr2, cr3, cr4; + unsigned long fsb, gsb, gss; + uint16_t ds, es, fs, gs; +}; + +static void print_xen_info(void) +{ + char taint_str[TAINT_STRING_MAX_LEN]; + + printk("----[ Xen-%d.%d%s x86_64 %s %s ]----\n", + xen_major_version(), xen_minor_version(), xen_extra_version(), + xen_build_info(), print_tainted(taint_str)); +} + +enum context { + CTXT_hypervisor, + CTXT_pv_guest, + CTXT_hvm_guest, +}; + +static void read_registers(struct extra_state *state) +{ + state->cr0 = read_cr0(); + state->cr2 = read_cr2(); + state->cr3 = read_cr3(); + state->cr4 = read_cr4(); + + state->fsb = read_fs_base(); + state->gsb = read_gs_base(); + state->gss = read_gs_shadow(); + + asm ( "mov %%ds, %0" : "=m" (state->ds) ); + asm ( "mov %%es, %0" : "=m" (state->es) ); + asm ( "mov %%fs, %0" : "=m" (state->fs) ); + asm ( "mov %%gs, %0" : "=m" (state->gs) ); +} + +static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, + struct extra_state *state) +{ + struct segment_register sreg; + + state->cr0 = v->arch.hvm.guest_cr[0]; + state->cr2 = v->arch.hvm.guest_cr[2]; + state->cr3 = v->arch.hvm.guest_cr[3]; + state->cr4 = v->arch.hvm.guest_cr[4]; + + hvm_get_segment_register(v, x86_seg_cs, &sreg); + regs->cs = sreg.sel; + + hvm_get_segment_register(v, x86_seg_ds, &sreg); + state->ds = sreg.sel; + + hvm_get_segment_register(v, x86_seg_es, &sreg); + state->es = sreg.sel; + + hvm_get_segment_register(v, x86_seg_fs, &sreg); + state->fs = sreg.sel; + state->fsb = sreg.base; + + hvm_get_segment_register(v, x86_seg_gs, &sreg); + state->gs = sreg.sel; + state->gsb = sreg.base; + + hvm_get_segment_register(v, x86_seg_ss, &sreg); + regs->ss = sreg.sel; + + state->gss = hvm_get_reg(v, MSR_SHADOW_GS_BASE); +} + +static void _show_registers( + const struct cpu_user_regs *regs, const struct extra_state *state, + enum context context, const struct vcpu *v) +{ + static const char *const context_names[] = { + [CTXT_hypervisor] = "hypervisor", + [CTXT_pv_guest] = "pv guest", + [CTXT_hvm_guest] = "hvm guest", + }; + + printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); + if ( context == CTXT_hypervisor ) + printk(" %pS", _p(regs->rip)); + printk("\nRFLAGS: %016lx ", regs->rflags); + if ( (context == CTXT_pv_guest) && v && v->vcpu_info_area.map ) + printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); + printk("CONTEXT: %s", context_names[context]); + if ( v && !is_idle_vcpu(v) ) + printk(" (%pv)", v); + + printk("\nrax: %016lx rbx: %016lx rcx: %016lx\n", + regs->rax, regs->rbx, regs->rcx); + printk("rdx: %016lx rsi: %016lx rdi: %016lx\n", + regs->rdx, regs->rsi, regs->rdi); + printk("rbp: %016lx rsp: %016lx r8: %016lx\n", + regs->rbp, regs->rsp, regs->r8); + printk("r9: %016lx r10: %016lx r11: %016lx\n", + regs->r9, regs->r10, regs->r11); + printk("r12: %016lx r13: %016lx r14: %016lx\n", + regs->r12, regs->r13, regs->r14); + printk("r15: %016lx cr0: %016lx cr4: %016lx\n", + regs->r15, state->cr0, state->cr4); + printk("cr3: %016lx cr2: %016lx\n", state->cr3, state->cr2); + printk("fsb: %016lx gsb: %016lx gss: %016lx\n", + state->fsb, state->gsb, state->gss); + printk("ds: %04x es: %04x fs: %04x gs: %04x ss: %04x cs: %04x\n", + state->ds, state->es, state->fs, + state->gs, regs->ss, regs->cs); +} + +void show_registers(const struct cpu_user_regs *regs) +{ + struct cpu_user_regs fault_regs = *regs; + struct extra_state fault_state; + enum context context; + struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; + + if ( guest_mode(regs) && is_hvm_vcpu(v) ) + { + get_hvm_registers(v, &fault_regs, &fault_state); + context = CTXT_hvm_guest; + } + else + { + read_registers(&fault_state); + + if ( guest_mode(regs) ) + { + context = CTXT_pv_guest; + fault_state.cr2 = arch_get_cr2(v); + } + else + { + context = CTXT_hypervisor; + } + } + + print_xen_info(); + printk("CPU: %d\n", smp_processor_id()); + _show_registers(&fault_regs, &fault_state, context, v); + + if ( ler_msr && !guest_mode(regs) ) + { + uint64_t from, to; + + rdmsrl(ler_msr, from); + rdmsrl(ler_msr + 1, to); + + /* Upper bits may store metadata. Re-canonicalise for printing. */ + printk("ler: from %016"PRIx64" [%ps]\n", + from, _p(canonicalise_addr(from))); + printk(" to %016"PRIx64" [%ps]\n", + to, _p(canonicalise_addr(to))); + } +} + +void vcpu_show_registers(struct vcpu *v) +{ + const struct cpu_user_regs *regs = &v->arch.user_regs; + struct cpu_user_regs aux_regs; + struct extra_state state; + enum context context; + + if ( is_hvm_vcpu(v) ) + { + aux_regs = *regs; + get_hvm_registers(v, &aux_regs, &state); + regs = &aux_regs; + context = CTXT_hvm_guest; + } + else + { + bool kernel = guest_kernel_mode(v, regs); + unsigned long gsb, gss; + + state.cr0 = v->arch.pv.ctrlreg[0]; + state.cr2 = arch_get_cr2(v); + state.cr3 = pagetable_get_paddr(kernel + ? v->arch.guest_table + : v->arch.guest_table_user); + state.cr4 = v->arch.pv.ctrlreg[4]; + + gsb = v->arch.pv.gs_base_user; + gss = v->arch.pv.gs_base_kernel; + if ( kernel ) + SWAP(gsb, gss); + + state.fsb = v->arch.pv.fs_base; + state.gsb = gsb; + state.gss = gss; + + state.ds = v->arch.pv.ds; + state.es = v->arch.pv.es; + state.fs = v->arch.pv.fs; + state.gs = v->arch.pv.gs; + + context = CTXT_pv_guest; + } + + _show_registers(regs, &state, context, v); +} + +void show_page_walk(unsigned long addr) +{ + unsigned long pfn, mfn = read_cr3() >> PAGE_SHIFT; + l4_pgentry_t l4e, *l4t; + l3_pgentry_t l3e, *l3t; + l2_pgentry_t l2e, *l2t; + l1_pgentry_t l1e, *l1t; + + printk("Pagetable walk from %016lx:\n", addr); + if ( !is_canonical_address(addr) ) + return; + + l4t = map_domain_page(_mfn(mfn)); + l4e = l4t[l4_table_offset(addr)]; + unmap_domain_page(l4t); + mfn = l4e_get_pfn(l4e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L4[0x%03lx] = %"PRIpte" %016lx\n", + l4_table_offset(addr), l4e_get_intpte(l4e), pfn); + if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) || + !mfn_valid(_mfn(mfn)) ) + return; + + l3t = map_domain_page(_mfn(mfn)); + l3e = l3t[l3_table_offset(addr)]; + unmap_domain_page(l3t); + mfn = l3e_get_pfn(l3e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L3[0x%03lx] = %"PRIpte" %016lx%s\n", + l3_table_offset(addr), l3e_get_intpte(l3e), pfn, + (l3e_get_flags(l3e) & _PAGE_PSE) ? " (PSE)" : ""); + if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) || + (l3e_get_flags(l3e) & _PAGE_PSE) || + !mfn_valid(_mfn(mfn)) ) + return; + + l2t = map_domain_page(_mfn(mfn)); + l2e = l2t[l2_table_offset(addr)]; + unmap_domain_page(l2t); + mfn = l2e_get_pfn(l2e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L2[0x%03lx] = %"PRIpte" %016lx%s\n", + l2_table_offset(addr), l2e_get_intpte(l2e), pfn, + (l2e_get_flags(l2e) & _PAGE_PSE) ? " (PSE)" : ""); + if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) || + (l2e_get_flags(l2e) & _PAGE_PSE) || + !mfn_valid(_mfn(mfn)) ) + return; + + l1t = map_domain_page(_mfn(mfn)); + l1e = l1t[l1_table_offset(addr)]; + unmap_domain_page(l1t); + mfn = l1e_get_pfn(l1e); + pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? + get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; + printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", + l1_table_offset(addr), l1e_get_intpte(l1e), pfn); +} + void show_code(const struct cpu_user_regs *regs) { unsigned char insns_before[8] = {}, insns_after[16] = {}; @@ -762,6 +1029,30 @@ const char *vector_name(unsigned int vec) return (vec < ARRAY_SIZE(names) && names[vec][0]) ? names[vec] : "???"; } +void asmlinkage do_double_fault(struct cpu_user_regs *regs) +{ + unsigned int cpu; + struct extra_state state; + + console_force_unlock(); + + asm ( "lsll %[sel], %[limit]" : [limit] "=r" (cpu) + : [sel] "r" (PER_CPU_SELECTOR) ); + + /* Find information saved during fault and dump it to the console. */ + printk("*** DOUBLE FAULT ***\n"); + print_xen_info(); + + read_registers(&state); + + printk("CPU: %d\n", cpu); + _show_registers(regs, &state, CTXT_hypervisor, NULL); + show_code(regs); + show_stack_overflow(cpu, regs); + + panic("DOUBLE FAULT -- system shutdown\n"); +} + /* * This is called for faults at very unexpected times (e.g., when interrupts * are disabled). In such situations we can't do much that is safe. We try to diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index 472b2bab52..f207630887 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -1,7 +1,6 @@ obj-$(CONFIG_PV32) += compat/ obj-bin-y += entry.o -obj-y += traps.o obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += pci.o obj-y += acpi_mmcfg.o diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c deleted file mode 100644 index 81e64466e4..0000000000 --- a/xen/arch/x86/x86_64/traps.c +++ /dev/null @@ -1,322 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct extra_state -{ - unsigned long cr0, cr2, cr3, cr4; - unsigned long fsb, gsb, gss; - uint16_t ds, es, fs, gs; -}; - -static void print_xen_info(void) -{ - char taint_str[TAINT_STRING_MAX_LEN]; - - printk("----[ Xen-%d.%d%s x86_64 %s %s ]----\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - xen_build_info(), print_tainted(taint_str)); -} - -enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; - -static void read_registers(struct extra_state *state) -{ - state->cr0 = read_cr0(); - state->cr2 = read_cr2(); - state->cr3 = read_cr3(); - state->cr4 = read_cr4(); - - state->fsb = read_fs_base(); - state->gsb = read_gs_base(); - state->gss = read_gs_shadow(); - - asm ( "mov %%ds, %0" : "=m" (state->ds) ); - asm ( "mov %%es, %0" : "=m" (state->es) ); - asm ( "mov %%fs, %0" : "=m" (state->fs) ); - asm ( "mov %%gs, %0" : "=m" (state->gs) ); -} - -static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, - struct extra_state *state) -{ - struct segment_register sreg; - - state->cr0 = v->arch.hvm.guest_cr[0]; - state->cr2 = v->arch.hvm.guest_cr[2]; - state->cr3 = v->arch.hvm.guest_cr[3]; - state->cr4 = v->arch.hvm.guest_cr[4]; - - hvm_get_segment_register(v, x86_seg_cs, &sreg); - regs->cs = sreg.sel; - - hvm_get_segment_register(v, x86_seg_ds, &sreg); - state->ds = sreg.sel; - - hvm_get_segment_register(v, x86_seg_es, &sreg); - state->es = sreg.sel; - - hvm_get_segment_register(v, x86_seg_fs, &sreg); - state->fs = sreg.sel; - state->fsb = sreg.base; - - hvm_get_segment_register(v, x86_seg_gs, &sreg); - state->gs = sreg.sel; - state->gsb = sreg.base; - - hvm_get_segment_register(v, x86_seg_ss, &sreg); - regs->ss = sreg.sel; - - state->gss = hvm_get_reg(v, MSR_SHADOW_GS_BASE); -} - -static void _show_registers( - const struct cpu_user_regs *regs, const struct extra_state *state, - enum context context, const struct vcpu *v) -{ - static const char *const context_names[] = { - [CTXT_hypervisor] = "hypervisor", - [CTXT_pv_guest] = "pv guest", - [CTXT_hvm_guest] = "hvm guest" - }; - - printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); - if ( context == CTXT_hypervisor ) - printk(" %pS", _p(regs->rip)); - printk("\nRFLAGS: %016lx ", regs->rflags); - if ( (context == CTXT_pv_guest) && v && v->vcpu_info_area.map ) - printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); - printk("CONTEXT: %s", context_names[context]); - if ( v && !is_idle_vcpu(v) ) - printk(" (%pv)", v); - - printk("\nrax: %016lx rbx: %016lx rcx: %016lx\n", - regs->rax, regs->rbx, regs->rcx); - printk("rdx: %016lx rsi: %016lx rdi: %016lx\n", - regs->rdx, regs->rsi, regs->rdi); - printk("rbp: %016lx rsp: %016lx r8: %016lx\n", - regs->rbp, regs->rsp, regs->r8); - printk("r9: %016lx r10: %016lx r11: %016lx\n", - regs->r9, regs->r10, regs->r11); - printk("r12: %016lx r13: %016lx r14: %016lx\n", - regs->r12, regs->r13, regs->r14); - printk("r15: %016lx cr0: %016lx cr4: %016lx\n", - regs->r15, state->cr0, state->cr4); - printk("cr3: %016lx cr2: %016lx\n", state->cr3, state->cr2); - printk("fsb: %016lx gsb: %016lx gss: %016lx\n", - state->fsb, state->gsb, state->gss); - printk("ds: %04x es: %04x fs: %04x gs: %04x " - "ss: %04x cs: %04x\n", - state->ds, state->es, state->fs, - state->gs, regs->ss, regs->cs); -} - -void show_registers(const struct cpu_user_regs *regs) -{ - struct cpu_user_regs fault_regs = *regs; - struct extra_state fault_state; - enum context context; - struct vcpu *v = system_state >= SYS_STATE_smp_boot ? current : NULL; - - if ( guest_mode(regs) && is_hvm_vcpu(v) ) - { - get_hvm_registers(v, &fault_regs, &fault_state); - context = CTXT_hvm_guest; - } - else - { - read_registers(&fault_state); - - if ( guest_mode(regs) ) - { - context = CTXT_pv_guest; - fault_state.cr2 = arch_get_cr2(v); - } - else - { - context = CTXT_hypervisor; - } - } - - print_xen_info(); - printk("CPU: %d\n", smp_processor_id()); - _show_registers(&fault_regs, &fault_state, context, v); - - if ( ler_msr && !guest_mode(regs) ) - { - u64 from, to; - - rdmsrl(ler_msr, from); - rdmsrl(ler_msr + 1, to); - - /* Upper bits may store metadata. Re-canonicalise for printing. */ - printk("ler: from %016"PRIx64" [%ps]\n", - from, _p(canonicalise_addr(from))); - printk(" to %016"PRIx64" [%ps]\n", - to, _p(canonicalise_addr(to))); - } -} - -void vcpu_show_registers(struct vcpu *v) -{ - const struct cpu_user_regs *regs = &v->arch.user_regs; - struct cpu_user_regs aux_regs; - struct extra_state state; - enum context context; - - if ( is_hvm_vcpu(v) ) - { - aux_regs = *regs; - get_hvm_registers(v, &aux_regs, &state); - regs = &aux_regs; - context = CTXT_hvm_guest; - } - else - { - bool kernel = guest_kernel_mode(v, regs); - unsigned long gsb, gss; - - state.cr0 = v->arch.pv.ctrlreg[0]; - state.cr2 = arch_get_cr2(v); - state.cr3 = pagetable_get_paddr(kernel - ? v->arch.guest_table - : v->arch.guest_table_user); - state.cr4 = v->arch.pv.ctrlreg[4]; - - gsb = v->arch.pv.gs_base_user; - gss = v->arch.pv.gs_base_kernel; - if ( kernel ) - SWAP(gsb, gss); - - state.fsb = v->arch.pv.fs_base; - state.gsb = gsb; - state.gss = gss; - - state.ds = v->arch.pv.ds; - state.es = v->arch.pv.es; - state.fs = v->arch.pv.fs; - state.gs = v->arch.pv.gs; - - context = CTXT_pv_guest; - } - - _show_registers(regs, &state, context, v); -} - -void show_page_walk(unsigned long addr) -{ - unsigned long pfn, mfn = read_cr3() >> PAGE_SHIFT; - l4_pgentry_t l4e, *l4t; - l3_pgentry_t l3e, *l3t; - l2_pgentry_t l2e, *l2t; - l1_pgentry_t l1e, *l1t; - - printk("Pagetable walk from %016lx:\n", addr); - if ( !is_canonical_address(addr) ) - return; - - l4t = map_domain_page(_mfn(mfn)); - l4e = l4t[l4_table_offset(addr)]; - unmap_domain_page(l4t); - mfn = l4e_get_pfn(l4e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L4[0x%03lx] = %"PRIpte" %016lx\n", - l4_table_offset(addr), l4e_get_intpte(l4e), pfn); - if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) || - !mfn_valid(_mfn(mfn)) ) - return; - - l3t = map_domain_page(_mfn(mfn)); - l3e = l3t[l3_table_offset(addr)]; - unmap_domain_page(l3t); - mfn = l3e_get_pfn(l3e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L3[0x%03lx] = %"PRIpte" %016lx%s\n", - l3_table_offset(addr), l3e_get_intpte(l3e), pfn, - (l3e_get_flags(l3e) & _PAGE_PSE) ? " (PSE)" : ""); - if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) || - (l3e_get_flags(l3e) & _PAGE_PSE) || - !mfn_valid(_mfn(mfn)) ) - return; - - l2t = map_domain_page(_mfn(mfn)); - l2e = l2t[l2_table_offset(addr)]; - unmap_domain_page(l2t); - mfn = l2e_get_pfn(l2e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L2[0x%03lx] = %"PRIpte" %016lx%s\n", - l2_table_offset(addr), l2e_get_intpte(l2e), pfn, - (l2e_get_flags(l2e) & _PAGE_PSE) ? " (PSE)" : ""); - if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) || - (l2e_get_flags(l2e) & _PAGE_PSE) || - !mfn_valid(_mfn(mfn)) ) - return; - - l1t = map_domain_page(_mfn(mfn)); - l1e = l1t[l1_table_offset(addr)]; - unmap_domain_page(l1t); - mfn = l1e_get_pfn(l1e); - pfn = mfn_valid(_mfn(mfn)) && machine_to_phys_mapping_valid ? - get_gpfn_from_mfn(mfn) : INVALID_M2P_ENTRY; - printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", - l1_table_offset(addr), l1e_get_intpte(l1e), pfn); -} - -void asmlinkage noreturn do_double_fault(struct cpu_user_regs *regs) -{ - unsigned int cpu; - struct extra_state state; - - console_force_unlock(); - - asm ( "lsll %[sel], %[limit]" : [limit] "=r" (cpu) - : [sel] "r" (PER_CPU_SELECTOR) ); - - /* Find information saved during fault and dump it to the console. */ - printk("*** DOUBLE FAULT ***\n"); - print_xen_info(); - - read_registers(&state); - - printk("CPU: %d\n", cpu); - _show_registers(regs, &state, CTXT_hypervisor, NULL); - show_code(regs); - show_stack_overflow(cpu, regs); - - panic("DOUBLE FAULT -- system shutdown\n"); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 13:55:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 13:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083486.1443087 (Exim 4.92) (envelope-from ) id 1umuuP-0000s9-Hh; Fri, 15 Aug 2025 13:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083486.1443087; Fri, 15 Aug 2025 13:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuuP-0000s0-F4; Fri, 15 Aug 2025 13:55:53 +0000 Received: by outflank-mailman (input) for mailman id 1083486; Fri, 15 Aug 2025 13:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1umuuO-0000rm-Fx for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1umuuO-006k3q-0p for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1umuuO-004iQ7-1O for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 13:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Xse+mRYlvfflgKi3UA2EPb0gm5C3DmNi8YM/LyRiH0Q=; b=uz/38ob1kjmz0K7yeZostsoRcd VWerXbsvjv0Bdsl5+gKPKfderNOINp1foOkY7eaC9ZmVt1ufwQK7uE//XuDOv0Yb5dDINQpEApTSA eXseKV2REJ+kbSYcsw8TD65MTYO+yDiiTgr0/i5PDs8ENuJk8sQI/sPTHq7SFv+YLug4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Unexport show_code() and show_stack_overflow() Message-Id: Date: Fri, 15 Aug 2025 13:55:52 +0000 commit 528efc7b6aa2ed66b494bbc648892e5338522a26 Author: Andrew Cooper AuthorDate: Mon May 26 19:59:17 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 15 11:13:42 2025 +0100 x86/traps: Unexport show_code() and show_stack_overflow() These can become static now the two traps.c have been merged. No fucntional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/processor.h | 2 -- xen/arch/x86/traps.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 2799d59e38..1342241742 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -333,8 +333,6 @@ extern void write_ptbase(struct vcpu *v); /* PAUSE (encoding: REP NOP) is a good thing to insert into busy-wait loops. */ #define cpu_relax() asm volatile ( "pause" ::: "memory" ) -void show_code(const struct cpu_user_regs *regs); -void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs); void show_registers(const struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index ab8ff36acf..270b93ed62 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -354,7 +354,7 @@ void show_page_walk(unsigned long addr) l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -void show_code(const struct cpu_user_regs *regs) +static void show_code(const struct cpu_user_regs *regs) { unsigned char insns_before[8] = {}, insns_after[16] = {}; unsigned int i, tmp, missing_before, missing_after; @@ -838,7 +838,7 @@ static void show_stack(const struct cpu_user_regs *regs) show_trace(regs); } -void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) +static void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) { unsigned long esp = regs->rsp; unsigned long curr_stack_base = esp & ~(STACK_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 20:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 20:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083847.1443287 (Exim 4.92) (envelope-from ) id 1un0lS-0008No-Ps; Fri, 15 Aug 2025 20:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083847.1443287; Fri, 15 Aug 2025 20:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1un0lS-0008Ng-NA; Fri, 15 Aug 2025 20:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1083847; Fri, 15 Aug 2025 20:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1un0lS-0008NX-0V for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 20:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1un0lR-006s9I-1y for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 20:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1un0lR-0053hB-2W for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 20:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VHrFyS3R5a52HltK4r6whfw4DekWE4ccIvuEnTTmerQ=; b=nlPM/nUPsjrTZu4fdV3AaQ2DqR Luh3xw//i162X0fP0dheopffklVZOF6NVh66YXcw73R/Y96m1dVHATjDn9+ViFUIyQ4ZmhCiZhs8K ngMzEHFN9reOAvKY1aclS3c/83GikAtDYp4ba25Xw/E1GzidA4OZvc7vVZMPJBKm6IM8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] misra: add missing noreturn attribute for __div0() Message-Id: Date: Fri, 15 Aug 2025 20:11:01 +0000 commit 268e818bf1c301d7367f923b72f369a3d6a76922 Author: Dmytro Prokopchuk1 AuthorDate: Tue Aug 12 15:46:43 2025 +0000 Commit: Stefano Stabellini CommitDate: Fri Aug 15 12:37:18 2025 -0700 misra: add missing noreturn attribute for __div0() The __div0() function never returns to its caller, causing a violation of MISRA C Rule 2.1: "A project shall not contain unreachable code". Add the `noreturn` attribute to fix this. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Nicola Vetrini Acked-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 445e7378dd..2bc3e1df04 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -172,7 +172,7 @@ void init_traps(void) isb(); } -void asmlinkage __div0(void) +void asmlinkage noreturn __div0(void) { printk("Division by zero in hypervisor.\n"); BUG(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 15 20:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Aug 2025 20:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1083848.1443292 (Exim 4.92) (envelope-from ) id 1un0lc-0008U7-Te; Fri, 15 Aug 2025 20:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1083848.1443292; Fri, 15 Aug 2025 20:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1un0lc-0008Tz-Q2; Fri, 15 Aug 2025 20:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1083848; Fri, 15 Aug 2025 20:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1un0lb-0008Tq-WA for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 20:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1un0lb-006s9O-2S for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 20:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1un0lb-0053ha-2q for xen-changelog@lists.xenproject.org; Fri, 15 Aug 2025 20:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u68/gb+eM11/V6VjF6gM1xQN4yVeYcmL+0FtOmnEsjM=; b=aTRCmlQOi3HnApVj6AIYd3cVG7 qDxFlzuB6dTXLwhdtUDmYaWYFBb5w6WmKcxy78EoZpyQTe6WeON4fyQljutw845kqUtFI8gcMGjBg i29QTEsJOg6npY64EN2wW6cdXEvueFntpjL6oC5MwFfuPAFsqyAdT2qYzJ8TiNHkEZac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] misra: add deviations of MISRA C Rule 5.5 Message-Id: Date: Fri, 15 Aug 2025 20:11:11 +0000 commit 212f690aee6c83343a85d4f8fb4770ee789e094d Author: Dmytro Prokopchuk1 AuthorDate: Thu Jul 31 20:43:48 2025 +0000 Commit: Stefano Stabellini CommitDate: Fri Aug 15 12:44:22 2025 -0700 misra: add deviations of MISRA C Rule 5.5 MISRA C Rule 5.5 states: "Identifiers shall be distinct from macro names". Update ECLAIR configuration to deviate clashes: specify the macros that should be ignored. Update deviations.rst and rules.rst accordingly. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 10 ++++++++++ docs/misra/deviations.rst | 22 ++++++++++++++++++++++ docs/misra/rules.rst | 17 +++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index ebce1ceab9..7f3fd35a33 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -122,6 +122,16 @@ it defines would (in the common case) be already defined. Peer reviewed by the c -config=MC3A2.R5.5,reports+={deliberate, "any_area(decl(kind(function))||any_loc(macro(name(memcpy||memset||memmove))))&&any_area(any_loc(file(^xen/common/libelf/libelf-private\\.h$)))"} -doc_end +-doc_begin="Clashes between bitops functions and macro names are deliberate. +These macros are needed for input validation and error handling." +-config=MC3A2.R5.5,ignored_macros+="^(__)?(test|set|clear|change|test_and_(set|clear|change))_bit$" +-doc_end + +-doc_begin="Clashes between grant table functions and macro names in 'xen/common/grant_table.c' are deliberate. +These macros address differences in argument count during compile-time, effectively discarding unused parameters to avoid warnings or errors related to them." +-config=MC3A2.R5.5,ignored_macros+="name(update_gnttab_par||parse_gnttab_limit)&&loc(file(^xen/common/grant_table\\.c$))" +-doc_end + -doc_begin="The type \"ret_t\" is deliberately defined multiple times, depending on the guest." -config=MC3A2.R5.6,reports+={deliberate,"any_area(any_loc(text(^.*ret_t.*$)))"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 3c46a1e47a..2119066531 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -153,6 +153,28 @@ Deviations related to MISRA C:2012 Rules: memmove. - Tagged as `deliberate` for ECLAIR. + * - R5.5 + - Clashes between bitops ('__test_and_set_bit', '__test_and_clear_bit', + '__test_and_change_bit', 'test_bit', 'set_bit', 'clear_bit', 'change_bit', + 'test_and_set_bit', 'test_and_clear_bit', 'test_and_change_bit') + functions and macro names are intentional. These are necessary for error + handling and input validation to ensure that the size of the object being + referenced by the memory address (passed as an argument to the macro) + meets the minimum requirements for the bit operation. This prevents unsafe + operations on improperly sized data types that could lead to undefined + behavior or memory corruption. The macros encapsulate this conditional + logic into a single, reusable form, simplifying the code and avoiding + function call overhead. Also this bit operations API was inherited from + Linux and should be kept for familiarity. + - ECLAIR has been configured to ignore these macros. + + * - R5.5 + - Clashes between grant table ('update_gnttab_par', 'parse_gnttab_limit') + functions and macro names are intentional. These macros address + differences in argument count during compile-time, effectively discarding + unused 2nd and 3rd parameters to avoid warnings or errors related to them. + - ECLAIR has been configured to ignore these macros. + * - R5.6 - The type ret_t is deliberately defined multiple times depending on the type of guest to service. diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 6812eb7e8a..a2e4e9f4ff 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -205,6 +205,23 @@ maintainers if you want to suggest a change. #define f(x, y) f(x, y) void f(int x, int y); + Clashes between bitops functions and macro names are allowed + because they are used for input validation and error handling. + Example:: + + static inline void set_bit(int nr, volatile void *addr) + { + asm volatile ( "lock btsl %1,%0" + : "+m" (ADDR) : "Ir" (nr) : "memory"); + } + #define set_bit(nr, addr) ({ \ + if ( bitop_bad_size(addr) ) __bitop_bad_size(); \ + set_bit(nr, addr); \ + }) + + Clashes between grant table functions and macro names are allowed + because they are used for discarding unused parameters. + * - `Rule 5.6 `_ - Required - A typedef name shall be a unique identifier -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sun Aug 17 13:44:11 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Aug 2025 13:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1085143.1443675 (Exim 4.92) (envelope-from ) id 1undg3-0005Oy-VM; Sun, 17 Aug 2025 13:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1085143.1443675; Sun, 17 Aug 2025 13:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1undg3-0005Op-SI; Sun, 17 Aug 2025 13:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1085143; Sun, 17 Aug 2025 13:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1undg2-0005Oj-6J for xen-changelog@lists.xenproject.org; Sun, 17 Aug 2025 13:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1undg1-00A45p-24 for xen-changelog@lists.xenproject.org; Sun, 17 Aug 2025 13:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1undg1-006oDu-2Y for xen-changelog@lists.xenproject.org; Sun, 17 Aug 2025 13:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HcfmQVDpvWQ5VoSWZDuJVIL6qhTW6KV9y4lP/QYArqg=; b=wq6YWJab9leR1Tx5O/Z1xHdXj3 /B3eSMNOSJ8MQcFdP5GGLvD++PkdDXl7cAxuwGNlS1trCXYlrqxJmSCfbhSZ9OmP+LwKD4ExXnnAQ nQ7+XaYLJyvjr92xvAAiJOR/i7GHNswb9Eq0o+G5ez+t5UKEdU4My0wpxSKFBS6kplsk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] misra: add missing noreturn attribute for __div0() Message-Id: Date: Sun, 17 Aug 2025 13:44:01 +0000 commit 268e818bf1c301d7367f923b72f369a3d6a76922 Author: Dmytro Prokopchuk1 AuthorDate: Tue Aug 12 15:46:43 2025 +0000 Commit: Stefano Stabellini CommitDate: Fri Aug 15 12:37:18 2025 -0700 misra: add missing noreturn attribute for __div0() The __div0() function never returns to its caller, causing a violation of MISRA C Rule 2.1: "A project shall not contain unreachable code". Add the `noreturn` attribute to fix this. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Nicola Vetrini Acked-by: Stefano Stabellini --- xen/arch/arm/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 445e7378dd..2bc3e1df04 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -172,7 +172,7 @@ void init_traps(void) isb(); } -void asmlinkage __div0(void) +void asmlinkage noreturn __div0(void) { printk("Division by zero in hypervisor.\n"); BUG(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Aug 17 13:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Aug 2025 13:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1085144.1443680 (Exim 4.92) (envelope-from ) id 1undgD-0005QE-0m; Sun, 17 Aug 2025 13:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1085144.1443680; Sun, 17 Aug 2025 13:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1undgC-0005Q6-Th; Sun, 17 Aug 2025 13:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1085144; Sun, 17 Aug 2025 13:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1undgB-0005Q0-VV for xen-changelog@lists.xenproject.org; Sun, 17 Aug 2025 13:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1undgB-00A45t-2N for xen-changelog@lists.xenproject.org; Sun, 17 Aug 2025 13:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1undgB-006oHy-2v for xen-changelog@lists.xenproject.org; Sun, 17 Aug 2025 13:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rgUGah/xCOP5Gf5Hz6lQOmFj32Nv/SGMKP2TAfIveME=; b=bzsbDs3VLqS/V/gntK0kT/Oknc Bo+tZbA73eb7J1vxwTbeAWxinqLHvtqhTjJ3N/6vH7kA60PMMR79mQpG6/wUApkcDJwRYqK2ysr9T gG+tZGpTRiMnYtKiIjzoz9NR7vbiI65QIgQh3epxNjWsOm2lyrFQ6Mx7BpO3tGtrGt9k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] misra: add deviations of MISRA C Rule 5.5 Message-Id: Date: Sun, 17 Aug 2025 13:44:11 +0000 commit 212f690aee6c83343a85d4f8fb4770ee789e094d Author: Dmytro Prokopchuk1 AuthorDate: Thu Jul 31 20:43:48 2025 +0000 Commit: Stefano Stabellini CommitDate: Fri Aug 15 12:44:22 2025 -0700 misra: add deviations of MISRA C Rule 5.5 MISRA C Rule 5.5 states: "Identifiers shall be distinct from macro names". Update ECLAIR configuration to deviate clashes: specify the macros that should be ignored. Update deviations.rst and rules.rst accordingly. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 10 ++++++++++ docs/misra/deviations.rst | 22 ++++++++++++++++++++++ docs/misra/rules.rst | 17 +++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index ebce1ceab9..7f3fd35a33 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -122,6 +122,16 @@ it defines would (in the common case) be already defined. Peer reviewed by the c -config=MC3A2.R5.5,reports+={deliberate, "any_area(decl(kind(function))||any_loc(macro(name(memcpy||memset||memmove))))&&any_area(any_loc(file(^xen/common/libelf/libelf-private\\.h$)))"} -doc_end +-doc_begin="Clashes between bitops functions and macro names are deliberate. +These macros are needed for input validation and error handling." +-config=MC3A2.R5.5,ignored_macros+="^(__)?(test|set|clear|change|test_and_(set|clear|change))_bit$" +-doc_end + +-doc_begin="Clashes between grant table functions and macro names in 'xen/common/grant_table.c' are deliberate. +These macros address differences in argument count during compile-time, effectively discarding unused parameters to avoid warnings or errors related to them." +-config=MC3A2.R5.5,ignored_macros+="name(update_gnttab_par||parse_gnttab_limit)&&loc(file(^xen/common/grant_table\\.c$))" +-doc_end + -doc_begin="The type \"ret_t\" is deliberately defined multiple times, depending on the guest." -config=MC3A2.R5.6,reports+={deliberate,"any_area(any_loc(text(^.*ret_t.*$)))"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 3c46a1e47a..2119066531 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -153,6 +153,28 @@ Deviations related to MISRA C:2012 Rules: memmove. - Tagged as `deliberate` for ECLAIR. + * - R5.5 + - Clashes between bitops ('__test_and_set_bit', '__test_and_clear_bit', + '__test_and_change_bit', 'test_bit', 'set_bit', 'clear_bit', 'change_bit', + 'test_and_set_bit', 'test_and_clear_bit', 'test_and_change_bit') + functions and macro names are intentional. These are necessary for error + handling and input validation to ensure that the size of the object being + referenced by the memory address (passed as an argument to the macro) + meets the minimum requirements for the bit operation. This prevents unsafe + operations on improperly sized data types that could lead to undefined + behavior or memory corruption. The macros encapsulate this conditional + logic into a single, reusable form, simplifying the code and avoiding + function call overhead. Also this bit operations API was inherited from + Linux and should be kept for familiarity. + - ECLAIR has been configured to ignore these macros. + + * - R5.5 + - Clashes between grant table ('update_gnttab_par', 'parse_gnttab_limit') + functions and macro names are intentional. These macros address + differences in argument count during compile-time, effectively discarding + unused 2nd and 3rd parameters to avoid warnings or errors related to them. + - ECLAIR has been configured to ignore these macros. + * - R5.6 - The type ret_t is deliberately defined multiple times depending on the type of guest to service. diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 6812eb7e8a..a2e4e9f4ff 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -205,6 +205,23 @@ maintainers if you want to suggest a change. #define f(x, y) f(x, y) void f(int x, int y); + Clashes between bitops functions and macro names are allowed + because they are used for input validation and error handling. + Example:: + + static inline void set_bit(int nr, volatile void *addr) + { + asm volatile ( "lock btsl %1,%0" + : "+m" (ADDR) : "Ir" (nr) : "memory"); + } + #define set_bit(nr, addr) ({ \ + if ( bitop_bad_size(addr) ) __bitop_bad_size(); \ + set_bit(nr, addr); \ + }) + + Clashes between grant table functions and macro names are allowed + because they are used for discarding unused parameters. + * - `Rule 5.6 `_ - Required - A typedef name shall be a unique identifier -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 08:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 08:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1085714.1444010 (Exim 4.92) (envelope-from ) id 1unvdv-0001F4-GR; Mon, 18 Aug 2025 08:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1085714.1444010; Mon, 18 Aug 2025 08:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unvdv-0001Ev-Do; Mon, 18 Aug 2025 08:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1085714; Mon, 18 Aug 2025 08:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unvdu-0001Ep-Fz for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1unvdu-00BdwM-0M for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1unvdu-007fbU-0s for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8udlMAKkb2GXg0TvuuZVdaRrrCoWCZCYhF0V6+YopaQ=; b=hRMIuZheQ3ZKhST6KJgTwWg9FQ k8O1OTwmV/cDu4Jfo/9ZOEyOuToxpHTpmJLloOdUCRIvHy8o1lU+jgOH6PJftsoXRAQU2ZsveubzI xr6wuFiVK19ws/5mYmGVc2DkFD1G30y/rftnYDwa8Uiirm0TdQP8MQdsL57elwOXa4LY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mkelf32: pad load segment to 2Mb boundary Message-Id: Date: Mon, 18 Aug 2025 08:55:02 +0000 commit 4fb075201f54b16c0800af0107162461a93065fb Author: Jan Beulich AuthorDate: Mon Aug 18 10:42:24 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 18 10:42:24 2025 +0200 x86/mkelf32: pad load segment to 2Mb boundary In order to legitimately set up initial mappings past _end[], we need to make sure that the entire mapped range is inside a RAM region. Therefore we need to inform the bootloader (or alike) that our allocated size is larger than just the next SECTION_ALIGN-ed boundary past _end[]. This allows dropping a command line option from the tool, which was introduced to work around a supposed linker bug, when the problem was really Xen's. While adjusting adjacent code, correct the argc check to also cover the case correctly when --notes was passed. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/Makefile | 3 +-- xen/arch/x86/boot/mkelf32.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 5aab30a0c4..9d67ea7cd4 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -130,8 +130,7 @@ orphan-handling-$(call ld-option,--orphan-handling=warn) += --orphan-handling=wa $(TARGET): TMP = $(dot-target).elf32 $(TARGET): $(TARGET)-syms $(efi-y) $(obj)/boot/mkelf32 - $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) $(XEN_IMG_OFFSET) \ - `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . __2M_rwdata_end$$/0x\1/p'` + $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) $(XEN_IMG_OFFSET) od -t x4 -N 8192 $(TMP) | grep 1badb002 > /dev/null || \ { echo "No Multiboot1 header found" >&2; false; } od -t x4 -N 32768 $(TMP) | grep e85250d6 > /dev/null || \ diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c index f0f406687c..373ba4ddd5 100644 --- a/xen/arch/x86/boot/mkelf32.c +++ b/xen/arch/x86/boot/mkelf32.c @@ -248,7 +248,6 @@ static void do_read(int fd, void *data, int len) int main(int argc, char **argv) { - uint64_t final_exec_addr; uint32_t loadbase, dat_siz, mem_siz, note_base, note_sz, offset; char *inimage, *outimage; int infd, outfd; @@ -261,22 +260,24 @@ int main(int argc, char **argv) Elf64_Ehdr in64_ehdr; Elf64_Phdr in64_phdr; - if ( argc < 5 ) + if ( argc < 4 ) { + help: fprintf(stderr, "Usage: mkelf32 [--notes] " - " \n"); + "\n"); return 1; } if ( !strcmp(argv[1], "--notes") ) { + if ( argc < 5 ) + goto help; i = 2; num_phdrs = 2; } inimage = argv[i++]; outimage = argv[i++]; loadbase = strtoul(argv[i++], NULL, 16); - final_exec_addr = strtoull(argv[i++], NULL, 16); infd = open(inimage, O_RDONLY); if ( infd == -1 ) @@ -339,9 +340,12 @@ int main(int argc, char **argv) (void)lseek(infd, in64_phdr.p_offset, SEEK_SET); dat_siz = (uint32_t)in64_phdr.p_filesz; - /* Do not use p_memsz: it does not include BSS alignment padding. */ - /*mem_siz = (uint32_t)in64_phdr.p_memsz;*/ - mem_siz = (uint32_t)(final_exec_addr - in64_phdr.p_vaddr); + /* + * We don't pad .bss in the linker script, but during early boot we map + * the Xen image using 2M pages. To avoid running into adjacent non-RAM + * regions, pad the segment to the next 2M boundary. + */ + mem_siz = ((uint32_t)in64_phdr.p_memsz + (1U << 20) - 1) & (-1U << 20); note_sz = note_base = offset = 0; if ( num_phdrs > 1 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 08:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 08:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1085715.1444015 (Exim 4.92) (envelope-from ) id 1unve5-0001Gs-Hq; Mon, 18 Aug 2025 08:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1085715.1444015; Mon, 18 Aug 2025 08:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unve5-0001Gk-FC; Mon, 18 Aug 2025 08:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1085715; Mon, 18 Aug 2025 08:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unve4-0001Ga-EJ for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1unve4-00BdwQ-0e for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1unve4-007fch-1D for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rjB/lOr8s5H3rY/cef04/Q94hJYmFb63Qr8F0gDbxfE=; b=pDGwK201gZGeD/+hixmXX2XFLJ 5jpLO+W7S1IxjqXrvvla7C5aWRq5nXQL/VHnrGZ6/6kQIzl9d6bdceppQm7lpnVOl6B36QyoWig3V CkHv70HTj/9aQdj1OV3qV9zl4JhKdFp3WJ3Cnp0dG8DJbHNWpIARk9egbQGhx9+uTJmI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: split unmapping and marking-as-I/O in arch_init_memory() Message-Id: Date: Mon, 18 Aug 2025 08:55:12 +0000 commit 248096b113fefd36260afb06a2520781ec37f9e8 Author: Jan Beulich AuthorDate: Mon Aug 18 10:43:28 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 18 10:43:28 2025 +0200 x86/mm: split unmapping and marking-as-I/O in arch_init_memory() The unmapping part also wants to cover UNUSABLE regions, and it will now be necessary for space outside the low 16Mb (wherever Xen is placed). While there, limit the scopes of involved variables. Fixes: e4dd91ea85a3 ("x86: Ensure RAM holes really are not mapped in Xen's ongoing 1:1 physmap") Fixes: 7cd7f2f5e116 ("x86/boot: Remove the preconstructed low 16M superpage mappings") Signed-off-by: Jan Beulich --- xen/arch/x86/mm.c | 63 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e7fd56c7ce..9ca3469a78 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -275,8 +275,6 @@ static void __init assign_io_page(struct page_info *page) void __init arch_init_memory(void) { - unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; - /* * Basic guest-accessible flags: * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). @@ -292,12 +290,55 @@ void __init arch_init_memory(void) * case the low 1MB. */ BUG_ON(pvh_boot && trampoline_phys != 0x1000); - for ( i = 0; i < 0x100; i++ ) + for ( unsigned int i = 0; i < MB(1) >> PAGE_SHIFT; i++ ) assign_io_page(mfn_to_page(_mfn(i))); - /* Any areas not specified as RAM by the e820 map are considered I/O. */ - for ( i = 0, pfn = 0; pfn < max_page; i++ ) + /* + * Any areas not specified as RAM by the e820 map want to have no mappings. + * We may have established some by mapping more than necessary in head.S, + * due to the use of super-pages there. + */ + for ( unsigned long i = 0, pfn = 0, + rlimit_pfn = PFN_DOWN(PAGE_ALIGN_2M(__pa(_end))); + pfn < rlimit_pfn; i++ ) { + unsigned long rstart_pfn, rend_pfn, start_pfn; + + while ( i < e820.nr_map && + e820.map[i].type != E820_RAM ) + i++; + + if ( i >= e820.nr_map ) + { + /* No more RAM regions: Unmap right to upper boundary. */ + rstart_pfn = rend_pfn = rlimit_pfn; + } + else + { + /* Unmap just up as far as next RAM region. */ + rstart_pfn = min(rlimit_pfn, PFN_UP(e820.map[i].addr)); + rend_pfn = max(rstart_pfn, + PFN_DOWN(e820.map[i].addr + e820.map[i].size)); + } + + /* NB: _start is already 2Mb-aligned. */ + start_pfn = max(pfn, PFN_DOWN(__pa(_start))); + if ( start_pfn < rstart_pfn ) + destroy_xen_mappings((unsigned long)mfn_to_virt(start_pfn), + (unsigned long)mfn_to_virt(rstart_pfn)); + + /* Skip the RAM region. */ + pfn = rend_pfn; + } + + /* + * Any areas not specified as RAM or UNUSABLE by the e820 map are + * considered I/O. + */ + for ( unsigned long i = 0, pfn = 0; pfn < max_page; i++ ) + { + unsigned long rstart_pfn, rend_pfn; + while ( (i < e820.nr_map) && (e820.map[i].type != E820_RAM) && (e820.map[i].type != E820_UNUSABLE) ) @@ -317,17 +358,6 @@ void __init arch_init_memory(void) PFN_DOWN(e820.map[i].addr + e820.map[i].size)); } - /* - * Make sure any Xen mappings of RAM holes above 1MB are blown away. - * In particular this ensures that RAM holes are respected even in - * the statically-initialised 1-16MB mapping area. - */ - iostart_pfn = max_t(unsigned long, pfn, 1UL << (20 - PAGE_SHIFT)); - ioend_pfn = min(rstart_pfn, 16UL << (20 - PAGE_SHIFT)); - if ( iostart_pfn < ioend_pfn ) - destroy_xen_mappings((unsigned long)mfn_to_virt(iostart_pfn), - (unsigned long)mfn_to_virt(ioend_pfn)); - /* Mark as I/O up to next RAM region. */ for ( ; pfn < rstart_pfn; pfn++ ) { @@ -365,6 +395,7 @@ void __init arch_init_memory(void) const l3_pgentry_t *l3idle = map_l3t_from_l4e( idle_pg_table[l4_table_offset(split_va)]); l3_pgentry_t *l3tab = map_domain_page(l3mfn); + unsigned int i; for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 08:55:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 08:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1085717.1444018 (Exim 4.92) (envelope-from ) id 1unveF-0001J9-JF; Mon, 18 Aug 2025 08:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1085717.1444018; Mon, 18 Aug 2025 08:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unveF-0001J1-Ga; Mon, 18 Aug 2025 08:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1085717; Mon, 18 Aug 2025 08:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unveE-0001Iu-Gx for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1unveE-00BdwU-0v for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1unveE-007fdE-1V for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 08:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oHAPkCM9yqOHX/78tBJrLQfpBescg6jO87ks8XGMQDo=; b=UHqvXgy7ZheoYJv2mAiyHu/tb1 GiMG2/JmlyfKUtwJFBwdnfS26TfL/bplchNiTBiQ1WGXN1UVE2VBgOhIvMt9xD2H/m45HMvNALFBT ZH7k8DALn1L/1yAqFyoCERyWZIT6RY1Xo6qmL9lVIamAM57zP0XcExiAHjBsoWdktteE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm/ioreq: Fix condition in hvm_alloc_legacy_ioreq_gfn() Message-Id: Date: Mon, 18 Aug 2025 08:55:22 +0000 commit 282ed258a59195698a81ab4408a17336eb6ea7ed Author: Oleksandr Tyshchenko AuthorDate: Mon Aug 18 10:43:52 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 18 10:43:52 2025 +0200 x86/hvm/ioreq: Fix condition in hvm_alloc_legacy_ioreq_gfn() Fix the incorrect condition that causes hvm_alloc_legacy_ioreq_gfn() to return INVALID_GFN even if the HVM param was installed properly by the toolstack. Fixes: 3486f398a3dd (' x86/hvm/ioreq: allow ioreq servers to use HVM_PARAM_[BUF]IOREQ_PFN') Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/ioreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index ec709e5f47..4d30f2d730 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -63,7 +63,7 @@ static gfn_t hvm_alloc_legacy_ioreq_gfn(struct ioreq_server *s) for ( i = HVM_PARAM_IOREQ_PFN; i <= HVM_PARAM_BUFIOREQ_PFN; i++ ) { - if ( !test_and_clear_bit(i, &d->arch.hvm.ioreq_gfn.legacy_mask) ) + if ( test_and_clear_bit(i, &d->arch.hvm.ioreq_gfn.legacy_mask) ) return _gfn(d->arch.hvm.params[i]); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 12:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 12:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086040.1444263 (Exim 4.92) (envelope-from ) id 1unzOB-0005eH-OO; Mon, 18 Aug 2025 12:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086040.1444263; Mon, 18 Aug 2025 12:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unzOB-0005e7-LO; Mon, 18 Aug 2025 12:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1086040; Mon, 18 Aug 2025 12:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unzOA-0005e1-Gy for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 12:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1unzOA-00BigD-0V for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 12:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1unzOA-007ppg-11 for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 12:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bmfL1XsCi+KUEWH9Vrw6NzE1yRnBned8O7GpnbCGW2I=; b=5fjxD1K6JScM2K+SO2kUhsjkv0 XT1uPFHlgqpG+v/iu3rC0e7oSia8e/mRsBmXtpJf6HG6tk5tsFnvA/x6l2UCOm8aImIWy38YFBqF7 VCnXsEHxMwMu8Ae+lt7MCVDN83D4dbwRp3sQYW6hI4N+rmZ0bYHf1Zja5TNAx26QYJ0M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/link: Remove exception table sections Message-Id: Date: Mon, 18 Aug 2025 12:55:02 +0000 commit b3d6651df07bccb43b3ca25c65a29d014d934a4a Author: Andrew Cooper AuthorDate: Mon Aug 18 09:17:31 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 18 13:01:10 2025 +0100 arm/link: Remove exception table sections This was almost certainly copy&paste from x86. ARM does not us these nor selects HAS_EX_TABLE, so drop the sections and their boundary markers. No functional change. Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- xen/arch/arm/xen.lds.S | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 9f30c3a13e..db17ff1efa 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -86,16 +86,6 @@ SECTIONS } : text .data.read_mostly : { - /* Exception table */ - __start___ex_table = .; - *(.ex_table) - __stop___ex_table = .; - - /* Pre-exception table */ - __start___pre_ex_table = .; - *(.ex_table.pre) - __stop___pre_ex_table = .; - *(.data.read_mostly) } :text -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 12:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 12:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086041.1444267 (Exim 4.92) (envelope-from ) id 1unzOL-0005fw-Pl; Mon, 18 Aug 2025 12:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086041.1444267; Mon, 18 Aug 2025 12:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unzOL-0005fo-N4; Mon, 18 Aug 2025 12:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1086041; Mon, 18 Aug 2025 12:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1unzOK-0005fa-GE for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 12:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1unzOK-00Biig-0q for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 12:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1unzOK-007pqa-1N for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 12:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sC9h5BOovcXoo1a+sU+XubUTc4reBOFpUpe6h9PDkms=; b=sMqq9YbShtcFd5gG5RPlqyIr3A crDpTN8cwdcOzp5wiX3+qhOuIQsMmdRKC5JK18xiYZ7iy/n6NYU5HEQ6ZxavONnlxoAguzzoPDUwW 0tOObTiFSKFFd+AMrSMsI//jUIK4n+xHuAZNbWAaLyPgn2mrhjrUMMgWk5M8FxZZCWZQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pdx: introduce a new compression algorithm based on region offsets Message-Id: Date: Mon, 18 Aug 2025 12:55:12 +0000 commit c5c45bcbd6a13899f8a2de429987a6770de3eba9 Author: Roger Pau Monne AuthorDate: Tue Aug 12 17:06:24 2025 +0200 Commit: Andrew Cooper CommitDate: Mon Aug 18 13:01:10 2025 +0100 pdx: introduce a new compression algorithm based on region offsets With the appearance of Intel Sierra Forest and Granite Rapids it's now possible to get a production x86 host with the following memory map: SRAT: Node 0 PXM 0 [0000000000000000, 000000007fffffff] SRAT: Node 0 PXM 0 [0000000100000000, 000000807fffffff] SRAT: Node 1 PXM 1 [0000063e80000000, 000006be7fffffff] SRAT: Node 2 PXM 2 [00000c7e80000000, 00000cfe7fffffff] SRAT: Node 3 PXM 3 [000012be80000000, 0000133e7fffffff] This is from a four socket Granite Rapids system, with each node having 512GB of memory. The total amount of RAM on the system is 2TB, but without enabling CONFIG_BIGMEM the last range is not accessible, as it's above the 16TB boundary covered by the frame table. Sierra Forest and Granite Rapids are socket compatible, however Sierra Forest only supports 2 socket configurations, while Granite Rapids can go up to 8 sockets. Note that while the memory map is very sparse, it couldn't be compressed using the current PDX_MASK compression algorithm, which relies on all ranges having a shared zeroed region of bits that can be removed. The memory map presented above has the property of all regions being similarly spaced between each other, and all having also a similar size. Use a lookup table to store the offsets to translate from/to PFN and PDX spaces. Such table is indexed based on the input PFN or PDX to translated. The example PFN layout about would get compressed using the following: PFN compression using PFN lookup table shift 29 and PDX region size 0x10000000 range 0 [0000000000000, 0x0000807ffff] PFN IDX 0 : 0000000000000 range 1 [0x00063e80000, 0x0006be7ffff] PFN IDX 3 : 0x00053e80000 range 2 [0x000c7e80000, 0x000cfe7ffff] PFN IDX 6 : 0x000a7e80000 range 3 [0x0012be80000, 0x00133e7ffff] PFN IDX 9 : 0x000fbe80000 Note how the tow ranges belonging to node 0 get merged into a single PDX region by the compression algorithm. The default size of lookup tables currently set in Kconfig is 64 entries, and the example memory map consumes 10 entries. Such memory map is from a 4 socket Granite Rapids host, which in theory supports up to 8 sockets according to Intel documentation. Assuming the layout of a 8 socket system is similar to the 4 socket one, it would require 21 lookup table entries to support it, way below the current default of 64 entries. The valid range of lookup table size is currently restricted from 1 to 512 elements in Kconfig. An extra array is used to keep track of the base PFN for each translated range. Non used slots are set to ~0UL, so that in mfn_valid() the mfn < base check always fails, thus reporting the mfn as invalid. Introduce __init_or_pdx_mask and use it on some shared functions between PDX mask and offset compression, as otherwise some code becomes unreachable after boot if PDX offset compression is used. Mark the code as __init in that case, so it's pruned after boot. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- CHANGELOG.md | 3 + tools/tests/pdx/.gitignore | 1 + tools/tests/pdx/Makefile | 3 +- tools/tests/pdx/harness.h | 14 +++ tools/tests/pdx/test-pdx.c | 4 + xen/common/Kconfig | 21 +++- xen/common/pdx.c | 241 ++++++++++++++++++++++++++++++++++++++++++++- xen/include/xen/pdx.h | 87 +++++++++++++++- 8 files changed, 368 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f31ca08fe..f9ef893f48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) grant table or foreign memory. ### Added + - Introduce new PDX compression algorithm to cope with Intel Sierra Forest and + Granite Rapids having sparse memory maps. + - On x86: - Option to attempt to fixup p2m page-faults on PVH dom0. - Resizable BARs is supported for PVH dom0. diff --git a/tools/tests/pdx/.gitignore b/tools/tests/pdx/.gitignore index a32c7db4de..1202a531a7 100644 --- a/tools/tests/pdx/.gitignore +++ b/tools/tests/pdx/.gitignore @@ -1,2 +1,3 @@ /pdx.h /test-pdx-mask +/test-pdx-offset diff --git a/tools/tests/pdx/Makefile b/tools/tests/pdx/Makefile index b3734afde6..10b354f0ce 100644 --- a/tools/tests/pdx/Makefile +++ b/tools/tests/pdx/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -TARGETS := test-pdx-mask +TARGETS := test-pdx-mask test-pdx-offset .PHONY: all all: $(TARGETS) @@ -42,6 +42,7 @@ CFLAGS += $(APPEND_CFLAGS) CFLAGS += $(CFLAGS_xeninclude) test-pdx-mask: CFLAGS += -DCONFIG_PDX_MASK_COMPRESSION +test-pdx-offset: CFLAGS += -DCONFIG_PDX_OFFSET_COMPRESSION test-pdx-%: test-pdx.c pdx.h $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -o $@ $< $(APPEND_CFLAGS) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h index a8852ac453..e49d6bcf92 100644 --- a/tools/tests/pdx/harness.h +++ b/tools/tests/pdx/harness.h @@ -44,8 +44,10 @@ #define MAX_RANGES 16 #define MAX_PFN_RANGES MAX_RANGES +#define CONFIG_PDX_OFFSET_TBL_ORDER 6 #define ASSERT assert +#define ASSERT_UNREACHABLE() assert(0) #define CONFIG_DEBUG @@ -66,10 +68,22 @@ static inline unsigned int find_next( #define find_next_zero_bit(a, s, o) find_next(a, s, o, false) #define find_next_bit(a, s, o) find_next(a, s, o, true) +#define flsl(x) ((x) ? BITS_PER_LONG - __builtin_clzl(x) : 0) +#define ffsl(x) __builtin_ffsl(x) + #define boolean_param(name, func) typedef uint64_t paddr_t; +#define SWAP(a, b) \ + do { typeof(a) t_ = (a); (a) = (b); (b) = t_; } while ( 0 ) + +#define sort(elem, nr, size, cmp, swp) ({ \ + /* Consume swp() so compiler doesn't complain it's unused. */ \ + (void)(swp); \ + qsort(elem, nr, size, cmp); \ +}) + #include "pdx.h" #endif diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c index 0798ccee35..eefd54c768 100644 --- a/tools/tests/pdx/test-pdx.c +++ b/tools/tests/pdx/test-pdx.c @@ -51,7 +51,11 @@ int main(int argc, char **argv) { .start = 0xc7e80000UL, .end = 0xcfe80000UL }, { .start = 0x12be80000UL, .end = 0x133e80000UL }, }, +#ifdef CONFIG_PDX_OFFSET_COMPRESSION + .compress = true, +#else .compress = false, +#endif }, /* Simple hole. */ { diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 8dad0c923a..76f9ce705f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -59,7 +59,8 @@ config EVTCHN_FIFO choice prompt "PDX (Page inDeX) compression" - default PDX_MASK_COMPRESSION if !X86 && !RISCV + default PDX_OFFSET_COMPRESSION if X86 + default PDX_MASK_COMPRESSION if !RISCV default PDX_NONE help PDX compression is a technique designed to reduce the memory @@ -78,12 +79,30 @@ config PDX_MASK_COMPRESSION help Compression relying on all RAM addresses sharing a zeroed bit region. +config PDX_OFFSET_COMPRESSION + bool "Offset compression" + help + Compression relying on size and distance between RAM regions being + compressible using an offset lookup table. + config PDX_NONE bool "None" help No compression endchoice +config PDX_OFFSET_TBL_ORDER + int "PDX offset compression lookup table order" if EXPERT + depends on PDX_OFFSET_COMPRESSION + default 6 + range 0 9 + help + Order of the PFN to PDX and PDX to PFN translation lookup tables. + Number of table entries is calculated as 2^N. + + Size of the tables can be adjusted from 1 entry (order 0) to 512 + entries (order 9). + config ALTERNATIVE_CALL bool diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 9e6b36086f..7e070ff962 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -24,6 +24,7 @@ #include #include #include +#include /** * Maximum (non-inclusive) usable pdx. Must be @@ -40,6 +41,12 @@ bool __mfn_valid(unsigned long mfn) #ifdef CONFIG_PDX_MASK_COMPRESSION invalid |= mfn & pfn_hole_mask; +#elif defined(CONFIG_PDX_OFFSET_COMPRESSION) + { + unsigned long base = pfn_bases[PFN_TBL_IDX(mfn)]; + + invalid |= mfn < base || mfn >= base + pdx_region_size; + } #endif if ( unlikely(evaluate_nospec(invalid)) ) @@ -75,6 +82,13 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) # error "Missing architecture maximum number of RAM ranges" #endif +/* Some functions should be init when not using PDX mask compression. */ +#ifndef CONFIG_PDX_MASK_COMPRESSION +# define __init_or_mask_compr __init +#else +# define __init_or_mask_compr +#endif + /* Generic PFN compression helpers. */ static struct pfn_range { unsigned long base_pfn, pages; @@ -102,7 +116,7 @@ void __init pfn_pdx_add_region(paddr_t base, paddr_t size) } /* Sets all bits from the most-significant 1-bit down to the LSB */ -static uint64_t fill_mask(uint64_t mask) +static uint64_t __init_or_mask_compr fill_mask(uint64_t mask) { while (mask & (mask + 1)) mask |= mask + 1; @@ -128,7 +142,7 @@ static uint64_t fill_mask(uint64_t mask) * @param len Size in octets of the region * @return Mask of moving bits at the bottom of all the region addresses */ -static uint64_t pdx_region_mask(uint64_t base, uint64_t len) +static uint64_t __init_or_mask_compr pdx_region_mask(uint64_t base, uint64_t len) { /* * We say a bit "moves" in a range if there exist 2 addresses in that @@ -294,7 +308,228 @@ void __init pfn_pdx_compression_reset(void) nr_ranges = 0; } -#endif /* CONFIG_PDX_COMPRESSION */ +#elif defined(CONFIG_PDX_OFFSET_COMPRESSION) /* CONFIG_PDX_MASK_COMPRESSION */ + +unsigned int __ro_after_init pfn_index_shift; +unsigned int __ro_after_init pdx_index_shift; +unsigned long __ro_after_init pdx_region_size = ~0UL; + +unsigned long __ro_after_init pfn_pdx_lookup[CONFIG_PDX_NR_LOOKUP]; +unsigned long __ro_after_init pdx_pfn_lookup[CONFIG_PDX_NR_LOOKUP]; +unsigned long __ro_after_init pfn_bases[CONFIG_PDX_NR_LOOKUP]; + +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + unsigned long pfn = PFN_DOWN(base); + unsigned long pfn_base = pfn_bases[PFN_TBL_IDX(pfn)]; + + return pfn >= pfn_base && + pfn + npages <= pfn_base + pdx_region_size; +} + +static int __init cf_check cmp_node(const void *a, const void *b) +{ + const struct pfn_range *l = a, *r = b; + + if ( l->base_pfn > r->base_pfn ) + return 1; + if ( l->base_pfn < r->base_pfn ) + return -1; + + return 0; +} + +static void __init cf_check swp_node(void *a, void *b) +{ + struct pfn_range *l = a, *r = b; + + SWAP(*l, *r); +} + +bool __init pfn_pdx_compression_setup(paddr_t base) +{ + unsigned long mask = PFN_DOWN(pdx_init_mask(base)), idx_mask = 0; + unsigned long pages = 0; + unsigned int i; + + if ( !nr_ranges ) + { + printk(XENLOG_DEBUG "PFN compression disabled%s\n", + pdx_compress ? ": no ranges provided" : ""); + return false; + } + + if ( nr_ranges > ARRAY_SIZE(ranges) ) + { + printk(XENLOG_WARNING + "Too many PFN ranges (%u > %zu), not attempting PFN compression\n", + nr_ranges, ARRAY_SIZE(ranges)); + return false; + } + + /* Sort ranges by start address. */ + sort(ranges, nr_ranges, sizeof(*ranges), cmp_node, swp_node); + + for ( i = 0; i < nr_ranges; i++ ) + { + unsigned long start = ranges[i].base_pfn; + + /* + * Align range base to MAX_ORDER. This is required so the PDX offset + * for the bits below MAX_ORDER matches the MFN offset, and pages + * greater than the minimal order can be used to populate the + * directmap. + */ + ranges[i].base_pfn = start & ~((1UL << MAX_ORDER) - 1); + ranges[i].pages = start + ranges[i].pages - ranges[i].base_pfn; + + /* + * Only merge overlapped regions now, leave adjacent regions separated. + * They would be merged later if both use the same index into the + * lookup table. + */ + if ( !i || + ranges[i].base_pfn >= + (ranges[i - 1].base_pfn + ranges[i - 1].pages) ) + { + mask |= pdx_region_mask(ranges[i].base_pfn, ranges[i].pages); + continue; + } + + ranges[i - 1].pages = ranges[i].base_pfn + ranges[i].pages - + ranges[i - 1].base_pfn; + + if ( i + 1 < nr_ranges ) + memmove(&ranges[i], &ranges[i + 1], + (nr_ranges - (i + 1)) * sizeof(ranges[0])); + else /* last range */ + mask |= pdx_region_mask(ranges[i].base_pfn, ranges[i].pages); + nr_ranges--; + i--; + } + + /* + * Populate a mask with the non-equal bits of the different ranges, do this + * to calculate the maximum PFN shift to use as the lookup table index. + */ + for ( i = 0; i < nr_ranges; i++ ) + for ( unsigned int j = i + 1; j < nr_ranges; j++ ) + idx_mask |= ranges[i].base_pfn ^ ranges[j].base_pfn; + /* Mask out the bits that change inside of ranges. */ + idx_mask &= ~mask; + + if ( !idx_mask ) + /* Single region case. */ + pfn_index_shift = flsl(mask); + else if ( flsl(idx_mask) - ffsl(idx_mask) < CONFIG_PDX_OFFSET_TBL_ORDER ) + /* The changed mask fits in the table index width. */ + pfn_index_shift = ffsl(idx_mask) - 1; + else + { + /* Changed mask is wider than array size, use most significant bits. */ + pfn_index_shift = flsl(idx_mask) - CONFIG_PDX_OFFSET_TBL_ORDER; + printk(XENLOG_DEBUG + "PFN compression table index truncated, requires order %u\n", + flsl(idx_mask) - ffsl(idx_mask) + 1); + } + + /* + * Check correctness of the calculated values, plus merge ranges if they + * use the same lookup table index. + */ + for ( i = 0; i < nr_ranges; i++ ) + { + /* + * Ensure ranges [start, end] use the same offset table index. Should + * be guaranteed by the logic that calculates the pfn shift. + */ + if ( PFN_TBL_IDX(ranges[i].base_pfn) != + PFN_TBL_IDX(ranges[i].base_pfn + ranges[i].pages - 1) ) + { + printk(XENLOG_DEBUG "PFN compression is invalid, disabling\n"); + ASSERT_UNREACHABLE(); + pfn_pdx_compression_reset(); + return false; + } + + if ( !i || + PFN_TBL_IDX(ranges[i - 1].base_pfn) != + PFN_TBL_IDX(ranges[i].base_pfn) ) + continue; + + /* Merge ranges with the same table index. */ + ranges[i - 1].pages = ranges[i].base_pfn + ranges[i].pages - + ranges[i - 1].base_pfn; + if ( i + 1 < nr_ranges ) + memmove(&ranges[i], &ranges[i + 1], + (nr_ranges - (i + 1)) * sizeof(ranges[0])); + nr_ranges--; + i--; + } + + /* + * Find the maximum PFN range size after having merged ranges with same + * index. The rounded up region size will be the base for the PDX region + * size and shift. + */ + for ( i = 0; i < nr_ranges; i++ ) + pages = max(pages, ranges[i].pages); + + /* pdx_init_mask() already takes MAX_ORDER into account. */ + mask = PFN_DOWN(pdx_init_mask((paddr_t)pages << PAGE_SHIFT)); + pdx_index_shift = flsl(mask); + + /* Avoid compression if there's no gain. */ + if ( (mask + 1) * (nr_ranges - 1) >= ranges[nr_ranges - 1].base_pfn ) + { + printk(XENLOG_DEBUG + "PFN compression yields no space gain, disabling\n"); + pfn_pdx_compression_reset(); + return false; + } + + /* + * Set all entries in the bases table to ~0 to force both mfn_valid() and + * pdx_is_region_compressible() to return false for non-handled pfns. + */ + memset(pfn_bases, ~0, sizeof(pfn_bases)); + + pdx_region_size = mask + 1; + + printk(XENLOG_INFO + "PFN compression using lookup table shift %u and region size %#lx\n", + pfn_index_shift, pdx_region_size); + + for ( i = 0; i < nr_ranges; i++ ) + { + unsigned int idx = PFN_TBL_IDX(ranges[i].base_pfn); + + pfn_pdx_lookup[idx] = ranges[i].base_pfn - (mask + 1) * i; + pdx_pfn_lookup[i] = pfn_pdx_lookup[idx]; + pfn_bases[idx] = ranges[i].base_pfn; + + printk(XENLOG_DEBUG + " range %3u [%013lx, %013lx] PFN IDX %3u : %013lx\n", + i, ranges[i].base_pfn, ranges[i].base_pfn + ranges[i].pages - 1, + idx, pfn_pdx_lookup[idx]); + } + + return true; +} + +void __init pfn_pdx_compression_reset(void) +{ + memset(pfn_pdx_lookup, 0, sizeof(pfn_pdx_lookup)); + memset(pdx_pfn_lookup, 0, sizeof(pfn_pdx_lookup)); + memset(pfn_bases, 0, sizeof(pfn_bases)); + pfn_index_shift = 0; + pdx_index_shift = 0; + pdx_region_size = ~0UL; + + nr_ranges = 0; +} + +#endif /* CONFIG_PDX_OFFSET_COMPRESSION */ /* * Local variables: diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 425d45e9f0..856fc3e8a0 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -65,6 +65,46 @@ * This scheme also holds for multiple regions, where HHHHHHH acts as * the region identifier and LLLLLL fully contains the span of every * region involved. + * + * ## PDX offset compression + * + * Alternative compression mechanism that relies on RAM ranges having a similar + * size and offset between them: + * + * PFN address space: + * ┌────────┬──────────┬────────┬──────────┐ ┌────────┬──────────┐ + * │ RAM 0 │ │ RAM 1 │ │...│ RAM N │ │ + * ├────────┼──────────┼────────┴──────────┘ └────────┴──────────┘ + * │<------>│ │ + * │ size │ + * │<----------------->│ + * offset + * + * The compression reduces the holes between RAM regions: + * + * PDX address space: + * ┌────────┬───┬────────┬───┐ ┌─┬────────┐ + * │ RAM 0 │ │ RAM 1 │ │...│ │ RAM N │ + * ├────────┴───┼────────┴───┘ └─┴────────┘ + * │<---------->│ + * pdx region size + * + * The offsets to convert from PFN to PDX and from PDX to PFN are stored in a + * pair of lookup tables, and the index into those tables to find the offset + * for each PFN or PDX is obtained by shifting the to be translated address by + * a specific value calculated at boot: + * + * pdx = pfn - pfn_lookup_table[pfn >> pfn_shift] + * pfn = pdx + pdx_lookup_table[pdx >> pdx_shift] + * + * Note the indexes into the lookup tables are masked to avoid out of bounds + * accesses. + * + * This compression requires the PFN ranges to contain a non-equal most + * significant part that's smaller than the lookup table size, so that a valid + * shift value can be found to differentiate between PFN regions. The setup + * algorithm might merge otherwise separate PFN ranges to use the same lookup + * table entry. */ extern unsigned long max_pdx; @@ -157,7 +197,52 @@ static inline paddr_t directmapoff_to_maddr_xlate(unsigned long offset) (offset & ma_va_bottom_mask)); } -#endif /* CONFIG_PDX_MASK_COMPRESSION */ +#elif defined(CONFIG_PDX_OFFSET_COMPRESSION) /* CONFIG_PDX_MASK_COMPRESSION */ + +#include + +#define CONFIG_PDX_NR_LOOKUP (1UL << CONFIG_PDX_OFFSET_TBL_ORDER) +#define PDX_TBL_MASK (CONFIG_PDX_NR_LOOKUP - 1) + +#define PFN_TBL_IDX(pfn) \ + (((pfn) >> pfn_index_shift) & PDX_TBL_MASK) +#define PDX_TBL_IDX(pdx) \ + (((pdx) >> pdx_index_shift) & PDX_TBL_MASK) +#define MADDR_TBL_IDX(ma) \ + (((ma) >> (pfn_index_shift + PAGE_SHIFT)) & PDX_TBL_MASK) +#define DMAPOFF_TBL_IDX(off) \ + (((off) >> (pdx_index_shift + PAGE_SHIFT)) & PDX_TBL_MASK) + +extern unsigned int pfn_index_shift; +extern unsigned int pdx_index_shift; +extern unsigned long pdx_region_size; + +extern unsigned long pfn_pdx_lookup[]; +extern unsigned long pdx_pfn_lookup[]; +extern unsigned long pfn_bases[]; + +static inline unsigned long pfn_to_pdx_xlate(unsigned long pfn) +{ + return pfn - pfn_pdx_lookup[PFN_TBL_IDX(pfn)]; +} + +static inline unsigned long pdx_to_pfn_xlate(unsigned long pdx) +{ + return pdx + pdx_pfn_lookup[PDX_TBL_IDX(pdx)]; +} + +static inline unsigned long maddr_to_directmapoff_xlate(paddr_t ma) +{ + return ma - ((paddr_t)pfn_pdx_lookup[MADDR_TBL_IDX(ma)] << PAGE_SHIFT); +} + +static inline paddr_t directmapoff_to_maddr_xlate(unsigned long offset) +{ + return offset + ((paddr_t)pdx_pfn_lookup[DMAPOFF_TBL_IDX(offset)] << + PAGE_SHIFT); +} + +#endif /* CONFIG_PDX_OFFSET_COMPRESSION */ #ifdef CONFIG_PDX_NONE -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 17:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 17:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086222.1444422 (Exim 4.92) (envelope-from ) id 1uo3jD-0004Fr-Kl; Mon, 18 Aug 2025 17:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086222.1444422; Mon, 18 Aug 2025 17:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo3jD-0004Fj-Gg; Mon, 18 Aug 2025 17:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1086222; Mon, 18 Aug 2025 17:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo3jC-0004Fd-0B for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uo3jB-00BoZR-20 for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uo3jB-0087jW-2K for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4l7QJk+4IS2zq+ODi0BZWXe35EQ3L3s0VFRkm+kFwvA=; b=QDhSNiUp5DfosYzCjhtrNkf7/P WYVUVI+OLY+5ii/dkgTzSuRCz6SFQVxipGwllJr5HYWVF0X3p3Hwwbg+vsgSHKErOSZtkhRTypUyE rVgxMHfKu6hFhGvUHEzuKPaNXfmjIK4bzNBNlDPQxKTyT1+XwBYgmdzRjOJNMCPw2o2I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mkelf32: pad load segment to 2Mb boundary Message-Id: Date: Mon, 18 Aug 2025 17:33:01 +0000 commit 4fb075201f54b16c0800af0107162461a93065fb Author: Jan Beulich AuthorDate: Mon Aug 18 10:42:24 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 18 10:42:24 2025 +0200 x86/mkelf32: pad load segment to 2Mb boundary In order to legitimately set up initial mappings past _end[], we need to make sure that the entire mapped range is inside a RAM region. Therefore we need to inform the bootloader (or alike) that our allocated size is larger than just the next SECTION_ALIGN-ed boundary past _end[]. This allows dropping a command line option from the tool, which was introduced to work around a supposed linker bug, when the problem was really Xen's. While adjusting adjacent code, correct the argc check to also cover the case correctly when --notes was passed. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/Makefile | 3 +-- xen/arch/x86/boot/mkelf32.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 5aab30a0c4..9d67ea7cd4 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -130,8 +130,7 @@ orphan-handling-$(call ld-option,--orphan-handling=warn) += --orphan-handling=wa $(TARGET): TMP = $(dot-target).elf32 $(TARGET): $(TARGET)-syms $(efi-y) $(obj)/boot/mkelf32 - $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) $(XEN_IMG_OFFSET) \ - `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . __2M_rwdata_end$$/0x\1/p'` + $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) $(XEN_IMG_OFFSET) od -t x4 -N 8192 $(TMP) | grep 1badb002 > /dev/null || \ { echo "No Multiboot1 header found" >&2; false; } od -t x4 -N 32768 $(TMP) | grep e85250d6 > /dev/null || \ diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c index f0f406687c..373ba4ddd5 100644 --- a/xen/arch/x86/boot/mkelf32.c +++ b/xen/arch/x86/boot/mkelf32.c @@ -248,7 +248,6 @@ static void do_read(int fd, void *data, int len) int main(int argc, char **argv) { - uint64_t final_exec_addr; uint32_t loadbase, dat_siz, mem_siz, note_base, note_sz, offset; char *inimage, *outimage; int infd, outfd; @@ -261,22 +260,24 @@ int main(int argc, char **argv) Elf64_Ehdr in64_ehdr; Elf64_Phdr in64_phdr; - if ( argc < 5 ) + if ( argc < 4 ) { + help: fprintf(stderr, "Usage: mkelf32 [--notes] " - " \n"); + "\n"); return 1; } if ( !strcmp(argv[1], "--notes") ) { + if ( argc < 5 ) + goto help; i = 2; num_phdrs = 2; } inimage = argv[i++]; outimage = argv[i++]; loadbase = strtoul(argv[i++], NULL, 16); - final_exec_addr = strtoull(argv[i++], NULL, 16); infd = open(inimage, O_RDONLY); if ( infd == -1 ) @@ -339,9 +340,12 @@ int main(int argc, char **argv) (void)lseek(infd, in64_phdr.p_offset, SEEK_SET); dat_siz = (uint32_t)in64_phdr.p_filesz; - /* Do not use p_memsz: it does not include BSS alignment padding. */ - /*mem_siz = (uint32_t)in64_phdr.p_memsz;*/ - mem_siz = (uint32_t)(final_exec_addr - in64_phdr.p_vaddr); + /* + * We don't pad .bss in the linker script, but during early boot we map + * the Xen image using 2M pages. To avoid running into adjacent non-RAM + * regions, pad the segment to the next 2M boundary. + */ + mem_siz = ((uint32_t)in64_phdr.p_memsz + (1U << 20) - 1) & (-1U << 20); note_sz = note_base = offset = 0; if ( num_phdrs > 1 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 17:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 17:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086223.1444425 (Exim 4.92) (envelope-from ) id 1uo3jN-0004I4-MO; Mon, 18 Aug 2025 17:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086223.1444425; Mon, 18 Aug 2025 17:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo3jN-0004Hw-Jl; Mon, 18 Aug 2025 17:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1086223; Mon, 18 Aug 2025 17:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo3jL-0004Hn-VY for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uo3jL-00BoZV-2N for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uo3jL-0087k0-2t for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GqlE0bYmmTvLLSwVJvjIHnX3VNuUoval19cWrQLCQqQ=; b=ZM+hnPl+C8hrj8BQ6ymBpXb0/k tiIdKcgSCWZDpSFlG2bRNwYuMas/kqKuHygPgJtTO9S6rQdCZxR33H4Dy/2Kj0hq9LFQlp+pCndvz trHM4brLDmUh+4M8tVuDI5i2u4jL+2YkBOSb2EW3fG4JN3zRoD1Fo//gWaooXJ5y7IZM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: split unmapping and marking-as-I/O in arch_init_memory() Message-Id: Date: Mon, 18 Aug 2025 17:33:11 +0000 commit 248096b113fefd36260afb06a2520781ec37f9e8 Author: Jan Beulich AuthorDate: Mon Aug 18 10:43:28 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 18 10:43:28 2025 +0200 x86/mm: split unmapping and marking-as-I/O in arch_init_memory() The unmapping part also wants to cover UNUSABLE regions, and it will now be necessary for space outside the low 16Mb (wherever Xen is placed). While there, limit the scopes of involved variables. Fixes: e4dd91ea85a3 ("x86: Ensure RAM holes really are not mapped in Xen's ongoing 1:1 physmap") Fixes: 7cd7f2f5e116 ("x86/boot: Remove the preconstructed low 16M superpage mappings") Signed-off-by: Jan Beulich --- xen/arch/x86/mm.c | 63 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e7fd56c7ce..9ca3469a78 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -275,8 +275,6 @@ static void __init assign_io_page(struct page_info *page) void __init arch_init_memory(void) { - unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; - /* * Basic guest-accessible flags: * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). @@ -292,12 +290,55 @@ void __init arch_init_memory(void) * case the low 1MB. */ BUG_ON(pvh_boot && trampoline_phys != 0x1000); - for ( i = 0; i < 0x100; i++ ) + for ( unsigned int i = 0; i < MB(1) >> PAGE_SHIFT; i++ ) assign_io_page(mfn_to_page(_mfn(i))); - /* Any areas not specified as RAM by the e820 map are considered I/O. */ - for ( i = 0, pfn = 0; pfn < max_page; i++ ) + /* + * Any areas not specified as RAM by the e820 map want to have no mappings. + * We may have established some by mapping more than necessary in head.S, + * due to the use of super-pages there. + */ + for ( unsigned long i = 0, pfn = 0, + rlimit_pfn = PFN_DOWN(PAGE_ALIGN_2M(__pa(_end))); + pfn < rlimit_pfn; i++ ) { + unsigned long rstart_pfn, rend_pfn, start_pfn; + + while ( i < e820.nr_map && + e820.map[i].type != E820_RAM ) + i++; + + if ( i >= e820.nr_map ) + { + /* No more RAM regions: Unmap right to upper boundary. */ + rstart_pfn = rend_pfn = rlimit_pfn; + } + else + { + /* Unmap just up as far as next RAM region. */ + rstart_pfn = min(rlimit_pfn, PFN_UP(e820.map[i].addr)); + rend_pfn = max(rstart_pfn, + PFN_DOWN(e820.map[i].addr + e820.map[i].size)); + } + + /* NB: _start is already 2Mb-aligned. */ + start_pfn = max(pfn, PFN_DOWN(__pa(_start))); + if ( start_pfn < rstart_pfn ) + destroy_xen_mappings((unsigned long)mfn_to_virt(start_pfn), + (unsigned long)mfn_to_virt(rstart_pfn)); + + /* Skip the RAM region. */ + pfn = rend_pfn; + } + + /* + * Any areas not specified as RAM or UNUSABLE by the e820 map are + * considered I/O. + */ + for ( unsigned long i = 0, pfn = 0; pfn < max_page; i++ ) + { + unsigned long rstart_pfn, rend_pfn; + while ( (i < e820.nr_map) && (e820.map[i].type != E820_RAM) && (e820.map[i].type != E820_UNUSABLE) ) @@ -317,17 +358,6 @@ void __init arch_init_memory(void) PFN_DOWN(e820.map[i].addr + e820.map[i].size)); } - /* - * Make sure any Xen mappings of RAM holes above 1MB are blown away. - * In particular this ensures that RAM holes are respected even in - * the statically-initialised 1-16MB mapping area. - */ - iostart_pfn = max_t(unsigned long, pfn, 1UL << (20 - PAGE_SHIFT)); - ioend_pfn = min(rstart_pfn, 16UL << (20 - PAGE_SHIFT)); - if ( iostart_pfn < ioend_pfn ) - destroy_xen_mappings((unsigned long)mfn_to_virt(iostart_pfn), - (unsigned long)mfn_to_virt(ioend_pfn)); - /* Mark as I/O up to next RAM region. */ for ( ; pfn < rstart_pfn; pfn++ ) { @@ -365,6 +395,7 @@ void __init arch_init_memory(void) const l3_pgentry_t *l3idle = map_l3t_from_l4e( idle_pg_table[l4_table_offset(split_va)]); l3_pgentry_t *l3tab = map_domain_page(l3mfn); + unsigned int i; for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 17:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 17:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086224.1444429 (Exim 4.92) (envelope-from ) id 1uo3jX-0004KT-Nv; Mon, 18 Aug 2025 17:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086224.1444429; Mon, 18 Aug 2025 17:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo3jX-0004KL-LA; Mon, 18 Aug 2025 17:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1086224; Mon, 18 Aug 2025 17:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo3jW-0004KC-43 for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uo3jV-00BoZZ-2g for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uo3jW-0087kO-01 for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 17:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5QdQMAn7blEDoNfaitr3QKpl7CKC9I5w0f51tUgGecU=; b=gRostzcje8jVcILGKVsPUZUsQl O+UYauDz3CltuMjC75dMfDxn0T/k8lWUpDV6++yXZ6yUVb6wiDu2V4yZ07aeOxBlm0QPB8/p5zl8p VHljvATeMlhaHXS2x0084ZFPmYdVY4hOYq+iNHiLN+XtsfkHni+V1qenh5e3iZJDHoFU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm/ioreq: Fix condition in hvm_alloc_legacy_ioreq_gfn() Message-Id: Date: Mon, 18 Aug 2025 17:33:22 +0000 commit 282ed258a59195698a81ab4408a17336eb6ea7ed Author: Oleksandr Tyshchenko AuthorDate: Mon Aug 18 10:43:52 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 18 10:43:52 2025 +0200 x86/hvm/ioreq: Fix condition in hvm_alloc_legacy_ioreq_gfn() Fix the incorrect condition that causes hvm_alloc_legacy_ioreq_gfn() to return INVALID_GFN even if the HVM param was installed properly by the toolstack. Fixes: 3486f398a3dd (' x86/hvm/ioreq: allow ioreq servers to use HVM_PARAM_[BUF]IOREQ_PFN') Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/ioreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index ec709e5f47..4d30f2d730 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -63,7 +63,7 @@ static gfn_t hvm_alloc_legacy_ioreq_gfn(struct ioreq_server *s) for ( i = HVM_PARAM_IOREQ_PFN; i <= HVM_PARAM_BUFIOREQ_PFN; i++ ) { - if ( !test_and_clear_bit(i, &d->arch.hvm.ioreq_gfn.legacy_mask) ) + if ( test_and_clear_bit(i, &d->arch.hvm.ioreq_gfn.legacy_mask) ) return _gfn(d->arch.hvm.params[i]); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 22:55:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 22:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086247.1444432 (Exim 4.92) (envelope-from ) id 1uo8kp-0006DG-Tm; Mon, 18 Aug 2025 22:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086247.1444432; Mon, 18 Aug 2025 22:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo8kp-0006D8-RC; Mon, 18 Aug 2025 22:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1086247; Mon, 18 Aug 2025 22:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo8ko-0006D2-HB for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 22:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uo8ko-00BuzG-0G for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 22:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uo8ko-008L7O-0m for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 22:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UszkGaKI3c5MOEXUwUZVIQ+NZyFajpREv9P7sc3pl+8=; b=ohJrpkFsUTggvM1gzMEY+74nvp 09NpJ+4p5NsF1+UEnzccFdvSaqdxJ4e5dNoyJgHfst9PYwXBS3d0r69JyoTpUWGH5dom3aULKdXMs HUeENLbJnYSoRWcfhORNo7iL1ZvTKFFPWW3yTOjZhlCkahfzP8hiFNB041yv4TTRDPAg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/link: Remove exception table sections Message-Id: Date: Mon, 18 Aug 2025 22:55:02 +0000 commit b3d6651df07bccb43b3ca25c65a29d014d934a4a Author: Andrew Cooper AuthorDate: Mon Aug 18 09:17:31 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 18 13:01:10 2025 +0100 arm/link: Remove exception table sections This was almost certainly copy&paste from x86. ARM does not us these nor selects HAS_EX_TABLE, so drop the sections and their boundary markers. No functional change. Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- xen/arch/arm/xen.lds.S | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 9f30c3a13e..db17ff1efa 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -86,16 +86,6 @@ SECTIONS } : text .data.read_mostly : { - /* Exception table */ - __start___ex_table = .; - *(.ex_table) - __stop___ex_table = .; - - /* Pre-exception table */ - __start___pre_ex_table = .; - *(.ex_table.pre) - __stop___pre_ex_table = .; - *(.data.read_mostly) } :text -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 18 22:55:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Aug 2025 22:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086248.1444437 (Exim 4.92) (envelope-from ) id 1uo8kz-0006Em-Vq; Mon, 18 Aug 2025 22:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086248.1444437; Mon, 18 Aug 2025 22:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo8kz-0006Ef-Sj; Mon, 18 Aug 2025 22:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1086248; Mon, 18 Aug 2025 22:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uo8ky-0006ER-Fp for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 22:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uo8ky-00BuzK-0k for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 22:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uo8ky-008L7m-17 for xen-changelog@lists.xenproject.org; Mon, 18 Aug 2025 22:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cjjZ5TmkLSOt9J2V44ET2iP0xmcT6n8Ibw8+SjKNBTA=; b=yPFjViJ7Prqc4b7epyTy7m2dxW /FXcqgA3FrAeEFYhxChlzHOLVjq0iulgHBYWiLiq5XBYN4pa8vtQJLTIf8xG2iB8Q2wWcjgqdS9Ql Ww3/MmZJNqSLZMru/yoQm7NQ+PnZUPSXRhqy6tM+BTd62+YNgVqD6jkVG4xOgV5Io0uk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pdx: introduce a new compression algorithm based on region offsets Message-Id: Date: Mon, 18 Aug 2025 22:55:12 +0000 commit c5c45bcbd6a13899f8a2de429987a6770de3eba9 Author: Roger Pau Monne AuthorDate: Tue Aug 12 17:06:24 2025 +0200 Commit: Andrew Cooper CommitDate: Mon Aug 18 13:01:10 2025 +0100 pdx: introduce a new compression algorithm based on region offsets With the appearance of Intel Sierra Forest and Granite Rapids it's now possible to get a production x86 host with the following memory map: SRAT: Node 0 PXM 0 [0000000000000000, 000000007fffffff] SRAT: Node 0 PXM 0 [0000000100000000, 000000807fffffff] SRAT: Node 1 PXM 1 [0000063e80000000, 000006be7fffffff] SRAT: Node 2 PXM 2 [00000c7e80000000, 00000cfe7fffffff] SRAT: Node 3 PXM 3 [000012be80000000, 0000133e7fffffff] This is from a four socket Granite Rapids system, with each node having 512GB of memory. The total amount of RAM on the system is 2TB, but without enabling CONFIG_BIGMEM the last range is not accessible, as it's above the 16TB boundary covered by the frame table. Sierra Forest and Granite Rapids are socket compatible, however Sierra Forest only supports 2 socket configurations, while Granite Rapids can go up to 8 sockets. Note that while the memory map is very sparse, it couldn't be compressed using the current PDX_MASK compression algorithm, which relies on all ranges having a shared zeroed region of bits that can be removed. The memory map presented above has the property of all regions being similarly spaced between each other, and all having also a similar size. Use a lookup table to store the offsets to translate from/to PFN and PDX spaces. Such table is indexed based on the input PFN or PDX to translated. The example PFN layout about would get compressed using the following: PFN compression using PFN lookup table shift 29 and PDX region size 0x10000000 range 0 [0000000000000, 0x0000807ffff] PFN IDX 0 : 0000000000000 range 1 [0x00063e80000, 0x0006be7ffff] PFN IDX 3 : 0x00053e80000 range 2 [0x000c7e80000, 0x000cfe7ffff] PFN IDX 6 : 0x000a7e80000 range 3 [0x0012be80000, 0x00133e7ffff] PFN IDX 9 : 0x000fbe80000 Note how the tow ranges belonging to node 0 get merged into a single PDX region by the compression algorithm. The default size of lookup tables currently set in Kconfig is 64 entries, and the example memory map consumes 10 entries. Such memory map is from a 4 socket Granite Rapids host, which in theory supports up to 8 sockets according to Intel documentation. Assuming the layout of a 8 socket system is similar to the 4 socket one, it would require 21 lookup table entries to support it, way below the current default of 64 entries. The valid range of lookup table size is currently restricted from 1 to 512 elements in Kconfig. An extra array is used to keep track of the base PFN for each translated range. Non used slots are set to ~0UL, so that in mfn_valid() the mfn < base check always fails, thus reporting the mfn as invalid. Introduce __init_or_pdx_mask and use it on some shared functions between PDX mask and offset compression, as otherwise some code becomes unreachable after boot if PDX offset compression is used. Mark the code as __init in that case, so it's pruned after boot. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- CHANGELOG.md | 3 + tools/tests/pdx/.gitignore | 1 + tools/tests/pdx/Makefile | 3 +- tools/tests/pdx/harness.h | 14 +++ tools/tests/pdx/test-pdx.c | 4 + xen/common/Kconfig | 21 +++- xen/common/pdx.c | 241 ++++++++++++++++++++++++++++++++++++++++++++- xen/include/xen/pdx.h | 87 +++++++++++++++- 8 files changed, 368 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f31ca08fe..f9ef893f48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) grant table or foreign memory. ### Added + - Introduce new PDX compression algorithm to cope with Intel Sierra Forest and + Granite Rapids having sparse memory maps. + - On x86: - Option to attempt to fixup p2m page-faults on PVH dom0. - Resizable BARs is supported for PVH dom0. diff --git a/tools/tests/pdx/.gitignore b/tools/tests/pdx/.gitignore index a32c7db4de..1202a531a7 100644 --- a/tools/tests/pdx/.gitignore +++ b/tools/tests/pdx/.gitignore @@ -1,2 +1,3 @@ /pdx.h /test-pdx-mask +/test-pdx-offset diff --git a/tools/tests/pdx/Makefile b/tools/tests/pdx/Makefile index b3734afde6..10b354f0ce 100644 --- a/tools/tests/pdx/Makefile +++ b/tools/tests/pdx/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -TARGETS := test-pdx-mask +TARGETS := test-pdx-mask test-pdx-offset .PHONY: all all: $(TARGETS) @@ -42,6 +42,7 @@ CFLAGS += $(APPEND_CFLAGS) CFLAGS += $(CFLAGS_xeninclude) test-pdx-mask: CFLAGS += -DCONFIG_PDX_MASK_COMPRESSION +test-pdx-offset: CFLAGS += -DCONFIG_PDX_OFFSET_COMPRESSION test-pdx-%: test-pdx.c pdx.h $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -o $@ $< $(APPEND_CFLAGS) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h index a8852ac453..e49d6bcf92 100644 --- a/tools/tests/pdx/harness.h +++ b/tools/tests/pdx/harness.h @@ -44,8 +44,10 @@ #define MAX_RANGES 16 #define MAX_PFN_RANGES MAX_RANGES +#define CONFIG_PDX_OFFSET_TBL_ORDER 6 #define ASSERT assert +#define ASSERT_UNREACHABLE() assert(0) #define CONFIG_DEBUG @@ -66,10 +68,22 @@ static inline unsigned int find_next( #define find_next_zero_bit(a, s, o) find_next(a, s, o, false) #define find_next_bit(a, s, o) find_next(a, s, o, true) +#define flsl(x) ((x) ? BITS_PER_LONG - __builtin_clzl(x) : 0) +#define ffsl(x) __builtin_ffsl(x) + #define boolean_param(name, func) typedef uint64_t paddr_t; +#define SWAP(a, b) \ + do { typeof(a) t_ = (a); (a) = (b); (b) = t_; } while ( 0 ) + +#define sort(elem, nr, size, cmp, swp) ({ \ + /* Consume swp() so compiler doesn't complain it's unused. */ \ + (void)(swp); \ + qsort(elem, nr, size, cmp); \ +}) + #include "pdx.h" #endif diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c index 0798ccee35..eefd54c768 100644 --- a/tools/tests/pdx/test-pdx.c +++ b/tools/tests/pdx/test-pdx.c @@ -51,7 +51,11 @@ int main(int argc, char **argv) { .start = 0xc7e80000UL, .end = 0xcfe80000UL }, { .start = 0x12be80000UL, .end = 0x133e80000UL }, }, +#ifdef CONFIG_PDX_OFFSET_COMPRESSION + .compress = true, +#else .compress = false, +#endif }, /* Simple hole. */ { diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 8dad0c923a..76f9ce705f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -59,7 +59,8 @@ config EVTCHN_FIFO choice prompt "PDX (Page inDeX) compression" - default PDX_MASK_COMPRESSION if !X86 && !RISCV + default PDX_OFFSET_COMPRESSION if X86 + default PDX_MASK_COMPRESSION if !RISCV default PDX_NONE help PDX compression is a technique designed to reduce the memory @@ -78,12 +79,30 @@ config PDX_MASK_COMPRESSION help Compression relying on all RAM addresses sharing a zeroed bit region. +config PDX_OFFSET_COMPRESSION + bool "Offset compression" + help + Compression relying on size and distance between RAM regions being + compressible using an offset lookup table. + config PDX_NONE bool "None" help No compression endchoice +config PDX_OFFSET_TBL_ORDER + int "PDX offset compression lookup table order" if EXPERT + depends on PDX_OFFSET_COMPRESSION + default 6 + range 0 9 + help + Order of the PFN to PDX and PDX to PFN translation lookup tables. + Number of table entries is calculated as 2^N. + + Size of the tables can be adjusted from 1 entry (order 0) to 512 + entries (order 9). + config ALTERNATIVE_CALL bool diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 9e6b36086f..7e070ff962 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -24,6 +24,7 @@ #include #include #include +#include /** * Maximum (non-inclusive) usable pdx. Must be @@ -40,6 +41,12 @@ bool __mfn_valid(unsigned long mfn) #ifdef CONFIG_PDX_MASK_COMPRESSION invalid |= mfn & pfn_hole_mask; +#elif defined(CONFIG_PDX_OFFSET_COMPRESSION) + { + unsigned long base = pfn_bases[PFN_TBL_IDX(mfn)]; + + invalid |= mfn < base || mfn >= base + pdx_region_size; + } #endif if ( unlikely(evaluate_nospec(invalid)) ) @@ -75,6 +82,13 @@ void set_pdx_range(unsigned long smfn, unsigned long emfn) # error "Missing architecture maximum number of RAM ranges" #endif +/* Some functions should be init when not using PDX mask compression. */ +#ifndef CONFIG_PDX_MASK_COMPRESSION +# define __init_or_mask_compr __init +#else +# define __init_or_mask_compr +#endif + /* Generic PFN compression helpers. */ static struct pfn_range { unsigned long base_pfn, pages; @@ -102,7 +116,7 @@ void __init pfn_pdx_add_region(paddr_t base, paddr_t size) } /* Sets all bits from the most-significant 1-bit down to the LSB */ -static uint64_t fill_mask(uint64_t mask) +static uint64_t __init_or_mask_compr fill_mask(uint64_t mask) { while (mask & (mask + 1)) mask |= mask + 1; @@ -128,7 +142,7 @@ static uint64_t fill_mask(uint64_t mask) * @param len Size in octets of the region * @return Mask of moving bits at the bottom of all the region addresses */ -static uint64_t pdx_region_mask(uint64_t base, uint64_t len) +static uint64_t __init_or_mask_compr pdx_region_mask(uint64_t base, uint64_t len) { /* * We say a bit "moves" in a range if there exist 2 addresses in that @@ -294,7 +308,228 @@ void __init pfn_pdx_compression_reset(void) nr_ranges = 0; } -#endif /* CONFIG_PDX_COMPRESSION */ +#elif defined(CONFIG_PDX_OFFSET_COMPRESSION) /* CONFIG_PDX_MASK_COMPRESSION */ + +unsigned int __ro_after_init pfn_index_shift; +unsigned int __ro_after_init pdx_index_shift; +unsigned long __ro_after_init pdx_region_size = ~0UL; + +unsigned long __ro_after_init pfn_pdx_lookup[CONFIG_PDX_NR_LOOKUP]; +unsigned long __ro_after_init pdx_pfn_lookup[CONFIG_PDX_NR_LOOKUP]; +unsigned long __ro_after_init pfn_bases[CONFIG_PDX_NR_LOOKUP]; + +bool pdx_is_region_compressible(paddr_t base, unsigned long npages) +{ + unsigned long pfn = PFN_DOWN(base); + unsigned long pfn_base = pfn_bases[PFN_TBL_IDX(pfn)]; + + return pfn >= pfn_base && + pfn + npages <= pfn_base + pdx_region_size; +} + +static int __init cf_check cmp_node(const void *a, const void *b) +{ + const struct pfn_range *l = a, *r = b; + + if ( l->base_pfn > r->base_pfn ) + return 1; + if ( l->base_pfn < r->base_pfn ) + return -1; + + return 0; +} + +static void __init cf_check swp_node(void *a, void *b) +{ + struct pfn_range *l = a, *r = b; + + SWAP(*l, *r); +} + +bool __init pfn_pdx_compression_setup(paddr_t base) +{ + unsigned long mask = PFN_DOWN(pdx_init_mask(base)), idx_mask = 0; + unsigned long pages = 0; + unsigned int i; + + if ( !nr_ranges ) + { + printk(XENLOG_DEBUG "PFN compression disabled%s\n", + pdx_compress ? ": no ranges provided" : ""); + return false; + } + + if ( nr_ranges > ARRAY_SIZE(ranges) ) + { + printk(XENLOG_WARNING + "Too many PFN ranges (%u > %zu), not attempting PFN compression\n", + nr_ranges, ARRAY_SIZE(ranges)); + return false; + } + + /* Sort ranges by start address. */ + sort(ranges, nr_ranges, sizeof(*ranges), cmp_node, swp_node); + + for ( i = 0; i < nr_ranges; i++ ) + { + unsigned long start = ranges[i].base_pfn; + + /* + * Align range base to MAX_ORDER. This is required so the PDX offset + * for the bits below MAX_ORDER matches the MFN offset, and pages + * greater than the minimal order can be used to populate the + * directmap. + */ + ranges[i].base_pfn = start & ~((1UL << MAX_ORDER) - 1); + ranges[i].pages = start + ranges[i].pages - ranges[i].base_pfn; + + /* + * Only merge overlapped regions now, leave adjacent regions separated. + * They would be merged later if both use the same index into the + * lookup table. + */ + if ( !i || + ranges[i].base_pfn >= + (ranges[i - 1].base_pfn + ranges[i - 1].pages) ) + { + mask |= pdx_region_mask(ranges[i].base_pfn, ranges[i].pages); + continue; + } + + ranges[i - 1].pages = ranges[i].base_pfn + ranges[i].pages - + ranges[i - 1].base_pfn; + + if ( i + 1 < nr_ranges ) + memmove(&ranges[i], &ranges[i + 1], + (nr_ranges - (i + 1)) * sizeof(ranges[0])); + else /* last range */ + mask |= pdx_region_mask(ranges[i].base_pfn, ranges[i].pages); + nr_ranges--; + i--; + } + + /* + * Populate a mask with the non-equal bits of the different ranges, do this + * to calculate the maximum PFN shift to use as the lookup table index. + */ + for ( i = 0; i < nr_ranges; i++ ) + for ( unsigned int j = i + 1; j < nr_ranges; j++ ) + idx_mask |= ranges[i].base_pfn ^ ranges[j].base_pfn; + /* Mask out the bits that change inside of ranges. */ + idx_mask &= ~mask; + + if ( !idx_mask ) + /* Single region case. */ + pfn_index_shift = flsl(mask); + else if ( flsl(idx_mask) - ffsl(idx_mask) < CONFIG_PDX_OFFSET_TBL_ORDER ) + /* The changed mask fits in the table index width. */ + pfn_index_shift = ffsl(idx_mask) - 1; + else + { + /* Changed mask is wider than array size, use most significant bits. */ + pfn_index_shift = flsl(idx_mask) - CONFIG_PDX_OFFSET_TBL_ORDER; + printk(XENLOG_DEBUG + "PFN compression table index truncated, requires order %u\n", + flsl(idx_mask) - ffsl(idx_mask) + 1); + } + + /* + * Check correctness of the calculated values, plus merge ranges if they + * use the same lookup table index. + */ + for ( i = 0; i < nr_ranges; i++ ) + { + /* + * Ensure ranges [start, end] use the same offset table index. Should + * be guaranteed by the logic that calculates the pfn shift. + */ + if ( PFN_TBL_IDX(ranges[i].base_pfn) != + PFN_TBL_IDX(ranges[i].base_pfn + ranges[i].pages - 1) ) + { + printk(XENLOG_DEBUG "PFN compression is invalid, disabling\n"); + ASSERT_UNREACHABLE(); + pfn_pdx_compression_reset(); + return false; + } + + if ( !i || + PFN_TBL_IDX(ranges[i - 1].base_pfn) != + PFN_TBL_IDX(ranges[i].base_pfn) ) + continue; + + /* Merge ranges with the same table index. */ + ranges[i - 1].pages = ranges[i].base_pfn + ranges[i].pages - + ranges[i - 1].base_pfn; + if ( i + 1 < nr_ranges ) + memmove(&ranges[i], &ranges[i + 1], + (nr_ranges - (i + 1)) * sizeof(ranges[0])); + nr_ranges--; + i--; + } + + /* + * Find the maximum PFN range size after having merged ranges with same + * index. The rounded up region size will be the base for the PDX region + * size and shift. + */ + for ( i = 0; i < nr_ranges; i++ ) + pages = max(pages, ranges[i].pages); + + /* pdx_init_mask() already takes MAX_ORDER into account. */ + mask = PFN_DOWN(pdx_init_mask((paddr_t)pages << PAGE_SHIFT)); + pdx_index_shift = flsl(mask); + + /* Avoid compression if there's no gain. */ + if ( (mask + 1) * (nr_ranges - 1) >= ranges[nr_ranges - 1].base_pfn ) + { + printk(XENLOG_DEBUG + "PFN compression yields no space gain, disabling\n"); + pfn_pdx_compression_reset(); + return false; + } + + /* + * Set all entries in the bases table to ~0 to force both mfn_valid() and + * pdx_is_region_compressible() to return false for non-handled pfns. + */ + memset(pfn_bases, ~0, sizeof(pfn_bases)); + + pdx_region_size = mask + 1; + + printk(XENLOG_INFO + "PFN compression using lookup table shift %u and region size %#lx\n", + pfn_index_shift, pdx_region_size); + + for ( i = 0; i < nr_ranges; i++ ) + { + unsigned int idx = PFN_TBL_IDX(ranges[i].base_pfn); + + pfn_pdx_lookup[idx] = ranges[i].base_pfn - (mask + 1) * i; + pdx_pfn_lookup[i] = pfn_pdx_lookup[idx]; + pfn_bases[idx] = ranges[i].base_pfn; + + printk(XENLOG_DEBUG + " range %3u [%013lx, %013lx] PFN IDX %3u : %013lx\n", + i, ranges[i].base_pfn, ranges[i].base_pfn + ranges[i].pages - 1, + idx, pfn_pdx_lookup[idx]); + } + + return true; +} + +void __init pfn_pdx_compression_reset(void) +{ + memset(pfn_pdx_lookup, 0, sizeof(pfn_pdx_lookup)); + memset(pdx_pfn_lookup, 0, sizeof(pfn_pdx_lookup)); + memset(pfn_bases, 0, sizeof(pfn_bases)); + pfn_index_shift = 0; + pdx_index_shift = 0; + pdx_region_size = ~0UL; + + nr_ranges = 0; +} + +#endif /* CONFIG_PDX_OFFSET_COMPRESSION */ /* * Local variables: diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 425d45e9f0..856fc3e8a0 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -65,6 +65,46 @@ * This scheme also holds for multiple regions, where HHHHHHH acts as * the region identifier and LLLLLL fully contains the span of every * region involved. + * + * ## PDX offset compression + * + * Alternative compression mechanism that relies on RAM ranges having a similar + * size and offset between them: + * + * PFN address space: + * ┌────────┬──────────┬────────┬──────────┐ ┌────────┬──────────┐ + * │ RAM 0 │ │ RAM 1 │ │...│ RAM N │ │ + * ├────────┼──────────┼────────┴──────────┘ └────────┴──────────┘ + * │<------>│ │ + * │ size │ + * │<----------------->│ + * offset + * + * The compression reduces the holes between RAM regions: + * + * PDX address space: + * ┌────────┬───┬────────┬───┐ ┌─┬────────┐ + * │ RAM 0 │ │ RAM 1 │ │...│ │ RAM N │ + * ├────────┴───┼────────┴───┘ └─┴────────┘ + * │<---------->│ + * pdx region size + * + * The offsets to convert from PFN to PDX and from PDX to PFN are stored in a + * pair of lookup tables, and the index into those tables to find the offset + * for each PFN or PDX is obtained by shifting the to be translated address by + * a specific value calculated at boot: + * + * pdx = pfn - pfn_lookup_table[pfn >> pfn_shift] + * pfn = pdx + pdx_lookup_table[pdx >> pdx_shift] + * + * Note the indexes into the lookup tables are masked to avoid out of bounds + * accesses. + * + * This compression requires the PFN ranges to contain a non-equal most + * significant part that's smaller than the lookup table size, so that a valid + * shift value can be found to differentiate between PFN regions. The setup + * algorithm might merge otherwise separate PFN ranges to use the same lookup + * table entry. */ extern unsigned long max_pdx; @@ -157,7 +197,52 @@ static inline paddr_t directmapoff_to_maddr_xlate(unsigned long offset) (offset & ma_va_bottom_mask)); } -#endif /* CONFIG_PDX_MASK_COMPRESSION */ +#elif defined(CONFIG_PDX_OFFSET_COMPRESSION) /* CONFIG_PDX_MASK_COMPRESSION */ + +#include + +#define CONFIG_PDX_NR_LOOKUP (1UL << CONFIG_PDX_OFFSET_TBL_ORDER) +#define PDX_TBL_MASK (CONFIG_PDX_NR_LOOKUP - 1) + +#define PFN_TBL_IDX(pfn) \ + (((pfn) >> pfn_index_shift) & PDX_TBL_MASK) +#define PDX_TBL_IDX(pdx) \ + (((pdx) >> pdx_index_shift) & PDX_TBL_MASK) +#define MADDR_TBL_IDX(ma) \ + (((ma) >> (pfn_index_shift + PAGE_SHIFT)) & PDX_TBL_MASK) +#define DMAPOFF_TBL_IDX(off) \ + (((off) >> (pdx_index_shift + PAGE_SHIFT)) & PDX_TBL_MASK) + +extern unsigned int pfn_index_shift; +extern unsigned int pdx_index_shift; +extern unsigned long pdx_region_size; + +extern unsigned long pfn_pdx_lookup[]; +extern unsigned long pdx_pfn_lookup[]; +extern unsigned long pfn_bases[]; + +static inline unsigned long pfn_to_pdx_xlate(unsigned long pfn) +{ + return pfn - pfn_pdx_lookup[PFN_TBL_IDX(pfn)]; +} + +static inline unsigned long pdx_to_pfn_xlate(unsigned long pdx) +{ + return pdx + pdx_pfn_lookup[PDX_TBL_IDX(pdx)]; +} + +static inline unsigned long maddr_to_directmapoff_xlate(paddr_t ma) +{ + return ma - ((paddr_t)pfn_pdx_lookup[MADDR_TBL_IDX(ma)] << PAGE_SHIFT); +} + +static inline paddr_t directmapoff_to_maddr_xlate(unsigned long offset) +{ + return offset + ((paddr_t)pdx_pfn_lookup[DMAPOFF_TBL_IDX(offset)] << + PAGE_SHIFT); +} + +#endif /* CONFIG_PDX_OFFSET_COMPRESSION */ #ifdef CONFIG_PDX_NONE -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:11:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086395.1444553 (Exim 4.92) (envelope-from ) id 1uoJJ2-0005pv-Aw; Tue, 19 Aug 2025 10:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086395.1444553; Tue, 19 Aug 2025 10:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJ2-0005pm-7x; Tue, 19 Aug 2025 10:11:04 +0000 Received: by outflank-mailman (input) for mailman id 1086395; Tue, 19 Aug 2025 10:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJ0-0005pg-PZ for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJ0-00DLAO-16 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJ0-008pYk-1T for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=79SbC8duIFLIViSUgEk5f2u+31HqDtwwCuMWSRz4lSA=; b=eMEvmjlUXjQeQkymo+fQGdN07t yi3tq6w61xg5rJJ5eHeEWOLbA+CvSW+Tx3I8ELxBh1cY6Yed4dHHhrEaegAbMIFK9cxTmg4eI5Zkr yQOqhFfi8HYl6tbspN/8Xjv7UwNAfQ04yZAVLKfKrH9bbSMAlVRbKFYnr8XQ+1r/8T0Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "x86/mm: split unmapping and marking-as-I/O in arch_init_memory()" Message-Id: Date: Tue, 19 Aug 2025 10:11:02 +0000 commit 22c2cca55280a11d2a1849137eb146830e606e76 Author: Jan Beulich AuthorDate: Tue Aug 19 11:00:26 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 19 11:00:26 2025 +0200 Revert "x86/mm: split unmapping and marking-as-I/O in arch_init_memory()" This reverts commit 248096b113fefd36260afb06a2520781ec37f9e8. This was a stale version of the patch, and thus also not what was ack-ed. --- xen/arch/x86/mm.c | 63 ++++++++++++++----------------------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ca3469a78..e7fd56c7ce 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -275,6 +275,8 @@ static void __init assign_io_page(struct page_info *page) void __init arch_init_memory(void) { + unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; + /* * Basic guest-accessible flags: * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). @@ -290,55 +292,12 @@ void __init arch_init_memory(void) * case the low 1MB. */ BUG_ON(pvh_boot && trampoline_phys != 0x1000); - for ( unsigned int i = 0; i < MB(1) >> PAGE_SHIFT; i++ ) + for ( i = 0; i < 0x100; i++ ) assign_io_page(mfn_to_page(_mfn(i))); - /* - * Any areas not specified as RAM by the e820 map want to have no mappings. - * We may have established some by mapping more than necessary in head.S, - * due to the use of super-pages there. - */ - for ( unsigned long i = 0, pfn = 0, - rlimit_pfn = PFN_DOWN(PAGE_ALIGN_2M(__pa(_end))); - pfn < rlimit_pfn; i++ ) + /* Any areas not specified as RAM by the e820 map are considered I/O. */ + for ( i = 0, pfn = 0; pfn < max_page; i++ ) { - unsigned long rstart_pfn, rend_pfn, start_pfn; - - while ( i < e820.nr_map && - e820.map[i].type != E820_RAM ) - i++; - - if ( i >= e820.nr_map ) - { - /* No more RAM regions: Unmap right to upper boundary. */ - rstart_pfn = rend_pfn = rlimit_pfn; - } - else - { - /* Unmap just up as far as next RAM region. */ - rstart_pfn = min(rlimit_pfn, PFN_UP(e820.map[i].addr)); - rend_pfn = max(rstart_pfn, - PFN_DOWN(e820.map[i].addr + e820.map[i].size)); - } - - /* NB: _start is already 2Mb-aligned. */ - start_pfn = max(pfn, PFN_DOWN(__pa(_start))); - if ( start_pfn < rstart_pfn ) - destroy_xen_mappings((unsigned long)mfn_to_virt(start_pfn), - (unsigned long)mfn_to_virt(rstart_pfn)); - - /* Skip the RAM region. */ - pfn = rend_pfn; - } - - /* - * Any areas not specified as RAM or UNUSABLE by the e820 map are - * considered I/O. - */ - for ( unsigned long i = 0, pfn = 0; pfn < max_page; i++ ) - { - unsigned long rstart_pfn, rend_pfn; - while ( (i < e820.nr_map) && (e820.map[i].type != E820_RAM) && (e820.map[i].type != E820_UNUSABLE) ) @@ -358,6 +317,17 @@ void __init arch_init_memory(void) PFN_DOWN(e820.map[i].addr + e820.map[i].size)); } + /* + * Make sure any Xen mappings of RAM holes above 1MB are blown away. + * In particular this ensures that RAM holes are respected even in + * the statically-initialised 1-16MB mapping area. + */ + iostart_pfn = max_t(unsigned long, pfn, 1UL << (20 - PAGE_SHIFT)); + ioend_pfn = min(rstart_pfn, 16UL << (20 - PAGE_SHIFT)); + if ( iostart_pfn < ioend_pfn ) + destroy_xen_mappings((unsigned long)mfn_to_virt(iostart_pfn), + (unsigned long)mfn_to_virt(ioend_pfn)); + /* Mark as I/O up to next RAM region. */ for ( ; pfn < rstart_pfn; pfn++ ) { @@ -395,7 +365,6 @@ void __init arch_init_memory(void) const l3_pgentry_t *l3idle = map_l3t_from_l4e( idle_pg_table[l4_table_offset(split_va)]); l3_pgentry_t *l3tab = map_domain_page(l3mfn); - unsigned int i; for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:11:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086396.1444557 (Exim 4.92) (envelope-from ) id 1uoJJC-0005sm-CH; Tue, 19 Aug 2025 10:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086396.1444557; Tue, 19 Aug 2025 10:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJC-0005sN-9I; Tue, 19 Aug 2025 10:11:14 +0000 Received: by outflank-mailman (input) for mailman id 1086396; Tue, 19 Aug 2025 10:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJA-0005rA-Lw for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJA-00DLAU-1Q for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJA-008pZB-1z for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yr6a+uxBg1drsKvEa5kwWORgiJHh3sgNm83iQNR0AuU=; b=t+Od4TbRgwk/5gCphr+Ygmdruh zN8b1YSYBu1wdYSOrGO7uGCabWQwe0rLim1MqY/7hsp5z62qYAC0h/i38/ZhWCe2LJIWvfPFKdbja ptx0nlVESFGapuOOzSCA8j01kUo7c0sdktLUV1gQi3E2T4aoJENHgNNfl4Kv3uVLhWb0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: drop unmapping from marking-as-I/O in arch_init_memory() Message-Id: Date: Tue, 19 Aug 2025 10:11:12 +0000 commit 3101c46a063c6dc3be859eb90a3413dc579eed98 Author: Jan Beulich AuthorDate: Tue Aug 19 11:02:57 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 19 11:02:57 2025 +0200 x86/mm: drop unmapping from marking-as-I/O in arch_init_memory() The unmapping part would have wanted to cover UNUSABLE regions as well, and it would now have been necessary for space outside the low 16Mb (wherever Xen is placed). However, with everything up to the next 2Mb boundary now properly backed by RAM, we don't need to unmap anything anymore: Space up to __2M_rwdata_end[] is properly reserved, whereas space past that mark (up to the next 2Mb boundary) is ordinary RAM. While there, limit the scopes of involved variables. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e7fd56c7ce..5682f600bb 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -275,8 +275,6 @@ static void __init assign_io_page(struct page_info *page) void __init arch_init_memory(void) { - unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; - /* * Basic guest-accessible flags: * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). @@ -292,12 +290,17 @@ void __init arch_init_memory(void) * case the low 1MB. */ BUG_ON(pvh_boot && trampoline_phys != 0x1000); - for ( i = 0; i < 0x100; i++ ) + for ( unsigned int i = 0; i < PFN_DOWN(MB(1)); i++ ) assign_io_page(mfn_to_page(_mfn(i))); - /* Any areas not specified as RAM by the e820 map are considered I/O. */ - for ( i = 0, pfn = 0; pfn < max_page; i++ ) + /* + * Any areas not specified as RAM or UNUSABLE by the e820 map are + * considered I/O. + */ + for ( unsigned long i = 0, pfn = 0; pfn < max_page; i++ ) { + unsigned long rstart_pfn, rend_pfn; + while ( (i < e820.nr_map) && (e820.map[i].type != E820_RAM) && (e820.map[i].type != E820_UNUSABLE) ) @@ -317,17 +320,6 @@ void __init arch_init_memory(void) PFN_DOWN(e820.map[i].addr + e820.map[i].size)); } - /* - * Make sure any Xen mappings of RAM holes above 1MB are blown away. - * In particular this ensures that RAM holes are respected even in - * the statically-initialised 1-16MB mapping area. - */ - iostart_pfn = max_t(unsigned long, pfn, 1UL << (20 - PAGE_SHIFT)); - ioend_pfn = min(rstart_pfn, 16UL << (20 - PAGE_SHIFT)); - if ( iostart_pfn < ioend_pfn ) - destroy_xen_mappings((unsigned long)mfn_to_virt(iostart_pfn), - (unsigned long)mfn_to_virt(ioend_pfn)); - /* Mark as I/O up to next RAM region. */ for ( ; pfn < rstart_pfn; pfn++ ) { @@ -365,6 +357,7 @@ void __init arch_init_memory(void) const l3_pgentry_t *l3idle = map_l3t_from_l4e( idle_pg_table[l4_table_offset(split_va)]); l3_pgentry_t *l3tab = map_domain_page(l3mfn); + unsigned int i; for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:11:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086397.1444561 (Exim 4.92) (envelope-from ) id 1uoJJM-0005vT-DG; Tue, 19 Aug 2025 10:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086397.1444561; Tue, 19 Aug 2025 10:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJM-0005vM-Ac; Tue, 19 Aug 2025 10:11:24 +0000 Received: by outflank-mailman (input) for mailman id 1086397; Tue, 19 Aug 2025 10:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJK-0005vA-Sr for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJK-00DLAa-27 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJK-008paK-2H for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=z98ehQhs+hOjjomZe2aDearPDxybvYx1hNECaRWtJUo=; b=CBu3gXNcoa+sqZkhOqoBx4+dkH 0sUwzeWTSjFzBvweDlv4xSQnnrWUeft3nIv4YN2ftAQN00z1pUwag5WmZIr0kUqtY8QH+V3ka2+lF 1PYs4nNYW0cpL/+ej10gv8GcYE+4ZG6XG9WoxlmhKmebX4gMZgwk0BjY/n074FlOu4RE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Read event channel from xenstored page Message-Id: Date: Tue, 19 Aug 2025 10:11:22 +0000 commit f78895ad78c9534e4e5b81ed54422d38c68c2d12 Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:49 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:37 2025 +0200 tools/xenstored: Read event channel from xenstored page Make introduce_domain() use an event channel from the the xenstore page. It is only used if non-zero. Otherwise the passed in event channel port is used. The is useful for a xenstored stubdom to configure domains autonomously. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 34ebeaac9b..60d398682f 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1036,6 +1036,10 @@ static struct domain *introduce_domain(const void *ctx, interface = map_interface(domid); if (!interface && !restore) return NULL; + + if (interface->evtchn_port) + port = interface->evtchn_port; + if (new_domain(domain, port, restore)) { rc = errno; if (interface) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086398.1444565 (Exim 4.92) (envelope-from ) id 1uoJJW-0005xi-Et; Tue, 19 Aug 2025 10:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086398.1444565; Tue, 19 Aug 2025 10:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJW-0005xa-CK; Tue, 19 Aug 2025 10:11:34 +0000 Received: by outflank-mailman (input) for mailman id 1086398; Tue, 19 Aug 2025 10:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJU-0005xQ-WF for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJU-00DLAe-2P for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJU-008pb1-2z for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NEHUeuR5Wd5sylw16SoHyY9ykISK6h8M9CbvOB3YpDM=; b=1+SNO3rY8aYP7KoKc6J5MUgyr4 BIrW+ycI0H0HYO80w34bKhMUceED0UB7SD9oyT5EF579wb5AMESxEwx2mzZoLYLpBE8lxTwfaWN+I YFHy5d7OHyiEh/6o+/KEWn7kHVxJWBMObwAx/G9QGa5iOu5MZfScTS4qv3PsxOwY2Zek=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Add get_domain_evtchn() to find evtchn Message-Id: Date: Tue, 19 Aug 2025 10:11:32 +0000 commit cec885de7fb2854310dd27056e989900776aa2df Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:50 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:43 2025 +0200 tools/xenstored: Add get_domain_evtchn() to find evtchn Add helpers to lookup the event channel for a domid. This hides some of the differences between dom0 and stubdom xenstored. Each version defines its own. It highlights the different meanings between get_xenbus_evtchn() in a stubdom, where it looks up dom0's event channel, and dom0, where it looks up the local event channel. get_domain_evtchn() replaces get_xenbus_evtchn(), and get_xenbus_evtchn() is removed from minios.c as it is inlined in the new function. The default return 0 will be fine as any other auto-introduced domain will needs the event channel populated in the grant. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.h | 2 +- tools/xenstored/domain.c | 10 +++++++--- tools/xenstored/minios.c | 19 ++++++++++++++++--- tools/xenstored/posix.c | 16 +++++++++++++++- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 5071f1dedd..cef3c71eb0 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -397,7 +397,7 @@ static inline bool domain_is_unprivileged(const struct connection *conn) extern xenevtchn_handle *xce_handle; /* in domain.c */ /* Return the event channel used by xenbus. */ -evtchn_port_t get_xenbus_evtchn(void); +evtchn_port_t get_domain_evtchn(unsigned int domid); void early_init(bool live_update, bool dofork, const char *pidfile); void late_init(bool live_update); diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 60d398682f..0866e04aa9 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1330,7 +1330,7 @@ void dom0_init(void) evtchn_port_t port; struct domain *dom0; - port = get_xenbus_evtchn(); + port = get_domain_evtchn(xenbus_master_domid()); if (port == -1) barf_perror("Failed to initialize dom0 port"); @@ -1345,13 +1345,17 @@ void stubdom_init(bool live_update) { #ifdef __MINIOS__ struct domain *stubdom; + evtchn_port_t port; if (stub_domid < 0) return; if (!live_update) { - stubdom = introduce_domain(NULL, stub_domid, xenbus_evtchn, - false); + port = get_domain_evtchn(stub_domid); + if (port == -1) + barf_perror("Failed to initialize stubdom port"); + + stubdom = introduce_domain(NULL, stub_domid, port, false); if (!stubdom) barf_perror("Failed to initialize stubdom"); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index f04423fe09..60d921cf01 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -41,9 +41,22 @@ struct connection *add_socket_connection(int fd) barf("socket based connection without sockets"); } -evtchn_port_t get_xenbus_evtchn(void) -{ - return dom0_event; +/* + * minios stubdom looks up dom0's event channel from the command line + * (--event). The stubdom's own event channel is returned directly. + * + * Any other existing domains from dom0less/Hyperlaunch will have + * the event channel in the xenstore page, so lookup here isn't necessary. + * --event would not be set, so it would default to 0. + */ +evtchn_port_t get_domain_evtchn(unsigned int domid) +{ + if (domid == stub_domid) + return xenbus_evtchn; + else if (domid == priv_domid) + return dom0_event; + + return 0; } void *xenbus_map(void) diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 97561701ae..4a97f53dc0 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -139,7 +139,7 @@ void unmap_xenbus(void *interface) munmap(interface, getpagesize()); } -evtchn_port_t get_xenbus_evtchn(void) +static evtchn_port_t get_xenbus_evtchn(void) { int fd; int rc; @@ -166,6 +166,20 @@ evtchn_port_t get_xenbus_evtchn(void) return port; } +/* + * dom0 xenstored uses get_xenbus_evtchn() to lookup with XENSTORED_PORT_DEV. + * + * Any other existing domains from dom0less/Hyperlaunch will have + * the event channel in the xenstore page, so lookup here isn't necessary. + */ +evtchn_port_t get_domain_evtchn(unsigned int domid) +{ + if (domid == xenbus_master_domid()) + return get_xenbus_evtchn(); + + return 0; +} + void *xenbus_map(void) { int fd; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086399.1444569 (Exim 4.92) (envelope-from ) id 1uoJJg-0005zx-Gl; Tue, 19 Aug 2025 10:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086399.1444569; Tue, 19 Aug 2025 10:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJg-0005zl-Dg; Tue, 19 Aug 2025 10:11:44 +0000 Received: by outflank-mailman (input) for mailman id 1086399; Tue, 19 Aug 2025 10:11:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJf-0005zZ-4T for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJe-00DLAo-2j for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJf-008pbV-03 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YmL6lRjr+80oh20GOVfWuqyGVkQI1/gj8HIjXiJdSbQ=; b=AE2cOETgjShOVTxujAdO21iSwl e+JxIqC+B6zGM/vkVRC9L/vEDVIxf0lxVLNm72Y/0+rgpLQAEtg0j0p0kNLcs/IrzQmj8kbgYJmpq Szy1BNZUJvZGIRg/CkCM94PCrfxvYMPLy0Wr8ojef+fPCvAaJDoTn4V8OF9d+U4WQoTM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Auto-introduce domains Message-Id: Date: Tue, 19 Aug 2025 10:11:43 +0000 commit e5b0a9405571cffe8cb248baff09d794571db65d Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:51 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:48 2025 +0200 tools/xenstored: Auto-introduce domains Replace dom0_init() with init_domains() which uses libxenmanage to iterate through all existing domains, storing them in a list. The xenstore domain is introduced first, and then all the other domains are introduced. The xenstore domain needs to be introduced first to setup structures needed for firing watches. dom0_domid is updated with the xenstore domain, since it really indicates the local domain. priv_domid is set to the control domain. This makes it limited to a single domain. These features let xenstore automatically connect any existing domains, which means it doesn't need to be done manually from init-dom0less. For a legacy dom0, the result should be unchanged. For a late xenstore stubdom it should also be the same, but priv_domid would be set automatically to control domain (which default to 0 normally). Always signal the event channel for initial domains. This gets dom0 (a local xenstored domain) to connect. Also always write XENSTORE_CONNECTED since we know we are connected at this point. To support ARM dom0less domains with xen,enhanced = "no-xenstore" a failed introduce_domain() becomes non-fatal. Normally, HVM_PARAM_STORE_EVTCHN is used to identify . priv_domid from the command line is used, or the first control domain is used. dom0_domid will set to the last xenstore found. This will handle dom0 or dom0less, where only 1 xenstore domain can exist, or stubdom, where dom0 and dom1 exist, and we want to take the stubdom. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.c | 6 +-- tools/xenstored/domain.c | 100 ++++++++++++++++++++++++++++++++++++----------- tools/xenstored/domain.h | 2 +- 3 files changed, 81 insertions(+), 27 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 5377d72f54..d447e1167e 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2567,9 +2567,9 @@ static struct option options[] = { #endif { NULL, 0, NULL, 0 } }; -int dom0_domid = 0; +int dom0_domid = DOMID_INVALID; int dom0_event = 0; -int priv_domid = 0; +int priv_domid = DOMID_INVALID; domid_t stub_domid = DOMID_INVALID; static unsigned int get_optval_uint(const char *arg) @@ -2760,7 +2760,7 @@ int main(int argc, char *argv[]) /* Listen to hypervisor. */ if (!live_update) { domain_init(-1); - dom0_init(); + init_domains(); } /* redirect to /dev/null now we're ready to accept connections */ diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 0866e04aa9..051e3fd164 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1325,43 +1325,97 @@ const char *get_implicit_path(const struct connection *conn) return conn->domain->path; } -void dom0_init(void) +static bool init_domain(unsigned int domid) { evtchn_port_t port; - struct domain *dom0; + struct domain *domain; - port = get_domain_evtchn(xenbus_master_domid()); + port = get_domain_evtchn(domid); if (port == -1) - barf_perror("Failed to initialize dom0 port"); + barf_perror("Failed to initialize dom%u port", domid); - dom0 = introduce_domain(NULL, xenbus_master_domid(), port, false); - if (!dom0) - barf_perror("Failed to initialize dom0"); + domain = introduce_domain(NULL, domid, port, false); + if (!domain) { + xprintf("Could not initialize dom%u", domid); + return false; + } - xenevtchn_notify(xce_handle, dom0->port); -} + if (domain->interface) + domain->interface->connection = XENSTORE_CONNECTED; -void stubdom_init(bool live_update) + xenevtchn_notify(xce_handle, domain->port); + + return true; +} +void init_domains(void) { -#ifdef __MINIOS__ - struct domain *stubdom; - evtchn_port_t port; + unsigned int *domids = NULL; + unsigned int nr_domids = 0; + unsigned int domid; + unsigned int state; + unsigned int caps; + uint64_t unique_id; + int introduce_count = 0; - if (stub_domid < 0) - return; + while (!xenmanage_poll_changed_domain(xm_handle, &domid, &state, &caps, + &unique_id)) { + nr_domids++; + domids = talloc_realloc(NULL, domids, unsigned int, nr_domids); + if (!domids) + barf_perror("Failed to reallocate domids"); + + domids[nr_domids - 1] = domid; + + if (caps & XENMANAGE_GETDOMSTATE_CAP_CONTROL) { + /* + * Only update with first found - otherwise use command + * line. + */ + if (priv_domid == DOMID_INVALID) + priv_domid = domid; + } + + if (caps & XENMANAGE_GETDOMSTATE_CAP_XENSTORE) { + /* + * Update with last found. dom0 or dom0less will only + * have 1 domain. stubdom there will be dom0 and dom1, + * so this will take the second for stubdom. + */ + dom0_domid = domid; + } + } + + if (dom0_domid == DOMID_INVALID) + dom0_domid = priv_domid; - if (!live_update) { - port = get_domain_evtchn(stub_domid); - if (port == -1) - barf_perror("Failed to initialize stubdom port"); + if (dom0_domid == DOMID_INVALID) + barf("Could not determine xenstore domid\n"); + + /* + * Local domid must be first to setup structures for firing the special + * watches. + */ + if (init_domain(dom0_domid)) + introduce_count++; - stubdom = introduce_domain(NULL, stub_domid, port, false); - if (!stubdom) - barf_perror("Failed to initialize stubdom"); + for (unsigned int i = 0; i < nr_domids; i++) { + domid = domids[i]; + if (domid == dom0_domid) + continue; - xenevtchn_notify(xce_handle, stubdom->port); + if (init_domain(domid)) + introduce_count++; } + talloc_free(domids); + + if (introduce_count == 0) + barf("Did not initialize any domains"); +} + +void stubdom_init(bool live_update) +{ +#ifdef __MINIOS__ mount_9pfs(live_update); #endif } diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h index 3ca702f56d..3b1fce74cf 100644 --- a/tools/xenstored/domain.h +++ b/tools/xenstored/domain.h @@ -92,7 +92,7 @@ int do_set_feature(const void *ctx, struct connection *conn, void domain_early_init(void); void domain_init(int evtfd); -void dom0_init(void); +void init_domains(void); void stubdom_init(bool live_update); void domain_deinit(void); void ignore_connection(struct connection *conn, unsigned int err); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086400.1444572 (Exim 4.92) (envelope-from ) id 1uoJJq-00062Z-JR; Tue, 19 Aug 2025 10:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086400.1444572; Tue, 19 Aug 2025 10:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJq-00062R-Gs; Tue, 19 Aug 2025 10:11:54 +0000 Received: by outflank-mailman (input) for mailman id 1086400; Tue, 19 Aug 2025 10:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJp-00062J-5q for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJo-00DLAx-32 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJp-008pbz-0N for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:11:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=evTpHELqaQvkcnxL4RrM/5iYz5YtGo9KTrINlzmdxy4=; b=IElgU3dpLOXPYL04LKaMu4SpOC WAv0BsXjmFCB+anI/OwPdM+7Iu/Cnq9PxiedGIOUHejhC6cU2JB20PwvTT09uKmFgMO+f4mhbbdJK cZ4ZYvnJtnj33bGfg0ICgxWKBj+hYa7f+V6H5J0R+it45CxoQ6F9kKSYupdHegHRZFAg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Check NULL domain in domain_chk_quota() Message-Id: Date: Tue, 19 Aug 2025 10:11:53 +0000 commit 1b4e935f4597218d19ea8e8494ba59b8aec170f4 Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:52 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:52 2025 +0200 tools/xenstored: Check NULL domain in domain_chk_quota() With separate control and xenstore domains, the xenstore domain itself is no longer privileged. Local socket connections do not have conn->domain assigned, but domain_chk_quota() will go ahead and dereference it. The !domid_is_unprivileged(conn->id) check usually means the function would have already returned. Bail out on !conn->domain to avoid faulting. This adds a similar check to that in domain_max_chk() Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 051e3fd164..c74bafa165 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1762,7 +1762,7 @@ static bool domain_chk_quota(struct connection *conn, unsigned int mem) time_t now; struct domain *domain; - if (!conn || !domid_is_unprivileged(conn->id) || + if (!conn || !conn->domain || !domid_is_unprivileged(conn->id) || conn->is_ignored) return false; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086401.1444576 (Exim 4.92) (envelope-from ) id 1uoJK0-00065A-Kq; Tue, 19 Aug 2025 10:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086401.1444576; Tue, 19 Aug 2025 10:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJK0-000653-II; Tue, 19 Aug 2025 10:12:04 +0000 Received: by outflank-mailman (input) for mailman id 1086401; Tue, 19 Aug 2025 10:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJJz-00064n-9H for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJJz-00DLBV-07 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJJz-008pdD-0g for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2+PMNm1WOUJgT04gpnvaQwxpuYeQDMS8p71NicCxV78=; b=O1RiI8xIu7h00dh9gRJGEfjWl8 svhOOrFPAFGzg7e5AZKj1ZkAv5Pr0koqB5ZgSGs6PMnn5E2/ydNH5KrO/x1FNG8HIibbe+ixvv6Ge jIaSIhZNPdIWRJycekqzC0SK/iLIhiA7tMtoHxse2voZkYcr91XMuZv9UlW1FpHTrRJU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Use priv_domid for manual nodes and permission Message-Id: Date: Tue, 19 Aug 2025 10:12:03 +0000 commit c67def341a1d1f35ed5c681f3001496be2ad5ea6 Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:53 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:57 2025 +0200 tools/xenstored: Use priv_domid for manual nodes and permission Usually, priv_domid == dom0_domid == 0, and that is what is expected. If we rename s/dom0_domid/store_domid/, it seems more likely we want to actually have the priv_domid as the owner. That leads to follow on changes to ensure that the priv_domid is created first. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.c | 4 ++-- tools/xenstored/domain.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index d447e1167e..7a65ddb585 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2269,7 +2269,7 @@ struct connection *get_connection_by_id(unsigned int conn_id) static void manual_node(const char *name, const char *child) { struct node *node; - struct xs_permissions perms = { .id = dom0_domid, + struct xs_permissions perms = { .id = priv_domid, .perms = XS_PERM_NONE }; node = talloc_zero(NULL, struct node); @@ -2320,7 +2320,7 @@ void setup_structure(bool live_update) manual_node("/tool/xenstored", NULL); manual_node("@releaseDomain", NULL); manual_node("@introduceDomain", NULL); - domain_nbentry_fix(dom0_domid, 5, true); + domain_nbentry_fix(priv_domid, 5, true); } } diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index c74bafa165..bcc63104b7 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1026,7 +1026,7 @@ static struct domain *introduce_domain(const void *ctx, struct domain *domain; int rc; struct xenstore_domain_interface *interface; - bool is_master_domain = (domid == xenbus_master_domid()); + bool is_priv_domain = (domid == priv_domid); domain = find_or_alloc_domain(ctx, domid); if (!domain) @@ -1051,13 +1051,13 @@ static struct domain *introduce_domain(const void *ctx, if (!restore) interface->server_features = domain->features; - if (is_master_domain) + if (is_priv_domain) setup_structure(restore); /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); - if (!is_master_domain && !restore) + if (!is_priv_domain && !restore) fire_special_watches("@introduceDomain"); } else { /* Use XS_INTRODUCE for recreating the xenbus event-channel. */ @@ -1392,15 +1392,15 @@ void init_domains(void) barf("Could not determine xenstore domid\n"); /* - * Local domid must be first to setup structures for firing the special - * watches. + * Privileged domid must be first to setup structures for firing the + * special watches. */ - if (init_domain(dom0_domid)) + if (init_domain(priv_domid)) introduce_count++; for (unsigned int i = 0; i < nr_domids; i++) { domid = domids[i]; - if (domid == dom0_domid) + if (domid == priv_domid) continue; if (init_domain(domid)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086402.1444580 (Exim 4.92) (envelope-from ) id 1uoJKA-00067O-M7; Tue, 19 Aug 2025 10:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086402.1444580; Tue, 19 Aug 2025 10:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJKA-00067H-Jh; Tue, 19 Aug 2025 10:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1086402; Tue, 19 Aug 2025 10:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJK9-000675-Dg for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJK9-00DLBb-0b for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJK9-008pdl-0z for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=j8rv+DvSbbEs9Sd98KeYCKAY7vFXzNn4UDLUhK5+MNM=; b=IK25baV8M1ZBCt7Bq8YsDBRBXo u1Mz7EvV5xjEZ4T0bng9+yTaZGF9oUiRC8O1FJ3cQTVMzZHge/BAVUBCPStqXeQHTwuDzphBuaspN Xync1aWTKF83jXLMkM9gruDMgODFmhAyfT2BX/TeOy7vG/KF9cwGxTyykNjzcmM1/wrk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Rename dom0_domid to store_domid Message-Id: Date: Tue, 19 Aug 2025 10:12:13 +0000 commit 9947e2ad889cd111b3a1a1afb9f401928d8f5dda Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:54 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:04:02 2025 +0200 tools/xenstored: Rename dom0_domid to store_domid The dom0_domid variable is misnamed and conflates purposes. If we have xenstored running in a Linux domain that is not dom0, this variable controls the lookup of /proc/xen/xsd_kva and the event channel. Rename to store_domid to better show its purpose. One implication of this change is that the xenstore domain is not privileged by virtue of considering store_domid as privileged. domain_is_unprivileged() removes the dom0_domid/store_domid check, so xenstore domain is no longer considered privileged. onearg_domain() is updated to return EINVAL for store_domid or priv_domid to maintain the ability to call XS_RESUME. xenbus_master_domid() is removed with store_domid being used instead. Add a description of the -m/--master-domid options while doing this. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.c | 9 ++++++--- tools/xenstored/core.h | 6 ++---- tools/xenstored/domain.c | 14 +++++++------- tools/xenstored/posix.c | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 7a65ddb585..64c478a801 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2539,7 +2539,10 @@ static void usage(void) " allowed timeout candidates are:\n" " watch-event: time a watch-event is kept pending\n" " -K, --keep-orphans don't delete nodes owned by a domain when the\n" -" domain is deleted (this is a security risk!)\n"); +" domain is deleted (this is a security risk!)\n" +" -m, --master-domid specify the domid of the domain where xenstored\n" +" is running. defaults to 0\n" +); } @@ -2567,7 +2570,7 @@ static struct option options[] = { #endif { NULL, 0, NULL, 0 } }; -int dom0_domid = DOMID_INVALID; +int store_domid = DOMID_INVALID; int dom0_event = 0; int priv_domid = DOMID_INVALID; domid_t stub_domid = DOMID_INVALID; @@ -2736,7 +2739,7 @@ int main(int argc, char *argv[]) dom0_event = get_optval_uint(optarg); break; case 'm': - dom0_domid = get_optval_uint(optarg); + store_domid = get_optval_uint(optarg); break; case 'p': priv_domid = get_optval_uint(optarg); diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index cef3c71eb0..e0b48e4978 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -365,7 +365,7 @@ do { \ trace("tdb: " __VA_ARGS__); \ } while (0) -extern int dom0_domid; +extern int store_domid; extern int dom0_event; extern int priv_domid; extern domid_t stub_domid; @@ -382,11 +382,9 @@ uint64_t get_now_msec(void); void *xenbus_map(void); void unmap_xenbus(void *interface); -static inline int xenbus_master_domid(void) { return dom0_domid; } - static inline bool domid_is_unprivileged(unsigned int domid) { - return domid != dom0_domid && domid != priv_domid; + return domid != priv_domid; } static inline bool domain_is_unprivileged(const struct connection *conn) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index bcc63104b7..e282b5c5ed 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -509,7 +509,7 @@ static const struct interface_funcs domain_funcs = { static void *map_interface(domid_t domid) { - if (domid == xenbus_master_domid()) + if (domid == store_domid) return xenbus_map(); #ifdef __MINIOS__ @@ -524,7 +524,7 @@ static void *map_interface(domid_t domid) static void unmap_interface(domid_t domid, void *interface) { - if (domid == xenbus_master_domid()) + if (domid == store_domid) unmap_xenbus(interface); else if (domid != stub_domid) xengnttab_unmap(*xgt_handle, interface, 1); @@ -1158,7 +1158,7 @@ static struct domain *onearg_domain(struct connection *conn, return ERR_PTR(-EINVAL); domid = atoi(domid_str); - if (domid == dom0_domid) + if (domid == store_domid || domid == priv_domid) return ERR_PTR(-EINVAL); return find_connected_domain(domid); @@ -1381,14 +1381,14 @@ void init_domains(void) * have 1 domain. stubdom there will be dom0 and dom1, * so this will take the second for stubdom. */ - dom0_domid = domid; + store_domid = domid; } } - if (dom0_domid == DOMID_INVALID) - dom0_domid = priv_domid; + if (store_domid == DOMID_INVALID) + store_domid = priv_domid; - if (dom0_domid == DOMID_INVALID) + if (store_domid == DOMID_INVALID) barf("Could not determine xenstore domid\n"); /* diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 4a97f53dc0..0ec7babb7a 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -174,7 +174,7 @@ static evtchn_port_t get_xenbus_evtchn(void) */ evtchn_port_t get_domain_evtchn(unsigned int domid) { - if (domid == xenbus_master_domid()) + if (domid == store_domid) return get_xenbus_evtchn(); return 0; @@ -280,7 +280,7 @@ static void accept_connection(int sock) conn = new_connection(&socket_funcs); if (conn) { conn->fd = fd; - conn->id = dom0_domid; + conn->id = store_domid; } else close(fd); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:12:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086403.1444584 (Exim 4.92) (envelope-from ) id 1uoJKK-00069W-Nc; Tue, 19 Aug 2025 10:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086403.1444584; Tue, 19 Aug 2025 10:12:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJKK-00069O-L6; Tue, 19 Aug 2025 10:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1086403; Tue, 19 Aug 2025 10:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJKJ-00069G-GP for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJKJ-00DLBo-0s for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJKJ-008peD-1S for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PX4XEW9AM2X0pVrZzn8aubS+YpXGWGFMI5hyqOb/t7w=; b=msiiwHgmNoeQIl/qltR7RmNbv4 hM6yL8F7z0zNfyMQ1I7f5Bl62YdMkb6I7tzamw1DlmvZtftN5yFPXpccPPxL27vFBASRg14QJ5siT BD+ZpQL+m3j/O6fMeAKSnFIZA+41A6FPXE+uYpCIDL5jsQV+WP4V21RTXHk8+l3h+cNU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Remove stubdom special casing Message-Id: Date: Tue, 19 Aug 2025 10:12:23 +0000 commit 671e80d9905339e329eada7549e1c2f7f804585e Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:55 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:04:08 2025 +0200 tools/xenstored: Remove stubdom special casing posix.c and minios.c implement the same named functions serving slightly different purposes. For xenbus_map() posix.c maps the local /dev/xen/xsd_kva minios.c maps dom0 via grant and there is open coding for stub_domid in map_interface. Change xenbus_map() to map the local domain's interface. The default grant table mapping is performed otherwise. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 5 ----- tools/xenstored/minios.c | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index e282b5c5ed..cf5a54965a 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -512,11 +512,6 @@ static void *map_interface(domid_t domid) if (domid == store_domid) return xenbus_map(); -#ifdef __MINIOS__ - if (domid == stub_domid) - return xenstore_buf; -#endif - return xengnttab_map_grant_ref(*xgt_handle, domid, GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 60d921cf01..a214e23907 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -61,13 +61,11 @@ evtchn_port_t get_domain_evtchn(unsigned int domid) void *xenbus_map(void) { - return xengnttab_map_grant_ref(*xgt_handle, xenbus_master_domid(), - GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); + return xenstore_buf; } void unmap_xenbus(void *interface) { - xengnttab_unmap(*xgt_handle, interface, 1); } void early_init(bool live_update, bool dofork, const char *pidfile) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 10:12:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 10:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086404.1444590 (Exim 4.92) (envelope-from ) id 1uoJKU-0006Bt-PO; Tue, 19 Aug 2025 10:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086404.1444590; Tue, 19 Aug 2025 10:12:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJKU-0006Bl-MS; Tue, 19 Aug 2025 10:12:34 +0000 Received: by outflank-mailman (input) for mailman id 1086404; Tue, 19 Aug 2025 10:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoJKT-0006Bc-Jm for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoJKT-00DLBs-1D for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoJKT-008pej-1j for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 10:12:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d9vncEEV2kIWlMLM5KekPfcp8FZKWJSb49W8avGMCrE=; b=cUEoi1py/l0X336TSPqRrdln4u np2fAqSXyFtGxLu2EGc2YZ92mObxbRz2y2CrsZgdbA4F7roifiS8xp4H3pNrRUOuuEGNl0OUwOCJx Zyp+EHUVqu1eWQsFKe73kZBeFh0yEUa9B54jtnIOSIHQlGk1L/jGvRHxaKoR+m7BNtPc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Remove hardcoded implicit path Message-Id: Date: Tue, 19 Aug 2025 10:12:33 +0000 commit 2e8067a773e2a2fa7268e065f0c97dfda7b0638e Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:56 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:04:13 2025 +0200 tools/xenstored: Remove hardcoded implicit path Update get_implicit_path to return the correct value for a non-dom0 xenstored domain. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index cf5a54965a..694d68670a 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1312,11 +1312,13 @@ static int close_xgt_handle(void *_handle) return 0; } +static char store_domain_path[] = "/local/domain/65535"; + /* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path(const struct connection *conn) { if (!conn->domain) - return "/local/domain/0"; + return store_domain_path; return conn->domain->path; } @@ -1386,6 +1388,9 @@ void init_domains(void) if (store_domid == DOMID_INVALID) barf("Could not determine xenstore domid\n"); + snprintf(store_domain_path, sizeof(store_domain_path), + "/local/domain/%u", store_domid); + /* * Privileged domid must be first to setup structures for firing the * special watches. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086498.1444679 (Exim 4.92) (envelope-from ) id 1uoKvf-00061L-GW; Tue, 19 Aug 2025 11:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086498.1444679; Tue, 19 Aug 2025 11:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKvf-00061C-DH; Tue, 19 Aug 2025 11:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1086498; Tue, 19 Aug 2025 11:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKve-000616-BQ for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKvd-00DN6t-33 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKve-008uKu-0A for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3s0PM4JWrHiN9Vdf8hYanjKfwTy4zsh1+k7hk48MqKE=; b=KlGNrAdgiC6xbmrG8yMviKPicB GGyeqNid2HyIirb4P1rNP23RYKeMhie8YFIWBgStbRjPs7OBXx13WtliqfAPO29EdPKkktIV1qFJf aKvK6ThFoiOwgSdcUMsswu0L45OUFUVuCYwGBuqLorofy+KbErn4ULb1vTZvK0wGvB44=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "x86/mm: split unmapping and marking-as-I/O in arch_init_memory()" Message-Id: Date: Tue, 19 Aug 2025 11:55:02 +0000 commit 22c2cca55280a11d2a1849137eb146830e606e76 Author: Jan Beulich AuthorDate: Tue Aug 19 11:00:26 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 19 11:00:26 2025 +0200 Revert "x86/mm: split unmapping and marking-as-I/O in arch_init_memory()" This reverts commit 248096b113fefd36260afb06a2520781ec37f9e8. This was a stale version of the patch, and thus also not what was ack-ed. --- xen/arch/x86/mm.c | 63 ++++++++++++++----------------------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ca3469a78..e7fd56c7ce 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -275,6 +275,8 @@ static void __init assign_io_page(struct page_info *page) void __init arch_init_memory(void) { + unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; + /* * Basic guest-accessible flags: * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). @@ -290,55 +292,12 @@ void __init arch_init_memory(void) * case the low 1MB. */ BUG_ON(pvh_boot && trampoline_phys != 0x1000); - for ( unsigned int i = 0; i < MB(1) >> PAGE_SHIFT; i++ ) + for ( i = 0; i < 0x100; i++ ) assign_io_page(mfn_to_page(_mfn(i))); - /* - * Any areas not specified as RAM by the e820 map want to have no mappings. - * We may have established some by mapping more than necessary in head.S, - * due to the use of super-pages there. - */ - for ( unsigned long i = 0, pfn = 0, - rlimit_pfn = PFN_DOWN(PAGE_ALIGN_2M(__pa(_end))); - pfn < rlimit_pfn; i++ ) + /* Any areas not specified as RAM by the e820 map are considered I/O. */ + for ( i = 0, pfn = 0; pfn < max_page; i++ ) { - unsigned long rstart_pfn, rend_pfn, start_pfn; - - while ( i < e820.nr_map && - e820.map[i].type != E820_RAM ) - i++; - - if ( i >= e820.nr_map ) - { - /* No more RAM regions: Unmap right to upper boundary. */ - rstart_pfn = rend_pfn = rlimit_pfn; - } - else - { - /* Unmap just up as far as next RAM region. */ - rstart_pfn = min(rlimit_pfn, PFN_UP(e820.map[i].addr)); - rend_pfn = max(rstart_pfn, - PFN_DOWN(e820.map[i].addr + e820.map[i].size)); - } - - /* NB: _start is already 2Mb-aligned. */ - start_pfn = max(pfn, PFN_DOWN(__pa(_start))); - if ( start_pfn < rstart_pfn ) - destroy_xen_mappings((unsigned long)mfn_to_virt(start_pfn), - (unsigned long)mfn_to_virt(rstart_pfn)); - - /* Skip the RAM region. */ - pfn = rend_pfn; - } - - /* - * Any areas not specified as RAM or UNUSABLE by the e820 map are - * considered I/O. - */ - for ( unsigned long i = 0, pfn = 0; pfn < max_page; i++ ) - { - unsigned long rstart_pfn, rend_pfn; - while ( (i < e820.nr_map) && (e820.map[i].type != E820_RAM) && (e820.map[i].type != E820_UNUSABLE) ) @@ -358,6 +317,17 @@ void __init arch_init_memory(void) PFN_DOWN(e820.map[i].addr + e820.map[i].size)); } + /* + * Make sure any Xen mappings of RAM holes above 1MB are blown away. + * In particular this ensures that RAM holes are respected even in + * the statically-initialised 1-16MB mapping area. + */ + iostart_pfn = max_t(unsigned long, pfn, 1UL << (20 - PAGE_SHIFT)); + ioend_pfn = min(rstart_pfn, 16UL << (20 - PAGE_SHIFT)); + if ( iostart_pfn < ioend_pfn ) + destroy_xen_mappings((unsigned long)mfn_to_virt(iostart_pfn), + (unsigned long)mfn_to_virt(ioend_pfn)); + /* Mark as I/O up to next RAM region. */ for ( ; pfn < rstart_pfn; pfn++ ) { @@ -395,7 +365,6 @@ void __init arch_init_memory(void) const l3_pgentry_t *l3idle = map_l3t_from_l4e( idle_pg_table[l4_table_offset(split_va)]); l3_pgentry_t *l3tab = map_domain_page(l3mfn); - unsigned int i; for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086499.1444681 (Exim 4.92) (envelope-from ) id 1uoKvp-00063l-Ih; Tue, 19 Aug 2025 11:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086499.1444681; Tue, 19 Aug 2025 11:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKvp-00063c-Fx; Tue, 19 Aug 2025 11:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1086499; Tue, 19 Aug 2025 11:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKvo-00063O-9p for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKvo-00DN6x-0B for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKvo-008uLG-0i for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kVBem5gLzeiKgh8zs+WfrVqvDHanwVMtSKKz6O6Chsc=; b=zJC+8mFYRFN6qGpLQFEhQMjIao 7Q3g3B7Ng7ujAweVfmWkqdwgSMtnpkwBEiyH1CXw4+1TGZEOD92ZJtzBoiCc0vzuVHko1gBWaG6qY gaHLB7hgKYTLpka8cm4tDVoPpi9gogjWezTZLdugHQAHn9CbCcztXnXCF0wKIzJnb2zQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: drop unmapping from marking-as-I/O in arch_init_memory() Message-Id: Date: Tue, 19 Aug 2025 11:55:12 +0000 commit 3101c46a063c6dc3be859eb90a3413dc579eed98 Author: Jan Beulich AuthorDate: Tue Aug 19 11:02:57 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 19 11:02:57 2025 +0200 x86/mm: drop unmapping from marking-as-I/O in arch_init_memory() The unmapping part would have wanted to cover UNUSABLE regions as well, and it would now have been necessary for space outside the low 16Mb (wherever Xen is placed). However, with everything up to the next 2Mb boundary now properly backed by RAM, we don't need to unmap anything anymore: Space up to __2M_rwdata_end[] is properly reserved, whereas space past that mark (up to the next 2Mb boundary) is ordinary RAM. While there, limit the scopes of involved variables. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e7fd56c7ce..5682f600bb 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -275,8 +275,6 @@ static void __init assign_io_page(struct page_info *page) void __init arch_init_memory(void) { - unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; - /* * Basic guest-accessible flags: * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). @@ -292,12 +290,17 @@ void __init arch_init_memory(void) * case the low 1MB. */ BUG_ON(pvh_boot && trampoline_phys != 0x1000); - for ( i = 0; i < 0x100; i++ ) + for ( unsigned int i = 0; i < PFN_DOWN(MB(1)); i++ ) assign_io_page(mfn_to_page(_mfn(i))); - /* Any areas not specified as RAM by the e820 map are considered I/O. */ - for ( i = 0, pfn = 0; pfn < max_page; i++ ) + /* + * Any areas not specified as RAM or UNUSABLE by the e820 map are + * considered I/O. + */ + for ( unsigned long i = 0, pfn = 0; pfn < max_page; i++ ) { + unsigned long rstart_pfn, rend_pfn; + while ( (i < e820.nr_map) && (e820.map[i].type != E820_RAM) && (e820.map[i].type != E820_UNUSABLE) ) @@ -317,17 +320,6 @@ void __init arch_init_memory(void) PFN_DOWN(e820.map[i].addr + e820.map[i].size)); } - /* - * Make sure any Xen mappings of RAM holes above 1MB are blown away. - * In particular this ensures that RAM holes are respected even in - * the statically-initialised 1-16MB mapping area. - */ - iostart_pfn = max_t(unsigned long, pfn, 1UL << (20 - PAGE_SHIFT)); - ioend_pfn = min(rstart_pfn, 16UL << (20 - PAGE_SHIFT)); - if ( iostart_pfn < ioend_pfn ) - destroy_xen_mappings((unsigned long)mfn_to_virt(iostart_pfn), - (unsigned long)mfn_to_virt(ioend_pfn)); - /* Mark as I/O up to next RAM region. */ for ( ; pfn < rstart_pfn; pfn++ ) { @@ -365,6 +357,7 @@ void __init arch_init_memory(void) const l3_pgentry_t *l3idle = map_l3t_from_l4e( idle_pg_table[l4_table_offset(split_va)]); l3_pgentry_t *l3tab = map_domain_page(l3mfn); + unsigned int i; for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086500.1444684 (Exim 4.92) (envelope-from ) id 1uoKvz-000663-Jy; Tue, 19 Aug 2025 11:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086500.1444684; Tue, 19 Aug 2025 11:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKvz-00065v-HQ; Tue, 19 Aug 2025 11:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1086500; Tue, 19 Aug 2025 11:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKvy-00065n-Cf for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKvy-00DN73-0U for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKvy-008uLf-11 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QrSCGIsxazzK2san9FxgYWLZbbTAEUswSpgBJPUA8Ls=; b=Lmg1U1aGAwWbiLqTnjOt0Dsw5V HdK6EcgKVAbH74PXb6iYC8ZyKWY7Uuz2Qx2x4Rk8rB+oPODPowzQZrNAaFf/nuFKICk3180qr8Teb Hrl0i+59OweSRJd95iAqXT1cn5Yia2P2rucqjV0cM+l/hkwp+K/8gLIGLG+XHkqSaW4s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Read event channel from xenstored page Message-Id: Date: Tue, 19 Aug 2025 11:55:22 +0000 commit f78895ad78c9534e4e5b81ed54422d38c68c2d12 Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:49 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:37 2025 +0200 tools/xenstored: Read event channel from xenstored page Make introduce_domain() use an event channel from the the xenstore page. It is only used if non-zero. Otherwise the passed in event channel port is used. The is useful for a xenstored stubdom to configure domains autonomously. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 34ebeaac9b..60d398682f 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1036,6 +1036,10 @@ static struct domain *introduce_domain(const void *ctx, interface = map_interface(domid); if (!interface && !restore) return NULL; + + if (interface->evtchn_port) + port = interface->evtchn_port; + if (new_domain(domain, port, restore)) { rc = errno; if (interface) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086501.1444690 (Exim 4.92) (envelope-from ) id 1uoKw9-00068A-Lu; Tue, 19 Aug 2025 11:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086501.1444690; Tue, 19 Aug 2025 11:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKw9-000682-Ir; Tue, 19 Aug 2025 11:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1086501; Tue, 19 Aug 2025 11:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKw8-00067u-FH for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKw8-00DN7D-0l for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKw8-008uMI-1M for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wOCVLK7XvFkvrH2FhZDrUOR12jPHizqP4KEd4XFz+gA=; b=n+rRocm6dPf3jnC1BHAu5YzH+m yVdURSfaLj/7T7oKk289vo6HtGQoWdSUxcMtd4ACSw+crhRBm2h5t8wmV12Mhi/k9eFFjkpx5K4mP tdxomjlxApLLC9lJx0DPzZzfwKsc/9nms/UmDUMtCq5p+g7HpqIXtF7EZQmx4FtN+L5M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Add get_domain_evtchn() to find evtchn Message-Id: Date: Tue, 19 Aug 2025 11:55:32 +0000 commit cec885de7fb2854310dd27056e989900776aa2df Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:50 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:43 2025 +0200 tools/xenstored: Add get_domain_evtchn() to find evtchn Add helpers to lookup the event channel for a domid. This hides some of the differences between dom0 and stubdom xenstored. Each version defines its own. It highlights the different meanings between get_xenbus_evtchn() in a stubdom, where it looks up dom0's event channel, and dom0, where it looks up the local event channel. get_domain_evtchn() replaces get_xenbus_evtchn(), and get_xenbus_evtchn() is removed from minios.c as it is inlined in the new function. The default return 0 will be fine as any other auto-introduced domain will needs the event channel populated in the grant. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.h | 2 +- tools/xenstored/domain.c | 10 +++++++--- tools/xenstored/minios.c | 19 ++++++++++++++++--- tools/xenstored/posix.c | 16 +++++++++++++++- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 5071f1dedd..cef3c71eb0 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -397,7 +397,7 @@ static inline bool domain_is_unprivileged(const struct connection *conn) extern xenevtchn_handle *xce_handle; /* in domain.c */ /* Return the event channel used by xenbus. */ -evtchn_port_t get_xenbus_evtchn(void); +evtchn_port_t get_domain_evtchn(unsigned int domid); void early_init(bool live_update, bool dofork, const char *pidfile); void late_init(bool live_update); diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 60d398682f..0866e04aa9 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1330,7 +1330,7 @@ void dom0_init(void) evtchn_port_t port; struct domain *dom0; - port = get_xenbus_evtchn(); + port = get_domain_evtchn(xenbus_master_domid()); if (port == -1) barf_perror("Failed to initialize dom0 port"); @@ -1345,13 +1345,17 @@ void stubdom_init(bool live_update) { #ifdef __MINIOS__ struct domain *stubdom; + evtchn_port_t port; if (stub_domid < 0) return; if (!live_update) { - stubdom = introduce_domain(NULL, stub_domid, xenbus_evtchn, - false); + port = get_domain_evtchn(stub_domid); + if (port == -1) + barf_perror("Failed to initialize stubdom port"); + + stubdom = introduce_domain(NULL, stub_domid, port, false); if (!stubdom) barf_perror("Failed to initialize stubdom"); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index f04423fe09..60d921cf01 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -41,9 +41,22 @@ struct connection *add_socket_connection(int fd) barf("socket based connection without sockets"); } -evtchn_port_t get_xenbus_evtchn(void) -{ - return dom0_event; +/* + * minios stubdom looks up dom0's event channel from the command line + * (--event). The stubdom's own event channel is returned directly. + * + * Any other existing domains from dom0less/Hyperlaunch will have + * the event channel in the xenstore page, so lookup here isn't necessary. + * --event would not be set, so it would default to 0. + */ +evtchn_port_t get_domain_evtchn(unsigned int domid) +{ + if (domid == stub_domid) + return xenbus_evtchn; + else if (domid == priv_domid) + return dom0_event; + + return 0; } void *xenbus_map(void) diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 97561701ae..4a97f53dc0 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -139,7 +139,7 @@ void unmap_xenbus(void *interface) munmap(interface, getpagesize()); } -evtchn_port_t get_xenbus_evtchn(void) +static evtchn_port_t get_xenbus_evtchn(void) { int fd; int rc; @@ -166,6 +166,20 @@ evtchn_port_t get_xenbus_evtchn(void) return port; } +/* + * dom0 xenstored uses get_xenbus_evtchn() to lookup with XENSTORED_PORT_DEV. + * + * Any other existing domains from dom0less/Hyperlaunch will have + * the event channel in the xenstore page, so lookup here isn't necessary. + */ +evtchn_port_t get_domain_evtchn(unsigned int domid) +{ + if (domid == xenbus_master_domid()) + return get_xenbus_evtchn(); + + return 0; +} + void *xenbus_map(void) { int fd; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086502.1444693 (Exim 4.92) (envelope-from ) id 1uoKwJ-0006AO-Mm; Tue, 19 Aug 2025 11:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086502.1444693; Tue, 19 Aug 2025 11:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwJ-0006AE-KI; Tue, 19 Aug 2025 11:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1086502; Tue, 19 Aug 2025 11:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwI-0006A8-KH for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKwI-00DN7H-14 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKwI-008uMg-1d for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zk9MzmVgbuHmeVGsH0U/ZxY5UkekDxloQLxFR/rs+Ks=; b=0fy39tWn5ZofEIezp4kfcgcxLv zCTb4bNhFtkske5Bz4kBRTxyyAkX2hOu4A3IIUDAS0T8oCovhwNLlPRlaZo72j3Dq0t2nOD/ELQTv YhN/v47x7S8wAvyq7KEXHQ63yGSsy/HPW0HkGrfp2tgYl5iYwHI2oKToEa4tRby2Q5Hc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Auto-introduce domains Message-Id: Date: Tue, 19 Aug 2025 11:55:42 +0000 commit e5b0a9405571cffe8cb248baff09d794571db65d Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:51 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:48 2025 +0200 tools/xenstored: Auto-introduce domains Replace dom0_init() with init_domains() which uses libxenmanage to iterate through all existing domains, storing them in a list. The xenstore domain is introduced first, and then all the other domains are introduced. The xenstore domain needs to be introduced first to setup structures needed for firing watches. dom0_domid is updated with the xenstore domain, since it really indicates the local domain. priv_domid is set to the control domain. This makes it limited to a single domain. These features let xenstore automatically connect any existing domains, which means it doesn't need to be done manually from init-dom0less. For a legacy dom0, the result should be unchanged. For a late xenstore stubdom it should also be the same, but priv_domid would be set automatically to control domain (which default to 0 normally). Always signal the event channel for initial domains. This gets dom0 (a local xenstored domain) to connect. Also always write XENSTORE_CONNECTED since we know we are connected at this point. To support ARM dom0less domains with xen,enhanced = "no-xenstore" a failed introduce_domain() becomes non-fatal. Normally, HVM_PARAM_STORE_EVTCHN is used to identify . priv_domid from the command line is used, or the first control domain is used. dom0_domid will set to the last xenstore found. This will handle dom0 or dom0less, where only 1 xenstore domain can exist, or stubdom, where dom0 and dom1 exist, and we want to take the stubdom. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.c | 6 +-- tools/xenstored/domain.c | 100 ++++++++++++++++++++++++++++++++++++----------- tools/xenstored/domain.h | 2 +- 3 files changed, 81 insertions(+), 27 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 5377d72f54..d447e1167e 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2567,9 +2567,9 @@ static struct option options[] = { #endif { NULL, 0, NULL, 0 } }; -int dom0_domid = 0; +int dom0_domid = DOMID_INVALID; int dom0_event = 0; -int priv_domid = 0; +int priv_domid = DOMID_INVALID; domid_t stub_domid = DOMID_INVALID; static unsigned int get_optval_uint(const char *arg) @@ -2760,7 +2760,7 @@ int main(int argc, char *argv[]) /* Listen to hypervisor. */ if (!live_update) { domain_init(-1); - dom0_init(); + init_domains(); } /* redirect to /dev/null now we're ready to accept connections */ diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 0866e04aa9..051e3fd164 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1325,43 +1325,97 @@ const char *get_implicit_path(const struct connection *conn) return conn->domain->path; } -void dom0_init(void) +static bool init_domain(unsigned int domid) { evtchn_port_t port; - struct domain *dom0; + struct domain *domain; - port = get_domain_evtchn(xenbus_master_domid()); + port = get_domain_evtchn(domid); if (port == -1) - barf_perror("Failed to initialize dom0 port"); + barf_perror("Failed to initialize dom%u port", domid); - dom0 = introduce_domain(NULL, xenbus_master_domid(), port, false); - if (!dom0) - barf_perror("Failed to initialize dom0"); + domain = introduce_domain(NULL, domid, port, false); + if (!domain) { + xprintf("Could not initialize dom%u", domid); + return false; + } - xenevtchn_notify(xce_handle, dom0->port); -} + if (domain->interface) + domain->interface->connection = XENSTORE_CONNECTED; -void stubdom_init(bool live_update) + xenevtchn_notify(xce_handle, domain->port); + + return true; +} +void init_domains(void) { -#ifdef __MINIOS__ - struct domain *stubdom; - evtchn_port_t port; + unsigned int *domids = NULL; + unsigned int nr_domids = 0; + unsigned int domid; + unsigned int state; + unsigned int caps; + uint64_t unique_id; + int introduce_count = 0; - if (stub_domid < 0) - return; + while (!xenmanage_poll_changed_domain(xm_handle, &domid, &state, &caps, + &unique_id)) { + nr_domids++; + domids = talloc_realloc(NULL, domids, unsigned int, nr_domids); + if (!domids) + barf_perror("Failed to reallocate domids"); + + domids[nr_domids - 1] = domid; + + if (caps & XENMANAGE_GETDOMSTATE_CAP_CONTROL) { + /* + * Only update with first found - otherwise use command + * line. + */ + if (priv_domid == DOMID_INVALID) + priv_domid = domid; + } + + if (caps & XENMANAGE_GETDOMSTATE_CAP_XENSTORE) { + /* + * Update with last found. dom0 or dom0less will only + * have 1 domain. stubdom there will be dom0 and dom1, + * so this will take the second for stubdom. + */ + dom0_domid = domid; + } + } + + if (dom0_domid == DOMID_INVALID) + dom0_domid = priv_domid; - if (!live_update) { - port = get_domain_evtchn(stub_domid); - if (port == -1) - barf_perror("Failed to initialize stubdom port"); + if (dom0_domid == DOMID_INVALID) + barf("Could not determine xenstore domid\n"); + + /* + * Local domid must be first to setup structures for firing the special + * watches. + */ + if (init_domain(dom0_domid)) + introduce_count++; - stubdom = introduce_domain(NULL, stub_domid, port, false); - if (!stubdom) - barf_perror("Failed to initialize stubdom"); + for (unsigned int i = 0; i < nr_domids; i++) { + domid = domids[i]; + if (domid == dom0_domid) + continue; - xenevtchn_notify(xce_handle, stubdom->port); + if (init_domain(domid)) + introduce_count++; } + talloc_free(domids); + + if (introduce_count == 0) + barf("Did not initialize any domains"); +} + +void stubdom_init(bool live_update) +{ +#ifdef __MINIOS__ mount_9pfs(live_update); #endif } diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h index 3ca702f56d..3b1fce74cf 100644 --- a/tools/xenstored/domain.h +++ b/tools/xenstored/domain.h @@ -92,7 +92,7 @@ int do_set_feature(const void *ctx, struct connection *conn, void domain_early_init(void); void domain_init(int evtfd); -void dom0_init(void); +void init_domains(void); void stubdom_init(bool live_update); void domain_deinit(void); void ignore_connection(struct connection *conn, unsigned int err); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:55:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086503.1444697 (Exim 4.92) (envelope-from ) id 1uoKwT-0006CM-O7; Tue, 19 Aug 2025 11:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086503.1444697; Tue, 19 Aug 2025 11:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwT-0006CE-Le; Tue, 19 Aug 2025 11:55:53 +0000 Received: by outflank-mailman (input) for mailman id 1086503; Tue, 19 Aug 2025 11:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwS-0006C4-LJ for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKwS-00DN7P-1M for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKwS-008uNP-1v for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HQbntREANPihI/7ES2C/hTbXWoERBntTS7k0ndLZcVc=; b=AIynU0ux9pxOfiUopYAXp17iTP Jp5XJuj2BKVTwuLFLIzDd0OPPa9xRRRaF7q5Ljjc4kivsNIrHIuM2d8cyj6999u9O4Z+roN8gUxNe CtKkXYjaq5fg6mVuEn2WzfE1efk0A3K02gwRBETme+L0K9YVGPGJvEwJd/IjYy/BCFw8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Check NULL domain in domain_chk_quota() Message-Id: Date: Tue, 19 Aug 2025 11:55:52 +0000 commit 1b4e935f4597218d19ea8e8494ba59b8aec170f4 Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:52 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:52 2025 +0200 tools/xenstored: Check NULL domain in domain_chk_quota() With separate control and xenstore domains, the xenstore domain itself is no longer privileged. Local socket connections do not have conn->domain assigned, but domain_chk_quota() will go ahead and dereference it. The !domid_is_unprivileged(conn->id) check usually means the function would have already returned. Bail out on !conn->domain to avoid faulting. This adds a similar check to that in domain_max_chk() Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 051e3fd164..c74bafa165 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1762,7 +1762,7 @@ static bool domain_chk_quota(struct connection *conn, unsigned int mem) time_t now; struct domain *domain; - if (!conn || !domid_is_unprivileged(conn->id) || + if (!conn || !conn->domain || !domid_is_unprivileged(conn->id) || conn->is_ignored) return false; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:56:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086504.1444700 (Exim 4.92) (envelope-from ) id 1uoKwd-0006FL-Po; Tue, 19 Aug 2025 11:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086504.1444700; Tue, 19 Aug 2025 11:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwd-0006FC-My; Tue, 19 Aug 2025 11:56:03 +0000 Received: by outflank-mailman (input) for mailman id 1086504; Tue, 19 Aug 2025 11:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwc-0006Ey-Og for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKwc-00DN7x-1h for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKwc-008uON-2E for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jdY507eHc5YgKG6ID6UA0cm0SKdvLBAiYDy9dd3Mvlw=; b=F2Fx2NyrWk4IPz0DT4LcMFBGDL LNFcPDUk/ObdMrXuT0VYBgp5zGqbmMwKwC4dsFhPAoljTCJhu8G15Q+/9jYh9dwrZTkdR/cPCtQhI 3iQy0dJgSe9SUUZX3JvPdIN473OWaUBalxEXvjnTGs32tavzbJks78RlwpG8bPv4DncE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Use priv_domid for manual nodes and permission Message-Id: Date: Tue, 19 Aug 2025 11:56:02 +0000 commit c67def341a1d1f35ed5c681f3001496be2ad5ea6 Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:53 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:03:57 2025 +0200 tools/xenstored: Use priv_domid for manual nodes and permission Usually, priv_domid == dom0_domid == 0, and that is what is expected. If we rename s/dom0_domid/store_domid/, it seems more likely we want to actually have the priv_domid as the owner. That leads to follow on changes to ensure that the priv_domid is created first. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.c | 4 ++-- tools/xenstored/domain.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index d447e1167e..7a65ddb585 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2269,7 +2269,7 @@ struct connection *get_connection_by_id(unsigned int conn_id) static void manual_node(const char *name, const char *child) { struct node *node; - struct xs_permissions perms = { .id = dom0_domid, + struct xs_permissions perms = { .id = priv_domid, .perms = XS_PERM_NONE }; node = talloc_zero(NULL, struct node); @@ -2320,7 +2320,7 @@ void setup_structure(bool live_update) manual_node("/tool/xenstored", NULL); manual_node("@releaseDomain", NULL); manual_node("@introduceDomain", NULL); - domain_nbentry_fix(dom0_domid, 5, true); + domain_nbentry_fix(priv_domid, 5, true); } } diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index c74bafa165..bcc63104b7 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1026,7 +1026,7 @@ static struct domain *introduce_domain(const void *ctx, struct domain *domain; int rc; struct xenstore_domain_interface *interface; - bool is_master_domain = (domid == xenbus_master_domid()); + bool is_priv_domain = (domid == priv_domid); domain = find_or_alloc_domain(ctx, domid); if (!domain) @@ -1051,13 +1051,13 @@ static struct domain *introduce_domain(const void *ctx, if (!restore) interface->server_features = domain->features; - if (is_master_domain) + if (is_priv_domain) setup_structure(restore); /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); - if (!is_master_domain && !restore) + if (!is_priv_domain && !restore) fire_special_watches("@introduceDomain"); } else { /* Use XS_INTRODUCE for recreating the xenbus event-channel. */ @@ -1392,15 +1392,15 @@ void init_domains(void) barf("Could not determine xenstore domid\n"); /* - * Local domid must be first to setup structures for firing the special - * watches. + * Privileged domid must be first to setup structures for firing the + * special watches. */ - if (init_domain(dom0_domid)) + if (init_domain(priv_domid)) introduce_count++; for (unsigned int i = 0; i < nr_domids; i++) { domid = domids[i]; - if (domid == dom0_domid) + if (domid == priv_domid) continue; if (init_domain(domid)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:56:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086505.1444705 (Exim 4.92) (envelope-from ) id 1uoKwo-0006Jd-T8; Tue, 19 Aug 2025 11:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086505.1444705; Tue, 19 Aug 2025 11:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwo-0006JT-Q3; Tue, 19 Aug 2025 11:56:14 +0000 Received: by outflank-mailman (input) for mailman id 1086505; Tue, 19 Aug 2025 11:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwm-0006He-Rc for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKwm-00DN81-1z for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKwm-008uOq-2Z for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3CPX4Ev9TYWz+Vs9uiA6Jn07dTdUmkp6HeEDL3mzSXM=; b=fgLAJGEbx67XRVsO99clSYU7sk C/BtbQV24qlS4yDw+jgR9F1q7bDiewlKh4Qtv7Vw6G8Rc69khiJxH7ShvT+SGNRAYBoZnqd8TSxyq 3klxUP358mNFJEw/A4UpHcYedKXdeGHqeyFoiQ4Ca5+Ft2827cDSxyxK6VAKsDl7QGnM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Rename dom0_domid to store_domid Message-Id: Date: Tue, 19 Aug 2025 11:56:12 +0000 commit 9947e2ad889cd111b3a1a1afb9f401928d8f5dda Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:54 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:04:02 2025 +0200 tools/xenstored: Rename dom0_domid to store_domid The dom0_domid variable is misnamed and conflates purposes. If we have xenstored running in a Linux domain that is not dom0, this variable controls the lookup of /proc/xen/xsd_kva and the event channel. Rename to store_domid to better show its purpose. One implication of this change is that the xenstore domain is not privileged by virtue of considering store_domid as privileged. domain_is_unprivileged() removes the dom0_domid/store_domid check, so xenstore domain is no longer considered privileged. onearg_domain() is updated to return EINVAL for store_domid or priv_domid to maintain the ability to call XS_RESUME. xenbus_master_domid() is removed with store_domid being used instead. Add a description of the -m/--master-domid options while doing this. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/core.c | 9 ++++++--- tools/xenstored/core.h | 6 ++---- tools/xenstored/domain.c | 14 +++++++------- tools/xenstored/posix.c | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 7a65ddb585..64c478a801 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2539,7 +2539,10 @@ static void usage(void) " allowed timeout candidates are:\n" " watch-event: time a watch-event is kept pending\n" " -K, --keep-orphans don't delete nodes owned by a domain when the\n" -" domain is deleted (this is a security risk!)\n"); +" domain is deleted (this is a security risk!)\n" +" -m, --master-domid specify the domid of the domain where xenstored\n" +" is running. defaults to 0\n" +); } @@ -2567,7 +2570,7 @@ static struct option options[] = { #endif { NULL, 0, NULL, 0 } }; -int dom0_domid = DOMID_INVALID; +int store_domid = DOMID_INVALID; int dom0_event = 0; int priv_domid = DOMID_INVALID; domid_t stub_domid = DOMID_INVALID; @@ -2736,7 +2739,7 @@ int main(int argc, char *argv[]) dom0_event = get_optval_uint(optarg); break; case 'm': - dom0_domid = get_optval_uint(optarg); + store_domid = get_optval_uint(optarg); break; case 'p': priv_domid = get_optval_uint(optarg); diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index cef3c71eb0..e0b48e4978 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -365,7 +365,7 @@ do { \ trace("tdb: " __VA_ARGS__); \ } while (0) -extern int dom0_domid; +extern int store_domid; extern int dom0_event; extern int priv_domid; extern domid_t stub_domid; @@ -382,11 +382,9 @@ uint64_t get_now_msec(void); void *xenbus_map(void); void unmap_xenbus(void *interface); -static inline int xenbus_master_domid(void) { return dom0_domid; } - static inline bool domid_is_unprivileged(unsigned int domid) { - return domid != dom0_domid && domid != priv_domid; + return domid != priv_domid; } static inline bool domain_is_unprivileged(const struct connection *conn) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index bcc63104b7..e282b5c5ed 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -509,7 +509,7 @@ static const struct interface_funcs domain_funcs = { static void *map_interface(domid_t domid) { - if (domid == xenbus_master_domid()) + if (domid == store_domid) return xenbus_map(); #ifdef __MINIOS__ @@ -524,7 +524,7 @@ static void *map_interface(domid_t domid) static void unmap_interface(domid_t domid, void *interface) { - if (domid == xenbus_master_domid()) + if (domid == store_domid) unmap_xenbus(interface); else if (domid != stub_domid) xengnttab_unmap(*xgt_handle, interface, 1); @@ -1158,7 +1158,7 @@ static struct domain *onearg_domain(struct connection *conn, return ERR_PTR(-EINVAL); domid = atoi(domid_str); - if (domid == dom0_domid) + if (domid == store_domid || domid == priv_domid) return ERR_PTR(-EINVAL); return find_connected_domain(domid); @@ -1381,14 +1381,14 @@ void init_domains(void) * have 1 domain. stubdom there will be dom0 and dom1, * so this will take the second for stubdom. */ - dom0_domid = domid; + store_domid = domid; } } - if (dom0_domid == DOMID_INVALID) - dom0_domid = priv_domid; + if (store_domid == DOMID_INVALID) + store_domid = priv_domid; - if (dom0_domid == DOMID_INVALID) + if (store_domid == DOMID_INVALID) barf("Could not determine xenstore domid\n"); /* diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 4a97f53dc0..0ec7babb7a 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -174,7 +174,7 @@ static evtchn_port_t get_xenbus_evtchn(void) */ evtchn_port_t get_domain_evtchn(unsigned int domid) { - if (domid == xenbus_master_domid()) + if (domid == store_domid) return get_xenbus_evtchn(); return 0; @@ -280,7 +280,7 @@ static void accept_connection(int sock) conn = new_connection(&socket_funcs); if (conn) { conn->fd = fd; - conn->id = dom0_domid; + conn->id = store_domid; } else close(fd); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:56:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086506.1444708 (Exim 4.92) (envelope-from ) id 1uoKwy-0006Ld-UA; Tue, 19 Aug 2025 11:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086506.1444708; Tue, 19 Aug 2025 11:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKwy-0006LV-RX; Tue, 19 Aug 2025 11:56:24 +0000 Received: by outflank-mailman (input) for mailman id 1086506; Tue, 19 Aug 2025 11:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKww-0006LL-Uw for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKww-00DN85-2K for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKww-008uQ6-2r for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4Dri3wO1WwqLWsr8ig6aaROtRZGOV21t7SgEYzbpn4g=; b=WtPxyfeKDL5GoJBycxsS72/A7T Js5gxEjr0pJ4tv/HU2l2Bzi03Qnpv+Du6TPORS3XK1OBaxJEMpNuz0X68o/0GxtNNqVl0gf5Tciys sCv465MwJStRIPuNYiGrtS7T8p0uqgtHtUReKLPaNulpMCtl0IZjDealU2Iopxq/esZc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Remove stubdom special casing Message-Id: Date: Tue, 19 Aug 2025 11:56:22 +0000 commit 671e80d9905339e329eada7549e1c2f7f804585e Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:55 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:04:08 2025 +0200 tools/xenstored: Remove stubdom special casing posix.c and minios.c implement the same named functions serving slightly different purposes. For xenbus_map() posix.c maps the local /dev/xen/xsd_kva minios.c maps dom0 via grant and there is open coding for stub_domid in map_interface. Change xenbus_map() to map the local domain's interface. The default grant table mapping is performed otherwise. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 5 ----- tools/xenstored/minios.c | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index e282b5c5ed..cf5a54965a 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -512,11 +512,6 @@ static void *map_interface(domid_t domid) if (domid == store_domid) return xenbus_map(); -#ifdef __MINIOS__ - if (domid == stub_domid) - return xenstore_buf; -#endif - return xengnttab_map_grant_ref(*xgt_handle, domid, GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 60d921cf01..a214e23907 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -61,13 +61,11 @@ evtchn_port_t get_domain_evtchn(unsigned int domid) void *xenbus_map(void) { - return xengnttab_map_grant_ref(*xgt_handle, xenbus_master_domid(), - GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); + return xenstore_buf; } void unmap_xenbus(void *interface) { - xengnttab_unmap(*xgt_handle, interface, 1); } void early_init(bool live_update, bool dofork, const char *pidfile) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 11:56:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 11:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1086507.1444713 (Exim 4.92) (envelope-from ) id 1uoKx8-0006Ne-Vi; Tue, 19 Aug 2025 11:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1086507.1444713; Tue, 19 Aug 2025 11:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKx8-0006NW-T3; Tue, 19 Aug 2025 11:56:34 +0000 Received: by outflank-mailman (input) for mailman id 1086507; Tue, 19 Aug 2025 11:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoKx7-0006NO-2T for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoKx6-00DN8B-2h for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoKx6-008uQW-3B for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 11:56:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uImufeO4lLYTV5+haArnzc9woTFYNq+9hZkdyZWJsrc=; b=Sf/0lO+DNUd4MNjLD5WRVmC3Hk ojATKNtc2kMbure0UuX07CYRkOmKF/9fB/lNsQYvoyDTfD7bOaMlqDMOk3CBa+gZMhsusAFXxxDyj MGwFSlxFODPmksI94TZBzghNUXlkvM5Nm0tqgetDWUZGt/o9lv7EJQnqnf+Gtd70hbWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Remove hardcoded implicit path Message-Id: Date: Tue, 19 Aug 2025 11:56:32 +0000 commit 2e8067a773e2a2fa7268e065f0c97dfda7b0638e Author: Jason Andryuk AuthorDate: Fri Aug 15 17:35:56 2025 -0400 Commit: Jan Beulich CommitDate: Tue Aug 19 11:04:13 2025 +0200 tools/xenstored: Remove hardcoded implicit path Update get_implicit_path to return the correct value for a non-dom0 xenstored domain. Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstored/domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index cf5a54965a..694d68670a 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1312,11 +1312,13 @@ static int close_xgt_handle(void *_handle) return 0; } +static char store_domain_path[] = "/local/domain/65535"; + /* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path(const struct connection *conn) { if (!conn->domain) - return "/local/domain/0"; + return store_domain_path; return conn->domain->path; } @@ -1386,6 +1388,9 @@ void init_domains(void) if (store_domid == DOMID_INVALID) barf("Could not determine xenstore domid\n"); + snprintf(store_domain_path, sizeof(store_domain_path), + "/local/domain/%u", store_domid); + /* * Privileged domid must be first to setup structures for firing the * special watches. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087037.1445187 (Exim 4.92) (envelope-from ) id 1uoSQB-0000qO-Px; Tue, 19 Aug 2025 19:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087037.1445187; Tue, 19 Aug 2025 19:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQB-0000qG-NF; Tue, 19 Aug 2025 19:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1087037; Tue, 19 Aug 2025 19:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQA-0000pt-Au for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSQ9-00DWnd-2z for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSQA-009MHC-09 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1ZZRJUdqpIz11QR1BccE2sBh0elIhlB73VwzjJy1LuM=; b=f7hKKoYr9rAj9X+SWce2CKhPZJ lMmF8UrhwApiS/oq4kJXKmLb23TQFjqzjKKibDEJ8EFNU8/qVF8jurad+dHMLGgJGlx4dVk2I4KrH 83G5ENxkyFGcFUJanBtN6R+KynqMpyDnv3pj3NcIg+wYOTRoCEzXElfL1UTNc9tf2F3M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Sort headers Message-Id: Date: Tue, 19 Aug 2025 19:55:02 +0000 commit 90226b8b1adf45b9c2ec29e640fdadb8ce6ad0eb Author: Andrew Cooper AuthorDate: Fri Aug 15 15:10:01 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86: Sort headers No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/acpi.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 4 +- xen/arch/x86/domain.c | 6 +-- xen/arch/x86/domctl.c | 44 +++++++++++----------- xen/arch/x86/hvm/hvm.c | 76 +++++++++++++++++++------------------- xen/arch/x86/hvm/svm/svm.c | 6 +-- xen/arch/x86/hvm/svm/vmcb.c | 6 +-- xen/arch/x86/hvm/vmx/vmx.c | 54 ++++++++++++++------------- xen/arch/x86/hvm/vmx/vvmx.c | 6 +-- xen/arch/x86/include/asm/hvm/hvm.h | 2 +- xen/arch/x86/tboot.c | 15 ++++---- xen/arch/x86/xstate.c | 4 +- xen/drivers/acpi/apei/apei-base.c | 14 ++++--- 13 files changed, 124 insertions(+), 115 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c index 0c25376406..b81f2afc9b 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -11,8 +11,8 @@ * porting acpi-cpufreq.c from Linux 2.6.23 to Xen hypervisor */ -#include #include +#include #include #include diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index eba4b536c7..0f046862ac 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -7,11 +7,11 @@ #include #include -#include #include +#include -#include "x86_mca.h" #include "mctelem.h" +#include "x86_mca.h" #define MCE_QUIET 0 #define MCE_VERBOSE 1 diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 28c91cf023..4c7231230a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -24,11 +24,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -64,12 +66,10 @@ #include #include #include -#include -#include #include -#include #include +#include #ifdef CONFIG_COMPAT #include diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f07cae6a70..d7781b7dc5 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -4,39 +4,41 @@ * Copyright (c) 2002-2006, K A Fraser */ -#include -#include -#include -#include #include -#include -#include -#include +#include #include -#include #include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include -#include #include #include +#include +#include +#include +#include #include -#include /* for hvm_acpi_power_button */ -#include /* for arch_do_domctl */ +#include +#include + #include -#include -#include + +#include #include -#include -#include -#include -#include -#include static int update_domain_cpu_policy(struct domain *d, xen_domctl_cpu_policy_t *xdpc) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index cb8ecd050d..6d2b937b62 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -7,64 +7,66 @@ * Copyright (c) 2008, Citrix Systems, Inc. */ +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include + +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include -#include -#include -#include -#include #include +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include #include -#include +#include + +#include #include -#include #include +#include +#include #include -#include #include diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index fce750ca1f..62f455ad94 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -29,13 +28,14 @@ #include #include #include -#include #include +#include +#include #include #include +#include #include #include -#include #include #include diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 839d3ff91b..153aa34133 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -7,18 +7,18 @@ */ #include -#include #include +#include #include #include #include #include +#include +#include #include #include #include -#include -#include #include struct vmcb_struct *alloc_vmcb(void) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index cb82d52ef0..3e21f20278 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4,51 +4,53 @@ * Copyright (c) 2004, Intel Corporation. */ +#include #include +#include #include +#include #include #include -#include +#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include #include #include +#include +#include #include -#include -#include -#include -#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include #include +#include +#include +#include #include +#include #include #include +#include +#include + #include +#include +#include +#include static bool __initdata opt_force_ept; boolean_param("force-ept", opt_force_ept); diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2432af58e0..95d3c2ee7b 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,12 +10,12 @@ #include -#include -#include +#include #include #include #include -#include +#include +#include static DEFINE_PER_CPU(u64 *, vvmcs_buf); diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 18e40910ff..228f47dbde 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -14,8 +14,8 @@ #include #include -#include #include +#include struct pirq; /* needed by pi_update_irte */ diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index d5db60d335..319116857d 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -1,19 +1,20 @@ +#include +#include #include #include -#include +#include #include #include -#include -#include -#include -#include #include +#include +#include + +#include #include #include #include -#include -#include #include +#include #include #include diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index e8e218caed..f6d677eb12 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -10,12 +10,12 @@ #include #include +#include #include #include -#include #include +#include #include -#include /* * Maximum size (in byte) of the XSAVE/XRSTOR save area required by all diff --git a/xen/drivers/acpi/apei/apei-base.c b/xen/drivers/acpi/apei/apei-base.c index 053a92c307..4fe99573a2 100644 --- a/xen/drivers/acpi/apei/apei-base.c +++ b/xen/drivers/acpi/apei/apei-base.c @@ -30,15 +30,17 @@ * You should have received a copy of the GNU General Public License * along with this program; If not, see . */ -#include -#include + +#include #include -#include -#include -#include +#include #include -#include +#include +#include +#include + #include + #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087038.1445191 (Exim 4.92) (envelope-from ) id 1uoSQL-0000s6-RT; Tue, 19 Aug 2025 19:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087038.1445191; Tue, 19 Aug 2025 19:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQL-0000ry-Oj; Tue, 19 Aug 2025 19:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1087038; Tue, 19 Aug 2025 19:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQK-0000rm-D7 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSQK-00DWnz-0X for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSQK-009MHf-0j for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GiLaGFMCSTh7kbS4JjEnB5S855QkslJ2BBSSdLicNZA=; b=FhPlseg9GMi0wttMcO8PStZmlw nYcXf9Kx0BFnZNxkTUKb+zD/CVJ0XbaeMiocgu03qizWu8CVMnB7XbCulaPtGmNi/FTTyO/Z+Zwou Tgfg8uawNhC5caRvXU5J8vAGJkHmH9Pv7ESd6jJwgy3t6EKMGFhMRXRUOAcU/Ro+4bYE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Split out guest-msr.h Message-Id: Date: Tue, 19 Aug 2025 19:55:12 +0000 commit ef745a2d014d2969a89a430cf8b34fa696d0adc4 Author: Andrew Cooper AuthorDate: Fri Aug 15 15:06:10 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Split out guest-msr.h struct vcpu_msrs has a very different purpose to everything else in msr.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 1 + xen/arch/x86/cpuid.c | 1 + xen/arch/x86/debug.c | 1 + xen/arch/x86/domain.c | 1 + xen/arch/x86/domctl.c | 1 + xen/arch/x86/hvm/hvm.c | 1 + xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/arch/x86/hvm/vmx/vmx.c | 1 + xen/arch/x86/hvm/vmx/vvmx.c | 1 + xen/arch/x86/include/asm/guest-msr.h | 155 +++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/msr.h | 145 -------------------------------- xen/arch/x86/msr.c | 1 + xen/arch/x86/pv/emulate.h | 1 + xen/arch/x86/x86_64/asm-offsets.c | 1 + 15 files changed, 168 insertions(+), 145 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index da05015578..a66cd5f9c7 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 8dc68945f7..b63a82dd38 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 71755dea6f..11b0a7e547 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -9,6 +9,7 @@ #include #include +#include /* * Merge new bits into dr6. 'new' is always given in positive polarity, diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 4c7231230a..dbf2ff14f5 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d7781b7dc5..6153e3c07e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6d2b937b62..bd64faf207 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 62f455ad94..6aac83b5f9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 153aa34133..c57d314a24 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 3e21f20278..4934449577 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 95d3c2ee7b..6201665d9f 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,6 +10,7 @@ #include +#include #include #include #include diff --git a/xen/arch/x86/include/asm/guest-msr.h b/xen/arch/x86/include/asm/guest-msr.h new file mode 100644 index 0000000000..5f0cb0a939 --- /dev/null +++ b/xen/arch/x86/include/asm/guest-msr.h @@ -0,0 +1,155 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_GUEST_MSR_H +#define X86_GUEST_MSR_H + +#include + +/* Container object for per-vCPU MSRs */ +struct vcpu_msrs +{ + /* + * 0x00000048 - MSR_SPEC_CTRL + * 0xc001011f - MSR_VIRT_SPEC_CTRL (if X86_FEATURE_AMD_SSBD) + * + * For PV guests, this holds the guest kernel value. It is accessed on + * every entry/exit path. + * + * For VT-x guests, one of two situations exist: + * + * - If hardware supports virtualized MSR_SPEC_CTRL, it is active by + * default and the guest value lives in the VMCS. + * - Otherwise, the guest value is held in the MSR load/save list. + * + * For SVM, the guest value lives in the VMCB, and hardware saves/restores + * the host value automatically. However, guests run with the OR of the + * host and guest value, which allows Xen to set protections behind the + * guest's back. + * + * We must clear/restore Xen's value before/after VMRUN to avoid unduly + * influencing the guest. In order to support "behind the guest's back" + * protections, we load this value (commonly 0) before VMRUN. + * + * Once of such "behind the guest's back" usages is setting SPEC_CTRL.SSBD + * if the guest sets VIRT_SPEC_CTRL.SSBD. + */ + struct { + uint32_t raw; + } spec_ctrl; + + /* + * 0x00000140 - MSR_INTEL_MISC_FEATURES_ENABLES + * + * This MSR is non-architectural, but for simplicy we allow it to be read + * unconditionally. The CPUID Faulting bit is the only writeable bit, and + * only if enumerated by MSR_PLATFORM_INFO. + */ + union { + uint32_t raw; + struct { + bool cpuid_faulting:1; + }; + } misc_features_enables; + + /* + * 0x00000560 ... 57x - MSR_RTIT_* + * + * "Real Time Instruction Trace", now called Processor Trace. + * + * These MSRs are not exposed to guests. They are controlled by Xen + * behind the scenes, when vmtrace is enabled for the domain. + * + * MSR_RTIT_OUTPUT_BASE not stored here. It is fixed per vcpu, and + * derived from v->vmtrace.buf. + */ + struct { + /* + * Placed in the MSR load/save lists. Only modified by hypercall in + * the common case. + */ + uint64_t ctl; + + /* + * Updated by hardware in non-root mode. Synchronised here on vcpu + * context switch. + */ + uint64_t status; + union { + uint64_t output_mask; + struct { + uint32_t output_limit; + uint32_t output_offset; + }; + }; + } rtit; + + /* + * 0x000006e1 - MSR_PKRS - Protection Key Supervisor. + * + * Exposed R/W to guests. Xen doesn't use PKS yet, so only context + * switched per vcpu. When in current context, live value is in hardware, + * and this value is stale. + */ + uint32_t pkrs; + + /* 0x00000da0 - MSR_IA32_XSS */ + struct { + uint64_t raw; + } xss; + + /* + * 0xc0000103 - MSR_TSC_AUX + * + * Value is guest chosen, and always loaded in vcpu context. Guests have + * no direct MSR access, and the value is accessible to userspace with the + * RDTSCP and RDPID instructions. + */ + uint32_t tsc_aux; + + /* + * 0xc001011f - MSR_VIRT_SPEC_CTRL (if !X86_FEATURE_AMD_SSBD) + * + * AMD only, used on Zen1 and older hardware (pre-AMD_SSBD). Holds the + * the guests value. + * + * In the default case, Xen doesn't protect itself from SSB, and guests + * are expected to use VIRT_SPEC_CTRL.SSBD=1 sparingly. Xen therefore + * runs in the guest kernel's choice of SSBD. + * + * However, if the global enable `spec-ctrl=ssbd` is selected, hardware is + * always configured with SSBD=1 and the guest's setting is never loaded + * into hardware. + */ + struct { + uint32_t raw; + } virt_spec_ctrl; + + /* + * 0xc00110{27,19-1b} MSR_AMD64_DR{0-3}_ADDRESS_MASK + * + * Loaded into hardware for guests which have active %dr7 settings. + * Furthermore, HVM guests are offered direct access, meaning that the + * values here may be stale in current context. + */ + uint32_t dr_mask[4]; +}; + +struct vcpu; +struct cpu_policy; + +int init_vcpu_msr_policy(struct vcpu *v); + +/* + * Below functions can return X86EMUL_UNHANDLEABLE which means that MSR is + * not (yet) handled by it and must be processed by legacy handlers. Such + * behaviour is needed for transition period until all rd/wrmsr are handled + * by the new MSR infrastructure. + * + * These functions are also used by the migration logic, so need to cope with + * being used outside of v's context. + */ +int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val); +int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val); + +uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp); + +#endif /* X86_GUEST_MSR_H */ diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index e185db0967..06afdb460a 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -273,149 +273,4 @@ static inline void wrmsr_tsc_aux(uint32_t val) } } -uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp); - -/* Container object for per-vCPU MSRs */ -struct vcpu_msrs -{ - /* - * 0x00000048 - MSR_SPEC_CTRL - * 0xc001011f - MSR_VIRT_SPEC_CTRL (if X86_FEATURE_AMD_SSBD) - * - * For PV guests, this holds the guest kernel value. It is accessed on - * every entry/exit path. - * - * For VT-x guests, one of two situations exist: - * - * - If hardware supports virtualized MSR_SPEC_CTRL, it is active by - * default and the guest value lives in the VMCS. - * - Otherwise, the guest value is held in the MSR load/save list. - * - * For SVM, the guest value lives in the VMCB, and hardware saves/restores - * the host value automatically. However, guests run with the OR of the - * host and guest value, which allows Xen to set protections behind the - * guest's back. - * - * We must clear/restore Xen's value before/after VMRUN to avoid unduly - * influencing the guest. In order to support "behind the guest's back" - * protections, we load this value (commonly 0) before VMRUN. - * - * Once of such "behind the guest's back" usages is setting SPEC_CTRL.SSBD - * if the guest sets VIRT_SPEC_CTRL.SSBD. - */ - struct { - uint32_t raw; - } spec_ctrl; - - /* - * 0x00000140 - MSR_INTEL_MISC_FEATURES_ENABLES - * - * This MSR is non-architectural, but for simplicy we allow it to be read - * unconditionally. The CPUID Faulting bit is the only writeable bit, and - * only if enumerated by MSR_PLATFORM_INFO. - */ - union { - uint32_t raw; - struct { - bool cpuid_faulting:1; - }; - } misc_features_enables; - - /* - * 0x00000560 ... 57x - MSR_RTIT_* - * - * "Real Time Instruction Trace", now called Processor Trace. - * - * These MSRs are not exposed to guests. They are controlled by Xen - * behind the scenes, when vmtrace is enabled for the domain. - * - * MSR_RTIT_OUTPUT_BASE not stored here. It is fixed per vcpu, and - * derived from v->vmtrace.buf. - */ - struct { - /* - * Placed in the MSR load/save lists. Only modified by hypercall in - * the common case. - */ - uint64_t ctl; - - /* - * Updated by hardware in non-root mode. Synchronised here on vcpu - * context switch. - */ - uint64_t status; - union { - uint64_t output_mask; - struct { - uint32_t output_limit; - uint32_t output_offset; - }; - }; - } rtit; - - /* - * 0x000006e1 - MSR_PKRS - Protection Key Supervisor. - * - * Exposed R/W to guests. Xen doesn't use PKS yet, so only context - * switched per vcpu. When in current context, live value is in hardware, - * and this value is stale. - */ - uint32_t pkrs; - - /* 0x00000da0 - MSR_IA32_XSS */ - struct { - uint64_t raw; - } xss; - - /* - * 0xc0000103 - MSR_TSC_AUX - * - * Value is guest chosen, and always loaded in vcpu context. Guests have - * no direct MSR access, and the value is accessible to userspace with the - * RDTSCP and RDPID instructions. - */ - uint32_t tsc_aux; - - /* - * 0xc001011f - MSR_VIRT_SPEC_CTRL (if !X86_FEATURE_AMD_SSBD) - * - * AMD only, used on Zen1 and older hardware (pre-AMD_SSBD). Holds the - * the guests value. - * - * In the default case, Xen doesn't protect itself from SSB, and guests - * are expected to use VIRT_SPEC_CTRL.SSBD=1 sparingly. Xen therefore - * runs in the guest kernel's choice of SSBD. - * - * However, if the global enable `spec-ctrl=ssbd` is selected, hardware is - * always configured with SSBD=1 and the guest's setting is never loaded - * into hardware. - */ - struct { - uint32_t raw; - } virt_spec_ctrl; - - /* - * 0xc00110{27,19-1b} MSR_AMD64_DR{0-3}_ADDRESS_MASK - * - * Loaded into hardware for guests which have active %dr7 settings. - * Furthermore, HVM guests are offered direct access, meaning that the - * values here may be stale in current context. - */ - uint32_t dr_mask[4]; -}; - -int init_vcpu_msr_policy(struct vcpu *v); - -/* - * Below functions can return X86EMUL_UNHANDLEABLE which means that MSR is - * not (yet) handled by it and must be processed by legacy handlers. Such - * behaviour is needed for transition period until all rd/wrmsr are handled - * by the new MSR infrastructure. - * - * These functions are also used by the migration logic, so need to cope with - * being used outside of v's context. - */ -int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val); -int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val); - #endif /* __ASM_MSR_H */ diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 1bf117cbd8..c6465b41ee 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/emulate.h b/xen/arch/x86/pv/emulate.h index 49a4d34832..c74e45e50c 100644 --- a/xen/arch/x86/pv/emulate.h +++ b/xen/arch/x86/pv/emulate.h @@ -3,6 +3,7 @@ #include +#include #include #include diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 2258b4ce1b..9d45364026 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef CONFIG_VIDEO # include "../boot/video.h" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087039.1445195 (Exim 4.92) (envelope-from ) id 1uoSQV-0000um-UB; Tue, 19 Aug 2025 19:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087039.1445195; Tue, 19 Aug 2025 19:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQV-0000ue-RX; Tue, 19 Aug 2025 19:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1087039; Tue, 19 Aug 2025 19:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQU-0000uW-GU for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSQU-00DWo3-0r for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSQU-009MIR-1R for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ag+j41KozaS9RC8uGjhQCXNYjUxt04GqfgzYVuzdZtM=; b=qZsWg5hJ+q/q2Ujgb7rdLlthxu 9N+2+tSDu+nNIwuBztwZgTPl8K+yXcXlJOZlS+wP1dkWxJ6TI0VLa0AlkB6qkPNEB7V4G80+M+oI6 Lt2kluAqCFF0cCOErWmgO7L5sj9oaeeJ3ogPg3oirG3ZSUZoIoCs0npn3gedZSmwR+6M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Split out fsgsbase.h Message-Id: Date: Tue, 19 Aug 2025 19:55:22 +0000 commit 9e544443716ead4cc09a09fe00ae74620ea2d54b Author: Andrew Cooper AuthorDate: Thu Aug 14 14:32:03 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Split out fsgsbase.h It is a large and complex API, but only a handful of translation units need access. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 1 + xen/arch/x86/hvm/vmx/vmx.c | 1 + xen/arch/x86/include/asm/fsgsbase.h | 114 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/msr.h | 105 --------------------------------- xen/arch/x86/pv/domain.c | 1 + xen/arch/x86/pv/emul-priv-op.c | 1 + xen/arch/x86/pv/misc-hypercalls.c | 1 + xen/arch/x86/traps.c | 1 + 8 files changed, 120 insertions(+), 105 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index dbf2ff14f5..cd56f5821a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 4934449577..5439f950dc 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/include/asm/fsgsbase.h b/xen/arch/x86/include/asm/fsgsbase.h new file mode 100644 index 0000000000..03e6a85d31 --- /dev/null +++ b/xen/arch/x86/include/asm/fsgsbase.h @@ -0,0 +1,114 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_FSGSBASE_H +#define X86_FSGSBASE_H + +#include +#include +#include + +/* + * On hardware supporting FSGSBASE, the value loaded into hardware is the + * guest kernel's choice for 64bit PV guests (Xen's choice for Idle, HVM and + * 32bit PV). + * + * Therefore, the {RD,WR}{FS,GS}BASE instructions are only safe to use if + * %cr4.fsgsbase is set. + */ +static inline unsigned long __rdfsbase(void) +{ + unsigned long base; + + asm volatile ( "rdfsbase %0" : "=r" (base) ); + + return base; +} + +static inline unsigned long __rdgsbase(void) +{ + unsigned long base; + + asm volatile ( "rdgsbase %0" : "=r" (base) ); + + return base; +} + +static inline void __wrfsbase(unsigned long base) +{ + asm volatile ( "wrfsbase %0" :: "r" (base) ); +} + +static inline void __wrgsbase(unsigned long base) +{ + asm volatile ( "wrgsbase %0" :: "r" (base) ); +} + +static inline unsigned long read_fs_base(void) +{ + unsigned long base; + + if ( read_cr4() & X86_CR4_FSGSBASE ) + return __rdfsbase(); + + rdmsrl(MSR_FS_BASE, base); + + return base; +} + +static inline unsigned long read_gs_base(void) +{ + unsigned long base; + + if ( read_cr4() & X86_CR4_FSGSBASE ) + return __rdgsbase(); + + rdmsrl(MSR_GS_BASE, base); + + return base; +} + +static inline unsigned long read_gs_shadow(void) +{ + unsigned long base; + + if ( read_cr4() & X86_CR4_FSGSBASE ) + { + asm volatile ( "swapgs" ); + base = __rdgsbase(); + asm volatile ( "swapgs" ); + } + else + rdmsrl(MSR_SHADOW_GS_BASE, base); + + return base; +} + +static inline void write_fs_base(unsigned long base) +{ + if ( read_cr4() & X86_CR4_FSGSBASE ) + __wrfsbase(base); + else + wrmsrl(MSR_FS_BASE, base); +} + +static inline void write_gs_base(unsigned long base) +{ + if ( read_cr4() & X86_CR4_FSGSBASE ) + __wrgsbase(base); + else + wrmsrl(MSR_GS_BASE, base); +} + +static inline void write_gs_shadow(unsigned long base) +{ + if ( read_cr4() & X86_CR4_FSGSBASE ) + { + asm volatile ( "swapgs\n\t" + "wrgsbase %0\n\t" + "swapgs" + :: "r" (base) ); + } + else + wrmsrl(MSR_SHADOW_GS_BASE, base); +} + +#endif /* X86_FSGSBASE_H */ diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 06afdb460a..9d1cb4e6ee 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -142,111 +142,6 @@ static inline uint64_t rdtsc_ordered(void) : "=a" (low), "=d" (high) \ : "c" (counter)) -/* - * On hardware supporting FSGSBASE, the value loaded into hardware is the - * guest kernel's choice for 64bit PV guests (Xen's choice for Idle, HVM and - * 32bit PV). - * - * Therefore, the {RD,WR}{FS,GS}BASE instructions are only safe to use if - * %cr4.fsgsbase is set. - */ -static inline unsigned long __rdfsbase(void) -{ - unsigned long base; - - asm volatile ( "rdfsbase %0" : "=r" (base) ); - - return base; -} - -static inline unsigned long __rdgsbase(void) -{ - unsigned long base; - - asm volatile ( "rdgsbase %0" : "=r" (base) ); - - return base; -} - -static inline void __wrfsbase(unsigned long base) -{ - asm volatile ( "wrfsbase %0" :: "r" (base) ); -} - -static inline void __wrgsbase(unsigned long base) -{ - asm volatile ( "wrgsbase %0" :: "r" (base) ); -} - -static inline unsigned long read_fs_base(void) -{ - unsigned long base; - - if ( read_cr4() & X86_CR4_FSGSBASE ) - return __rdfsbase(); - - rdmsrl(MSR_FS_BASE, base); - - return base; -} - -static inline unsigned long read_gs_base(void) -{ - unsigned long base; - - if ( read_cr4() & X86_CR4_FSGSBASE ) - return __rdgsbase(); - - rdmsrl(MSR_GS_BASE, base); - - return base; -} - -static inline unsigned long read_gs_shadow(void) -{ - unsigned long base; - - if ( read_cr4() & X86_CR4_FSGSBASE ) - { - asm volatile ( "swapgs" ); - base = __rdgsbase(); - asm volatile ( "swapgs" ); - } - else - rdmsrl(MSR_SHADOW_GS_BASE, base); - - return base; -} - -static inline void write_fs_base(unsigned long base) -{ - if ( read_cr4() & X86_CR4_FSGSBASE ) - __wrfsbase(base); - else - wrmsrl(MSR_FS_BASE, base); -} - -static inline void write_gs_base(unsigned long base) -{ - if ( read_cr4() & X86_CR4_FSGSBASE ) - __wrgsbase(base); - else - wrmsrl(MSR_GS_BASE, base); -} - -static inline void write_gs_shadow(unsigned long base) -{ - if ( read_cr4() & X86_CR4_FSGSBASE ) - { - asm volatile ( "swapgs\n\t" - "wrgsbase %0\n\t" - "swapgs" - :: "r" (base) ); - } - else - wrmsrl(MSR_SHADOW_GS_BASE, base); -} - DECLARE_PER_CPU(uint64_t, efer); static inline uint64_t read_efer(void) { diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 9334da1dab..9c4785c187 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index f3f012f8fb..9f8600f43a 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index 17030d800d..7a37f16bf0 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -10,6 +10,7 @@ #include #include +#include long do_set_debugreg(int reg, unsigned long value) { diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 270b93ed62..0c5393cb21 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:55:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087040.1445198 (Exim 4.92) (envelope-from ) id 1uoSQf-0000x2-VX; Tue, 19 Aug 2025 19:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087040.1445198; Tue, 19 Aug 2025 19:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQf-0000wv-Sw; Tue, 19 Aug 2025 19:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1087040; Tue, 19 Aug 2025 19:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQe-0000wl-LR for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSQe-00DWoD-1N for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSQe-009MJL-1j for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=44LWm0qaLRcoDi4VBQpxxnIB/0uXPwvuOKa0ad9awTc=; b=ZXuakLLBe7jzl8Qq+f+P6/tCGv 6m7Il4vGPQoGmKnDEMACOWkYGmMDUZh7AaCYovprCN08MncsofZs2rAe9Zg/on8yQathZkrHt6wOE lVZwm2LRS4nLviEqxzYIs58IhHkBfFwhXNopYX8ykkUfKAdyCWr/LP5nVkX9dI4rOra8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Split out tsc.h Message-Id: Date: Tue, 19 Aug 2025 19:55:32 +0000 commit 2b3d1c8a30d0df73665c16470ee1365c6d73589c Author: Andrew Cooper AuthorDate: Fri Aug 15 13:33:01 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Split out tsc.h The TSC functionality is only related to MSRs by write_tsc(), and this really does not want to be available as widely as is currently is. asm/time.h shouldn't be including asm/msr.h, but this turns out to be sufficiently tangled that I've chosen to break it out into it's own patch. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 39 -------------------------------- xen/arch/x86/include/asm/time.h | 1 + xen/arch/x86/include/asm/tsc.h | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 9d1cb4e6ee..39f0bdbe7f 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -98,45 +98,6 @@ static inline void msr_split(struct cpu_user_regs *regs, uint64_t val) regs->rax = (uint32_t)val; } -static inline uint64_t rdtsc(void) -{ - uint64_t low, high; - - __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)); - - return (high << 32) | low; -} - -static inline uint64_t rdtsc_ordered(void) -{ - uint64_t low, high, aux; - - /* - * The RDTSC instruction is not serializing. Make it dispatch serializing - * for the purposes here by issuing LFENCE (or MFENCE if necessary) ahead - * of it. - * - * RDTSCP, otoh, "does wait until all previous instructions have executed - * and all previous loads are globally visible" (SDM) / "forces all older - * instructions to retire before reading the timestamp counter" (APM). - */ - alternative_io_2("lfence; rdtsc", - "mfence; rdtsc", X86_FEATURE_MFENCE_RDTSC, - "rdtscp", X86_FEATURE_RDTSCP, - ASM_OUTPUT2("=a" (low), "=d" (high), "=c" (aux)), - /* no inputs */); - - return (high << 32) | low; -} - -#define __write_tsc(val) wrmsrl(MSR_IA32_TSC, val) -#define write_tsc(val) ({ \ - /* Reliable TSCs are in lockstep across all CPUs. We should \ - * never write to them. */ \ - ASSERT(!boot_cpu_has(X86_FEATURE_TSC_RELIABLE)); \ - __write_tsc(val); \ -}) - #define rdpmc(counter,low,high) \ __asm__ __volatile__("rdpmc" \ : "=a" (low), "=d" (high) \ diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 3dfbb5297a..c55b698314 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -3,6 +3,7 @@ #define __X86_TIME_H__ #include +#include typedef u64 cycles_t; diff --git a/xen/arch/x86/include/asm/tsc.h b/xen/arch/x86/include/asm/tsc.h new file mode 100644 index 0000000000..12557a7ee0 --- /dev/null +++ b/xen/arch/x86/include/asm/tsc.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_TSC_H +#define X86_TSC_H + +#include + +static inline uint64_t rdtsc(void) +{ + uint64_t low, high; + + asm volatile ( "rdtsc" : "=a" (low), "=d" (high) ); + + return (high << 32) | low; +} + +static inline uint64_t rdtsc_ordered(void) +{ + uint64_t low, high, aux; + + /* + * The RDTSC instruction is not serializing. Make it dispatch serializing + * for the purposes here by issuing LFENCE (or MFENCE if necessary) ahead + * of it. + * + * RDTSCP, otoh, "does wait until all previous instructions have executed + * and all previous loads are globally visible" (SDM) / "forces all older + * instructions to retire before reading the timestamp counter" (APM). + */ + alternative_io_2("lfence; rdtsc", + "mfence; rdtsc", X86_FEATURE_MFENCE_RDTSC, + "rdtscp", X86_FEATURE_RDTSCP, + ASM_OUTPUT2("=a" (low), "=d" (high), "=c" (aux)), + /* no inputs */); + + return (high << 32) | low; +} + +#define __write_tsc(val) wrmsrl(MSR_IA32_TSC, val) + +/* + * Reliable TSCs are in lockstep across all CPUs. We should never write to + * them. + */ +#define write_tsc(val) ({ \ + ASSERT(!boot_cpu_has(X86_FEATURE_TSC_RELIABLE)); \ + __write_tsc(val); \ +}) + +#endif /* X86_TSC_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:55:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087041.1445203 (Exim 4.92) (envelope-from ) id 1uoSQq-0000zO-0s; Tue, 19 Aug 2025 19:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087041.1445203; Tue, 19 Aug 2025 19:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQp-0000zG-UM; Tue, 19 Aug 2025 19:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1087041; Tue, 19 Aug 2025 19:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQo-0000z4-Rq for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSQo-00DWoH-1q for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSQo-009MJh-2E for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tIU6L0TMPmVNxTb5EXqG7W5jFr6eMy+7C0nkWrNpjO0=; b=YLM8A/B3TCFRBUdI4XdsJmAF+N VG/NRgnEciNdwNhPHEz/olbiooVNVlyh7M7KN13Cp2UswYYnL/UTcVqAqjZ0p/Kf4g54lYqv+eCFb ZTog9VgVPw2Kl19qnGC5AM/DZ+wvi1C/ZWdY4dIbt2bluvYp2YGtvuOZLMF50xMAXRMw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Move msr_{split,fold}() into asm/cpu-user-regs.h Message-Id: Date: Tue, 19 Aug 2025 19:55:42 +0000 commit f1e4325f598a80f187dae32c5a5a082a67c97790 Author: Andrew Cooper AuthorDate: Fri Aug 15 16:19:45 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Move msr_{split,fold}() into asm/cpu-user-regs.h Now there is a local header, asm/cpu-user-regs.h is a far better place for these to live. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/cpu-user-regs.h | 11 +++++++++++ xen/arch/x86/include/asm/msr.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h index d700a3ef34..5b283a2f6d 100644 --- a/xen/arch/x86/include/asm/cpu-user-regs.h +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -55,4 +55,15 @@ struct cpu_user_regs */ }; +static inline uint64_t msr_fold(const struct cpu_user_regs *regs) +{ + return (regs->rdx << 32) | regs->eax; +} + +static inline void msr_split(struct cpu_user_regs *regs, uint64_t val) +{ + regs->rdx = val >> 32; + regs->rax = (uint32_t)val; +} + #endif /* X86_CPU_USER_REGS_H */ diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 39f0bdbe7f..ad188d8639 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -87,17 +87,6 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) return -EFAULT; } -static inline uint64_t msr_fold(const struct cpu_user_regs *regs) -{ - return (regs->rdx << 32) | regs->eax; -} - -static inline void msr_split(struct cpu_user_regs *regs, uint64_t val) -{ - regs->rdx = val >> 32; - regs->rax = (uint32_t)val; -} - #define rdpmc(counter,low,high) \ __asm__ __volatile__("rdpmc" \ : "=a" (low), "=d" (high) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:55:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087042.1445209 (Exim 4.92) (envelope-from ) id 1uoSR0-00011k-2z; Tue, 19 Aug 2025 19:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087042.1445209; Tue, 19 Aug 2025 19:55:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQz-00011c-Vr; Tue, 19 Aug 2025 19:55:53 +0000 Received: by outflank-mailman (input) for mailman id 1087042; Tue, 19 Aug 2025 19:55:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSQy-00011Q-Vf for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSQy-00DWoO-2D for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSQy-009MKM-2l for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IU0JgYiHvITfNBF91oa5GRWnrNvwR7ZaKUutB3EJ2z8=; b=hs/XsRnOedGeXhHovQ4rADp2mp M+F0xZ/H8IDFKBzXY8zD3bWMaY7BXWbBWUBn4Z/X6yWFnXXhF0P9jA+Iofj8Omk1i63JeDt+r/GtK bU67VB0g0NuztWkWu7PUWY/sERr1MKSBsD9KF4p148gP29K0NS/tdK1oLXp+dYgIExEk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Clean up asm/time.h Message-Id: Date: Tue, 19 Aug 2025 19:55:52 +0000 commit 1373eca8370b5abc7548e50fb3769fff52c08400 Author: Andrew Cooper AuthorDate: Fri Aug 15 15:41:07 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86: Clean up asm/time.h With asm/tsc.h split out, asm/time.h shouldn't be including asm/msr.h, but it turns out that an outrageous number of files (even some headers) are pulling their dependentices transitively through asm/time.h -> asm/msr.h Most are asm/msr{,-index}.h, but in some cases it's printk(), va_args, and even PRIxxx macros. Give asm/time.h an SPDX tag, update it's guards, and strip trailing whitespace. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/acpi.c | 3 ++- xen/arch/x86/acpi/cpufreq/cpufreq.c | 3 +++ xen/arch/x86/cpu/mcheck/mce.h | 1 + xen/arch/x86/debug.c | 1 + xen/arch/x86/guest/hyperv/hyperv.c | 1 + xen/arch/x86/hvm/ioreq.c | 1 + xen/arch/x86/hvm/vmx/vvmx.c | 1 + xen/arch/x86/include/asm/hvm/hvm.h | 1 + xen/arch/x86/include/asm/time.h | 11 +++++------ xen/arch/x86/machine_kexec.c | 1 + xen/arch/x86/psr.c | 2 ++ xen/arch/x86/tboot.c | 1 + xen/arch/x86/xstate.c | 1 + xen/common/efi/runtime.c | 1 + xen/common/ubsan/ubsan.c | 2 ++ xen/drivers/acpi/apei/apei-base.c | 1 + xen/drivers/acpi/tables/tbfadt.c | 2 ++ xen/drivers/acpi/utilities/utmisc.c | 3 +++ xen/lib/x86/private.h | 2 +- 19 files changed, 31 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c index b81f2afc9b..567c10dd06 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -14,7 +14,8 @@ #include #include #include -#include + +#include #include #include diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 45f301f354..d18735c7ae 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -30,6 +30,9 @@ #include #include #include + +#include + #include struct acpi_cpufreq_data *cpufreq_drv_data[NR_CPUS]; diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 0f046862ac..920b075355 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -8,6 +8,7 @@ #include #include +#include #include #include "mctelem.h" diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 11b0a7e547..037f97d6f1 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -10,6 +10,7 @@ #include #include #include +#include /* * Merge new bits into dr6. 'new' is always given in positive polarity, diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 6989af38f1..90757e0793 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "private.h" diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index 4d30f2d730..199cee5b33 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 6201665d9f..e4f3a5fe4c 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 228f47dbde..5c5a790f9e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -15,6 +15,7 @@ #include #include #include +#include #include struct pirq; /* needed by pi_update_irte */ diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index c55b698314..c35d25abd6 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_TIME_H +#define X86_TIME_H -#ifndef __X86_TIME_H__ -#define __X86_TIME_H__ - -#include #include typedef u64 cycles_t; @@ -38,6 +37,7 @@ uint64_t cf_check acpi_pm_tick_to_ns(uint64_t ticks); uint64_t tsc_ticks2ns(uint64_t ticks); +struct cpu_user_regs; uint64_t pv_soft_rdtsc(const struct vcpu *v, const struct cpu_user_regs *regs); uint64_t gtime_to_gtsc(const struct domain *d, uint64_t time); uint64_t gtsc_to_gtime(const struct domain *d, uint64_t tsc); @@ -47,7 +47,6 @@ int tsc_set_info(struct domain *d, uint32_t tsc_mode, uint64_t elapsed_nsec, void tsc_get_info(struct domain *d, uint32_t *tsc_mode, uint64_t *elapsed_nsec, uint32_t *gtsc_khz, uint32_t *incarnation); - void force_update_vcpu_system_time(struct vcpu *v); @@ -93,4 +92,4 @@ u64 scale_delta(u64 delta, const struct time_scale *scale); #define PIT_STATUS_NULL_COUNT (1 << 6) /* Lower bits match Timer Control Word. */ -#endif /* __X86_TIME_H__ */ +#endif /* X86_TIME_H */ diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c index 35fa5c82e9..f921eec5aa 100644 --- a/xen/arch/x86/machine_kexec.c +++ b/xen/arch/x86/machine_kexec.c @@ -24,6 +24,7 @@ #include #include #include +#include #include /* diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 499d320e61..9c7aab9f40 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -18,6 +18,8 @@ #include #include #include + +#include #include /* diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 319116857d..9d9bb6e7cf 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index f6d677eb12..e990abc9d1 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 7e1fce291d..42386c6bde 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -33,6 +33,7 @@ void efi_rs_leave(struct efi_rs_state *state); #ifndef CONFIG_ARM # include +# include # include # include #endif diff --git a/xen/common/ubsan/ubsan.c b/xen/common/ubsan/ubsan.c index 20aa0cb598..15ae348164 100644 --- a/xen/common/ubsan/ubsan.c +++ b/xen/common/ubsan/ubsan.c @@ -16,6 +16,8 @@ #include #include +#include + #define __noreturn noreturn #define pr_err(...) printk(XENLOG_ERR __VA_ARGS__) struct xen_ubsan { int in_ubsan; }; diff --git a/xen/drivers/acpi/apei/apei-base.c b/xen/drivers/acpi/apei/apei-base.c index 4fe99573a2..1722698ba6 100644 --- a/xen/drivers/acpi/apei/apei-base.c +++ b/xen/drivers/acpi/apei/apei-base.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include diff --git a/xen/drivers/acpi/tables/tbfadt.c b/xen/drivers/acpi/tables/tbfadt.c index a03836e0dc..32678700bd 100644 --- a/xen/drivers/acpi/tables/tbfadt.c +++ b/xen/drivers/acpi/tables/tbfadt.c @@ -42,6 +42,8 @@ */ #include +#include + #include #include diff --git a/xen/drivers/acpi/utilities/utmisc.c b/xen/drivers/acpi/utilities/utmisc.c index ee22c83e38..b7756e4ebf 100644 --- a/xen/drivers/acpi/utilities/utmisc.c +++ b/xen/drivers/acpi/utilities/utmisc.c @@ -42,6 +42,9 @@ */ #include +#include +#include + #include #define _COMPONENT ACPI_UTILITIES diff --git a/xen/lib/x86/private.h b/xen/lib/x86/private.h index 60bb82a400..aedd8e4821 100644 --- a/xen/lib/x86/private.h +++ b/xen/lib/x86/private.h @@ -10,7 +10,7 @@ #include #include -#include +#include #define copy_to_buffer_offset copy_to_guest_offset #define copy_from_buffer_offset copy_from_guest_offset -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:56:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087043.1445211 (Exim 4.92) (envelope-from ) id 1uoSRA-00014o-53; Tue, 19 Aug 2025 19:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087043.1445211; Tue, 19 Aug 2025 19:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSRA-00014h-2S; Tue, 19 Aug 2025 19:56:04 +0000 Received: by outflank-mailman (input) for mailman id 1087043; Tue, 19 Aug 2025 19:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSR9-00014E-0L for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSR8-00DWod-2T for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSR8-009MLR-34 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZOk4hrKQzyRKctWmT4doL3c88xrBifD5yNARGO/FlOU=; b=UmGt3rasE8VAUhvPkUvQRzXf1k jlP0HE751d/9tucXhqSSB3MPe/Nyf84qV3s6r0VIc7WIVEX+Eq4pWe27BGY34+vVMsdQtd/OmcR/r lvozOqy+88G0H+9VvRA9Qo3F427tOBwMKvwtsTC7qGpw2/YjEhWUD5wgGjAIeZEgxz/8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Clean up asm/msr.h Message-Id: Date: Tue, 19 Aug 2025 19:56:02 +0000 commit 5ea2d0952e560a9c41d556fd92e55a00590966c7 Author: Andrew Cooper AuthorDate: Fri Aug 15 16:19:11 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86: Clean up asm/msr.h Now that content has been split out, minimise the header files as msr.h is included by many translation units. A few more TUs were pulling dependencies in transitively, so fix them up. Give asm/time.h an SPDX tag, update it's guards, and drop the unused rdpmc(). If we do re-gain uses, the helper will want a proper API. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/acpi.c | 2 ++ xen/arch/x86/acpi/cpufreq/hwp.c | 4 ++++ xen/arch/x86/cpu/microcode/intel.c | 4 ++++ xen/arch/x86/include/asm/msr.h | 24 +++++++----------------- xen/arch/x86/tsx.c | 2 ++ 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c index 567c10dd06..b027459417 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -14,8 +14,10 @@ #include #include #include +#include #include +#include #include #include diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index f22b4674df..36ecb0ed9d 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -8,8 +8,12 @@ #include #include #include +#include #include + #include +#include + #include static bool __ro_after_init hwp_in_use; diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 3f8e9ca63b..281993e725 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -23,8 +23,12 @@ #include #include +#include +#include +#include #include +#include #include #include "private.h" diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index ad188d8639..f5df8698b7 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -1,18 +1,13 @@ -#ifndef __ASM_MSR_H -#define __ASM_MSR_H +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_MSR_H +#define X86_MSR_H -#include "msr-index.h" - -#include -#include #include -#include - -#include +#include +#include #include -#include -#include +#include #define rdmsr(msr,val1,val2) \ __asm__ __volatile__("rdmsr" \ @@ -87,11 +82,6 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) return -EFAULT; } -#define rdpmc(counter,low,high) \ - __asm__ __volatile__("rdpmc" \ - : "=a" (low), "=d" (high) \ - : "c" (counter)) - DECLARE_PER_CPU(uint64_t, efer); static inline uint64_t read_efer(void) { @@ -118,4 +108,4 @@ static inline void wrmsr_tsc_aux(uint32_t val) } } -#endif /* __ASM_MSR_H */ +#endif /* X86_MSR_H */ diff --git a/xen/arch/x86/tsx.c b/xen/arch/x86/tsx.c index fbdd05971c..2a0c7c08a2 100644 --- a/xen/arch/x86/tsx.c +++ b/xen/arch/x86/tsx.c @@ -1,7 +1,9 @@ #include #include + #include #include +#include /* * Valid values: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 19:56:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 19:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087044.1445215 (Exim 4.92) (envelope-from ) id 1uoSRK-00017q-7D; Tue, 19 Aug 2025 19:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087044.1445215; Tue, 19 Aug 2025 19:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSRK-00017i-3n; Tue, 19 Aug 2025 19:56:14 +0000 Received: by outflank-mailman (input) for mailman id 1087044; Tue, 19 Aug 2025 19:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoSRJ-00016m-34 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoSRI-00DWp2-2l for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoSRJ-009MLp-06 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 19:56:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PjI0EqBW3KGr0EAYzHZiD5KFKilnPEyuvvIdPe4PP6I=; b=J5wovIh2gvfd2d2Qxw93NFTgS6 6+L8uP8CdcJOkcdX7Rf3hMMIhp829jtam/DNnzELZpga/SsN5Zrxe5xXSojhjv3iKy9DtG7O408lP ExZn5/azihJ3KkYo/B+dm2MRR+uAtQTPOxnjVoJMTbUHMSfKFOgWCSonHouFGUsVP3+o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/svm: Rename variable in svm_msr_write_intercept() Message-Id: Date: Tue, 19 Aug 2025 19:56:13 +0000 commit 97f9db488a48d5f7c41681ac3bde7047dcfca899 Author: Andrew Cooper AuthorDate: Fri Aug 15 18:38:25 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/svm: Rename variable in svm_msr_write_intercept() We're about to turn the rdmsr() macro into a real function, at which point Eclair complains that we're now shadowing an identifer. Rename rdmsr to is_read. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 6aac83b5f9..7301846c2a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2087,14 +2087,14 @@ static int cf_check svm_msr_write_intercept( static void svm_do_msr_access(struct cpu_user_regs *regs) { struct vcpu *curr = current; - bool rdmsr = curr->arch.hvm.svm.vmcb->exitinfo1 == 0; - int rc, inst_len = svm_get_insn_len(curr, rdmsr ? INSTR_RDMSR - : INSTR_WRMSR); + bool is_read = curr->arch.hvm.svm.vmcb->exitinfo1 == 0; + int rc, inst_len = svm_get_insn_len(curr, is_read ? INSTR_RDMSR + : INSTR_WRMSR); if ( inst_len == 0 ) return; - if ( rdmsr ) + if ( is_read ) { uint64_t msr_content = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087063.1445229 (Exim 4.92) (envelope-from ) id 1uoT0x-0003Om-2P; Tue, 19 Aug 2025 20:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087063.1445229; Tue, 19 Aug 2025 20:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT0w-0003Oe-W2; Tue, 19 Aug 2025 20:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1087063; Tue, 19 Aug 2025 20:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT0w-0003OY-CF for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT0w-00DXYt-09 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT0w-009NzM-0i for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OzGtfLettGG0kALp0PFrzGO/p4TC/PEzCVjoM4wVpu8=; b=TrlWPLzvIjdHMNrGhOpWjiF6zi BolEf3gx/RsxFheyPbxwvjKYIHMOEBJ5JgJqXggRtVtpCjk0A/SDH1K0AUS6l2IjwA4Idc4MXe3il H4s4VrnZa2e3lG7nT9FFVPHq68BBMpXtfB+faQJn2SLZ41l9B6eNGJLD60ipuHJTvUPQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Sort headers Message-Id: Date: Tue, 19 Aug 2025 20:33:02 +0000 commit 90226b8b1adf45b9c2ec29e640fdadb8ce6ad0eb Author: Andrew Cooper AuthorDate: Fri Aug 15 15:10:01 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86: Sort headers No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/acpi.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 4 +- xen/arch/x86/domain.c | 6 +-- xen/arch/x86/domctl.c | 44 +++++++++++----------- xen/arch/x86/hvm/hvm.c | 76 +++++++++++++++++++------------------- xen/arch/x86/hvm/svm/svm.c | 6 +-- xen/arch/x86/hvm/svm/vmcb.c | 6 +-- xen/arch/x86/hvm/vmx/vmx.c | 54 ++++++++++++++------------- xen/arch/x86/hvm/vmx/vvmx.c | 6 +-- xen/arch/x86/include/asm/hvm/hvm.h | 2 +- xen/arch/x86/tboot.c | 15 ++++---- xen/arch/x86/xstate.c | 4 +- xen/drivers/acpi/apei/apei-base.c | 14 ++++--- 13 files changed, 124 insertions(+), 115 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c index 0c25376406..b81f2afc9b 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -11,8 +11,8 @@ * porting acpi-cpufreq.c from Linux 2.6.23 to Xen hypervisor */ -#include #include +#include #include #include diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index eba4b536c7..0f046862ac 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -7,11 +7,11 @@ #include #include -#include #include +#include -#include "x86_mca.h" #include "mctelem.h" +#include "x86_mca.h" #define MCE_QUIET 0 #define MCE_VERBOSE 1 diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 28c91cf023..4c7231230a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -24,11 +24,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -64,12 +66,10 @@ #include #include #include -#include -#include #include -#include #include +#include #ifdef CONFIG_COMPAT #include diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f07cae6a70..d7781b7dc5 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -4,39 +4,41 @@ * Copyright (c) 2002-2006, K A Fraser */ -#include -#include -#include -#include #include -#include -#include -#include +#include #include -#include #include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include -#include #include #include +#include +#include +#include +#include #include -#include /* for hvm_acpi_power_button */ -#include /* for arch_do_domctl */ +#include +#include + #include -#include -#include + +#include #include -#include -#include -#include -#include -#include static int update_domain_cpu_policy(struct domain *d, xen_domctl_cpu_policy_t *xdpc) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index cb8ecd050d..6d2b937b62 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -7,64 +7,66 @@ * Copyright (c) 2008, Citrix Systems, Inc. */ +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include + +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include -#include -#include -#include -#include #include +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include #include -#include +#include + +#include #include -#include #include +#include +#include #include -#include #include diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index fce750ca1f..62f455ad94 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -29,13 +28,14 @@ #include #include #include -#include #include +#include +#include #include #include +#include #include #include -#include #include #include diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 839d3ff91b..153aa34133 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -7,18 +7,18 @@ */ #include -#include #include +#include #include #include #include #include +#include +#include #include #include #include -#include -#include #include struct vmcb_struct *alloc_vmcb(void) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index cb82d52ef0..3e21f20278 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4,51 +4,53 @@ * Copyright (c) 2004, Intel Corporation. */ +#include #include +#include #include +#include #include #include -#include +#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include #include #include +#include +#include #include -#include -#include -#include -#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include #include +#include +#include +#include #include +#include #include #include +#include +#include + #include +#include +#include +#include static bool __initdata opt_force_ept; boolean_param("force-ept", opt_force_ept); diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2432af58e0..95d3c2ee7b 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,12 +10,12 @@ #include -#include -#include +#include #include #include #include -#include +#include +#include static DEFINE_PER_CPU(u64 *, vvmcs_buf); diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 18e40910ff..228f47dbde 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -14,8 +14,8 @@ #include #include -#include #include +#include struct pirq; /* needed by pi_update_irte */ diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index d5db60d335..319116857d 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -1,19 +1,20 @@ +#include +#include #include #include -#include +#include #include #include -#include -#include -#include -#include #include +#include +#include + +#include #include #include #include -#include -#include #include +#include #include #include diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index e8e218caed..f6d677eb12 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -10,12 +10,12 @@ #include #include +#include #include #include -#include #include +#include #include -#include /* * Maximum size (in byte) of the XSAVE/XRSTOR save area required by all diff --git a/xen/drivers/acpi/apei/apei-base.c b/xen/drivers/acpi/apei/apei-base.c index 053a92c307..4fe99573a2 100644 --- a/xen/drivers/acpi/apei/apei-base.c +++ b/xen/drivers/acpi/apei/apei-base.c @@ -30,15 +30,17 @@ * You should have received a copy of the GNU General Public License * along with this program; If not, see . */ -#include -#include + +#include #include -#include -#include -#include +#include #include -#include +#include +#include +#include + #include + #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087064.1445233 (Exim 4.92) (envelope-from ) id 1uoT17-0003Qn-41; Tue, 19 Aug 2025 20:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087064.1445233; Tue, 19 Aug 2025 20:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT17-0003Qf-1C; Tue, 19 Aug 2025 20:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1087064; Tue, 19 Aug 2025 20:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT16-0003QX-Dz for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT16-00DXZD-0a for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT16-009O0H-19 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qFwPCdi7lIH1pk9ktHaapISPmNJgftJ+dEMqjKUUdmM=; b=6hGgBa3LxnTIxjGRew1EVA1DSj 5qNX0MgFJy9AtukK8yASHd7roy7RfBaTAwEPgqfbhpz+xaa5Ctbd+iq6VBpqH/i/sQSEWBzvMGV+O ZYR83xhvcWNOeRMNOz8r8twJBny32my+YfxT4IkjKE841rFusKw/RzqFwNual5mwSuJM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Split out guest-msr.h Message-Id: Date: Tue, 19 Aug 2025 20:33:12 +0000 commit ef745a2d014d2969a89a430cf8b34fa696d0adc4 Author: Andrew Cooper AuthorDate: Fri Aug 15 15:06:10 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Split out guest-msr.h struct vcpu_msrs has a very different purpose to everything else in msr.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 1 + xen/arch/x86/cpuid.c | 1 + xen/arch/x86/debug.c | 1 + xen/arch/x86/domain.c | 1 + xen/arch/x86/domctl.c | 1 + xen/arch/x86/hvm/hvm.c | 1 + xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/arch/x86/hvm/vmx/vmx.c | 1 + xen/arch/x86/hvm/vmx/vvmx.c | 1 + xen/arch/x86/include/asm/guest-msr.h | 155 +++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/msr.h | 145 -------------------------------- xen/arch/x86/msr.c | 1 + xen/arch/x86/pv/emulate.h | 1 + xen/arch/x86/x86_64/asm-offsets.c | 1 + 15 files changed, 168 insertions(+), 145 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index da05015578..a66cd5f9c7 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 8dc68945f7..b63a82dd38 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 71755dea6f..11b0a7e547 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -9,6 +9,7 @@ #include #include +#include /* * Merge new bits into dr6. 'new' is always given in positive polarity, diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 4c7231230a..dbf2ff14f5 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d7781b7dc5..6153e3c07e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6d2b937b62..bd64faf207 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 62f455ad94..6aac83b5f9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 153aa34133..c57d314a24 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 3e21f20278..4934449577 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 95d3c2ee7b..6201665d9f 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,6 +10,7 @@ #include +#include #include #include #include diff --git a/xen/arch/x86/include/asm/guest-msr.h b/xen/arch/x86/include/asm/guest-msr.h new file mode 100644 index 0000000000..5f0cb0a939 --- /dev/null +++ b/xen/arch/x86/include/asm/guest-msr.h @@ -0,0 +1,155 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_GUEST_MSR_H +#define X86_GUEST_MSR_H + +#include + +/* Container object for per-vCPU MSRs */ +struct vcpu_msrs +{ + /* + * 0x00000048 - MSR_SPEC_CTRL + * 0xc001011f - MSR_VIRT_SPEC_CTRL (if X86_FEATURE_AMD_SSBD) + * + * For PV guests, this holds the guest kernel value. It is accessed on + * every entry/exit path. + * + * For VT-x guests, one of two situations exist: + * + * - If hardware supports virtualized MSR_SPEC_CTRL, it is active by + * default and the guest value lives in the VMCS. + * - Otherwise, the guest value is held in the MSR load/save list. + * + * For SVM, the guest value lives in the VMCB, and hardware saves/restores + * the host value automatically. However, guests run with the OR of the + * host and guest value, which allows Xen to set protections behind the + * guest's back. + * + * We must clear/restore Xen's value before/after VMRUN to avoid unduly + * influencing the guest. In order to support "behind the guest's back" + * protections, we load this value (commonly 0) before VMRUN. + * + * Once of such "behind the guest's back" usages is setting SPEC_CTRL.SSBD + * if the guest sets VIRT_SPEC_CTRL.SSBD. + */ + struct { + uint32_t raw; + } spec_ctrl; + + /* + * 0x00000140 - MSR_INTEL_MISC_FEATURES_ENABLES + * + * This MSR is non-architectural, but for simplicy we allow it to be read + * unconditionally. The CPUID Faulting bit is the only writeable bit, and + * only if enumerated by MSR_PLATFORM_INFO. + */ + union { + uint32_t raw; + struct { + bool cpuid_faulting:1; + }; + } misc_features_enables; + + /* + * 0x00000560 ... 57x - MSR_RTIT_* + * + * "Real Time Instruction Trace", now called Processor Trace. + * + * These MSRs are not exposed to guests. They are controlled by Xen + * behind the scenes, when vmtrace is enabled for the domain. + * + * MSR_RTIT_OUTPUT_BASE not stored here. It is fixed per vcpu, and + * derived from v->vmtrace.buf. + */ + struct { + /* + * Placed in the MSR load/save lists. Only modified by hypercall in + * the common case. + */ + uint64_t ctl; + + /* + * Updated by hardware in non-root mode. Synchronised here on vcpu + * context switch. + */ + uint64_t status; + union { + uint64_t output_mask; + struct { + uint32_t output_limit; + uint32_t output_offset; + }; + }; + } rtit; + + /* + * 0x000006e1 - MSR_PKRS - Protection Key Supervisor. + * + * Exposed R/W to guests. Xen doesn't use PKS yet, so only context + * switched per vcpu. When in current context, live value is in hardware, + * and this value is stale. + */ + uint32_t pkrs; + + /* 0x00000da0 - MSR_IA32_XSS */ + struct { + uint64_t raw; + } xss; + + /* + * 0xc0000103 - MSR_TSC_AUX + * + * Value is guest chosen, and always loaded in vcpu context. Guests have + * no direct MSR access, and the value is accessible to userspace with the + * RDTSCP and RDPID instructions. + */ + uint32_t tsc_aux; + + /* + * 0xc001011f - MSR_VIRT_SPEC_CTRL (if !X86_FEATURE_AMD_SSBD) + * + * AMD only, used on Zen1 and older hardware (pre-AMD_SSBD). Holds the + * the guests value. + * + * In the default case, Xen doesn't protect itself from SSB, and guests + * are expected to use VIRT_SPEC_CTRL.SSBD=1 sparingly. Xen therefore + * runs in the guest kernel's choice of SSBD. + * + * However, if the global enable `spec-ctrl=ssbd` is selected, hardware is + * always configured with SSBD=1 and the guest's setting is never loaded + * into hardware. + */ + struct { + uint32_t raw; + } virt_spec_ctrl; + + /* + * 0xc00110{27,19-1b} MSR_AMD64_DR{0-3}_ADDRESS_MASK + * + * Loaded into hardware for guests which have active %dr7 settings. + * Furthermore, HVM guests are offered direct access, meaning that the + * values here may be stale in current context. + */ + uint32_t dr_mask[4]; +}; + +struct vcpu; +struct cpu_policy; + +int init_vcpu_msr_policy(struct vcpu *v); + +/* + * Below functions can return X86EMUL_UNHANDLEABLE which means that MSR is + * not (yet) handled by it and must be processed by legacy handlers. Such + * behaviour is needed for transition period until all rd/wrmsr are handled + * by the new MSR infrastructure. + * + * These functions are also used by the migration logic, so need to cope with + * being used outside of v's context. + */ +int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val); +int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val); + +uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp); + +#endif /* X86_GUEST_MSR_H */ diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index e185db0967..06afdb460a 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -273,149 +273,4 @@ static inline void wrmsr_tsc_aux(uint32_t val) } } -uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp); - -/* Container object for per-vCPU MSRs */ -struct vcpu_msrs -{ - /* - * 0x00000048 - MSR_SPEC_CTRL - * 0xc001011f - MSR_VIRT_SPEC_CTRL (if X86_FEATURE_AMD_SSBD) - * - * For PV guests, this holds the guest kernel value. It is accessed on - * every entry/exit path. - * - * For VT-x guests, one of two situations exist: - * - * - If hardware supports virtualized MSR_SPEC_CTRL, it is active by - * default and the guest value lives in the VMCS. - * - Otherwise, the guest value is held in the MSR load/save list. - * - * For SVM, the guest value lives in the VMCB, and hardware saves/restores - * the host value automatically. However, guests run with the OR of the - * host and guest value, which allows Xen to set protections behind the - * guest's back. - * - * We must clear/restore Xen's value before/after VMRUN to avoid unduly - * influencing the guest. In order to support "behind the guest's back" - * protections, we load this value (commonly 0) before VMRUN. - * - * Once of such "behind the guest's back" usages is setting SPEC_CTRL.SSBD - * if the guest sets VIRT_SPEC_CTRL.SSBD. - */ - struct { - uint32_t raw; - } spec_ctrl; - - /* - * 0x00000140 - MSR_INTEL_MISC_FEATURES_ENABLES - * - * This MSR is non-architectural, but for simplicy we allow it to be read - * unconditionally. The CPUID Faulting bit is the only writeable bit, and - * only if enumerated by MSR_PLATFORM_INFO. - */ - union { - uint32_t raw; - struct { - bool cpuid_faulting:1; - }; - } misc_features_enables; - - /* - * 0x00000560 ... 57x - MSR_RTIT_* - * - * "Real Time Instruction Trace", now called Processor Trace. - * - * These MSRs are not exposed to guests. They are controlled by Xen - * behind the scenes, when vmtrace is enabled for the domain. - * - * MSR_RTIT_OUTPUT_BASE not stored here. It is fixed per vcpu, and - * derived from v->vmtrace.buf. - */ - struct { - /* - * Placed in the MSR load/save lists. Only modified by hypercall in - * the common case. - */ - uint64_t ctl; - - /* - * Updated by hardware in non-root mode. Synchronised here on vcpu - * context switch. - */ - uint64_t status; - union { - uint64_t output_mask; - struct { - uint32_t output_limit; - uint32_t output_offset; - }; - }; - } rtit; - - /* - * 0x000006e1 - MSR_PKRS - Protection Key Supervisor. - * - * Exposed R/W to guests. Xen doesn't use PKS yet, so only context - * switched per vcpu. When in current context, live value is in hardware, - * and this value is stale. - */ - uint32_t pkrs; - - /* 0x00000da0 - MSR_IA32_XSS */ - struct { - uint64_t raw; - } xss; - - /* - * 0xc0000103 - MSR_TSC_AUX - * - * Value is guest chosen, and always loaded in vcpu context. Guests have - * no direct MSR access, and the value is accessible to userspace with the - * RDTSCP and RDPID instructions. - */ - uint32_t tsc_aux; - - /* - * 0xc001011f - MSR_VIRT_SPEC_CTRL (if !X86_FEATURE_AMD_SSBD) - * - * AMD only, used on Zen1 and older hardware (pre-AMD_SSBD). Holds the - * the guests value. - * - * In the default case, Xen doesn't protect itself from SSB, and guests - * are expected to use VIRT_SPEC_CTRL.SSBD=1 sparingly. Xen therefore - * runs in the guest kernel's choice of SSBD. - * - * However, if the global enable `spec-ctrl=ssbd` is selected, hardware is - * always configured with SSBD=1 and the guest's setting is never loaded - * into hardware. - */ - struct { - uint32_t raw; - } virt_spec_ctrl; - - /* - * 0xc00110{27,19-1b} MSR_AMD64_DR{0-3}_ADDRESS_MASK - * - * Loaded into hardware for guests which have active %dr7 settings. - * Furthermore, HVM guests are offered direct access, meaning that the - * values here may be stale in current context. - */ - uint32_t dr_mask[4]; -}; - -int init_vcpu_msr_policy(struct vcpu *v); - -/* - * Below functions can return X86EMUL_UNHANDLEABLE which means that MSR is - * not (yet) handled by it and must be processed by legacy handlers. Such - * behaviour is needed for transition period until all rd/wrmsr are handled - * by the new MSR infrastructure. - * - * These functions are also used by the migration logic, so need to cope with - * being used outside of v's context. - */ -int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val); -int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val); - #endif /* __ASM_MSR_H */ diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 1bf117cbd8..c6465b41ee 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/emulate.h b/xen/arch/x86/pv/emulate.h index 49a4d34832..c74e45e50c 100644 --- a/xen/arch/x86/pv/emulate.h +++ b/xen/arch/x86/pv/emulate.h @@ -3,6 +3,7 @@ #include +#include #include #include diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 2258b4ce1b..9d45364026 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef CONFIG_VIDEO # include "../boot/video.h" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087065.1445237 (Exim 4.92) (envelope-from ) id 1uoT1H-0003Tb-7G; Tue, 19 Aug 2025 20:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087065.1445237; Tue, 19 Aug 2025 20:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1H-0003TP-4K; Tue, 19 Aug 2025 20:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1087065; Tue, 19 Aug 2025 20:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1G-0003TF-Gq for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT1G-00DXZH-0u for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT1G-009O0w-1U for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=k3b7JG9FV4nntxOcejc9CavchttXC6aR/sjfzcmuYOE=; b=cfxLw9lXNiNNUjg+gg/REKxrdZ ZIJEO3Pa20TnmV+WKzpeO0vBDQHQH/3cqyrYvI5BlJqljhHpGidP7O4bwiV824ydoDrPiin8c2xe8 gwRF/FvVWiTZpqrtPidVL2ShqZkOmyRQVfiOXTMnMEg+N9yfOy68oBCspMNbfMglaPNs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Split out fsgsbase.h Message-Id: Date: Tue, 19 Aug 2025 20:33:22 +0000 commit 9e544443716ead4cc09a09fe00ae74620ea2d54b Author: Andrew Cooper AuthorDate: Thu Aug 14 14:32:03 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Split out fsgsbase.h It is a large and complex API, but only a handful of translation units need access. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 1 + xen/arch/x86/hvm/vmx/vmx.c | 1 + xen/arch/x86/include/asm/fsgsbase.h | 114 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/msr.h | 105 --------------------------------- xen/arch/x86/pv/domain.c | 1 + xen/arch/x86/pv/emul-priv-op.c | 1 + xen/arch/x86/pv/misc-hypercalls.c | 1 + xen/arch/x86/traps.c | 1 + 8 files changed, 120 insertions(+), 105 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index dbf2ff14f5..cd56f5821a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 4934449577..5439f950dc 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/include/asm/fsgsbase.h b/xen/arch/x86/include/asm/fsgsbase.h new file mode 100644 index 0000000000..03e6a85d31 --- /dev/null +++ b/xen/arch/x86/include/asm/fsgsbase.h @@ -0,0 +1,114 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_FSGSBASE_H +#define X86_FSGSBASE_H + +#include +#include +#include + +/* + * On hardware supporting FSGSBASE, the value loaded into hardware is the + * guest kernel's choice for 64bit PV guests (Xen's choice for Idle, HVM and + * 32bit PV). + * + * Therefore, the {RD,WR}{FS,GS}BASE instructions are only safe to use if + * %cr4.fsgsbase is set. + */ +static inline unsigned long __rdfsbase(void) +{ + unsigned long base; + + asm volatile ( "rdfsbase %0" : "=r" (base) ); + + return base; +} + +static inline unsigned long __rdgsbase(void) +{ + unsigned long base; + + asm volatile ( "rdgsbase %0" : "=r" (base) ); + + return base; +} + +static inline void __wrfsbase(unsigned long base) +{ + asm volatile ( "wrfsbase %0" :: "r" (base) ); +} + +static inline void __wrgsbase(unsigned long base) +{ + asm volatile ( "wrgsbase %0" :: "r" (base) ); +} + +static inline unsigned long read_fs_base(void) +{ + unsigned long base; + + if ( read_cr4() & X86_CR4_FSGSBASE ) + return __rdfsbase(); + + rdmsrl(MSR_FS_BASE, base); + + return base; +} + +static inline unsigned long read_gs_base(void) +{ + unsigned long base; + + if ( read_cr4() & X86_CR4_FSGSBASE ) + return __rdgsbase(); + + rdmsrl(MSR_GS_BASE, base); + + return base; +} + +static inline unsigned long read_gs_shadow(void) +{ + unsigned long base; + + if ( read_cr4() & X86_CR4_FSGSBASE ) + { + asm volatile ( "swapgs" ); + base = __rdgsbase(); + asm volatile ( "swapgs" ); + } + else + rdmsrl(MSR_SHADOW_GS_BASE, base); + + return base; +} + +static inline void write_fs_base(unsigned long base) +{ + if ( read_cr4() & X86_CR4_FSGSBASE ) + __wrfsbase(base); + else + wrmsrl(MSR_FS_BASE, base); +} + +static inline void write_gs_base(unsigned long base) +{ + if ( read_cr4() & X86_CR4_FSGSBASE ) + __wrgsbase(base); + else + wrmsrl(MSR_GS_BASE, base); +} + +static inline void write_gs_shadow(unsigned long base) +{ + if ( read_cr4() & X86_CR4_FSGSBASE ) + { + asm volatile ( "swapgs\n\t" + "wrgsbase %0\n\t" + "swapgs" + :: "r" (base) ); + } + else + wrmsrl(MSR_SHADOW_GS_BASE, base); +} + +#endif /* X86_FSGSBASE_H */ diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 06afdb460a..9d1cb4e6ee 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -142,111 +142,6 @@ static inline uint64_t rdtsc_ordered(void) : "=a" (low), "=d" (high) \ : "c" (counter)) -/* - * On hardware supporting FSGSBASE, the value loaded into hardware is the - * guest kernel's choice for 64bit PV guests (Xen's choice for Idle, HVM and - * 32bit PV). - * - * Therefore, the {RD,WR}{FS,GS}BASE instructions are only safe to use if - * %cr4.fsgsbase is set. - */ -static inline unsigned long __rdfsbase(void) -{ - unsigned long base; - - asm volatile ( "rdfsbase %0" : "=r" (base) ); - - return base; -} - -static inline unsigned long __rdgsbase(void) -{ - unsigned long base; - - asm volatile ( "rdgsbase %0" : "=r" (base) ); - - return base; -} - -static inline void __wrfsbase(unsigned long base) -{ - asm volatile ( "wrfsbase %0" :: "r" (base) ); -} - -static inline void __wrgsbase(unsigned long base) -{ - asm volatile ( "wrgsbase %0" :: "r" (base) ); -} - -static inline unsigned long read_fs_base(void) -{ - unsigned long base; - - if ( read_cr4() & X86_CR4_FSGSBASE ) - return __rdfsbase(); - - rdmsrl(MSR_FS_BASE, base); - - return base; -} - -static inline unsigned long read_gs_base(void) -{ - unsigned long base; - - if ( read_cr4() & X86_CR4_FSGSBASE ) - return __rdgsbase(); - - rdmsrl(MSR_GS_BASE, base); - - return base; -} - -static inline unsigned long read_gs_shadow(void) -{ - unsigned long base; - - if ( read_cr4() & X86_CR4_FSGSBASE ) - { - asm volatile ( "swapgs" ); - base = __rdgsbase(); - asm volatile ( "swapgs" ); - } - else - rdmsrl(MSR_SHADOW_GS_BASE, base); - - return base; -} - -static inline void write_fs_base(unsigned long base) -{ - if ( read_cr4() & X86_CR4_FSGSBASE ) - __wrfsbase(base); - else - wrmsrl(MSR_FS_BASE, base); -} - -static inline void write_gs_base(unsigned long base) -{ - if ( read_cr4() & X86_CR4_FSGSBASE ) - __wrgsbase(base); - else - wrmsrl(MSR_GS_BASE, base); -} - -static inline void write_gs_shadow(unsigned long base) -{ - if ( read_cr4() & X86_CR4_FSGSBASE ) - { - asm volatile ( "swapgs\n\t" - "wrgsbase %0\n\t" - "swapgs" - :: "r" (base) ); - } - else - wrmsrl(MSR_SHADOW_GS_BASE, base); -} - DECLARE_PER_CPU(uint64_t, efer); static inline uint64_t read_efer(void) { diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 9334da1dab..9c4785c187 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index f3f012f8fb..9f8600f43a 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index 17030d800d..7a37f16bf0 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -10,6 +10,7 @@ #include #include +#include long do_set_debugreg(int reg, unsigned long value) { diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 270b93ed62..0c5393cb21 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087066.1445241 (Exim 4.92) (envelope-from ) id 1uoT1R-0003Vp-8U; Tue, 19 Aug 2025 20:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087066.1445241; Tue, 19 Aug 2025 20:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1R-0003Vi-5q; Tue, 19 Aug 2025 20:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1087066; Tue, 19 Aug 2025 20:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1Q-0003Va-KG for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT1Q-00DXZL-1F for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT1Q-009O2T-1l for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X0Necg6T3jXcBfpKcS4gq1VBLdPb9hJgNkTQWLiEs4Q=; b=B25w+p6MrZdt3gQUycZAc0eeB8 NmZFce5Ml4/pAt0BBO+ZyTzGcWyu+0iPmcoCqY2hh5eWsaSmbriYYyjvhp8RGZQc577P5wm+NcFUx zJS5k09AWGdahMcqjJkPEwpcDGKC5Y2r0UGiVQ9YhF976WBn9FdwaWTmFwV5rOEfAjRI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Split out tsc.h Message-Id: Date: Tue, 19 Aug 2025 20:33:32 +0000 commit 2b3d1c8a30d0df73665c16470ee1365c6d73589c Author: Andrew Cooper AuthorDate: Fri Aug 15 13:33:01 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Split out tsc.h The TSC functionality is only related to MSRs by write_tsc(), and this really does not want to be available as widely as is currently is. asm/time.h shouldn't be including asm/msr.h, but this turns out to be sufficiently tangled that I've chosen to break it out into it's own patch. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 39 -------------------------------- xen/arch/x86/include/asm/time.h | 1 + xen/arch/x86/include/asm/tsc.h | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 9d1cb4e6ee..39f0bdbe7f 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -98,45 +98,6 @@ static inline void msr_split(struct cpu_user_regs *regs, uint64_t val) regs->rax = (uint32_t)val; } -static inline uint64_t rdtsc(void) -{ - uint64_t low, high; - - __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)); - - return (high << 32) | low; -} - -static inline uint64_t rdtsc_ordered(void) -{ - uint64_t low, high, aux; - - /* - * The RDTSC instruction is not serializing. Make it dispatch serializing - * for the purposes here by issuing LFENCE (or MFENCE if necessary) ahead - * of it. - * - * RDTSCP, otoh, "does wait until all previous instructions have executed - * and all previous loads are globally visible" (SDM) / "forces all older - * instructions to retire before reading the timestamp counter" (APM). - */ - alternative_io_2("lfence; rdtsc", - "mfence; rdtsc", X86_FEATURE_MFENCE_RDTSC, - "rdtscp", X86_FEATURE_RDTSCP, - ASM_OUTPUT2("=a" (low), "=d" (high), "=c" (aux)), - /* no inputs */); - - return (high << 32) | low; -} - -#define __write_tsc(val) wrmsrl(MSR_IA32_TSC, val) -#define write_tsc(val) ({ \ - /* Reliable TSCs are in lockstep across all CPUs. We should \ - * never write to them. */ \ - ASSERT(!boot_cpu_has(X86_FEATURE_TSC_RELIABLE)); \ - __write_tsc(val); \ -}) - #define rdpmc(counter,low,high) \ __asm__ __volatile__("rdpmc" \ : "=a" (low), "=d" (high) \ diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 3dfbb5297a..c55b698314 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -3,6 +3,7 @@ #define __X86_TIME_H__ #include +#include typedef u64 cycles_t; diff --git a/xen/arch/x86/include/asm/tsc.h b/xen/arch/x86/include/asm/tsc.h new file mode 100644 index 0000000000..12557a7ee0 --- /dev/null +++ b/xen/arch/x86/include/asm/tsc.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_TSC_H +#define X86_TSC_H + +#include + +static inline uint64_t rdtsc(void) +{ + uint64_t low, high; + + asm volatile ( "rdtsc" : "=a" (low), "=d" (high) ); + + return (high << 32) | low; +} + +static inline uint64_t rdtsc_ordered(void) +{ + uint64_t low, high, aux; + + /* + * The RDTSC instruction is not serializing. Make it dispatch serializing + * for the purposes here by issuing LFENCE (or MFENCE if necessary) ahead + * of it. + * + * RDTSCP, otoh, "does wait until all previous instructions have executed + * and all previous loads are globally visible" (SDM) / "forces all older + * instructions to retire before reading the timestamp counter" (APM). + */ + alternative_io_2("lfence; rdtsc", + "mfence; rdtsc", X86_FEATURE_MFENCE_RDTSC, + "rdtscp", X86_FEATURE_RDTSCP, + ASM_OUTPUT2("=a" (low), "=d" (high), "=c" (aux)), + /* no inputs */); + + return (high << 32) | low; +} + +#define __write_tsc(val) wrmsrl(MSR_IA32_TSC, val) + +/* + * Reliable TSCs are in lockstep across all CPUs. We should never write to + * them. + */ +#define write_tsc(val) ({ \ + ASSERT(!boot_cpu_has(X86_FEATURE_TSC_RELIABLE)); \ + __write_tsc(val); \ +}) + +#endif /* X86_TSC_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087067.1445245 (Exim 4.92) (envelope-from ) id 1uoT1c-0003Y7-A5; Tue, 19 Aug 2025 20:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087067.1445245; Tue, 19 Aug 2025 20:33:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1c-0003Xz-7M; Tue, 19 Aug 2025 20:33:44 +0000 Received: by outflank-mailman (input) for mailman id 1087067; Tue, 19 Aug 2025 20:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1a-0003Xm-Mx for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT1a-00DXZR-1W for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT1a-009O3C-26 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GqGCSHY1FEAumjdNAkjAc4WrQBR57nkmQ2HNG9N48PM=; b=1IZlz51l5Dao8s9lp/OTBqL2bR 8hAepsI2FF1DkbwsP59AKuX7jgoD9LTCAZnR4+sB3CWSHbde7MOR/yPftQpQT7UBxwhmEA53Vgkpi MGRzKBIfeoDUCZ28jgp91M/6/DuvOlDBSbu1jHRyvLVFKAK2Lwa9d1CjFETYVKwxrrow=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Move msr_{split,fold}() into asm/cpu-user-regs.h Message-Id: Date: Tue, 19 Aug 2025 20:33:42 +0000 commit f1e4325f598a80f187dae32c5a5a082a67c97790 Author: Andrew Cooper AuthorDate: Fri Aug 15 16:19:45 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/msr: Move msr_{split,fold}() into asm/cpu-user-regs.h Now there is a local header, asm/cpu-user-regs.h is a far better place for these to live. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/cpu-user-regs.h | 11 +++++++++++ xen/arch/x86/include/asm/msr.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h index d700a3ef34..5b283a2f6d 100644 --- a/xen/arch/x86/include/asm/cpu-user-regs.h +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -55,4 +55,15 @@ struct cpu_user_regs */ }; +static inline uint64_t msr_fold(const struct cpu_user_regs *regs) +{ + return (regs->rdx << 32) | regs->eax; +} + +static inline void msr_split(struct cpu_user_regs *regs, uint64_t val) +{ + regs->rdx = val >> 32; + regs->rax = (uint32_t)val; +} + #endif /* X86_CPU_USER_REGS_H */ diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 39f0bdbe7f..ad188d8639 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -87,17 +87,6 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) return -EFAULT; } -static inline uint64_t msr_fold(const struct cpu_user_regs *regs) -{ - return (regs->rdx << 32) | regs->eax; -} - -static inline void msr_split(struct cpu_user_regs *regs, uint64_t val) -{ - regs->rdx = val >> 32; - regs->rax = (uint32_t)val; -} - #define rdpmc(counter,low,high) \ __asm__ __volatile__("rdpmc" \ : "=a" (low), "=d" (high) \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:33:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087068.1445249 (Exim 4.92) (envelope-from ) id 1uoT1m-0003aA-BV; Tue, 19 Aug 2025 20:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087068.1445249; Tue, 19 Aug 2025 20:33:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1m-0003a2-8p; Tue, 19 Aug 2025 20:33:54 +0000 Received: by outflank-mailman (input) for mailman id 1087068; Tue, 19 Aug 2025 20:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1k-0003Zt-Qh for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT1k-00DXZX-1u for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT1k-009O3i-2R for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zd/d0WWehPRF4nNXJ6jRgyZka1GDsh9jXQd5bqIVC1A=; b=arP3lAECN/QrggDHYvpOKwZEf+ 4QyaLMiJKsqMRHa5oxRPKMwzz/m7w0f80N5a0SrYfXE9Upx6LdJ17T7zGyHNhqS1pHl0PdT5k5PXq sRH+sx2aRRNCLVucpdbqCiGWhul5kNQoGBy+cdnsI5VMvNvGVAJkh/B/NNs9KPXGKx6I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Clean up asm/time.h Message-Id: Date: Tue, 19 Aug 2025 20:33:52 +0000 commit 1373eca8370b5abc7548e50fb3769fff52c08400 Author: Andrew Cooper AuthorDate: Fri Aug 15 15:41:07 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86: Clean up asm/time.h With asm/tsc.h split out, asm/time.h shouldn't be including asm/msr.h, but it turns out that an outrageous number of files (even some headers) are pulling their dependentices transitively through asm/time.h -> asm/msr.h Most are asm/msr{,-index}.h, but in some cases it's printk(), va_args, and even PRIxxx macros. Give asm/time.h an SPDX tag, update it's guards, and strip trailing whitespace. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/acpi.c | 3 ++- xen/arch/x86/acpi/cpufreq/cpufreq.c | 3 +++ xen/arch/x86/cpu/mcheck/mce.h | 1 + xen/arch/x86/debug.c | 1 + xen/arch/x86/guest/hyperv/hyperv.c | 1 + xen/arch/x86/hvm/ioreq.c | 1 + xen/arch/x86/hvm/vmx/vvmx.c | 1 + xen/arch/x86/include/asm/hvm/hvm.h | 1 + xen/arch/x86/include/asm/time.h | 11 +++++------ xen/arch/x86/machine_kexec.c | 1 + xen/arch/x86/psr.c | 2 ++ xen/arch/x86/tboot.c | 1 + xen/arch/x86/xstate.c | 1 + xen/common/efi/runtime.c | 1 + xen/common/ubsan/ubsan.c | 2 ++ xen/drivers/acpi/apei/apei-base.c | 1 + xen/drivers/acpi/tables/tbfadt.c | 2 ++ xen/drivers/acpi/utilities/utmisc.c | 3 +++ xen/lib/x86/private.h | 2 +- 19 files changed, 31 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c index b81f2afc9b..567c10dd06 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -14,7 +14,8 @@ #include #include #include -#include + +#include #include #include diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 45f301f354..d18735c7ae 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -30,6 +30,9 @@ #include #include #include + +#include + #include struct acpi_cpufreq_data *cpufreq_drv_data[NR_CPUS]; diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 0f046862ac..920b075355 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -8,6 +8,7 @@ #include #include +#include #include #include "mctelem.h" diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 11b0a7e547..037f97d6f1 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -10,6 +10,7 @@ #include #include #include +#include /* * Merge new bits into dr6. 'new' is always given in positive polarity, diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 6989af38f1..90757e0793 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "private.h" diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index 4d30f2d730..199cee5b33 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 6201665d9f..e4f3a5fe4c 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 228f47dbde..5c5a790f9e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -15,6 +15,7 @@ #include #include #include +#include #include struct pirq; /* needed by pi_update_irte */ diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index c55b698314..c35d25abd6 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_TIME_H +#define X86_TIME_H -#ifndef __X86_TIME_H__ -#define __X86_TIME_H__ - -#include #include typedef u64 cycles_t; @@ -38,6 +37,7 @@ uint64_t cf_check acpi_pm_tick_to_ns(uint64_t ticks); uint64_t tsc_ticks2ns(uint64_t ticks); +struct cpu_user_regs; uint64_t pv_soft_rdtsc(const struct vcpu *v, const struct cpu_user_regs *regs); uint64_t gtime_to_gtsc(const struct domain *d, uint64_t time); uint64_t gtsc_to_gtime(const struct domain *d, uint64_t tsc); @@ -47,7 +47,6 @@ int tsc_set_info(struct domain *d, uint32_t tsc_mode, uint64_t elapsed_nsec, void tsc_get_info(struct domain *d, uint32_t *tsc_mode, uint64_t *elapsed_nsec, uint32_t *gtsc_khz, uint32_t *incarnation); - void force_update_vcpu_system_time(struct vcpu *v); @@ -93,4 +92,4 @@ u64 scale_delta(u64 delta, const struct time_scale *scale); #define PIT_STATUS_NULL_COUNT (1 << 6) /* Lower bits match Timer Control Word. */ -#endif /* __X86_TIME_H__ */ +#endif /* X86_TIME_H */ diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c index 35fa5c82e9..f921eec5aa 100644 --- a/xen/arch/x86/machine_kexec.c +++ b/xen/arch/x86/machine_kexec.c @@ -24,6 +24,7 @@ #include #include #include +#include #include /* diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 499d320e61..9c7aab9f40 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -18,6 +18,8 @@ #include #include #include + +#include #include /* diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 319116857d..9d9bb6e7cf 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index f6d677eb12..e990abc9d1 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 7e1fce291d..42386c6bde 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -33,6 +33,7 @@ void efi_rs_leave(struct efi_rs_state *state); #ifndef CONFIG_ARM # include +# include # include # include #endif diff --git a/xen/common/ubsan/ubsan.c b/xen/common/ubsan/ubsan.c index 20aa0cb598..15ae348164 100644 --- a/xen/common/ubsan/ubsan.c +++ b/xen/common/ubsan/ubsan.c @@ -16,6 +16,8 @@ #include #include +#include + #define __noreturn noreturn #define pr_err(...) printk(XENLOG_ERR __VA_ARGS__) struct xen_ubsan { int in_ubsan; }; diff --git a/xen/drivers/acpi/apei/apei-base.c b/xen/drivers/acpi/apei/apei-base.c index 4fe99573a2..1722698ba6 100644 --- a/xen/drivers/acpi/apei/apei-base.c +++ b/xen/drivers/acpi/apei/apei-base.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include diff --git a/xen/drivers/acpi/tables/tbfadt.c b/xen/drivers/acpi/tables/tbfadt.c index a03836e0dc..32678700bd 100644 --- a/xen/drivers/acpi/tables/tbfadt.c +++ b/xen/drivers/acpi/tables/tbfadt.c @@ -42,6 +42,8 @@ */ #include +#include + #include #include diff --git a/xen/drivers/acpi/utilities/utmisc.c b/xen/drivers/acpi/utilities/utmisc.c index ee22c83e38..b7756e4ebf 100644 --- a/xen/drivers/acpi/utilities/utmisc.c +++ b/xen/drivers/acpi/utilities/utmisc.c @@ -42,6 +42,9 @@ */ #include +#include +#include + #include #define _COMPONENT ACPI_UTILITIES diff --git a/xen/lib/x86/private.h b/xen/lib/x86/private.h index 60bb82a400..aedd8e4821 100644 --- a/xen/lib/x86/private.h +++ b/xen/lib/x86/private.h @@ -10,7 +10,7 @@ #include #include -#include +#include #define copy_to_buffer_offset copy_to_guest_offset #define copy_from_buffer_offset copy_from_guest_offset -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:34:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:34:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087069.1445254 (Exim 4.92) (envelope-from ) id 1uoT1w-0003d5-Fc; Tue, 19 Aug 2025 20:34:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087069.1445254; Tue, 19 Aug 2025 20:34:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1w-0003cx-BV; Tue, 19 Aug 2025 20:34:04 +0000 Received: by outflank-mailman (input) for mailman id 1087069; Tue, 19 Aug 2025 20:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT1u-0003cW-UI for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT1u-00DXcA-2D for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT1u-009O4u-2m for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:34:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=v+60d1ISNwa2IK6OqiF2IkqdAnvqG+Rc2AKgaJLytog=; b=6RClp6WyfxLwQaDikAIqxmAevK XHTOf+7CkKiYTikT+Uo5/v2dcS7K/HPAGFItTlIEMfC+r4BrjS09NQeCU+0Axdfg6bGZZQw15BWow EuFulqregIhL110xU1BgAgovr+dxZeWdZcgrCPDpZCNNTrJynwMT1df+TUNznBdlLFvU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Clean up asm/msr.h Message-Id: Date: Tue, 19 Aug 2025 20:34:02 +0000 commit 5ea2d0952e560a9c41d556fd92e55a00590966c7 Author: Andrew Cooper AuthorDate: Fri Aug 15 16:19:11 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86: Clean up asm/msr.h Now that content has been split out, minimise the header files as msr.h is included by many translation units. A few more TUs were pulling dependencies in transitively, so fix them up. Give asm/time.h an SPDX tag, update it's guards, and drop the unused rdpmc(). If we do re-gain uses, the helper will want a proper API. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/acpi.c | 2 ++ xen/arch/x86/acpi/cpufreq/hwp.c | 4 ++++ xen/arch/x86/cpu/microcode/intel.c | 4 ++++ xen/arch/x86/include/asm/msr.h | 24 +++++++----------------- xen/arch/x86/tsx.c | 2 ++ 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/acpi.c index 567c10dd06..b027459417 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -14,8 +14,10 @@ #include #include #include +#include #include +#include #include #include diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index f22b4674df..36ecb0ed9d 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -8,8 +8,12 @@ #include #include #include +#include #include + #include +#include + #include static bool __ro_after_init hwp_in_use; diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 3f8e9ca63b..281993e725 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -23,8 +23,12 @@ #include #include +#include +#include +#include #include +#include #include #include "private.h" diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index ad188d8639..f5df8698b7 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -1,18 +1,13 @@ -#ifndef __ASM_MSR_H -#define __ASM_MSR_H +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef X86_MSR_H +#define X86_MSR_H -#include "msr-index.h" - -#include -#include #include -#include - -#include +#include +#include #include -#include -#include +#include #define rdmsr(msr,val1,val2) \ __asm__ __volatile__("rdmsr" \ @@ -87,11 +82,6 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) return -EFAULT; } -#define rdpmc(counter,low,high) \ - __asm__ __volatile__("rdpmc" \ - : "=a" (low), "=d" (high) \ - : "c" (counter)) - DECLARE_PER_CPU(uint64_t, efer); static inline uint64_t read_efer(void) { @@ -118,4 +108,4 @@ static inline void wrmsr_tsc_aux(uint32_t val) } } -#endif /* __ASM_MSR_H */ +#endif /* X86_MSR_H */ diff --git a/xen/arch/x86/tsx.c b/xen/arch/x86/tsx.c index fbdd05971c..2a0c7c08a2 100644 --- a/xen/arch/x86/tsx.c +++ b/xen/arch/x86/tsx.c @@ -1,7 +1,9 @@ #include #include + #include #include +#include /* * Valid values: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 19 20:34:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Aug 2025 20:34:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087070.1445256 (Exim 4.92) (envelope-from ) id 1uoT26-0003fG-Fn; Tue, 19 Aug 2025 20:34:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087070.1445256; Tue, 19 Aug 2025 20:34:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT26-0003f6-D1; Tue, 19 Aug 2025 20:34:14 +0000 Received: by outflank-mailman (input) for mailman id 1087070; Tue, 19 Aug 2025 20:34:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uoT25-0003ew-0J for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:34:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uoT24-00DXcX-2U for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uoT24-009O7i-34 for xen-changelog@lists.xenproject.org; Tue, 19 Aug 2025 20:34:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EeyTOYAbxpRNVe1GN6XZWY/QSBXZfTomMxmBG6qaayo=; b=nJPmi9v5I+ziSLFPiBpEuisCWC 4LpcTdUT4ftmzLfHKrtBwcOnj/eFtaxOAfw/KVzFFkrWY7VPvaBO14zyeX8U3WtzROgv+hWZt+Rm8 I+Zs+N6sq9lW6EdWSYNFtIMdH8AeiqAWnI4G8p1knz4Q/C7YQrXDAUiAfzFLfyr0XNVI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/svm: Rename variable in svm_msr_write_intercept() Message-Id: Date: Tue, 19 Aug 2025 20:34:12 +0000 commit 97f9db488a48d5f7c41681ac3bde7047dcfca899 Author: Andrew Cooper AuthorDate: Fri Aug 15 18:38:25 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Aug 19 19:52:48 2025 +0100 x86/svm: Rename variable in svm_msr_write_intercept() We're about to turn the rdmsr() macro into a real function, at which point Eclair complains that we're now shadowing an identifer. Rename rdmsr to is_read. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 6aac83b5f9..7301846c2a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2087,14 +2087,14 @@ static int cf_check svm_msr_write_intercept( static void svm_do_msr_access(struct cpu_user_regs *regs) { struct vcpu *curr = current; - bool rdmsr = curr->arch.hvm.svm.vmcb->exitinfo1 == 0; - int rc, inst_len = svm_get_insn_len(curr, rdmsr ? INSTR_RDMSR - : INSTR_WRMSR); + bool is_read = curr->arch.hvm.svm.vmcb->exitinfo1 == 0; + int rc, inst_len = svm_get_insn_len(curr, is_read ? INSTR_RDMSR + : INSTR_WRMSR); if ( inst_len == 0 ) return; - if ( rdmsr ) + if ( is_read ) { uint64_t msr_content = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 01:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 01:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087738.1445609 (Exim 4.92) (envelope-from ) id 1uou0B-0004BJ-A0; Thu, 21 Aug 2025 01:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087738.1445609; Thu, 21 Aug 2025 01:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uou0B-0004BA-7D; Thu, 21 Aug 2025 01:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1087738; Thu, 21 Aug 2025 01:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uou0A-0004B4-E4 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uou09-00GULC-3A for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uou0A-00AqTe-0H for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Bno+I0ge7c9eNRL5QEt+dcLhurMZGWL4WvHJxrA7SJk=; b=wNk6aBizyBR7sn+s6ekBz4SJf9 cNTDq61onBsMjwIb9s3t399laQfrOGUJ50iQPk+gX7rN3N1ZxF+xA5L3SsVKGLMBj8JK8e2o4Zgor ONUOjO9l/aiCXoAqm4xPx81MFEabb3ouDWUW9bHNAChMvJOGUc1LGdoY6jhz074SALxc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/pci: allow designware-based hosts to have private data Message-Id: Date: Thu, 21 Aug 2025 01:22:02 +0000 commit 3ac97971f71c57e4029ae7425071af135d53870e Author: Mykyta Poturai AuthorDate: Mon Jul 14 08:51:48 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Aug 20 18:11:08 2025 -0700 arm/pci: allow designware-based hosts to have private data Introduce an additional private data field in `dw_pcie_priv` to allow vendors to store custom data without interfering with bridge->priv. Also add get/set pair to make accesing that private data less cumbersome. Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- xen/arch/arm/pci/pci-designware.c | 12 ++++++++++++ xen/arch/arm/pci/pci-designware.h | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/xen/arch/arm/pci/pci-designware.c b/xen/arch/arm/pci/pci-designware.c index 47dd2dd4c0..0bd67524ac 100644 --- a/xen/arch/arm/pci/pci-designware.c +++ b/xen/arch/arm/pci/pci-designware.c @@ -403,3 +403,15 @@ dw_pcie_host_probe(struct dt_device_node *dev, const void *data, return bridge; } + +void *dw_pcie_get_priv(struct pci_host_bridge *bridge) +{ + struct dw_pcie_priv *priv = bridge->priv; + return priv->priv; +} + +void dw_pcie_set_priv(struct pci_host_bridge *bridge, void *other) +{ + struct dw_pcie_priv *priv = bridge->priv; + priv->priv = other; +} diff --git a/xen/arch/arm/pci/pci-designware.h b/xen/arch/arm/pci/pci-designware.h index 7efb1dc9a2..b9deb3b138 100644 --- a/xen/arch/arm/pci/pci-designware.h +++ b/xen/arch/arm/pci/pci-designware.h @@ -66,8 +66,12 @@ struct dw_pcie_priv { bool iatu_unroll_enabled; void __iomem *atu_base; unsigned int version; + void *priv; }; +void *dw_pcie_get_priv(struct pci_host_bridge *bridge); +void dw_pcie_set_priv(struct pci_host_bridge *bridge, void *other); + void dw_pcie_set_version(struct pci_host_bridge *bridge, unsigned int version); void __iomem *dw_pcie_child_map_bus(struct pci_host_bridge *bridge, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 01:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 01:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087739.1445613 (Exim 4.92) (envelope-from ) id 1uou0L-0004Cx-BJ; Thu, 21 Aug 2025 01:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087739.1445613; Thu, 21 Aug 2025 01:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uou0L-0004Cq-8g; Thu, 21 Aug 2025 01:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1087739; Thu, 21 Aug 2025 01:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uou0K-0004Cg-CH for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uou0K-00GULI-0F for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uou0K-00AqVS-0n for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CaE22Su7d60kDCyX9vSn3gcrH0qxAlhHIIFXuPeAy0o=; b=ruGd3hyIkjIscNnSMKurd2cC3Y sfGgB9tF90/gDT+FSAL8eeJ6r62uFYj6b4MfZq+r1LJdJSEvpC3CtZfhImZng/gSorB9qx7+pqLu9 Y6nLvtA3cDcSITL8g7EWCHUgCNXw4J218G9nJq8/OmIbnzYCvnekXDsCSS4o0fTvZ24w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] pci/rcar: implement OSID configuration for Renesas RCar Gen4 PCIe host Message-Id: Date: Thu, 21 Aug 2025 01:22:12 +0000 commit 114c01ebf38e423bc92e709a25c25fae1e94b7a4 Author: Mykyta Poturai AuthorDate: Mon Jul 14 08:51:48 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Aug 20 18:11:12 2025 -0700 pci/rcar: implement OSID configuration for Renesas RCar Gen4 PCIe host For IPMMU to be able to associate a specific PCI device with it's TLB the BDF to OSID mapping needs to be set up in the host bridge. The configured OSID is then emmited as a sideband data on the AXI bus during PCI DMA transactions. OSID configuration registers are located in the "app" region of the host bridge. Map the "app" region on init and implement methods for setting up BDF->OSID mappings Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- xen/arch/arm/pci/pci-host-rcar4.c | 148 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-rcar4.h | 18 +++++ 2 files changed, 166 insertions(+) diff --git a/xen/arch/arm/pci/pci-host-rcar4.c b/xen/arch/arm/pci/pci-host-rcar4.c index 62d2130a63..9290c6cac5 100644 --- a/xen/arch/arm/pci/pci-host-rcar4.c +++ b/xen/arch/arm/pci/pci-host-rcar4.c @@ -16,6 +16,32 @@ #define RCAR4_DWC_VERSION 0x520A +/* PCIE BDF-OSID assignment */ +#define CNVID(n) (0x700 + ((n) * 4)) +#define CNVID_CNV_EN (1U << 31) +#define CNVID_OSID_MASK (0x0F << 16) +#define CNVID_OSID_SHIFT 16 +#define CNVID_BDF_MASK (0xFFFF << 0) +#define CNVID_BDF_SHIFT 0 + +#define CNVIDMSK(n) (0x780 + ((n) * 4)) +#define CNVIDMSK_BDF_MSK_MASK (0xFFFF << 0) +#define CNVIDMSK_BDF_MSK_SHIFT 0 + +#define CNVOSIDCTRL 0x800 +#define CNVOSIDCTRL_OSID_MASK (0x0F << 16) +#define CNVOSIDCTRL_OSID_SHIFT 16 + +#define DEFAULT_OSID 0 + +#define NUM_OSID_REGS 16 + +struct rcar4_pcie_priv { + bool init_done; + void __iomem *app_base; + DECLARE_BITMAP(osid_regs, NUM_OSID_REGS); +}; + /* * PCI host bridges often have different ways to access the root and child * bus config spaces: @@ -65,17 +91,139 @@ static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = { {}, }; +static void rcar4_pcie_writel_app(struct rcar4_pcie_priv *pci, uint32_t reg, + uint32_t val) +{ + writel(val, pci->app_base + reg); +} + +static uint32_t rcar4_pcie_readl_app(struct rcar4_pcie_priv *pci, uint32_t reg) +{ + return readl(pci->app_base + reg); +} + +int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + uint32_t val = rcar4_pcie_readl_app(priv, CNVOSIDCTRL); + + if ( priv->init_done ) + return 0; + priv->init_done = true; + + val = (val & ~CNVOSIDCTRL_OSID_MASK) | + (DEFAULT_OSID << CNVOSIDCTRL_OSID_SHIFT); + rcar4_pcie_writel_app(priv, CNVOSIDCTRL, val); + bitmap_zero(priv->osid_regs, NUM_OSID_REGS); + + printk("%s: Initialized OSID regs (default OSID %u)\n", + bridge->dt_node->full_name, DEFAULT_OSID); + + return 0; +} + +int rcar4_pcie_osid_reg_alloc(struct pci_host_bridge *bridge) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + int ret; + + ret = find_first_zero_bit(priv->osid_regs, NUM_OSID_REGS); + if ( ret != NUM_OSID_REGS ) + set_bit(ret, priv->osid_regs); + else + ret = -EBUSY; + + return ret; +} + +void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge, + unsigned int reg_id) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + + clear_bit(reg_id, priv->osid_regs); +} + +void rcar4_pcie_osid_bdf_set(struct pci_host_bridge *bridge, + unsigned int reg_id, uint32_t osid, uint32_t bdf) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + uint32_t data = rcar4_pcie_readl_app(priv, CNVID(reg_id)); + + data &= ~(CNVID_OSID_MASK | CNVID_BDF_MASK); + data |= CNVID_CNV_EN | (osid << CNVID_OSID_SHIFT) | + (bdf << CNVID_BDF_SHIFT); + rcar4_pcie_writel_app(priv, CNVID(reg_id), data); +} + +void rcar4_pcie_osid_bdf_clear(struct pci_host_bridge *bridge, + unsigned int reg_id) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + uint32_t data = rcar4_pcie_readl_app(priv, CNVID(reg_id)); + + data &= ~CNVID_CNV_EN; + rcar4_pcie_writel_app(priv, CNVID(reg_id), data); +} + +void rcar4_pcie_bdf_msk_set(struct pci_host_bridge *bridge, unsigned int reg_id, + uint32_t data) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + + uint32_t val = rcar4_pcie_readl_app(priv, CNVIDMSK(reg_id)); + + val = (val & ~CNVIDMSK_BDF_MSK_MASK) | (data << CNVIDMSK_BDF_MSK_SHIFT); + + rcar4_pcie_writel_app(priv, CNVIDMSK(reg_id), val); +} + static int __init pci_host_rcar4_probe(struct dt_device_node *dev, const void *data) { struct pci_host_bridge *bridge; + paddr_t app_phys_addr; + paddr_t app_size; + int app_idx, ret; + + struct rcar4_pcie_priv *priv = xzalloc(struct rcar4_pcie_priv); + if ( !priv ) + return -ENOMEM; bridge = dw_pcie_host_probe(dev, data, &rcar4_pcie_ops, &rcar4_pcie_child_ops); + app_idx = dt_property_match_string(dev, "reg-names", "app"); + if ( app_idx < 0 ) + { + printk(XENLOG_ERR "Cannot find \"app\" range index in device tree\n"); + ret = app_idx; + goto err; + } + ret = dt_device_get_address(dev, app_idx, &app_phys_addr, &app_size); + if ( ret ) + { + printk(XENLOG_ERR "Cannot find \"app\" range in device tree\n"); + goto err; + } + + priv->app_base = ioremap_nocache(app_phys_addr, app_size); + if ( !priv->app_base ) + { + printk(XENLOG_ERR "APP ioremap failed\n"); + ret = -ENXIO; + goto err; + } + printk("APP at [mem 0x%" PRIpaddr "-0x%" PRIpaddr "]\n", app_phys_addr, + app_phys_addr + app_size - 1); + + dw_pcie_set_priv(bridge, priv); dw_pcie_set_version(bridge, RCAR4_DWC_VERSION); return 0; +err: + xfree(priv); + return ret; } DT_DEVICE_START(pci_gen, "PCI HOST R-CAR GEN4", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-rcar4.h b/xen/arch/arm/pci/pci-host-rcar4.h new file mode 100644 index 0000000000..8ac6626a22 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-rcar4.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#include + +#ifndef __PCI_HOST_RCAR4_H__ +#define __PCI_HOST_RCAR4_H__ + +void rcar4_pcie_osid_bdf_set(struct pci_host_bridge *bridge, + unsigned int reg_id, uint32_t osid, uint32_t bdf); +void rcar4_pcie_osid_bdf_clear(struct pci_host_bridge *bridge, + unsigned int reg_id); +void rcar4_pcie_bdf_msk_set(struct pci_host_bridge *bridge, unsigned int reg_id, + uint32_t data); +int rcar4_pcie_osid_reg_alloc(struct pci_host_bridge *bridge); +void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge, + unsigned int reg_id); +int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge); + +#endif /* __PCI_HOST_RCAR4_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 01:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 01:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1087740.1445616 (Exim 4.92) (envelope-from ) id 1uou0V-0004FI-D8; Thu, 21 Aug 2025 01:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1087740.1445616; Thu, 21 Aug 2025 01:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uou0V-0004FB-AF; Thu, 21 Aug 2025 01:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1087740; Thu, 21 Aug 2025 01:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uou0U-0004Ek-Cr for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uou0U-00GULM-0V for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uou0U-00AqWT-16 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 01:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ADztv+aUHnOvYBoeFlBriAfc0vbxWc1BP7DH22Ag5xI=; b=hdWQvupiPp/TK8aiZC1h9jG51F at+qDZOVMzm+bQMdnN2I89QBdUhi4YTEWtnAvEVZ9Q72BV7CkAzUIRw84WRXkZxQxhuEd0frQOxVV 6LUwxj4g1TrwciTmyqSlkk7awcoOuJcX6XdUkc3JaXtHXSFEiXtSnFk49b4slwJPQKHw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] iommu/ipmmu-vmsa: Implement basic PCIE-IPMMU OSID support Message-Id: Date: Thu, 21 Aug 2025 01:22:22 +0000 commit 08b52c30bea5aaa7ef5646c768763dc52931fca8 Author: Oleksandr Tyshchenko AuthorDate: Mon Jul 14 08:51:49 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Aug 20 18:12:20 2025 -0700 iommu/ipmmu-vmsa: Implement basic PCIE-IPMMU OSID support Program PCIE BDF-OSID assignment according to the S4_PCIe_IPMMU-OSID when adding PCI device to the IOMMU in ipmmu_add_device callback. This is needed for being able to assign PCI devices to different domains at the same time. Programmed OSID is emmited as sideband data on the AXI bus during PCI DMA transactions and then used by IPMMU to match the transaction to the corresponding uTLB. Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 136 +++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthrough/arm/ipmmu-vmsa.c index dac0dd6d46..ea9fa9ddf3 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -51,12 +51,25 @@ #include #include #include +#include "../arch/arm/pci/pci-host-rcar4.h" #define dev_name(dev) dt_node_full_name(dev_to_dt(dev)) /* Device logger functions */ +#ifndef CONFIG_HAS_PCI #define dev_print(dev, lvl, fmt, ...) \ printk(lvl "ipmmu: %s: " fmt, dev_name(dev), ## __VA_ARGS__) +#else +#define dev_print(dev, lvl, fmt, ...) ({ \ + if ( !dev_is_pci((dev)) ) \ + printk(lvl "ipmmu: %s: " fmt, dev_name((dev)), ## __VA_ARGS__); \ + else \ + { \ + struct pci_dev *pdev = dev_to_pci((dev)); \ + printk(lvl "ipmmu: %pp: " fmt, &pdev->sbdf, ## __VA_ARGS__); \ + } \ +}) +#endif #define dev_info(dev, fmt, ...) \ dev_print(dev, XENLOG_INFO, fmt, ## __VA_ARGS__) @@ -1125,6 +1138,8 @@ static void ipmmu_free_root_domain(struct ipmmu_vmsa_domain *domain) xfree(domain); } +static int ipmmu_deassign_device(struct domain *d, struct device *dev); + static int ipmmu_assign_device(struct domain *d, u8 devfn, struct device *dev, uint32_t flag) { @@ -1138,8 +1153,38 @@ static int ipmmu_assign_device(struct domain *d, u8 devfn, struct device *dev, if ( !to_ipmmu(dev) ) return -ENODEV; - spin_lock(&xen_domain->lock); +#ifdef CONFIG_HAS_PCI + if ( dev_is_pci(dev) ) + { + struct pci_dev *pdev = dev_to_pci(dev); + struct domain *old_d = pdev->domain; + + /* Ignore calls for phantom functions */ + if ( devfn != pdev->devfn ) + return 0; + + write_lock(&d->pci_lock); + list_move(&pdev->domain_list, &d->pdev_list); + write_unlock(&d->pci_lock); + pdev->domain = d; + + /* dom_io is used as a sentinel for quarantined devices */ + if ( d == dom_io ) + { + int ret; + + /* + * Try to de-assign: do not return error if it was already + * de-assigned. + */ + ret = ipmmu_deassign_device(old_d, dev); + + return ret == -ESRCH ? 0 : ret; + } + } +#endif + spin_lock(&xen_domain->lock); /* * The IPMMU context for the Xen domain is not allocated beforehand * (at the Xen domain creation time), but on demand only, when the first @@ -1244,7 +1289,7 @@ static int ipmmu_reassign_device(struct domain *s, struct domain *t, int ret = 0; /* Don't allow remapping on other domain than hwdom */ - if ( t && !is_hardware_domain(t) ) + if ( t && !is_hardware_domain(t) && (t != dom_io) ) return -EPERM; if ( t == s ) @@ -1292,20 +1337,95 @@ static int ipmmu_dt_xlate(struct device *dev, static int ipmmu_add_device(u8 devfn, struct device *dev) { - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct iommu_fwspec *fwspec; + +#ifdef CONFIG_HAS_PCI + if ( dev_is_pci(dev) ) + { + struct pci_dev *pdev = dev_to_pci(dev); + int ret; + + if ( devfn != pdev->devfn ) + return 0; + + ret = iommu_add_pci_sideband_ids(pdev); + if ( ret < 0 ) + iommu_fwspec_free(dev); + } +#endif + + fwspec = dev_iommu_fwspec_get(dev); /* Only let through devices that have been verified in xlate(). */ if ( !to_ipmmu(dev) ) return -ENODEV; - if ( dt_device_is_protected(dev_to_dt(dev)) ) + if ( !dev_is_pci(dev) ) { - dev_err(dev, "Already added to IPMMU\n"); - return -EEXIST; + if ( dt_device_is_protected(dev_to_dt(dev)) ) + { + dev_err(dev, "Already added to IPMMU\n"); + return -EEXIST; + } + + /* Let Xen know that the master device is protected by an IOMMU. */ + dt_device_set_protected(dev_to_dt(dev)); } +#ifdef CONFIG_HAS_PCI + if ( dev_is_pci(dev) ) + { + struct pci_dev *pdev = dev_to_pci(dev); + unsigned int reg_id, osid; + struct pci_host_bridge *bridge; + struct iommu_fwspec *fwspec_bridge; + unsigned int utlb_osid0 = 0; + int ret; + + bridge = pci_find_host_bridge(pdev->seg, pdev->bus); + if ( !bridge ) + { + dev_err(dev, "Failed to find host bridge\n"); + return -ENODEV; + } + + fwspec_bridge = dev_iommu_fwspec_get(dt_to_dev(bridge->dt_node)); + if ( fwspec_bridge->num_ids < 1 ) + { + dev_err(dev, "Failed to find host bridge uTLB\n"); + return -ENXIO; + } + + if ( fwspec->num_ids < 1 ) + { + dev_err(dev, "Failed to find uTLB"); + return -ENXIO; + } + + rcar4_pcie_osid_regs_init(bridge); + + ret = rcar4_pcie_osid_reg_alloc(bridge); + if ( ret < 0 ) + { + dev_err(dev, "No unused OSID regs\n"); + return ret; + } + reg_id = ret; + + osid = fwspec->ids[0] - utlb_osid0; + rcar4_pcie_osid_bdf_set(bridge, reg_id, osid, pdev->sbdf.bdf); + rcar4_pcie_bdf_msk_set(bridge, reg_id, 0); + + dev_info(dev, "Allocated OSID reg %u (OSID %u)\n", reg_id, osid); - /* Let Xen know that the master device is protected by an IOMMU. */ - dt_device_set_protected(dev_to_dt(dev)); + ret = ipmmu_assign_device(pdev->domain, devfn, dev, 0); + if ( ret ) + { + rcar4_pcie_osid_bdf_clear(bridge, reg_id); + rcar4_pcie_osid_reg_free(bridge, reg_id); + return ret; + } + } +#endif dev_info(dev, "Added master device (IPMMU %s micro-TLBs %u)\n", dev_name(fwspec->iommu_dev), fwspec->num_ids); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 10:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 10:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088339.1446095 (Exim 4.92) (envelope-from ) id 1up2G6-0002tb-I0; Thu, 21 Aug 2025 10:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088339.1446095; Thu, 21 Aug 2025 10:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up2G6-0002tT-FS; Thu, 21 Aug 2025 10:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1088339; Thu, 21 Aug 2025 10:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up2G5-0002tN-Tp for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up2G5-00Ggvy-1d for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up2G5-00BPLB-1z for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0EoAvEAh7rMMWwaXfsGe2WQLi6VcBSgjAs0JHKOY2Mc=; b=WEADfpO0E/ZAvUG4H0a8dkeSbi aaFaUdXrPKPdDTHWJ4QshcY4vW428MSF0ggRb1Kuck4ZrkTqtKsQBPwRzlO1LW4KOexSK1q32bb1N oAy1ugzs2tLRCwovUEjmzvA7Zzhz8RY2ZKsUoOlWn9ehOmD4SrJsj5k+2zMQXavrLELs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/iommu: setup MMCFG ahead of IOMMU Message-Id: Date: Thu, 21 Aug 2025 10:11:01 +0000 commit c292772b4945d3a264a61c3c1920f1aebd17998b Author: Roger Pau Monne AuthorDate: Mon Aug 18 10:16:36 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu Aug 21 11:57:25 2025 +0200 x86/iommu: setup MMCFG ahead of IOMMU Otherwise the PCI accesses to segments different than the first one done by the IOMMU initialization code would silently fail by returning all ones. Introduce a new helper, called pci_setup(), and move both the creation of PCI segment 0 internal data structures, plus the parsing of ACPI MMCFG table to it. This moves acpi_mmcfg_init() slightly earlier from acpi_boot_init() into pci_setup(). Note that further work will be needed to support systems where access methods to segments different than 0 is not discoverable by Xen. Fixes: 3950f2485bbc ('x86/x2APIC: defer probe until after IOMMU ACPI table parsing') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 2 -- xen/arch/x86/include/asm/pci.h | 2 ++ xen/arch/x86/pci.c | 16 ++++++++++++++++ xen/arch/x86/setup.c | 7 +++---- xen/arch/x86/x86_64/mmconfig-shared.c | 3 +++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 3901f9d982..1ca2360e00 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -748,8 +748,6 @@ int __init acpi_boot_init(void) acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet); - acpi_mmcfg_init(); - erst_init(); acpi_hest_init(); diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index 665b321165..0b98081aea 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -74,4 +74,6 @@ bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); struct rangeset; int pci_sanitize_bar_memory(struct rangeset *r); +void pci_setup(void); + #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 26bb7f6a3c..fd0715fb6a 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -6,7 +6,10 @@ #include #include + +#include #include + #include static DEFINE_SPINLOCK(pci_config_lock); @@ -139,6 +142,19 @@ int pci_sanitize_bar_memory(struct rangeset *r) return 0; } +void __init pci_setup(void) +{ + /* + * Ahead of any ACPI table parsing make sure we have control structures + * for PCI segment 0. + */ + if ( pci_add_segment(0) ) + panic("Could not initialize PCI segment 0\n"); + + /* Parse ACPI MMCFG to see if other segments are available. */ + acpi_mmcfg_init(); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6fb42c5a5f..52c8a7adab 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1938,11 +1938,10 @@ void asmlinkage __init noreturn __start_xen(void) setup_system_domains(); /* - * Ahead of any ACPI table parsing make sure we have control structures - * for PCI segment 0. + * Initialize PCI (create segment 0, setup MMCFG access) ahead of IOMMU + * setup, as devices in segment > 0 must also be discoverable. */ - if ( pci_add_segment(0) ) - panic("Could not initialize PCI segment 0\n"); + pci_setup(); /* * IOMMU-related ACPI table parsing has to happen before APIC probing, for diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index f1a3d42c5b..fbe2676f86 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -402,6 +402,9 @@ void __init acpi_mmcfg_init(void) { bool valid = true; + if ( acpi_disabled ) + return; + /* MMCONFIG disabled */ if ((pci_probe & PCI_PROBE_MMCONF) == 0) return; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 10:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 10:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088472.1446209 (Exim 4.92) (envelope-from ) id 1up2wh-0001t3-A0; Thu, 21 Aug 2025 10:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088472.1446209; Thu, 21 Aug 2025 10:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up2wh-0001sv-79; Thu, 21 Aug 2025 10:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1088472; Thu, 21 Aug 2025 10:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up2wf-0001rc-Ml for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up2wf-00Ghrw-12 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up2wf-00BS5g-1b for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cet/MQYsrID9H11eXJSv6lEKF9bRCYonVfOnrmHOZoU=; b=68pgn26s1T6lGd6qU6gMxAO5vP hfMAQpmeYtdfslkkSo8fwsU267ggTFX6vSD3rAxumv08ujHV2dv3n/7hzuLj0DnHCRi0KWhHHfxZf b6tWAgtKIZ93W9Xy1dbOSOdLnCdyZsLrC731mdKd0lqZB/9gAyiwXEm0oPt+LYrcRoY4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG.md: add xenstorepvh-stubdom live update Message-Id: Date: Thu, 21 Aug 2025 10:55:01 +0000 commit 723e057192332f2b5010cd00298f5c6125acb606 Author: Juergen Gross AuthorDate: Thu Aug 21 12:49:02 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 21 12:49:02 2025 +0200 CHANGELOG.md: add xenstorepvh-stubdom live update Signed-off-by: Juergen Gross Acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ef893f48..e03e2526f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Support PCI passthrough for HVM domUs when dom0 is PVH (note SR-IOV capability usage is not yet supported on PVH dom0). - Smoke tests for the FreeBSD Xen builds in Cirrus CI. + - PVH xenstore-stubdom now supports Live Update. - On Arm: - Ability to enable stack protector -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 10:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 10:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088474.1446222 (Exim 4.92) (envelope-from ) id 1up2wr-0002HD-Om; Thu, 21 Aug 2025 10:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088474.1446222; Thu, 21 Aug 2025 10:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up2wr-0002H3-Lx; Thu, 21 Aug 2025 10:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1088474; Thu, 21 Aug 2025 10:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up2wp-0002ET-Oi for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up2wp-00GhsA-1V for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up2wp-00BS9F-1u for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 10:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XElfty7B6GsAmnoA8IVlNIqc85aFPGwphVUvN/Rlbxo=; b=h9EpOOpFtyjWzY4U3MUvBfdr5i FKIb9Ug42ErprhYkRYlMj9wRUz1/90x1tUPCobpT+q9VXwyrPT0b5ksXdLRa8viQjNU8LZ9ww6f94 Kq9fEzRch3QFNEb0FlAEg4Vptx7DNAXQPioyBU2PxETWP+8qm1K37Fwouv8oX7SBPGaI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: fix possible NULL deref Message-Id: Date: Thu, 21 Aug 2025 10:55:11 +0000 commit f3365a6bfd2142b067fb2c78fcb8b35d2e5d40e1 Author: Juergen Gross AuthorDate: Thu Aug 21 12:49:25 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 21 12:49:25 2025 +0200 tools/xenstored: fix possible NULL deref Avoid dereferencing NULL in introduce_domain() when called during live update. Coverity ID: 1665111 Fixes: f78895ad78c9 ("tools/xenstored: Read event channel from xenstored page") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- tools/xenstored/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 694d68670a..5ce539d640 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1032,7 +1032,7 @@ static struct domain *introduce_domain(const void *ctx, if (!interface && !restore) return NULL; - if (interface->evtchn_port) + if (!restore && interface->evtchn_port) port = interface->evtchn_port; if (new_domain(domain, port, restore)) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 12:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 12:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088657.1446387 (Exim 4.92) (envelope-from ) id 1up4eB-0000vX-VU; Thu, 21 Aug 2025 12:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088657.1446387; Thu, 21 Aug 2025 12:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eB-0000vQ-Sj; Thu, 21 Aug 2025 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1088657; Thu, 21 Aug 2025 12:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eA-0000vK-Mc for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up4eA-00Gjzv-0c for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up4eA-00BZMl-16 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+GpHTikK2nkpwKXEtVit9e0LoQpIeK5GpAVN/nmszCU=; b=5CkLAfeBLKKou8g3UTflUC/0Px 4my9dMZ+8WmudQXhmV2r1hRBv4gsZU8W8uBCMROr2TCjJrG7usKWjp9OHwd5StYABCUIeSPNFTjoR x/QE6kUnlI3j/AdTHN6J+uwaQnbAxWvyxdn4WU8ma4Y9vt05ugWpnSn/GvxvLHeJnW8Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/pci: allow designware-based hosts to have private data Message-Id: Date: Thu, 21 Aug 2025 12:44:02 +0000 commit 3ac97971f71c57e4029ae7425071af135d53870e Author: Mykyta Poturai AuthorDate: Mon Jul 14 08:51:48 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Aug 20 18:11:08 2025 -0700 arm/pci: allow designware-based hosts to have private data Introduce an additional private data field in `dw_pcie_priv` to allow vendors to store custom data without interfering with bridge->priv. Also add get/set pair to make accesing that private data less cumbersome. Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- xen/arch/arm/pci/pci-designware.c | 12 ++++++++++++ xen/arch/arm/pci/pci-designware.h | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/xen/arch/arm/pci/pci-designware.c b/xen/arch/arm/pci/pci-designware.c index 47dd2dd4c0..0bd67524ac 100644 --- a/xen/arch/arm/pci/pci-designware.c +++ b/xen/arch/arm/pci/pci-designware.c @@ -403,3 +403,15 @@ dw_pcie_host_probe(struct dt_device_node *dev, const void *data, return bridge; } + +void *dw_pcie_get_priv(struct pci_host_bridge *bridge) +{ + struct dw_pcie_priv *priv = bridge->priv; + return priv->priv; +} + +void dw_pcie_set_priv(struct pci_host_bridge *bridge, void *other) +{ + struct dw_pcie_priv *priv = bridge->priv; + priv->priv = other; +} diff --git a/xen/arch/arm/pci/pci-designware.h b/xen/arch/arm/pci/pci-designware.h index 7efb1dc9a2..b9deb3b138 100644 --- a/xen/arch/arm/pci/pci-designware.h +++ b/xen/arch/arm/pci/pci-designware.h @@ -66,8 +66,12 @@ struct dw_pcie_priv { bool iatu_unroll_enabled; void __iomem *atu_base; unsigned int version; + void *priv; }; +void *dw_pcie_get_priv(struct pci_host_bridge *bridge); +void dw_pcie_set_priv(struct pci_host_bridge *bridge, void *other); + void dw_pcie_set_version(struct pci_host_bridge *bridge, unsigned int version); void __iomem *dw_pcie_child_map_bus(struct pci_host_bridge *bridge, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 12:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 12:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088658.1446391 (Exim 4.92) (envelope-from ) id 1up4eL-0000x1-0a; Thu, 21 Aug 2025 12:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088658.1446391; Thu, 21 Aug 2025 12:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eK-0000wt-UH; Thu, 21 Aug 2025 12:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1088658; Thu, 21 Aug 2025 12:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eK-0000wn-H6 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up4eK-00Gjzz-0t for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up4eK-00BZOU-1T for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lwsLLJ87XEjuNaYwbxeoPeCtG25TOXIgdtXFW7W8Bdk=; b=537XL1xuauKsiCNhAJJYGI6lph UGVLTz3gAg1Zh/lm36DbYoWR6QDj5w7ah+RKUgnJxmtXhAvqUURYAEfcdILSGJ65fEXIx5+QjEPa+ eZuddEaXq6Re37EUtYToRf7dSN/mIe5X6EHI9Nf9RK4BvKQiexqFBU3qeI5Sf8nGnPFU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pci/rcar: implement OSID configuration for Renesas RCar Gen4 PCIe host Message-Id: Date: Thu, 21 Aug 2025 12:44:12 +0000 commit 114c01ebf38e423bc92e709a25c25fae1e94b7a4 Author: Mykyta Poturai AuthorDate: Mon Jul 14 08:51:48 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Aug 20 18:11:12 2025 -0700 pci/rcar: implement OSID configuration for Renesas RCar Gen4 PCIe host For IPMMU to be able to associate a specific PCI device with it's TLB the BDF to OSID mapping needs to be set up in the host bridge. The configured OSID is then emmited as a sideband data on the AXI bus during PCI DMA transactions. OSID configuration registers are located in the "app" region of the host bridge. Map the "app" region on init and implement methods for setting up BDF->OSID mappings Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- xen/arch/arm/pci/pci-host-rcar4.c | 148 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-rcar4.h | 18 +++++ 2 files changed, 166 insertions(+) diff --git a/xen/arch/arm/pci/pci-host-rcar4.c b/xen/arch/arm/pci/pci-host-rcar4.c index 62d2130a63..9290c6cac5 100644 --- a/xen/arch/arm/pci/pci-host-rcar4.c +++ b/xen/arch/arm/pci/pci-host-rcar4.c @@ -16,6 +16,32 @@ #define RCAR4_DWC_VERSION 0x520A +/* PCIE BDF-OSID assignment */ +#define CNVID(n) (0x700 + ((n) * 4)) +#define CNVID_CNV_EN (1U << 31) +#define CNVID_OSID_MASK (0x0F << 16) +#define CNVID_OSID_SHIFT 16 +#define CNVID_BDF_MASK (0xFFFF << 0) +#define CNVID_BDF_SHIFT 0 + +#define CNVIDMSK(n) (0x780 + ((n) * 4)) +#define CNVIDMSK_BDF_MSK_MASK (0xFFFF << 0) +#define CNVIDMSK_BDF_MSK_SHIFT 0 + +#define CNVOSIDCTRL 0x800 +#define CNVOSIDCTRL_OSID_MASK (0x0F << 16) +#define CNVOSIDCTRL_OSID_SHIFT 16 + +#define DEFAULT_OSID 0 + +#define NUM_OSID_REGS 16 + +struct rcar4_pcie_priv { + bool init_done; + void __iomem *app_base; + DECLARE_BITMAP(osid_regs, NUM_OSID_REGS); +}; + /* * PCI host bridges often have different ways to access the root and child * bus config spaces: @@ -65,17 +91,139 @@ static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = { {}, }; +static void rcar4_pcie_writel_app(struct rcar4_pcie_priv *pci, uint32_t reg, + uint32_t val) +{ + writel(val, pci->app_base + reg); +} + +static uint32_t rcar4_pcie_readl_app(struct rcar4_pcie_priv *pci, uint32_t reg) +{ + return readl(pci->app_base + reg); +} + +int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + uint32_t val = rcar4_pcie_readl_app(priv, CNVOSIDCTRL); + + if ( priv->init_done ) + return 0; + priv->init_done = true; + + val = (val & ~CNVOSIDCTRL_OSID_MASK) | + (DEFAULT_OSID << CNVOSIDCTRL_OSID_SHIFT); + rcar4_pcie_writel_app(priv, CNVOSIDCTRL, val); + bitmap_zero(priv->osid_regs, NUM_OSID_REGS); + + printk("%s: Initialized OSID regs (default OSID %u)\n", + bridge->dt_node->full_name, DEFAULT_OSID); + + return 0; +} + +int rcar4_pcie_osid_reg_alloc(struct pci_host_bridge *bridge) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + int ret; + + ret = find_first_zero_bit(priv->osid_regs, NUM_OSID_REGS); + if ( ret != NUM_OSID_REGS ) + set_bit(ret, priv->osid_regs); + else + ret = -EBUSY; + + return ret; +} + +void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge, + unsigned int reg_id) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + + clear_bit(reg_id, priv->osid_regs); +} + +void rcar4_pcie_osid_bdf_set(struct pci_host_bridge *bridge, + unsigned int reg_id, uint32_t osid, uint32_t bdf) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + uint32_t data = rcar4_pcie_readl_app(priv, CNVID(reg_id)); + + data &= ~(CNVID_OSID_MASK | CNVID_BDF_MASK); + data |= CNVID_CNV_EN | (osid << CNVID_OSID_SHIFT) | + (bdf << CNVID_BDF_SHIFT); + rcar4_pcie_writel_app(priv, CNVID(reg_id), data); +} + +void rcar4_pcie_osid_bdf_clear(struct pci_host_bridge *bridge, + unsigned int reg_id) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + uint32_t data = rcar4_pcie_readl_app(priv, CNVID(reg_id)); + + data &= ~CNVID_CNV_EN; + rcar4_pcie_writel_app(priv, CNVID(reg_id), data); +} + +void rcar4_pcie_bdf_msk_set(struct pci_host_bridge *bridge, unsigned int reg_id, + uint32_t data) +{ + struct rcar4_pcie_priv *priv = dw_pcie_get_priv(bridge); + + uint32_t val = rcar4_pcie_readl_app(priv, CNVIDMSK(reg_id)); + + val = (val & ~CNVIDMSK_BDF_MSK_MASK) | (data << CNVIDMSK_BDF_MSK_SHIFT); + + rcar4_pcie_writel_app(priv, CNVIDMSK(reg_id), val); +} + static int __init pci_host_rcar4_probe(struct dt_device_node *dev, const void *data) { struct pci_host_bridge *bridge; + paddr_t app_phys_addr; + paddr_t app_size; + int app_idx, ret; + + struct rcar4_pcie_priv *priv = xzalloc(struct rcar4_pcie_priv); + if ( !priv ) + return -ENOMEM; bridge = dw_pcie_host_probe(dev, data, &rcar4_pcie_ops, &rcar4_pcie_child_ops); + app_idx = dt_property_match_string(dev, "reg-names", "app"); + if ( app_idx < 0 ) + { + printk(XENLOG_ERR "Cannot find \"app\" range index in device tree\n"); + ret = app_idx; + goto err; + } + ret = dt_device_get_address(dev, app_idx, &app_phys_addr, &app_size); + if ( ret ) + { + printk(XENLOG_ERR "Cannot find \"app\" range in device tree\n"); + goto err; + } + + priv->app_base = ioremap_nocache(app_phys_addr, app_size); + if ( !priv->app_base ) + { + printk(XENLOG_ERR "APP ioremap failed\n"); + ret = -ENXIO; + goto err; + } + printk("APP at [mem 0x%" PRIpaddr "-0x%" PRIpaddr "]\n", app_phys_addr, + app_phys_addr + app_size - 1); + + dw_pcie_set_priv(bridge, priv); dw_pcie_set_version(bridge, RCAR4_DWC_VERSION); return 0; +err: + xfree(priv); + return ret; } DT_DEVICE_START(pci_gen, "PCI HOST R-CAR GEN4", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-rcar4.h b/xen/arch/arm/pci/pci-host-rcar4.h new file mode 100644 index 0000000000..8ac6626a22 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-rcar4.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#include + +#ifndef __PCI_HOST_RCAR4_H__ +#define __PCI_HOST_RCAR4_H__ + +void rcar4_pcie_osid_bdf_set(struct pci_host_bridge *bridge, + unsigned int reg_id, uint32_t osid, uint32_t bdf); +void rcar4_pcie_osid_bdf_clear(struct pci_host_bridge *bridge, + unsigned int reg_id); +void rcar4_pcie_bdf_msk_set(struct pci_host_bridge *bridge, unsigned int reg_id, + uint32_t data); +int rcar4_pcie_osid_reg_alloc(struct pci_host_bridge *bridge); +void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge, + unsigned int reg_id); +int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge); + +#endif /* __PCI_HOST_RCAR4_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 12:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 12:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088659.1446395 (Exim 4.92) (envelope-from ) id 1up4eV-0000za-2X; Thu, 21 Aug 2025 12:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088659.1446395; Thu, 21 Aug 2025 12:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eU-0000zS-Vg; Thu, 21 Aug 2025 12:44:22 +0000 Received: by outflank-mailman (input) for mailman id 1088659; Thu, 21 Aug 2025 12:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eU-0000zJ-Jk for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up4eU-00Gk03-1B for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up4eU-00BZPo-1k for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ddqXUbvSGAxXyVEvprz63NiH1xz5bO7az0CpqmK8Bdk=; b=lQ8GRdkzhLDl2/AxMDp6Azgtx1 lcBya+yxX3hwrxbDl4Tl0njQlwqDqDYIlu3NuB/8sN8H1aSqTVDpvBHmpY8ekZkm/6XXYwvglILh/ Rc8MVJ6t/VDyA/XJzagshdDP0VqfremdulaUoCECDvpZTBvs/X03LSsB7UhuB1LUonAQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/ipmmu-vmsa: Implement basic PCIE-IPMMU OSID support Message-Id: Date: Thu, 21 Aug 2025 12:44:22 +0000 commit 08b52c30bea5aaa7ef5646c768763dc52931fca8 Author: Oleksandr Tyshchenko AuthorDate: Mon Jul 14 08:51:49 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Aug 20 18:12:20 2025 -0700 iommu/ipmmu-vmsa: Implement basic PCIE-IPMMU OSID support Program PCIE BDF-OSID assignment according to the S4_PCIe_IPMMU-OSID when adding PCI device to the IOMMU in ipmmu_add_device callback. This is needed for being able to assign PCI devices to different domains at the same time. Programmed OSID is emmited as sideband data on the AXI bus during PCI DMA transactions and then used by IPMMU to match the transaction to the corresponding uTLB. Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 136 +++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthrough/arm/ipmmu-vmsa.c index dac0dd6d46..ea9fa9ddf3 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -51,12 +51,25 @@ #include #include #include +#include "../arch/arm/pci/pci-host-rcar4.h" #define dev_name(dev) dt_node_full_name(dev_to_dt(dev)) /* Device logger functions */ +#ifndef CONFIG_HAS_PCI #define dev_print(dev, lvl, fmt, ...) \ printk(lvl "ipmmu: %s: " fmt, dev_name(dev), ## __VA_ARGS__) +#else +#define dev_print(dev, lvl, fmt, ...) ({ \ + if ( !dev_is_pci((dev)) ) \ + printk(lvl "ipmmu: %s: " fmt, dev_name((dev)), ## __VA_ARGS__); \ + else \ + { \ + struct pci_dev *pdev = dev_to_pci((dev)); \ + printk(lvl "ipmmu: %pp: " fmt, &pdev->sbdf, ## __VA_ARGS__); \ + } \ +}) +#endif #define dev_info(dev, fmt, ...) \ dev_print(dev, XENLOG_INFO, fmt, ## __VA_ARGS__) @@ -1125,6 +1138,8 @@ static void ipmmu_free_root_domain(struct ipmmu_vmsa_domain *domain) xfree(domain); } +static int ipmmu_deassign_device(struct domain *d, struct device *dev); + static int ipmmu_assign_device(struct domain *d, u8 devfn, struct device *dev, uint32_t flag) { @@ -1138,8 +1153,38 @@ static int ipmmu_assign_device(struct domain *d, u8 devfn, struct device *dev, if ( !to_ipmmu(dev) ) return -ENODEV; - spin_lock(&xen_domain->lock); +#ifdef CONFIG_HAS_PCI + if ( dev_is_pci(dev) ) + { + struct pci_dev *pdev = dev_to_pci(dev); + struct domain *old_d = pdev->domain; + + /* Ignore calls for phantom functions */ + if ( devfn != pdev->devfn ) + return 0; + + write_lock(&d->pci_lock); + list_move(&pdev->domain_list, &d->pdev_list); + write_unlock(&d->pci_lock); + pdev->domain = d; + + /* dom_io is used as a sentinel for quarantined devices */ + if ( d == dom_io ) + { + int ret; + + /* + * Try to de-assign: do not return error if it was already + * de-assigned. + */ + ret = ipmmu_deassign_device(old_d, dev); + + return ret == -ESRCH ? 0 : ret; + } + } +#endif + spin_lock(&xen_domain->lock); /* * The IPMMU context for the Xen domain is not allocated beforehand * (at the Xen domain creation time), but on demand only, when the first @@ -1244,7 +1289,7 @@ static int ipmmu_reassign_device(struct domain *s, struct domain *t, int ret = 0; /* Don't allow remapping on other domain than hwdom */ - if ( t && !is_hardware_domain(t) ) + if ( t && !is_hardware_domain(t) && (t != dom_io) ) return -EPERM; if ( t == s ) @@ -1292,20 +1337,95 @@ static int ipmmu_dt_xlate(struct device *dev, static int ipmmu_add_device(u8 devfn, struct device *dev) { - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + struct iommu_fwspec *fwspec; + +#ifdef CONFIG_HAS_PCI + if ( dev_is_pci(dev) ) + { + struct pci_dev *pdev = dev_to_pci(dev); + int ret; + + if ( devfn != pdev->devfn ) + return 0; + + ret = iommu_add_pci_sideband_ids(pdev); + if ( ret < 0 ) + iommu_fwspec_free(dev); + } +#endif + + fwspec = dev_iommu_fwspec_get(dev); /* Only let through devices that have been verified in xlate(). */ if ( !to_ipmmu(dev) ) return -ENODEV; - if ( dt_device_is_protected(dev_to_dt(dev)) ) + if ( !dev_is_pci(dev) ) { - dev_err(dev, "Already added to IPMMU\n"); - return -EEXIST; + if ( dt_device_is_protected(dev_to_dt(dev)) ) + { + dev_err(dev, "Already added to IPMMU\n"); + return -EEXIST; + } + + /* Let Xen know that the master device is protected by an IOMMU. */ + dt_device_set_protected(dev_to_dt(dev)); } +#ifdef CONFIG_HAS_PCI + if ( dev_is_pci(dev) ) + { + struct pci_dev *pdev = dev_to_pci(dev); + unsigned int reg_id, osid; + struct pci_host_bridge *bridge; + struct iommu_fwspec *fwspec_bridge; + unsigned int utlb_osid0 = 0; + int ret; + + bridge = pci_find_host_bridge(pdev->seg, pdev->bus); + if ( !bridge ) + { + dev_err(dev, "Failed to find host bridge\n"); + return -ENODEV; + } + + fwspec_bridge = dev_iommu_fwspec_get(dt_to_dev(bridge->dt_node)); + if ( fwspec_bridge->num_ids < 1 ) + { + dev_err(dev, "Failed to find host bridge uTLB\n"); + return -ENXIO; + } + + if ( fwspec->num_ids < 1 ) + { + dev_err(dev, "Failed to find uTLB"); + return -ENXIO; + } + + rcar4_pcie_osid_regs_init(bridge); + + ret = rcar4_pcie_osid_reg_alloc(bridge); + if ( ret < 0 ) + { + dev_err(dev, "No unused OSID regs\n"); + return ret; + } + reg_id = ret; + + osid = fwspec->ids[0] - utlb_osid0; + rcar4_pcie_osid_bdf_set(bridge, reg_id, osid, pdev->sbdf.bdf); + rcar4_pcie_bdf_msk_set(bridge, reg_id, 0); + + dev_info(dev, "Allocated OSID reg %u (OSID %u)\n", reg_id, osid); - /* Let Xen know that the master device is protected by an IOMMU. */ - dt_device_set_protected(dev_to_dt(dev)); + ret = ipmmu_assign_device(pdev->domain, devfn, dev, 0); + if ( ret ) + { + rcar4_pcie_osid_bdf_clear(bridge, reg_id); + rcar4_pcie_osid_reg_free(bridge, reg_id); + return ret; + } + } +#endif dev_info(dev, "Added master device (IPMMU %s micro-TLBs %u)\n", dev_name(fwspec->iommu_dev), fwspec->num_ids); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 12:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 12:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088660.1446399 (Exim 4.92) (envelope-from ) id 1up4ef-000126-3U; Thu, 21 Aug 2025 12:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088660.1446399; Thu, 21 Aug 2025 12:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4ef-00011y-0q; Thu, 21 Aug 2025 12:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1088660; Thu, 21 Aug 2025 12:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4ee-00011q-Mg for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up4ee-00Gk2V-1V for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up4ee-00BZQg-24 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W+FwKV4WgTRfxouSjoHctIGAEEMUYOg21uSyxQ5tGU0=; b=jivqjsf9ihAcqvU+X0DNRlz7nf 94viSi1X574D2XluAjZSdR+tdgcrugLjRp133VDE8ByYSv/XDCyJcB1vQIry20C6aJHADERVWT7jT uK4Rb150sqOnlC08gxHJiaAGYq/NhXAdPNokYzhJ1W0iBOiq1yH7sEdTtuXI8VDt0DHg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/iommu: setup MMCFG ahead of IOMMU Message-Id: Date: Thu, 21 Aug 2025 12:44:32 +0000 commit c292772b4945d3a264a61c3c1920f1aebd17998b Author: Roger Pau Monne AuthorDate: Mon Aug 18 10:16:36 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu Aug 21 11:57:25 2025 +0200 x86/iommu: setup MMCFG ahead of IOMMU Otherwise the PCI accesses to segments different than the first one done by the IOMMU initialization code would silently fail by returning all ones. Introduce a new helper, called pci_setup(), and move both the creation of PCI segment 0 internal data structures, plus the parsing of ACPI MMCFG table to it. This moves acpi_mmcfg_init() slightly earlier from acpi_boot_init() into pci_setup(). Note that further work will be needed to support systems where access methods to segments different than 0 is not discoverable by Xen. Fixes: 3950f2485bbc ('x86/x2APIC: defer probe until after IOMMU ACPI table parsing') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 2 -- xen/arch/x86/include/asm/pci.h | 2 ++ xen/arch/x86/pci.c | 16 ++++++++++++++++ xen/arch/x86/setup.c | 7 +++---- xen/arch/x86/x86_64/mmconfig-shared.c | 3 +++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 3901f9d982..1ca2360e00 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -748,8 +748,6 @@ int __init acpi_boot_init(void) acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet); - acpi_mmcfg_init(); - erst_init(); acpi_hest_init(); diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index 665b321165..0b98081aea 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -74,4 +74,6 @@ bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); struct rangeset; int pci_sanitize_bar_memory(struct rangeset *r); +void pci_setup(void); + #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 26bb7f6a3c..fd0715fb6a 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -6,7 +6,10 @@ #include #include + +#include #include + #include static DEFINE_SPINLOCK(pci_config_lock); @@ -139,6 +142,19 @@ int pci_sanitize_bar_memory(struct rangeset *r) return 0; } +void __init pci_setup(void) +{ + /* + * Ahead of any ACPI table parsing make sure we have control structures + * for PCI segment 0. + */ + if ( pci_add_segment(0) ) + panic("Could not initialize PCI segment 0\n"); + + /* Parse ACPI MMCFG to see if other segments are available. */ + acpi_mmcfg_init(); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6fb42c5a5f..52c8a7adab 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1938,11 +1938,10 @@ void asmlinkage __init noreturn __start_xen(void) setup_system_domains(); /* - * Ahead of any ACPI table parsing make sure we have control structures - * for PCI segment 0. + * Initialize PCI (create segment 0, setup MMCFG access) ahead of IOMMU + * setup, as devices in segment > 0 must also be discoverable. */ - if ( pci_add_segment(0) ) - panic("Could not initialize PCI segment 0\n"); + pci_setup(); /* * IOMMU-related ACPI table parsing has to happen before APIC probing, for diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index f1a3d42c5b..fbe2676f86 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -402,6 +402,9 @@ void __init acpi_mmcfg_init(void) { bool valid = true; + if ( acpi_disabled ) + return; + /* MMCONFIG disabled */ if ((pci_probe & PCI_PROBE_MMCONF) == 0) return; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 12:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 12:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088661.1446403 (Exim 4.92) (envelope-from ) id 1up4eq-00014U-4m; Thu, 21 Aug 2025 12:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088661.1446403; Thu, 21 Aug 2025 12:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eq-00014M-2C; Thu, 21 Aug 2025 12:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1088661; Thu, 21 Aug 2025 12:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4eo-00014E-RB for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up4eo-00Gk2t-1w for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up4eo-00BZRq-2L for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=snF8ynT/yOMivULD41yxiTvUiprqSiPa3VgIh2UmP1s=; b=60TZ9TUJLn4ya4BEoFIfK2ExH3 PopH8nFIg3XRdT/Iz/wWmX4k9pqndX6g/MfPjXnf/3QqgL2a/QkjgVodNbxccYvEePuT0+w52xDfN Ne1nYHqx2v/XgNzJ1eakkAvFppwl2bc2+igAxOZgEUfU49PN1QUERdiVmU3nvh4ZRzb8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG.md: add xenstorepvh-stubdom live update Message-Id: Date: Thu, 21 Aug 2025 12:44:42 +0000 commit 723e057192332f2b5010cd00298f5c6125acb606 Author: Juergen Gross AuthorDate: Thu Aug 21 12:49:02 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 21 12:49:02 2025 +0200 CHANGELOG.md: add xenstorepvh-stubdom live update Signed-off-by: Juergen Gross Acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ef893f48..e03e2526f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Support PCI passthrough for HVM domUs when dom0 is PVH (note SR-IOV capability usage is not yet supported on PVH dom0). - Smoke tests for the FreeBSD Xen builds in Cirrus CI. + - PVH xenstore-stubdom now supports Live Update. - On Arm: - Ability to enable stack protector -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 12:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 12:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1088662.1446407 (Exim 4.92) (envelope-from ) id 1up4f0-000171-7v; Thu, 21 Aug 2025 12:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1088662.1446407; Thu, 21 Aug 2025 12:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4f0-00016t-54; Thu, 21 Aug 2025 12:44:54 +0000 Received: by outflank-mailman (input) for mailman id 1088662; Thu, 21 Aug 2025 12:44:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1up4ez-00016i-00 for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1up4ey-00Gk2x-2S for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1up4ey-00BZSv-2n for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 12:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OqWVh5wzCBidp/AW3wkOLQSMKREX65bM/clvnrHDYrk=; b=zxEQXvtAj7WSy9ebRAkjMoSU/y Hl+PFNuy0jD3+L+PsaFEfVGclHvH0MhS0J/WBMjte/QOoK/jADddvNUpfzQ0IR+8Yhnij7g9EWYer l4ncu9iFXtoxpiUJz9NWJIKYMDqNltadIKRsxWFzRIreSEF9tEGirW39r3GDIRjQwnd8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: fix possible NULL deref Message-Id: Date: Thu, 21 Aug 2025 12:44:52 +0000 commit f3365a6bfd2142b067fb2c78fcb8b35d2e5d40e1 Author: Juergen Gross AuthorDate: Thu Aug 21 12:49:25 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 21 12:49:25 2025 +0200 tools/xenstored: fix possible NULL deref Avoid dereferencing NULL in introduce_domain() when called during live update. Coverity ID: 1665111 Fixes: f78895ad78c9 ("tools/xenstored: Read event channel from xenstored page") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- tools/xenstored/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 694d68670a..5ce539d640 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1032,7 +1032,7 @@ static struct domain *introduce_domain(const void *ctx, if (!interface && !restore) return NULL; - if (interface->evtchn_port) + if (!restore && interface->evtchn_port) port = interface->evtchn_port; if (new_domain(domain, port, restore)) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 21 21:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2025 21:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089342.1446959 (Exim 4.92) (envelope-from ) id 1upDFO-0008Ur-VZ; Thu, 21 Aug 2025 21:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089342.1446959; Thu, 21 Aug 2025 21:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upDFO-0008Ui-Sw; Thu, 21 Aug 2025 21:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1089342; Thu, 21 Aug 2025 21:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upDFN-0008Uc-UZ for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 21:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upDFN-00Gvia-1x for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 21:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upDFN-00CAX2-2X for xen-changelog@lists.xenproject.org; Thu, 21 Aug 2025 21:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cWDCHms9kjNouTHBNZOeLSmUyhYSr6sBO+IYSpfF91c=; b=I9fJVvcPZXfxREQQe1P5mohESU 6U3EtzYm8fTP9/1JJHgxDBKLZ4eIgt/ZrCQ6mrciofZIQwUVfemDnChCGf1fKhyFnSJF5EeAKH0dG EM+SiJnAnFwgv+YzpPB/lgfDsAGcJq1AlMzPJjgoIU+5ANuS44yQlKbwt7WzEIq2mmpM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] iommu/ipmmu-vmsa: Fix build with HAS_PCI=n Message-Id: Date: Thu, 21 Aug 2025 21:55:01 +0000 commit 3cf47a1e16343a79e2a796c504ac567c02acecde Author: Mykyta Poturai AuthorDate: Thu Aug 21 11:23:55 2025 +0000 Commit: Stefano Stabellini CommitDate: Thu Aug 21 14:47:01 2025 -0700 iommu/ipmmu-vmsa: Fix build with HAS_PCI=n With PCI disabled the build fails due to undefined struct pci_host_bridge. Add ifdef guard to pci-host-rcar4.h to not require the stuct being defined when PCI support is disabled. All call sites are already covered by HAS_PCI check, so no dummy implementations are needed. Also move includes under the header guard to not break MISRA rules. Fixes: 08b52c30bea5 ("iommu/ipmmu-vmsa: Implement basic PCIE-IPMMU OSID support") Reported-by: Jan Beulich Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/pci-host-rcar4.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/pci/pci-host-rcar4.h b/xen/arch/arm/pci/pci-host-rcar4.h index 8ac6626a22..31ef9d2d40 100644 --- a/xen/arch/arm/pci/pci-host-rcar4.h +++ b/xen/arch/arm/pci/pci-host-rcar4.h @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include - #ifndef __PCI_HOST_RCAR4_H__ #define __PCI_HOST_RCAR4_H__ +#include + +#ifdef CONFIG_HAS_PCI void rcar4_pcie_osid_bdf_set(struct pci_host_bridge *bridge, unsigned int reg_id, uint32_t osid, uint32_t bdf); void rcar4_pcie_osid_bdf_clear(struct pci_host_bridge *bridge, @@ -14,5 +15,6 @@ int rcar4_pcie_osid_reg_alloc(struct pci_host_bridge *bridge); void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge, unsigned int reg_id); int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge); +#endif #endif /* __PCI_HOST_RCAR4_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 08:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 08:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089675.1447176 (Exim 4.92) (envelope-from ) id 1upMgt-0005Hd-EA; Fri, 22 Aug 2025 08:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089675.1447176; Fri, 22 Aug 2025 08:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upMgt-0005HF-8k; Fri, 22 Aug 2025 08:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1089675; Fri, 22 Aug 2025 08:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upMgs-0004bV-4M for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upMgr-000j9H-1s for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upMgr-00CniK-2O for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MUSRZOZAG6wM52AhQuO7bUa33l9OUSkcp2961fUOUQo=; b=CAVfAklKshMqMyGkj299Ezyfc/ 5VHH+Y6E/DbZdPduDGbdw9ylUp0Tsb+Wy9LBlyUZRvMmLbiIiSrKjm/kcNnJtsoSaV0LtzObmAVI1 Mms2K+k9x2k85rWYd4oNCwQCg6McYfeIGSV8GHre06oPkWC1ta7/qLhkmVYutVjr1hxU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/ipmmu-vmsa: Fix build with HAS_PCI=n Message-Id: Date: Fri, 22 Aug 2025 08:00:01 +0000 commit 3cf47a1e16343a79e2a796c504ac567c02acecde Author: Mykyta Poturai AuthorDate: Thu Aug 21 11:23:55 2025 +0000 Commit: Stefano Stabellini CommitDate: Thu Aug 21 14:47:01 2025 -0700 iommu/ipmmu-vmsa: Fix build with HAS_PCI=n With PCI disabled the build fails due to undefined struct pci_host_bridge. Add ifdef guard to pci-host-rcar4.h to not require the stuct being defined when PCI support is disabled. All call sites are already covered by HAS_PCI check, so no dummy implementations are needed. Also move includes under the header guard to not break MISRA rules. Fixes: 08b52c30bea5 ("iommu/ipmmu-vmsa: Implement basic PCIE-IPMMU OSID support") Reported-by: Jan Beulich Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/pci-host-rcar4.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/pci/pci-host-rcar4.h b/xen/arch/arm/pci/pci-host-rcar4.h index 8ac6626a22..31ef9d2d40 100644 --- a/xen/arch/arm/pci/pci-host-rcar4.h +++ b/xen/arch/arm/pci/pci-host-rcar4.h @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include - #ifndef __PCI_HOST_RCAR4_H__ #define __PCI_HOST_RCAR4_H__ +#include + +#ifdef CONFIG_HAS_PCI void rcar4_pcie_osid_bdf_set(struct pci_host_bridge *bridge, unsigned int reg_id, uint32_t osid, uint32_t bdf); void rcar4_pcie_osid_bdf_clear(struct pci_host_bridge *bridge, @@ -14,5 +15,6 @@ int rcar4_pcie_osid_reg_alloc(struct pci_host_bridge *bridge); void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge, unsigned int reg_id); int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge); +#endif #endif /* __PCI_HOST_RCAR4_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 08:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 08:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089728.1447221 (Exim 4.92) (envelope-from ) id 1upNCp-00045p-LJ; Fri, 22 Aug 2025 08:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089728.1447221; Fri, 22 Aug 2025 08:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNCp-00045h-Ii; Fri, 22 Aug 2025 08:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1089728; Fri, 22 Aug 2025 08:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNCo-00045a-CC for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upNCn-000kDQ-2v for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upNCo-00Cpv3-0F for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qBcWWqnpYdVqEZWMaVbFFvy1srwxFDGOsYnK/HBHRu4=; b=1qGHAaCfrgolrbeIFZKFknE6jm mniocEZGlviQ4/b6B+L08xJ5ELgSORUuYH3ACy69YgeNWxzuSNgnsLf67SlznrZFkPMoESW6UXWOL GLXjYUW+UWhrHwPfAP+7Ym7vGAfhVyRsm2ibU5i2T2L01wWL5WSlA+TSKokwGBN3bTik=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Enable is_xen_heap_page and is_xen_heap_mfn for ARM_32 Message-Id: Date: Fri, 22 Aug 2025 08:33:02 +0000 commit 120747f84a57b0705b8fb19adacb7fc586b2732a Author: Ayan Kumar Halder AuthorDate: Thu Aug 14 09:19:58 2025 +0100 Commit: Michal Orzel CommitDate: Fri Aug 22 09:55:45 2025 +0200 arm/mpu: Enable is_xen_heap_page and is_xen_heap_mfn for ARM_32 In case of ARM_32, all of the RAM will be covered by a permanent contiguous mapping (where VA == PA) and there will be a single heap. Thus, the memory allocated from Xen heap uses PGC_xen_heap. This is similar to the scenario described for "CONFIG_SEPARATE_XENHEAP=n W/ DIRECT MAP OF ALL RAM" in common/page_alloc.c. Signed-off-by: Ayan Kumar Halder Reviewed-by: Hari Limaye Tested-by: Hari Limaye Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/mm.h | 2 +- xen/arch/arm/include/asm/mpu/mm.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index fb79aeb088..7a93dad2ed 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -170,7 +170,7 @@ struct page_info #define _PGC_need_scrub _PGC_allocated #define PGC_need_scrub PGC_allocated -#ifdef CONFIG_ARM_64 +#if defined(CONFIG_ARM_64) || defined(CONFIG_MPU) #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap) #define is_xen_heap_mfn(mfn) \ (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn))) diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index c32fac8905..e1ded6521d 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -27,11 +27,6 @@ extern pr_t xen_mpumap[MAX_MPU_REGION_NR]; #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK)) -#ifdef CONFIG_ARM_32 -#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; }) -#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; }) -#endif - /* On MPU systems there is no translation, ma == va. */ static inline void *maddr_to_virt(paddr_t ma) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 08:33:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 08:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089729.1447226 (Exim 4.92) (envelope-from ) id 1upNCy-00047V-N7; Fri, 22 Aug 2025 08:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089729.1447226; Fri, 22 Aug 2025 08:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNCy-00047N-K6; Fri, 22 Aug 2025 08:33:12 +0000 Received: by outflank-mailman (input) for mailman id 1089729; Fri, 22 Aug 2025 08:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNCy-00047G-A5 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upNCy-000kDU-0B for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upNCy-00CpwC-0Z for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EOmfbCQEblElNo52eMRCZTOpb3VqiBEHE2xEj5hLA6g=; b=4VDOGGCeQeIoZ2R/Kc/1IUZ/Zo bg7MalJU/NB2lewlUMveoyDM8tzgApimEKv6UH19/0JJcrExlUqXmCa7id85t7LI/+xq7bEfgMnQ+ FKr35E+ujFmShPYd0s2Sv8rvxgzuJCNBYPBmAA/HC/1H8xrnzged4YJE6QOuZYCk8HAM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Disable map_domain_page for MPU Message-Id: Date: Fri, 22 Aug 2025 08:33:12 +0000 commit 72042ea63bfe7e480f12f81cc72acbe95c6f9511 Author: Ayan Kumar Halder AuthorDate: Thu Aug 14 09:19:59 2025 +0100 Commit: Michal Orzel CommitDate: Fri Aug 22 09:55:45 2025 +0200 arm/mpu: Disable map_domain_page for MPU There is no domheap for ARM_32. All of the RAM is mapped and VA == PA. Signed-off-by: Ayan Kumar Halder Reviewed-by: Hari Limaye Tested-by: Hari Limaye Reviewed-by: Michal Orzel --- xen/arch/arm/Kconfig | 2 +- xen/arch/arm/mpu/Makefile | 1 - xen/arch/arm/mpu/domain-page.c | 45 ------------------------------------------ 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index a0c8160474..5355534f3d 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -1,7 +1,7 @@ config ARM_32 def_bool y depends on "$(ARCH)" = "arm32" - select ARCH_MAP_DOMAIN_PAGE + select ARCH_MAP_DOMAIN_PAGE if MMU config ARM_64 def_bool y diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile index 50f8fe4326..4963c8b550 100644 --- a/xen/arch/arm/mpu/Makefile +++ b/xen/arch/arm/mpu/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ -obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o obj-y += p2m.o obj-y += setup.init.o diff --git a/xen/arch/arm/mpu/domain-page.c b/xen/arch/arm/mpu/domain-page.c deleted file mode 100644 index df5e06b6db..0000000000 --- a/xen/arch/arm/mpu/domain-page.c +++ /dev/null @@ -1,45 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include - -void *map_domain_page_global(mfn_t mfn) -{ - BUG_ON("unimplemented"); - return NULL; -} - -/* Map a page of domheap memory */ -void *map_domain_page(mfn_t mfn) -{ - BUG_ON("unimplemented"); - return NULL; -} - -/* Release a mapping taken with map_domain_page() */ -void unmap_domain_page(const void *ptr) -{ - BUG_ON("unimplemented"); -} - -mfn_t domain_page_map_to_mfn(const void *ptr) -{ - BUG_ON("unimplemented"); - return INVALID_MFN; -} - -void unmap_domain_page_global(const void *va) -{ - BUG_ON("unimplemented"); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 08:33:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 08:33:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089730.1447228 (Exim 4.92) (envelope-from ) id 1upND8-00049v-O7; Fri, 22 Aug 2025 08:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089730.1447228; Fri, 22 Aug 2025 08:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upND8-00049n-LV; Fri, 22 Aug 2025 08:33:22 +0000 Received: by outflank-mailman (input) for mailman id 1089730; Fri, 22 Aug 2025 08:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upND8-00049b-CY for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upND8-000kDY-0T for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upND8-00CpxG-12 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 08:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rPkel5FsY/yHZPkxyQxV/28d2wh9UEvA2b98ltc4IJ0=; b=PGTpuMK/6PgQ3g49rx9VMCfZ8L pibmj6xzZ91j4Pp+/Bvl3Hl27/2y2VXHDeZJ1xtyzvY5G/5KHzqYT7HvomYT3Gojzn7t1e2KkXz23 EUVq584nnzc2cK7J6YT4WGO07o2xVUODLAIGvsBj1PfZHxqkBkw5mCqdrVzLPmDknZmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/dom0less: Clear xenstore page Message-Id: Date: Fri, 22 Aug 2025 08:33:22 +0000 commit 76f9dbf9a2ffaeb0fed8661232d628dbffcfd333 Author: Jason Andryuk AuthorDate: Wed Aug 20 17:12:42 2025 -0400 Commit: Michal Orzel CommitDate: Fri Aug 22 09:56:51 2025 +0200 xen/dom0less: Clear xenstore page C Xenstored was seen failing to map a domU's event channel. Enhancing Xen's error messages shows: common/event_channel.c:427:d0v0 EVTCHNOP failure: d1, port 3267543746 error -22 Port 3267543746 is 0xc2c2c2c2 - SCRUB_PATTERN. Xenstore expects a non-zero evtchn_port to be valid. Explicitly zero the page to avoid this. Fixes: df2c03e2ebfe ("xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor") Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross Acked-by: Michal Orzel --- xen/common/device-tree/dom0less-build.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 6bb038111d..badc227031 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -600,6 +600,7 @@ static int __init alloc_xenstore_page(struct domain *d) d->arch.hvm.params[HVM_PARAM_STORE_PFN] = gfn_x(gfn); #endif interface = map_domain_page(mfn); + clear_page(interface); interface->connection = XENSTORE_RECONNECT; unmap_domain_page(interface); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 09:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 09:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089762.1447253 (Exim 4.92) (envelope-from ) id 1upNna-0001hc-Pw; Fri, 22 Aug 2025 09:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089762.1447253; Fri, 22 Aug 2025 09:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNna-0001hU-NN; Fri, 22 Aug 2025 09:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1089762; Fri, 22 Aug 2025 09:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNnZ-0001hO-TB for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upNnZ-000kwb-1V for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upNnZ-00CtPh-23 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EJcdxW/ZakuWsAOqyiY/xw0dKcOjEuTWjND4V+hLIbM=; b=iN6YK6t03GlfZ8BEOJ+x2Lyi1U jrv9scgcTcMgO8cbacTCnyKWd5+NUppiajb2+0dmNJMg2kEg6mauLh3lHpMHjD+BoRtTkWiNPFcQX GbW4rzrp8th5VZU4mLHyT1GXuayioWQ0vS3lMbNQX/Qtb4pUU9oGUcAjz8Tsq1l8xEHg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Enable is_xen_heap_page and is_xen_heap_mfn for ARM_32 Message-Id: Date: Fri, 22 Aug 2025 09:11:01 +0000 commit 120747f84a57b0705b8fb19adacb7fc586b2732a Author: Ayan Kumar Halder AuthorDate: Thu Aug 14 09:19:58 2025 +0100 Commit: Michal Orzel CommitDate: Fri Aug 22 09:55:45 2025 +0200 arm/mpu: Enable is_xen_heap_page and is_xen_heap_mfn for ARM_32 In case of ARM_32, all of the RAM will be covered by a permanent contiguous mapping (where VA == PA) and there will be a single heap. Thus, the memory allocated from Xen heap uses PGC_xen_heap. This is similar to the scenario described for "CONFIG_SEPARATE_XENHEAP=n W/ DIRECT MAP OF ALL RAM" in common/page_alloc.c. Signed-off-by: Ayan Kumar Halder Reviewed-by: Hari Limaye Tested-by: Hari Limaye Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/mm.h | 2 +- xen/arch/arm/include/asm/mpu/mm.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index fb79aeb088..7a93dad2ed 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -170,7 +170,7 @@ struct page_info #define _PGC_need_scrub _PGC_allocated #define PGC_need_scrub PGC_allocated -#ifdef CONFIG_ARM_64 +#if defined(CONFIG_ARM_64) || defined(CONFIG_MPU) #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap) #define is_xen_heap_mfn(mfn) \ (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn))) diff --git a/xen/arch/arm/include/asm/mpu/mm.h b/xen/arch/arm/include/asm/mpu/mm.h index c32fac8905..e1ded6521d 100644 --- a/xen/arch/arm/include/asm/mpu/mm.h +++ b/xen/arch/arm/include/asm/mpu/mm.h @@ -27,11 +27,6 @@ extern pr_t xen_mpumap[MAX_MPU_REGION_NR]; #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK)) -#ifdef CONFIG_ARM_32 -#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; }) -#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; }) -#endif - /* On MPU systems there is no translation, ma == va. */ static inline void *maddr_to_virt(paddr_t ma) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 09:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 09:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089763.1447256 (Exim 4.92) (envelope-from ) id 1upNnk-0001my-RO; Fri, 22 Aug 2025 09:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089763.1447256; Fri, 22 Aug 2025 09:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNnk-0001mq-Oq; Fri, 22 Aug 2025 09:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1089763; Fri, 22 Aug 2025 09:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNnj-0001me-SL for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upNnj-000kwf-1p for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upNnj-00CtQJ-2M for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kG+gVu4CJx7l+qHXKgSlzdFMnhxxOQxmxazhE2uqkCw=; b=F78SFRLfOFVrLm7RDhtYiwUUdl hESbkfU5dZE4n+1QS0dUF0lCOMmx8FyONlnDvY0D6zIhSI+nbsk0zH9HvhkqWMup9MqxX/Q/RR7Uj Q4qzQYCcRpqRAKsUvRJXcVbOGipvwojX1Y+j4cgjRKKolCa0ER0VDAEWvK6RelqK1z08=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Disable map_domain_page for MPU Message-Id: Date: Fri, 22 Aug 2025 09:11:11 +0000 commit 72042ea63bfe7e480f12f81cc72acbe95c6f9511 Author: Ayan Kumar Halder AuthorDate: Thu Aug 14 09:19:59 2025 +0100 Commit: Michal Orzel CommitDate: Fri Aug 22 09:55:45 2025 +0200 arm/mpu: Disable map_domain_page for MPU There is no domheap for ARM_32. All of the RAM is mapped and VA == PA. Signed-off-by: Ayan Kumar Halder Reviewed-by: Hari Limaye Tested-by: Hari Limaye Reviewed-by: Michal Orzel --- xen/arch/arm/Kconfig | 2 +- xen/arch/arm/mpu/Makefile | 1 - xen/arch/arm/mpu/domain-page.c | 45 ------------------------------------------ 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index a0c8160474..5355534f3d 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -1,7 +1,7 @@ config ARM_32 def_bool y depends on "$(ARCH)" = "arm32" - select ARCH_MAP_DOMAIN_PAGE + select ARCH_MAP_DOMAIN_PAGE if MMU config ARM_64 def_bool y diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile index 50f8fe4326..4963c8b550 100644 --- a/xen/arch/arm/mpu/Makefile +++ b/xen/arch/arm/mpu/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ -obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o obj-y += p2m.o obj-y += setup.init.o diff --git a/xen/arch/arm/mpu/domain-page.c b/xen/arch/arm/mpu/domain-page.c deleted file mode 100644 index df5e06b6db..0000000000 --- a/xen/arch/arm/mpu/domain-page.c +++ /dev/null @@ -1,45 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include - -void *map_domain_page_global(mfn_t mfn) -{ - BUG_ON("unimplemented"); - return NULL; -} - -/* Map a page of domheap memory */ -void *map_domain_page(mfn_t mfn) -{ - BUG_ON("unimplemented"); - return NULL; -} - -/* Release a mapping taken with map_domain_page() */ -void unmap_domain_page(const void *ptr) -{ - BUG_ON("unimplemented"); -} - -mfn_t domain_page_map_to_mfn(const void *ptr) -{ - BUG_ON("unimplemented"); - return INVALID_MFN; -} - -void unmap_domain_page_global(const void *va) -{ - BUG_ON("unimplemented"); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 09:11:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 09:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1089764.1447261 (Exim 4.92) (envelope-from ) id 1upNnu-0001q7-U5; Fri, 22 Aug 2025 09:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1089764.1447261; Fri, 22 Aug 2025 09:11:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNnu-0001pz-RX; Fri, 22 Aug 2025 09:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1089764; Fri, 22 Aug 2025 09:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upNnt-0001ph-Sj for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upNnt-000kwk-25 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upNnt-00CtQk-2f for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 09:11:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iaqxt7qdSy7b/o/H/1GHgsCaxTdQAx8kKcoXeEnKjiE=; b=aTvC8kcI4juGqczNCn+t5CkdQN E/qa3G+6PrOIQ0/TtGG1NvxWik1BlmGBAh7yjeK72/Q9WWZ/mHMBi7awZBF2SW5oNJ60aeMmIPAea uVS15pIKbleqJ3kFfNVEsH+1crQUIxxnLOyjooVLjeXwpyZY355Vde+X/HEqHs3CboX8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/dom0less: Clear xenstore page Message-Id: Date: Fri, 22 Aug 2025 09:11:21 +0000 commit 76f9dbf9a2ffaeb0fed8661232d628dbffcfd333 Author: Jason Andryuk AuthorDate: Wed Aug 20 17:12:42 2025 -0400 Commit: Michal Orzel CommitDate: Fri Aug 22 09:56:51 2025 +0200 xen/dom0less: Clear xenstore page C Xenstored was seen failing to map a domU's event channel. Enhancing Xen's error messages shows: common/event_channel.c:427:d0v0 EVTCHNOP failure: d1, port 3267543746 error -22 Port 3267543746 is 0xc2c2c2c2 - SCRUB_PATTERN. Xenstore expects a non-zero evtchn_port to be valid. Explicitly zero the page to avoid this. Fixes: df2c03e2ebfe ("xen/arm: Alloc XenStore page for Dom0less DomUs from hypervisor") Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross Acked-by: Michal Orzel --- xen/common/device-tree/dom0less-build.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 6bb038111d..badc227031 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -600,6 +600,7 @@ static int __init alloc_xenstore_page(struct domain *d) d->arch.hvm.params[HVM_PARAM_STORE_PFN] = gfn_x(gfn); #endif interface = map_domain_page(mfn); + clear_page(interface); interface->connection = XENSTORE_RECONNECT; unmap_domain_page(interface); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 22:44:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 22:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090591.1447718 (Exim 4.92) (envelope-from ) id 1upaUO-0004VK-1N; Fri, 22 Aug 2025 22:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090591.1447718; Fri, 22 Aug 2025 22:44:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUN-0004VB-UP; Fri, 22 Aug 2025 22:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1090591; Fri, 22 Aug 2025 22:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUM-0004V5-MS for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upaUM-0011ZF-0d for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upaUM-00DupX-18 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vZoYuEMN3lLTU6xxsAI0JwTWAqpB/x6Rle20Rc18N8Q=; b=aHVR1GKtu2xep3vjXZIxTFy/Q/ b9/gMXzyQKvaBU8wsyk4cMlYippqTCQp+eUSb6Rarc1+U0431ImzFR58XrAJoNpWqocX/W16TBaD4 x8NuJIpmd9mBcRVXkUdZVC07+qGfnJn5VAuDgKEF9aVohPYQm5XzKcsOZq8Ab5hSOmRU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/setup: Trim includes Message-Id: Date: Fri, 22 Aug 2025 22:44:02 +0000 commit abeb2fe8b5a556856548513550a4e973af678a67 Author: Andrew Cooper AuthorDate: Mon May 26 21:07:15 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 x86/setup: Trim includes None of these are used by setup.c today. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/setup.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 52c8a7adab..6c81841426 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -6,11 +6,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -25,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -62,7 +58,6 @@ #include -#include #ifdef CONFIG_COMPAT #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 22:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 22:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090592.1447721 (Exim 4.92) (envelope-from ) id 1upaUX-0004Wq-2I; Fri, 22 Aug 2025 22:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090592.1447721; Fri, 22 Aug 2025 22:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUW-0004Wi-Vu; Fri, 22 Aug 2025 22:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1090592; Fri, 22 Aug 2025 22:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUW-0004Wa-Lb for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upaUW-0011ZZ-1C for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upaUW-00Durc-1a for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R79NJa87PKhahTbKQ+YNTZdj4tC5rGkj7evgcmXas4g=; b=BQdzPDYQiZeigiPu1EZwuwatE8 NKihh09+pnUr89VRDIKAAl0jMSLAOE/hhpVt9iqdCP7PjyDu3QsnHjSL5az4HgWn6iZarWVlDDic/ hNlRHT0haVRdKFVW5VDu9BnGTdSp7hjZqgYKPtQ+TQPDK1daNJnTHq2RrpNSZKHAqku8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Implement rdmsr_safe() in C Message-Id: Date: Fri, 22 Aug 2025 22:44:12 +0000 commit d7c9d05cd1c3a0919e129c10a5b29b3215136552 Author: Andrew Cooper AuthorDate: Fri Apr 18 17:32:38 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 x86/msr: Implement rdmsr_safe() in C ... in preparation to be able to use asm goto. Notably this mean that the value parameter must be taken by pointer rather than by value. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/hwp.c | 14 +++++++------- xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu/amd.c | 25 ++++++++++++------------- xen/arch/x86/cpu/common.c | 6 +++--- xen/arch/x86/cpu/intel.c | 8 ++++---- xen/arch/x86/cpu/mcheck/mce_amd.c | 2 +- xen/arch/x86/cpu/mcheck/mce_intel.c | 6 +++--- xen/arch/x86/hvm/ioreq.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 16 ++++++++-------- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/arch/x86/include/asm/msr.h | 35 +++++++++++++++++++++-------------- xen/arch/x86/msr.c | 8 ++++---- xen/arch/x86/platform_hypercall.c | 2 +- xen/arch/x86/pv/emul-priv-op.c | 18 +++++++++--------- xen/arch/x86/spec_ctrl.c | 2 +- xen/arch/x86/x86_64/mmconfig-shared.c | 2 +- xen/drivers/passthrough/vtd/iommu.c | 2 +- 17 files changed, 80 insertions(+), 74 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index 36ecb0ed9d..38037d8300 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -249,7 +249,7 @@ static void cf_check hwp_write_request(void *info) { hwp_verbose("CPU%u: error wrmsr_safe(MSR_HWP_REQUEST, %lx)\n", policy->cpu, hwp_req.raw); - rdmsr_safe(MSR_HWP_REQUEST, data->curr_req.raw); + rdmsr_safe(MSR_HWP_REQUEST, &data->curr_req.raw); data->ret = -EINVAL; } } @@ -285,7 +285,7 @@ static bool hdc_set_pkg_hdc_ctl(unsigned int cpu, bool val) { uint64_t msr; - if ( rdmsr_safe(MSR_PKG_HDC_CTL, msr) ) + if ( rdmsr_safe(MSR_PKG_HDC_CTL, &msr) ) { hwp_err(cpu, "rdmsr_safe(MSR_PKG_HDC_CTL)\n"); return false; @@ -309,7 +309,7 @@ static bool hdc_set_pm_ctl1(unsigned int cpu, bool val) { uint64_t msr; - if ( rdmsr_safe(MSR_PM_CTL1, msr) ) + if ( rdmsr_safe(MSR_PM_CTL1, &msr) ) { hwp_err(cpu, "rdmsr_safe(MSR_PM_CTL1)\n"); return false; @@ -357,7 +357,7 @@ static void cf_check hwp_init_msrs(void *info) * Package level MSR, but we don't have a good idea of packages here, so * just do it everytime. */ - if ( rdmsr_safe(MSR_PM_ENABLE, val) ) + if ( rdmsr_safe(MSR_PM_ENABLE, &val) ) { hwp_err(policy->cpu, "rdmsr_safe(MSR_PM_ENABLE)\n"); data->curr_req.raw = -1; @@ -379,13 +379,13 @@ static void cf_check hwp_init_msrs(void *info) } } - if ( rdmsr_safe(MSR_HWP_CAPABILITIES, data->hwp_caps) ) + if ( rdmsr_safe(MSR_HWP_CAPABILITIES, &data->hwp_caps) ) { hwp_err(policy->cpu, "rdmsr_safe(MSR_HWP_CAPABILITIES)\n"); goto error; } - if ( rdmsr_safe(MSR_HWP_REQUEST, data->curr_req.raw) ) + if ( rdmsr_safe(MSR_HWP_REQUEST, &data->curr_req.raw) ) { hwp_err(policy->cpu, "rdmsr_safe(MSR_HWP_REQUEST)\n"); goto error; @@ -485,7 +485,7 @@ static void cf_check hwp_set_misc_turbo(void *info) data->ret = 0; - if ( rdmsr_safe(MSR_IA32_MISC_ENABLE, msr) ) + if ( rdmsr_safe(MSR_IA32_MISC_ENABLE, &msr) ) { hwp_verbose("CPU%u: error rdmsr_safe(MSR_IA32_MISC_ENABLE)\n", policy->cpu); diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 0fd8bdba70..cac5ba39e6 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -764,7 +764,7 @@ static int __init detect_init_APIC (void) if (enable_local_apic < 0) return -1; - if ( rdmsr_safe(MSR_APIC_BASE, msr_content) ) + if ( rdmsr_safe(MSR_APIC_BASE, &msr_content) ) { printk("No local APIC present\n"); return -1; diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index eb428f284e..567b992a9f 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -496,7 +496,7 @@ static void cf_check disable_c1e(void *unused) * The MSR does not exist in all FamilyF CPUs (only Rev F and above), * but we safely catch the #GP in that case. */ - if ((rdmsr_safe(MSR_K8_ENABLE_C1E, msr_content) == 0) && + if ((rdmsr_safe(MSR_K8_ENABLE_C1E, &msr_content) == 0) && (msr_content & (3ULL << 27)) && (wrmsr_safe(MSR_K8_ENABLE_C1E, msr_content & ~(3ULL << 27)) != 0)) printk(KERN_ERR "Failed to disable C1E on CPU#%u (%16"PRIx64")\n", @@ -695,21 +695,21 @@ static void amd_process_freq(const struct cpuinfo_x86 *c, lo = 0; /* gcc may not recognize the loop having at least 5 iterations */ for (h = c->x86 == 0x10 ? 5 : 8; h--; ) - if (!rdmsr_safe(0xC0010064 + h, lo) && (lo >> 63)) + if (!rdmsr_safe(0xC0010064 + h, &lo) && (lo >> 63)) break; if (!(lo >> 63)) return; if (idx && idx < h && - !rdmsr_safe(0xC0010064 + idx, val) && (val >> 63) && - !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) { + !rdmsr_safe(0xC0010064 + idx, &val) && (val >> 63) && + !rdmsr_safe(0xC0010064, &hi) && (hi >> 63)) { if (nom_mhz) *nom_mhz = amd_parse_freq(c->x86, val); if (low_mhz) *low_mhz = amd_parse_freq(c->x86, lo); if (hi_mhz) *hi_mhz = amd_parse_freq(c->x86, hi); - } else if (h && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) { + } else if (h && !rdmsr_safe(0xC0010064, &hi) && (hi >> 63)) { if (low_mhz) *low_mhz = amd_parse_freq(c->x86, lo); if (hi_mhz) @@ -765,7 +765,7 @@ void amd_init_lfence(struct cpuinfo_x86 *c) * rather than per-thread, so do a full safe read/write/readback cycle * in the worst case. */ - if (rdmsr_safe(MSR_AMD64_DE_CFG, value)) + if (rdmsr_safe(MSR_AMD64_DE_CFG, &value)) /* Unable to read. Assume the safer default. */ __clear_bit(X86_FEATURE_LFENCE_DISPATCH, c->x86_capability); @@ -775,7 +775,7 @@ void amd_init_lfence(struct cpuinfo_x86 *c) c->x86_capability); else if (wrmsr_safe(MSR_AMD64_DE_CFG, value | AMD64_DE_CFG_LFENCE_SERIALISE) || - rdmsr_safe(MSR_AMD64_DE_CFG, value) || + rdmsr_safe(MSR_AMD64_DE_CFG, &value) || !(value & AMD64_DE_CFG_LFENCE_SERIALISE)) /* Attempt to set failed. Assume the safer default. */ __clear_bit(X86_FEATURE_LFENCE_DISPATCH, @@ -804,7 +804,7 @@ static bool set_legacy_ssbd(const struct cpuinfo_x86 *c, bool enable) if (bit >= 0) { uint64_t val, mask = 1ull << bit; - if (rdmsr_safe(MSR_AMD64_LS_CFG, val) || + if (rdmsr_safe(MSR_AMD64_LS_CFG, &val) || ({ val &= ~mask; if (enable) @@ -962,7 +962,7 @@ void amd_init_spectral_chicken(void) if (cpu_has_hypervisor || !is_zen2_uarch()) return; - if (rdmsr_safe(MSR_AMD64_DE_CFG2, val) == 0 && !(val & chickenbit)) + if (rdmsr_safe(MSR_AMD64_DE_CFG2, &val) == 0 && !(val & chickenbit)) wrmsr_safe(MSR_AMD64_DE_CFG2, val | chickenbit); } @@ -1116,8 +1116,7 @@ static void amd_check_bp_cfg(void) static void cf_check init_amd(struct cpuinfo_x86 *c) { u32 l, h; - - unsigned long long value; + uint64_t value; /* Disable TLB flush filter by setting HWCR.FFDIS on K8 * bit 6 of msr C001_0015 @@ -1251,7 +1250,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) if ((c->x86 == 0x15) && (c->x86_model >= 0x10) && (c->x86_model <= 0x1f) && !cpu_has(c, X86_FEATURE_TOPOEXT) && - !rdmsr_safe(MSR_K8_EXT_FEATURE_MASK, value)) { + !rdmsr_safe(MSR_K8_EXT_FEATURE_MASK, &value)) { value |= 1ULL << 54; wrmsr_safe(MSR_K8_EXT_FEATURE_MASK, value); rdmsrl(MSR_K8_EXT_FEATURE_MASK, value); @@ -1267,7 +1266,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) * Disable it on the affected CPUs. */ if (c->x86 == 0x15 && c->x86_model >= 0x02 && c->x86_model < 0x20 && - !rdmsr_safe(MSR_AMD64_IC_CFG, value) && (value & 0x1e) != 0x1e) + !rdmsr_safe(MSR_AMD64_IC_CFG, &value) && (value & 0x1e) != 0x1e) wrmsr_safe(MSR_AMD64_IC_CFG, value | 0x1e); amd_get_topology(c); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index a66cd5f9c7..530b9eb39a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -131,14 +131,14 @@ bool __init probe_cpuid_faulting(void) uint64_t val; int rc; - if ((rc = rdmsr_safe(MSR_INTEL_PLATFORM_INFO, val)) == 0) + if ((rc = rdmsr_safe(MSR_INTEL_PLATFORM_INFO, &val)) == 0) raw_cpu_policy.platform_info.cpuid_faulting = val & MSR_PLATFORM_INFO_CPUID_FAULTING; if (rc || !(val & MSR_PLATFORM_INFO_CPUID_FAULTING) || rdmsr_safe(MSR_INTEL_MISC_FEATURES_ENABLES, - this_cpu(msr_misc_features))) + &this_cpu(msr_misc_features))) { setup_clear_cpu_cap(X86_FEATURE_CPUID_FAULTING); return false; @@ -852,7 +852,7 @@ static void skinit_enable_intr(void) * If the platform is performing a Secure Launch via SKINIT * INIT_REDIRECTION flag will be active. */ - if ( !cpu_has_skinit || rdmsr_safe(MSR_K8_VM_CR, val) || + if ( !cpu_has_skinit || rdmsr_safe(MSR_K8_VM_CR, &val) || !(val & VM_CR_INIT_REDIRECTION) ) return; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 29144ffe37..ecca11f04d 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -115,7 +115,7 @@ static uint64_t __init _probe_mask_msr(unsigned int *msr, uint64_t caps) expected_levelling_cap |= caps; - if (rdmsr_safe(*msr, val) || wrmsr_safe(*msr, val)) + if (rdmsr_safe(*msr, &val) || wrmsr_safe(*msr, val)) *msr = 0; else levelling_caps |= caps; @@ -546,7 +546,7 @@ static void intel_log_freq(const struct cpuinfo_x86 *c) { 26667, 13333, 20000, 16667, 33333, 10000, 40000 }; case 6: - if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, &msrval) ) return; max_ratio = msrval >> 8; min_ratio = msrval >> 40; @@ -566,7 +566,7 @@ static void intel_log_freq(const struct cpuinfo_x86 *c) */ if ( min_ratio > max_ratio ) SWAP(min_ratio, max_ratio); - if ( rdmsr_safe(MSR_FSB_FREQ, msrval) || + if ( rdmsr_safe(MSR_FSB_FREQ, &msrval) || (msrval &= 7) >= ARRAY_SIZE(core_factors) ) return; factor = core_factors[msrval]; @@ -584,7 +584,7 @@ static void intel_log_freq(const struct cpuinfo_x86 *c) break; case 0xf: - if ( rdmsr_safe(MSR_IA32_EBC_FREQUENCY_ID, msrval) ) + if ( rdmsr_safe(MSR_IA32_EBC_FREQUENCY_ID, &msrval) ) return; max_ratio = msrval >> 24; min_ratio = 0; diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mce_amd.c index 4f06a3153b..25c29eb3d2 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -195,7 +195,7 @@ static void mcequirk_amd_apply(enum mcequirk_amd_flags flags) break; case MCEQUIRK_F10_GART: - if ( rdmsr_safe(MSR_AMD64_MCx_MASK(4), val) == 0 ) + if ( rdmsr_safe(MSR_AMD64_MCx_MASK(4), &val) == 0 ) wrmsr_safe(MSR_AMD64_MCx_MASK(4), val | (1 << 10)); break; diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 1e52b1ac25..fac60f2d37 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -726,7 +726,7 @@ static bool intel_enable_lmce(void) * MSR_IA32_MCG_EXT_CTL.LMCE_EN. */ - if ( rdmsr_safe(MSR_IA32_FEATURE_CONTROL, msr_content) ) + if ( rdmsr_safe(MSR_IA32_FEATURE_CONTROL, &msr_content) ) return false; if ( (msr_content & IA32_FEATURE_CONTROL_LOCK) && @@ -879,14 +879,14 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) case 0x8f: /* Sapphire Rapids X */ if ( (c != &boot_cpu_data && !ppin_msr) || - rdmsr_safe(MSR_PPIN_CTL, val) ) + rdmsr_safe(MSR_PPIN_CTL, &val) ) return; /* If PPIN is disabled, but not locked, try to enable. */ if ( !(val & (PPIN_ENABLE | PPIN_LOCKOUT)) ) { wrmsr_safe(MSR_PPIN_CTL, val | PPIN_ENABLE); - rdmsr_safe(MSR_PPIN_CTL, val); + rdmsrl(MSR_PPIN_CTL, val); } if ( !(val & PPIN_ENABLE) ) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index 199cee5b33..a5fa97e149 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -293,7 +293,7 @@ bool arch_ioreq_server_get_type_addr(const struct domain *d, { uint64_t msr_val; - if ( !rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) && + if ( !rdmsr_safe(MSR_AMD64_NB_CFG, &msr_val) && (msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)) ) *addr |= CF8_ADDR_HI(cf8); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 7301846c2a..b54f9d9af5 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1083,8 +1083,8 @@ static void svm_host_osvw_init(void) { uint64_t len, status; - if ( rdmsr_safe(MSR_AMD_OSVW_ID_LENGTH, len) || - rdmsr_safe(MSR_AMD_OSVW_STATUS, status) ) + if ( rdmsr_safe(MSR_AMD_OSVW_ID_LENGTH, &len) || + rdmsr_safe(MSR_AMD_OSVW_STATUS, &status) ) len = status = 0; if ( len < osvw_length ) @@ -1482,7 +1482,7 @@ static void svm_init_erratum_383(const struct cpuinfo_x86 *c) return; /* use safe methods to be compatible with nested virtualization */ - if ( rdmsr_safe(MSR_AMD64_DC_CFG, msr_content) == 0 && + if ( rdmsr_safe(MSR_AMD64_DC_CFG, &msr_content) == 0 && wrmsr_safe(MSR_AMD64_DC_CFG, msr_content | (1ULL << 47)) == 0 ) amd_erratum383_found = 1; else @@ -1786,7 +1786,7 @@ static int cf_check svm_msr_read_intercept( break; case MSR_F10_BU_CFG: - if ( !rdmsr_safe(msr, *msr_content) ) + if ( !rdmsr_safe(msr, msr_content) ) break; if ( boot_cpu_data.x86 == 0xf ) @@ -1805,7 +1805,7 @@ static int cf_check svm_msr_read_intercept( goto gpf; case MSR_F10_BU_CFG2: - if ( rdmsr_safe(msr, *msr_content) ) + if ( rdmsr_safe(msr, msr_content) ) goto gpf; break; @@ -1882,7 +1882,7 @@ static int cf_check svm_msr_read_intercept( break; default: - if ( d->arch.msr_relaxed && !rdmsr_safe(msr, tmp) ) + if ( d->arch.msr_relaxed && !rdmsr_safe(msr, &tmp) ) { *msr_content = 0; break; @@ -2048,7 +2048,7 @@ static int cf_check svm_msr_write_intercept( case MSR_F10_BU_CFG: case MSR_F10_BU_CFG2: - if ( rdmsr_safe(msr, msr_content) ) + if ( rdmsr_safe(msr, &msr_content) ) goto gpf; break; @@ -2069,7 +2069,7 @@ static int cf_check svm_msr_write_intercept( break; default: - if ( d->arch.msr_relaxed && !rdmsr_safe(msr, msr_content) ) + if ( d->arch.msr_relaxed && !rdmsr_safe(msr, &msr_content) ) break; gdprintk(XENLOG_WARNING, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5439f950dc..f97a774653 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3503,7 +3503,7 @@ static int cf_check vmx_msr_read_intercept( break; } - if ( curr->domain->arch.msr_relaxed && !rdmsr_safe(msr, tmp) ) + if ( curr->domain->arch.msr_relaxed && !rdmsr_safe(msr, &tmp) ) { *msr_content = 0; break; @@ -3813,7 +3813,7 @@ static int cf_check vmx_msr_write_intercept( is_last_branch_msr(msr) ) break; - if ( v->domain->arch.msr_relaxed && !rdmsr_safe(msr, msr_content) ) + if ( v->domain->arch.msr_relaxed && !rdmsr_safe(msr, &msr_content) ) break; gdprintk(XENLOG_WARNING, diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index f5df8698b7..70e6796a45 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -48,20 +48,27 @@ static inline void wrmsrns(uint32_t msr, uint64_t val) } /* rdmsr with exception handling */ -#define rdmsr_safe(msr,val) ({\ - int rc_; \ - uint64_t lo_, hi_; \ - __asm__ __volatile__( \ - "1: rdmsr\n2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: xorl %k0,%k0\n; xorl %k1,%k1\n" \ - " movl %5,%2\n; jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE(1b, 3b) \ - : "=a" (lo_), "=d" (hi_), "=&r" (rc_) \ - : "c" (msr), "2" (0), "i" (-EFAULT)); \ - val = lo_ | (hi_ << 32); \ - rc_; }) +static inline int rdmsr_safe(unsigned int msr, uint64_t *val) +{ + uint64_t lo, hi; + int rc; + + asm_inline volatile ( + "1: rdmsr\n2:\n" + ".section .fixup,\"ax\"\n" + "3: xorl %k0,%k0\n\t" + " xorl %k1,%k1\n\t" + " movl %5,%2\n\t" + " jmp 2b\n\t" + ".previous" + _ASM_EXTABLE(1b, 3b) + : "=a" (lo), "=d" (hi), "=&r" (rc) + : "c" (msr), "2" (0), "i" (-EFAULT) ); + + *val = lo | (hi << 32); + + return rc; +} /* wrmsr with exception handling */ static inline int wrmsr_safe(unsigned int msr, uint64_t val) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index c6465b41ee..ad75a2e108 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -192,7 +192,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || !(boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || - rdmsr_safe(MSR_AMD_PATCHLEVEL, *val) ) + rdmsr_safe(MSR_AMD_PATCHLEVEL, val) ) goto gp_fault; break; @@ -240,7 +240,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) goto gp_fault; *val = 0; - if ( likely(!is_cpufreq_controller(d)) || rdmsr_safe(msr, *val) == 0 ) + if ( likely(!is_cpufreq_controller(d)) || rdmsr_safe(msr, val) == 0 ) break; goto gp_fault; @@ -306,7 +306,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) goto gp_fault; if ( !is_hardware_domain(d) ) return X86EMUL_UNHANDLEABLE; - if ( rdmsr_safe(msr, *val) ) + if ( rdmsr_safe(msr, val) ) goto gp_fault; if ( msr == MSR_K8_SYSCFG ) *val &= (SYSCFG_TOM2_FORCE_WB | SYSCFG_MTRR_TOM2_EN | @@ -322,7 +322,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_FAM10H_MMIO_CONF_BASE: if ( !is_hardware_domain(d) || !(cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) || - rdmsr_safe(msr, *val) ) + rdmsr_safe(msr, val) ) goto gp_fault; break; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 3eba791889..21f9f795c1 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -186,7 +186,7 @@ void cf_check resource_access(void *info) if ( unlikely(read_tsc) ) local_irq_save(flags); - ret = rdmsr_safe(entry->idx, entry->val); + ret = rdmsr_safe(entry->idx, &entry->val); if ( unlikely(read_tsc) ) { diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 9f8600f43a..f46aaf2a3b 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -249,7 +249,7 @@ static bool pci_cfg_ok(struct domain *currd, unsigned int start, { uint64_t msr_val; - if ( rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) ) + if ( rdmsr_safe(MSR_AMD64_NB_CFG, &msr_val) ) return false; if ( msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT) ) start |= CF8_ADDR_HI(currd->arch.pci_cf8); @@ -962,7 +962,7 @@ static int cf_check read_msr( return X86EMUL_OKAY; case MSR_IA32_MISC_ENABLE: - if ( rdmsr_safe(reg, *val) ) + if ( rdmsr_safe(reg, val) ) break; *val = guest_misc_enable(*val); return X86EMUL_OKAY; @@ -992,7 +992,7 @@ static int cf_check read_msr( } /* fall through */ default: - if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, tmp) ) + if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, &tmp) ) { *val = 0; return X86EMUL_OKAY; @@ -1002,14 +1002,14 @@ static int cf_check read_msr( break; normal: - if ( rdmsr_safe(reg, *val) ) + if ( rdmsr_safe(reg, val) ) break; return X86EMUL_OKAY; } done: if ( ret != X86EMUL_OKAY && !curr->arch.pv.trap_ctxt[X86_EXC_GP].address && - (reg >> 16) != 0x4000 && !rdmsr_safe(reg, tmp) ) + (reg >> 16) != 0x4000 && !rdmsr_safe(reg, &tmp) ) { gprintk(XENLOG_WARNING, "faking RDMSR 0x%08x\n", reg); *val = 0; @@ -1096,7 +1096,7 @@ static int cf_check write_msr( case MSR_AMD64_NB_CFG: if ( !is_hwdom_pinned_vcpu(curr) ) return X86EMUL_OKAY; - if ( (rdmsr_safe(MSR_AMD64_NB_CFG, temp) != 0) || + if ( (rdmsr_safe(MSR_AMD64_NB_CFG, &temp) != 0) || ((val ^ temp) & ~(1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)) ) goto invalid; if ( wrmsr_safe(MSR_AMD64_NB_CFG, val) == 0 ) @@ -1109,7 +1109,7 @@ static int cf_check write_msr( break; if ( !is_hwdom_pinned_vcpu(curr) ) return X86EMUL_OKAY; - if ( rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, temp) != 0 ) + if ( rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, &temp) != 0 ) break; if ( (pci_probe & PCI_PROBE_MASK) == PCI_PROBE_MMCONF ? temp != val : @@ -1125,7 +1125,7 @@ static int cf_check write_msr( break; case MSR_IA32_MISC_ENABLE: - if ( rdmsr_safe(reg, temp) ) + if ( rdmsr_safe(reg, &temp) ) break; if ( val != guest_misc_enable(temp) ) goto invalid; @@ -1172,7 +1172,7 @@ static int cf_check write_msr( } /* fall through */ default: - if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, val) ) + if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, &val) ) return X86EMUL_OKAY; gdprintk(XENLOG_WARNING, diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 1ff3d6835d..e71f62c601 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -714,7 +714,7 @@ static bool __init check_smt_enabled(void) */ if ( boot_cpu_data.vendor == X86_VENDOR_INTEL && boot_cpu_data.family != 0xf && !cpu_has_hypervisor && - !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, val) ) + !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, &val) ) return (MASK_EXTR(val, MSR_CTC_CORE_MASK) != MASK_EXTR(val, MSR_CTC_THREAD_MASK)); diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index fbe2676f86..d53da1e2a7 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -149,7 +149,7 @@ static const char *__init cf_check pci_mmcfg_amd_fam10h(void) return NULL; address = MSR_FAM10H_MMIO_CONF_BASE; - if (rdmsr_safe(address, msr_content)) + if ( rdmsr_safe(address, &msr_content) ) return NULL; /* mmconfig is not enable */ diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index c55f02c97e..b4105163cc 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2286,7 +2286,7 @@ static bool __init vtd_ept_page_compatible(const struct vtd_iommu *iommu) /* EPT is not initialised yet, so we must check the capability in * the MSR explicitly rather than use cpu_has_vmx_ept_*() */ - if ( rdmsr_safe(MSR_IA32_VMX_EPT_VPID_CAP, ept_cap) != 0 ) + if ( rdmsr_safe(MSR_IA32_VMX_EPT_VPID_CAP, &ept_cap) != 0 ) return false; return (ept_has_2mb(ept_cap) && opt_hap_2mb) <= -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 22:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 22:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090593.1447726 (Exim 4.92) (envelope-from ) id 1upaUi-0004ZT-4K; Fri, 22 Aug 2025 22:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090593.1447726; Fri, 22 Aug 2025 22:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUi-0004ZK-19; Fri, 22 Aug 2025 22:44:24 +0000 Received: by outflank-mailman (input) for mailman id 1090593; Fri, 22 Aug 2025 22:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUg-0004Z6-Q2 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upaUg-0011Zd-1e for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upaUg-00Duss-24 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cH0MmqOIP2QXLkceLNbsHxaTzfiSs7e5qmyqg+9aO5Q=; b=hIrwXU5fHXg12Q/ZWSfx8Wgq63 5kjH0RavBf3oxcYwYvS7GphcjfH2f8xCeRbcRiV3x6TYY9+e6wjmToYU18AtwBPdYqbTJ5hOhdzwi PcBeacH+k0Gw5ZnqEc9YdYeJTW9Il/Za5CVMRA7aLzUOX/mXm+3PNrKR618MgbAME+8Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msr: Rework rdmsr_safe() using asm goto() Message-Id: Date: Fri, 22 Aug 2025 22:44:22 +0000 commit 16de294bed6e4817a7275fa11cf8d203c009a1f5 Author: Andrew Cooper AuthorDate: Fri Apr 18 17:09:40 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 x86/msr: Rework rdmsr_safe() using asm goto() ... on capable toolchains. This avoids needing to hold rc in a register across the RDMSR, and in most cases removes direct testing and branching based on rc, as the fault label can be rearranged to directly land on the out-of-line block. There is a subtle difference in behaviour. The old behaviour would, on fault, still produce 0's and write to val. The new behaviour only writes val on success, and write_msr() is the only place where this matters. Move temp out of switch() scope and initialise it to 0. While it is possible to retain the old behaviour, it's not great to do so because the compiler cannot optimise out the dead store when it's not to a local function variable, and Xen has a lot of msr infrastructure which passes a val pointer through the call-tree. We have compilers with ASM_GOTO_OUTPUT in CI, and they do notice. Resolves: https://gitlab.com/xen-project/xen/-/work_items/217 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 18 ++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 70e6796a45..901770555b 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -51,6 +51,23 @@ static inline void wrmsrns(uint32_t msr, uint64_t val) static inline int rdmsr_safe(unsigned int msr, uint64_t *val) { uint64_t lo, hi; + +#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT + asm_inline goto ( + "1: rdmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : "=a" (lo), "=d" (hi) + : "c" (msr) + : + : fault ); + + *val = lo | (hi << 32); + + return 0; + + fault: + return -EFAULT; +#else int rc; asm_inline volatile ( @@ -68,6 +85,7 @@ static inline int rdmsr_safe(unsigned int msr, uint64_t *val) *val = lo | (hi << 32); return rc; +#endif } /* wrmsr with exception handling */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index f46aaf2a3b..225d4cff03 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1028,6 +1028,7 @@ static int cf_check write_msr( struct vcpu *curr = current; const struct domain *currd = curr->domain; const struct cpu_policy *cp = currd->arch.cpu_policy; + uint64_t temp = 0; bool vpmu_msr = false; int ret; @@ -1041,8 +1042,6 @@ static int cf_check write_msr( switch ( reg ) { - uint64_t temp; - case MSR_FS_BASE: case MSR_GS_BASE: case MSR_SHADOW_GS_BASE: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 22:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 22:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090594.1447729 (Exim 4.92) (envelope-from ) id 1upaUs-0004cB-6b; Fri, 22 Aug 2025 22:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090594.1447729; Fri, 22 Aug 2025 22:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUs-0004c3-3l; Fri, 22 Aug 2025 22:44:34 +0000 Received: by outflank-mailman (input) for mailman id 1090594; Fri, 22 Aug 2025 22:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaUq-0004bt-Rn for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upaUq-0011c4-20 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upaUq-00DutI-2V for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3NpSODopr8QGBx1L7it/sWwe5atkH14TzfUcYAz4yFk=; b=MRQEuu1JF0hXrcs3ntJ/oaGdgO NC6ACozEjyryhzyA+idMJIjaYPS5E5StACRNRECGpfpfimQYXrXPaaz6/3R6wryOtWldqEjRSdWkE iEIYUakbZ7o1hqzHBXyxNHEmxKv33qVx/A1O2j/dLfy/g9jBqAIMQRAG1KwCT6RtmP9w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Use 'watchdog' for x86 hardware Message-Id: Date: Fri, 22 Aug 2025 22:44:32 +0000 commit 011a9e2566564fb4c4dfadd3b1bfe94983b338f8 Author: Andrew Cooper AuthorDate: Wed Aug 20 11:57:57 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 CI: Use 'watchdog' for x86 hardware This detects various hangs and turns them into a crash with backtrace. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 2750d24eba..b49a44c5b1 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -260,14 +260,14 @@ TFTP=/scratch/gitlab-runner/tftp CONTROLLER=control@thor.testnet echo " -multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts +multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot watchdog $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe -kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot watchdog $extra_xen_opts || reboot module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot module /gitlab-ci/initrd-dom0 || reboot boot diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 6970a8658d..0ad8f658e3 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -15,7 +15,7 @@ WORKDIR="${PWD}" TEST="$1" PASS_MSG="Test passed: ${TEST}" XEN_CMD_DOM0="dom0=pvh dom0_max_vcpus=4 dom0_mem=4G" -XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot" +XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot watchdog" XEN_CMD_EXTRA="" DOM0_CMD="" DOMU_CMD="" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 22:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 22:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090595.1447734 (Exim 4.92) (envelope-from ) id 1upaV2-0004eR-8F; Fri, 22 Aug 2025 22:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090595.1447734; Fri, 22 Aug 2025 22:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaV2-0004eI-58; Fri, 22 Aug 2025 22:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1090595; Fri, 22 Aug 2025 22:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upaV0-0004e8-Vo for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upaV0-0011c9-2M for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upaV0-00Dutp-2t for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 22:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lvj+lcwwgZsl40fPTUn20cnN39aHTtKJJQAG+E7G6yc=; b=1cjhbu/8PswccIKaDFK4uuvhku eHj5lz2oXUyqQk+4h7NR14l6yXBH1TFxW4FmXVfX/S4sMCn4ANMEgcihJRrCfBRLlqtzDRZq7XA5z hj29rweQW1N5gl+UgRiNQezkqQL9Xuv+gcWHIbX9+RZMGBrY6TzICVhXsn+2LBgGZxLg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: hide xenstore-features behind option Message-Id: Date: Fri, 22 Aug 2025 22:44:42 +0000 commit 4efc1da300e3deb15f24ae3c3d4780c1941e3548 Author: Juergen Gross AuthorDate: Fri Aug 15 16:32:36 2025 +0200 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 tools/xl: hide xenstore-features behind option In order to be able to use "xl info" before Xenstore has been started or after it has crashed, hide obtaining the available Xenstore features behind the new option "-x". Fixes: ecce7970cfe7 ("tools/xl: add available Xenstore features to xl info output") Reported-by: Ross Lagerwall Signed-off-by: Juergen Gross Acked-by: Anthony PERARD --- docs/man/xl.1.pod.in | 4 ++++ docs/man/xl.cfg.5.pod.in | 2 +- tools/xl/xl_info.c | 14 ++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index fe38724b2b..88ccf7ad82 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -996,6 +996,10 @@ B List host NUMA topology information +=item B<-x>, B<--xenstore> + +Show Xenstore features available. + =back =item B diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index f0c920b39d..acff45d308 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -743,7 +743,7 @@ condition. =back The features supported by the running Xenstore instance can be retrieved -via the B command in dom0. +via the B command in dom0. The default value is B<0xffffffff>, meaning that all possible Xenstore features are visible by the guest. diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index eb019e3ee9..d3583cbf8f 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -353,7 +353,7 @@ static void output_xenstore_info(void) xs_close(xsh); } -static void print_info(int numa) +static void print_info(int numa, bool xs) { output_nodeinfo(); @@ -365,7 +365,8 @@ static void print_info(int numa) } output_xeninfo(); - output_xenstore_info(); + if (xs) + output_xenstore_info(); maybe_printf("xend_config_format : 4\n"); @@ -631,14 +632,19 @@ int main_info(int argc, char **argv) int opt; static struct option opts[] = { {"numa", 0, 0, 'n'}, + {"xenstore", 0, 0, 'x'}, COMMON_LONG_OPTS }; int numa = 0; + bool xs = false; - SWITCH_FOREACH_OPT(opt, "n", opts, "info", 0) { + SWITCH_FOREACH_OPT(opt, "nx", opts, "info", 0) { case 'n': numa = 1; break; + case 'x': + xs = true; + break; } /* @@ -648,7 +654,7 @@ int main_info(int argc, char **argv) if (numa == 0 && argc > optind) info_name = argv[optind]; - print_info(numa); + print_info(numa, xs); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 23:33:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 23:33:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090669.1447788 (Exim 4.92) (envelope-from ) id 1upbFm-0004oI-PJ; Fri, 22 Aug 2025 23:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090669.1447788; Fri, 22 Aug 2025 23:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbFm-0004oA-ME; Fri, 22 Aug 2025 23:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1090669; Fri, 22 Aug 2025 23:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbFm-0004o4-45 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upbFl-0012af-2B for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upbFl-00DwvP-2k for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jt8rxDKzGx4pZvKyj8sy0vFPD/hcDcw5n+T7g/pNOa0=; b=eNqTfUzLYYO0BwUTs5nA0Oh5oc VgGdYzy1DJalpxJX2M2OBqdcyUhnSnp6kxEuMwSA/7nWtmH9qkez1vv6KEVVbDrsgEDf1WJzjqGEm chLzlJZU591dm0AYy9JtEHkrfxEJRMl0AEC5RIDciULcRtVR2SWkNTeMKkc1PAp5iYfA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/setup: Trim includes Message-Id: Date: Fri, 22 Aug 2025 23:33:01 +0000 commit abeb2fe8b5a556856548513550a4e973af678a67 Author: Andrew Cooper AuthorDate: Mon May 26 21:07:15 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 x86/setup: Trim includes None of these are used by setup.c today. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/setup.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 52c8a7adab..6c81841426 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -6,11 +6,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -25,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -62,7 +58,6 @@ #include -#include #ifdef CONFIG_COMPAT #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 23:33:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 23:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090670.1447791 (Exim 4.92) (envelope-from ) id 1upbFw-0004qd-QP; Fri, 22 Aug 2025 23:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090670.1447791; Fri, 22 Aug 2025 23:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbFw-0004qV-Nk; Fri, 22 Aug 2025 23:33:12 +0000 Received: by outflank-mailman (input) for mailman id 1090670; Fri, 22 Aug 2025 23:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbFw-0004qO-1g for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upbFv-0012bE-2c for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upbFv-00Dwwg-39 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tu7pugXlludYsXs/0+j3wr8nPNnp2b6D5co+vVb4RIM=; b=5A2qjwenQOZF0sc5CjA7r3Y7Fs WbuQMqO9d982Z1FJd6JdwGXYsv5sWEN5RLX+dnyrZiAQgENVH1+sXdJyXK5pu2uV6RBK4vluhcbvV krhOSG3dkA0FKoyHap1dx6bxh5/Jud/pQgTTY5N+C1oiga4Rcrtm2WjvaZsyHfpooFSo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Implement rdmsr_safe() in C Message-Id: Date: Fri, 22 Aug 2025 23:33:11 +0000 commit d7c9d05cd1c3a0919e129c10a5b29b3215136552 Author: Andrew Cooper AuthorDate: Fri Apr 18 17:32:38 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 x86/msr: Implement rdmsr_safe() in C ... in preparation to be able to use asm goto. Notably this mean that the value parameter must be taken by pointer rather than by value. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/hwp.c | 14 +++++++------- xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu/amd.c | 25 ++++++++++++------------- xen/arch/x86/cpu/common.c | 6 +++--- xen/arch/x86/cpu/intel.c | 8 ++++---- xen/arch/x86/cpu/mcheck/mce_amd.c | 2 +- xen/arch/x86/cpu/mcheck/mce_intel.c | 6 +++--- xen/arch/x86/hvm/ioreq.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 16 ++++++++-------- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/arch/x86/include/asm/msr.h | 35 +++++++++++++++++++++-------------- xen/arch/x86/msr.c | 8 ++++---- xen/arch/x86/platform_hypercall.c | 2 +- xen/arch/x86/pv/emul-priv-op.c | 18 +++++++++--------- xen/arch/x86/spec_ctrl.c | 2 +- xen/arch/x86/x86_64/mmconfig-shared.c | 2 +- xen/drivers/passthrough/vtd/iommu.c | 2 +- 17 files changed, 80 insertions(+), 74 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index 36ecb0ed9d..38037d8300 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -249,7 +249,7 @@ static void cf_check hwp_write_request(void *info) { hwp_verbose("CPU%u: error wrmsr_safe(MSR_HWP_REQUEST, %lx)\n", policy->cpu, hwp_req.raw); - rdmsr_safe(MSR_HWP_REQUEST, data->curr_req.raw); + rdmsr_safe(MSR_HWP_REQUEST, &data->curr_req.raw); data->ret = -EINVAL; } } @@ -285,7 +285,7 @@ static bool hdc_set_pkg_hdc_ctl(unsigned int cpu, bool val) { uint64_t msr; - if ( rdmsr_safe(MSR_PKG_HDC_CTL, msr) ) + if ( rdmsr_safe(MSR_PKG_HDC_CTL, &msr) ) { hwp_err(cpu, "rdmsr_safe(MSR_PKG_HDC_CTL)\n"); return false; @@ -309,7 +309,7 @@ static bool hdc_set_pm_ctl1(unsigned int cpu, bool val) { uint64_t msr; - if ( rdmsr_safe(MSR_PM_CTL1, msr) ) + if ( rdmsr_safe(MSR_PM_CTL1, &msr) ) { hwp_err(cpu, "rdmsr_safe(MSR_PM_CTL1)\n"); return false; @@ -357,7 +357,7 @@ static void cf_check hwp_init_msrs(void *info) * Package level MSR, but we don't have a good idea of packages here, so * just do it everytime. */ - if ( rdmsr_safe(MSR_PM_ENABLE, val) ) + if ( rdmsr_safe(MSR_PM_ENABLE, &val) ) { hwp_err(policy->cpu, "rdmsr_safe(MSR_PM_ENABLE)\n"); data->curr_req.raw = -1; @@ -379,13 +379,13 @@ static void cf_check hwp_init_msrs(void *info) } } - if ( rdmsr_safe(MSR_HWP_CAPABILITIES, data->hwp_caps) ) + if ( rdmsr_safe(MSR_HWP_CAPABILITIES, &data->hwp_caps) ) { hwp_err(policy->cpu, "rdmsr_safe(MSR_HWP_CAPABILITIES)\n"); goto error; } - if ( rdmsr_safe(MSR_HWP_REQUEST, data->curr_req.raw) ) + if ( rdmsr_safe(MSR_HWP_REQUEST, &data->curr_req.raw) ) { hwp_err(policy->cpu, "rdmsr_safe(MSR_HWP_REQUEST)\n"); goto error; @@ -485,7 +485,7 @@ static void cf_check hwp_set_misc_turbo(void *info) data->ret = 0; - if ( rdmsr_safe(MSR_IA32_MISC_ENABLE, msr) ) + if ( rdmsr_safe(MSR_IA32_MISC_ENABLE, &msr) ) { hwp_verbose("CPU%u: error rdmsr_safe(MSR_IA32_MISC_ENABLE)\n", policy->cpu); diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 0fd8bdba70..cac5ba39e6 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -764,7 +764,7 @@ static int __init detect_init_APIC (void) if (enable_local_apic < 0) return -1; - if ( rdmsr_safe(MSR_APIC_BASE, msr_content) ) + if ( rdmsr_safe(MSR_APIC_BASE, &msr_content) ) { printk("No local APIC present\n"); return -1; diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index eb428f284e..567b992a9f 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -496,7 +496,7 @@ static void cf_check disable_c1e(void *unused) * The MSR does not exist in all FamilyF CPUs (only Rev F and above), * but we safely catch the #GP in that case. */ - if ((rdmsr_safe(MSR_K8_ENABLE_C1E, msr_content) == 0) && + if ((rdmsr_safe(MSR_K8_ENABLE_C1E, &msr_content) == 0) && (msr_content & (3ULL << 27)) && (wrmsr_safe(MSR_K8_ENABLE_C1E, msr_content & ~(3ULL << 27)) != 0)) printk(KERN_ERR "Failed to disable C1E on CPU#%u (%16"PRIx64")\n", @@ -695,21 +695,21 @@ static void amd_process_freq(const struct cpuinfo_x86 *c, lo = 0; /* gcc may not recognize the loop having at least 5 iterations */ for (h = c->x86 == 0x10 ? 5 : 8; h--; ) - if (!rdmsr_safe(0xC0010064 + h, lo) && (lo >> 63)) + if (!rdmsr_safe(0xC0010064 + h, &lo) && (lo >> 63)) break; if (!(lo >> 63)) return; if (idx && idx < h && - !rdmsr_safe(0xC0010064 + idx, val) && (val >> 63) && - !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) { + !rdmsr_safe(0xC0010064 + idx, &val) && (val >> 63) && + !rdmsr_safe(0xC0010064, &hi) && (hi >> 63)) { if (nom_mhz) *nom_mhz = amd_parse_freq(c->x86, val); if (low_mhz) *low_mhz = amd_parse_freq(c->x86, lo); if (hi_mhz) *hi_mhz = amd_parse_freq(c->x86, hi); - } else if (h && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) { + } else if (h && !rdmsr_safe(0xC0010064, &hi) && (hi >> 63)) { if (low_mhz) *low_mhz = amd_parse_freq(c->x86, lo); if (hi_mhz) @@ -765,7 +765,7 @@ void amd_init_lfence(struct cpuinfo_x86 *c) * rather than per-thread, so do a full safe read/write/readback cycle * in the worst case. */ - if (rdmsr_safe(MSR_AMD64_DE_CFG, value)) + if (rdmsr_safe(MSR_AMD64_DE_CFG, &value)) /* Unable to read. Assume the safer default. */ __clear_bit(X86_FEATURE_LFENCE_DISPATCH, c->x86_capability); @@ -775,7 +775,7 @@ void amd_init_lfence(struct cpuinfo_x86 *c) c->x86_capability); else if (wrmsr_safe(MSR_AMD64_DE_CFG, value | AMD64_DE_CFG_LFENCE_SERIALISE) || - rdmsr_safe(MSR_AMD64_DE_CFG, value) || + rdmsr_safe(MSR_AMD64_DE_CFG, &value) || !(value & AMD64_DE_CFG_LFENCE_SERIALISE)) /* Attempt to set failed. Assume the safer default. */ __clear_bit(X86_FEATURE_LFENCE_DISPATCH, @@ -804,7 +804,7 @@ static bool set_legacy_ssbd(const struct cpuinfo_x86 *c, bool enable) if (bit >= 0) { uint64_t val, mask = 1ull << bit; - if (rdmsr_safe(MSR_AMD64_LS_CFG, val) || + if (rdmsr_safe(MSR_AMD64_LS_CFG, &val) || ({ val &= ~mask; if (enable) @@ -962,7 +962,7 @@ void amd_init_spectral_chicken(void) if (cpu_has_hypervisor || !is_zen2_uarch()) return; - if (rdmsr_safe(MSR_AMD64_DE_CFG2, val) == 0 && !(val & chickenbit)) + if (rdmsr_safe(MSR_AMD64_DE_CFG2, &val) == 0 && !(val & chickenbit)) wrmsr_safe(MSR_AMD64_DE_CFG2, val | chickenbit); } @@ -1116,8 +1116,7 @@ static void amd_check_bp_cfg(void) static void cf_check init_amd(struct cpuinfo_x86 *c) { u32 l, h; - - unsigned long long value; + uint64_t value; /* Disable TLB flush filter by setting HWCR.FFDIS on K8 * bit 6 of msr C001_0015 @@ -1251,7 +1250,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) if ((c->x86 == 0x15) && (c->x86_model >= 0x10) && (c->x86_model <= 0x1f) && !cpu_has(c, X86_FEATURE_TOPOEXT) && - !rdmsr_safe(MSR_K8_EXT_FEATURE_MASK, value)) { + !rdmsr_safe(MSR_K8_EXT_FEATURE_MASK, &value)) { value |= 1ULL << 54; wrmsr_safe(MSR_K8_EXT_FEATURE_MASK, value); rdmsrl(MSR_K8_EXT_FEATURE_MASK, value); @@ -1267,7 +1266,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) * Disable it on the affected CPUs. */ if (c->x86 == 0x15 && c->x86_model >= 0x02 && c->x86_model < 0x20 && - !rdmsr_safe(MSR_AMD64_IC_CFG, value) && (value & 0x1e) != 0x1e) + !rdmsr_safe(MSR_AMD64_IC_CFG, &value) && (value & 0x1e) != 0x1e) wrmsr_safe(MSR_AMD64_IC_CFG, value | 0x1e); amd_get_topology(c); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index a66cd5f9c7..530b9eb39a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -131,14 +131,14 @@ bool __init probe_cpuid_faulting(void) uint64_t val; int rc; - if ((rc = rdmsr_safe(MSR_INTEL_PLATFORM_INFO, val)) == 0) + if ((rc = rdmsr_safe(MSR_INTEL_PLATFORM_INFO, &val)) == 0) raw_cpu_policy.platform_info.cpuid_faulting = val & MSR_PLATFORM_INFO_CPUID_FAULTING; if (rc || !(val & MSR_PLATFORM_INFO_CPUID_FAULTING) || rdmsr_safe(MSR_INTEL_MISC_FEATURES_ENABLES, - this_cpu(msr_misc_features))) + &this_cpu(msr_misc_features))) { setup_clear_cpu_cap(X86_FEATURE_CPUID_FAULTING); return false; @@ -852,7 +852,7 @@ static void skinit_enable_intr(void) * If the platform is performing a Secure Launch via SKINIT * INIT_REDIRECTION flag will be active. */ - if ( !cpu_has_skinit || rdmsr_safe(MSR_K8_VM_CR, val) || + if ( !cpu_has_skinit || rdmsr_safe(MSR_K8_VM_CR, &val) || !(val & VM_CR_INIT_REDIRECTION) ) return; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 29144ffe37..ecca11f04d 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -115,7 +115,7 @@ static uint64_t __init _probe_mask_msr(unsigned int *msr, uint64_t caps) expected_levelling_cap |= caps; - if (rdmsr_safe(*msr, val) || wrmsr_safe(*msr, val)) + if (rdmsr_safe(*msr, &val) || wrmsr_safe(*msr, val)) *msr = 0; else levelling_caps |= caps; @@ -546,7 +546,7 @@ static void intel_log_freq(const struct cpuinfo_x86 *c) { 26667, 13333, 20000, 16667, 33333, 10000, 40000 }; case 6: - if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, &msrval) ) return; max_ratio = msrval >> 8; min_ratio = msrval >> 40; @@ -566,7 +566,7 @@ static void intel_log_freq(const struct cpuinfo_x86 *c) */ if ( min_ratio > max_ratio ) SWAP(min_ratio, max_ratio); - if ( rdmsr_safe(MSR_FSB_FREQ, msrval) || + if ( rdmsr_safe(MSR_FSB_FREQ, &msrval) || (msrval &= 7) >= ARRAY_SIZE(core_factors) ) return; factor = core_factors[msrval]; @@ -584,7 +584,7 @@ static void intel_log_freq(const struct cpuinfo_x86 *c) break; case 0xf: - if ( rdmsr_safe(MSR_IA32_EBC_FREQUENCY_ID, msrval) ) + if ( rdmsr_safe(MSR_IA32_EBC_FREQUENCY_ID, &msrval) ) return; max_ratio = msrval >> 24; min_ratio = 0; diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mce_amd.c index 4f06a3153b..25c29eb3d2 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -195,7 +195,7 @@ static void mcequirk_amd_apply(enum mcequirk_amd_flags flags) break; case MCEQUIRK_F10_GART: - if ( rdmsr_safe(MSR_AMD64_MCx_MASK(4), val) == 0 ) + if ( rdmsr_safe(MSR_AMD64_MCx_MASK(4), &val) == 0 ) wrmsr_safe(MSR_AMD64_MCx_MASK(4), val | (1 << 10)); break; diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 1e52b1ac25..fac60f2d37 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -726,7 +726,7 @@ static bool intel_enable_lmce(void) * MSR_IA32_MCG_EXT_CTL.LMCE_EN. */ - if ( rdmsr_safe(MSR_IA32_FEATURE_CONTROL, msr_content) ) + if ( rdmsr_safe(MSR_IA32_FEATURE_CONTROL, &msr_content) ) return false; if ( (msr_content & IA32_FEATURE_CONTROL_LOCK) && @@ -879,14 +879,14 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) case 0x8f: /* Sapphire Rapids X */ if ( (c != &boot_cpu_data && !ppin_msr) || - rdmsr_safe(MSR_PPIN_CTL, val) ) + rdmsr_safe(MSR_PPIN_CTL, &val) ) return; /* If PPIN is disabled, but not locked, try to enable. */ if ( !(val & (PPIN_ENABLE | PPIN_LOCKOUT)) ) { wrmsr_safe(MSR_PPIN_CTL, val | PPIN_ENABLE); - rdmsr_safe(MSR_PPIN_CTL, val); + rdmsrl(MSR_PPIN_CTL, val); } if ( !(val & PPIN_ENABLE) ) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index 199cee5b33..a5fa97e149 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -293,7 +293,7 @@ bool arch_ioreq_server_get_type_addr(const struct domain *d, { uint64_t msr_val; - if ( !rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) && + if ( !rdmsr_safe(MSR_AMD64_NB_CFG, &msr_val) && (msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)) ) *addr |= CF8_ADDR_HI(cf8); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 7301846c2a..b54f9d9af5 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1083,8 +1083,8 @@ static void svm_host_osvw_init(void) { uint64_t len, status; - if ( rdmsr_safe(MSR_AMD_OSVW_ID_LENGTH, len) || - rdmsr_safe(MSR_AMD_OSVW_STATUS, status) ) + if ( rdmsr_safe(MSR_AMD_OSVW_ID_LENGTH, &len) || + rdmsr_safe(MSR_AMD_OSVW_STATUS, &status) ) len = status = 0; if ( len < osvw_length ) @@ -1482,7 +1482,7 @@ static void svm_init_erratum_383(const struct cpuinfo_x86 *c) return; /* use safe methods to be compatible with nested virtualization */ - if ( rdmsr_safe(MSR_AMD64_DC_CFG, msr_content) == 0 && + if ( rdmsr_safe(MSR_AMD64_DC_CFG, &msr_content) == 0 && wrmsr_safe(MSR_AMD64_DC_CFG, msr_content | (1ULL << 47)) == 0 ) amd_erratum383_found = 1; else @@ -1786,7 +1786,7 @@ static int cf_check svm_msr_read_intercept( break; case MSR_F10_BU_CFG: - if ( !rdmsr_safe(msr, *msr_content) ) + if ( !rdmsr_safe(msr, msr_content) ) break; if ( boot_cpu_data.x86 == 0xf ) @@ -1805,7 +1805,7 @@ static int cf_check svm_msr_read_intercept( goto gpf; case MSR_F10_BU_CFG2: - if ( rdmsr_safe(msr, *msr_content) ) + if ( rdmsr_safe(msr, msr_content) ) goto gpf; break; @@ -1882,7 +1882,7 @@ static int cf_check svm_msr_read_intercept( break; default: - if ( d->arch.msr_relaxed && !rdmsr_safe(msr, tmp) ) + if ( d->arch.msr_relaxed && !rdmsr_safe(msr, &tmp) ) { *msr_content = 0; break; @@ -2048,7 +2048,7 @@ static int cf_check svm_msr_write_intercept( case MSR_F10_BU_CFG: case MSR_F10_BU_CFG2: - if ( rdmsr_safe(msr, msr_content) ) + if ( rdmsr_safe(msr, &msr_content) ) goto gpf; break; @@ -2069,7 +2069,7 @@ static int cf_check svm_msr_write_intercept( break; default: - if ( d->arch.msr_relaxed && !rdmsr_safe(msr, msr_content) ) + if ( d->arch.msr_relaxed && !rdmsr_safe(msr, &msr_content) ) break; gdprintk(XENLOG_WARNING, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5439f950dc..f97a774653 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3503,7 +3503,7 @@ static int cf_check vmx_msr_read_intercept( break; } - if ( curr->domain->arch.msr_relaxed && !rdmsr_safe(msr, tmp) ) + if ( curr->domain->arch.msr_relaxed && !rdmsr_safe(msr, &tmp) ) { *msr_content = 0; break; @@ -3813,7 +3813,7 @@ static int cf_check vmx_msr_write_intercept( is_last_branch_msr(msr) ) break; - if ( v->domain->arch.msr_relaxed && !rdmsr_safe(msr, msr_content) ) + if ( v->domain->arch.msr_relaxed && !rdmsr_safe(msr, &msr_content) ) break; gdprintk(XENLOG_WARNING, diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index f5df8698b7..70e6796a45 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -48,20 +48,27 @@ static inline void wrmsrns(uint32_t msr, uint64_t val) } /* rdmsr with exception handling */ -#define rdmsr_safe(msr,val) ({\ - int rc_; \ - uint64_t lo_, hi_; \ - __asm__ __volatile__( \ - "1: rdmsr\n2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: xorl %k0,%k0\n; xorl %k1,%k1\n" \ - " movl %5,%2\n; jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE(1b, 3b) \ - : "=a" (lo_), "=d" (hi_), "=&r" (rc_) \ - : "c" (msr), "2" (0), "i" (-EFAULT)); \ - val = lo_ | (hi_ << 32); \ - rc_; }) +static inline int rdmsr_safe(unsigned int msr, uint64_t *val) +{ + uint64_t lo, hi; + int rc; + + asm_inline volatile ( + "1: rdmsr\n2:\n" + ".section .fixup,\"ax\"\n" + "3: xorl %k0,%k0\n\t" + " xorl %k1,%k1\n\t" + " movl %5,%2\n\t" + " jmp 2b\n\t" + ".previous" + _ASM_EXTABLE(1b, 3b) + : "=a" (lo), "=d" (hi), "=&r" (rc) + : "c" (msr), "2" (0), "i" (-EFAULT) ); + + *val = lo | (hi << 32); + + return rc; +} /* wrmsr with exception handling */ static inline int wrmsr_safe(unsigned int msr, uint64_t val) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index c6465b41ee..ad75a2e108 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -192,7 +192,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || !(boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || - rdmsr_safe(MSR_AMD_PATCHLEVEL, *val) ) + rdmsr_safe(MSR_AMD_PATCHLEVEL, val) ) goto gp_fault; break; @@ -240,7 +240,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) goto gp_fault; *val = 0; - if ( likely(!is_cpufreq_controller(d)) || rdmsr_safe(msr, *val) == 0 ) + if ( likely(!is_cpufreq_controller(d)) || rdmsr_safe(msr, val) == 0 ) break; goto gp_fault; @@ -306,7 +306,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) goto gp_fault; if ( !is_hardware_domain(d) ) return X86EMUL_UNHANDLEABLE; - if ( rdmsr_safe(msr, *val) ) + if ( rdmsr_safe(msr, val) ) goto gp_fault; if ( msr == MSR_K8_SYSCFG ) *val &= (SYSCFG_TOM2_FORCE_WB | SYSCFG_MTRR_TOM2_EN | @@ -322,7 +322,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_FAM10H_MMIO_CONF_BASE: if ( !is_hardware_domain(d) || !(cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) || - rdmsr_safe(msr, *val) ) + rdmsr_safe(msr, val) ) goto gp_fault; break; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 3eba791889..21f9f795c1 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -186,7 +186,7 @@ void cf_check resource_access(void *info) if ( unlikely(read_tsc) ) local_irq_save(flags); - ret = rdmsr_safe(entry->idx, entry->val); + ret = rdmsr_safe(entry->idx, &entry->val); if ( unlikely(read_tsc) ) { diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 9f8600f43a..f46aaf2a3b 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -249,7 +249,7 @@ static bool pci_cfg_ok(struct domain *currd, unsigned int start, { uint64_t msr_val; - if ( rdmsr_safe(MSR_AMD64_NB_CFG, msr_val) ) + if ( rdmsr_safe(MSR_AMD64_NB_CFG, &msr_val) ) return false; if ( msr_val & (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT) ) start |= CF8_ADDR_HI(currd->arch.pci_cf8); @@ -962,7 +962,7 @@ static int cf_check read_msr( return X86EMUL_OKAY; case MSR_IA32_MISC_ENABLE: - if ( rdmsr_safe(reg, *val) ) + if ( rdmsr_safe(reg, val) ) break; *val = guest_misc_enable(*val); return X86EMUL_OKAY; @@ -992,7 +992,7 @@ static int cf_check read_msr( } /* fall through */ default: - if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, tmp) ) + if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, &tmp) ) { *val = 0; return X86EMUL_OKAY; @@ -1002,14 +1002,14 @@ static int cf_check read_msr( break; normal: - if ( rdmsr_safe(reg, *val) ) + if ( rdmsr_safe(reg, val) ) break; return X86EMUL_OKAY; } done: if ( ret != X86EMUL_OKAY && !curr->arch.pv.trap_ctxt[X86_EXC_GP].address && - (reg >> 16) != 0x4000 && !rdmsr_safe(reg, tmp) ) + (reg >> 16) != 0x4000 && !rdmsr_safe(reg, &tmp) ) { gprintk(XENLOG_WARNING, "faking RDMSR 0x%08x\n", reg); *val = 0; @@ -1096,7 +1096,7 @@ static int cf_check write_msr( case MSR_AMD64_NB_CFG: if ( !is_hwdom_pinned_vcpu(curr) ) return X86EMUL_OKAY; - if ( (rdmsr_safe(MSR_AMD64_NB_CFG, temp) != 0) || + if ( (rdmsr_safe(MSR_AMD64_NB_CFG, &temp) != 0) || ((val ^ temp) & ~(1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)) ) goto invalid; if ( wrmsr_safe(MSR_AMD64_NB_CFG, val) == 0 ) @@ -1109,7 +1109,7 @@ static int cf_check write_msr( break; if ( !is_hwdom_pinned_vcpu(curr) ) return X86EMUL_OKAY; - if ( rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, temp) != 0 ) + if ( rdmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, &temp) != 0 ) break; if ( (pci_probe & PCI_PROBE_MASK) == PCI_PROBE_MMCONF ? temp != val : @@ -1125,7 +1125,7 @@ static int cf_check write_msr( break; case MSR_IA32_MISC_ENABLE: - if ( rdmsr_safe(reg, temp) ) + if ( rdmsr_safe(reg, &temp) ) break; if ( val != guest_misc_enable(temp) ) goto invalid; @@ -1172,7 +1172,7 @@ static int cf_check write_msr( } /* fall through */ default: - if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, val) ) + if ( currd->arch.msr_relaxed && !rdmsr_safe(reg, &val) ) return X86EMUL_OKAY; gdprintk(XENLOG_WARNING, diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 1ff3d6835d..e71f62c601 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -714,7 +714,7 @@ static bool __init check_smt_enabled(void) */ if ( boot_cpu_data.vendor == X86_VENDOR_INTEL && boot_cpu_data.family != 0xf && !cpu_has_hypervisor && - !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, val) ) + !rdmsr_safe(MSR_INTEL_CORE_THREAD_COUNT, &val) ) return (MASK_EXTR(val, MSR_CTC_CORE_MASK) != MASK_EXTR(val, MSR_CTC_THREAD_MASK)); diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index fbe2676f86..d53da1e2a7 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -149,7 +149,7 @@ static const char *__init cf_check pci_mmcfg_amd_fam10h(void) return NULL; address = MSR_FAM10H_MMIO_CONF_BASE; - if (rdmsr_safe(address, msr_content)) + if ( rdmsr_safe(address, &msr_content) ) return NULL; /* mmconfig is not enable */ diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index c55f02c97e..b4105163cc 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2286,7 +2286,7 @@ static bool __init vtd_ept_page_compatible(const struct vtd_iommu *iommu) /* EPT is not initialised yet, so we must check the capability in * the MSR explicitly rather than use cpu_has_vmx_ept_*() */ - if ( rdmsr_safe(MSR_IA32_VMX_EPT_VPID_CAP, ept_cap) != 0 ) + if ( rdmsr_safe(MSR_IA32_VMX_EPT_VPID_CAP, &ept_cap) != 0 ) return false; return (ept_has_2mb(ept_cap) && opt_hap_2mb) <= -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 23:33:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 23:33:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090671.1447795 (Exim 4.92) (envelope-from ) id 1upbG6-0004te-TC; Fri, 22 Aug 2025 23:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090671.1447795; Fri, 22 Aug 2025 23:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbG6-0004tW-QY; Fri, 22 Aug 2025 23:33:22 +0000 Received: by outflank-mailman (input) for mailman id 1090671; Fri, 22 Aug 2025 23:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbG6-0004tM-4b for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upbG5-0012bK-2u for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upbG6-00Dwx2-0G for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oAho523UrJAmM2/pN+2mu5SwvHEnXI3K9p0AWRpsWqQ=; b=LR9QO5d4WC4kLiLlxBM/K1N+Fw SLq4Cf+I0ziBUCkR+ZUmZ03ClNEEpdZefIR9xeqfY5YlFLIHLyVCsluOFR9lHX73DW6QtUQK2Mggt sGc/fvkWhEH9wuBlXGwhVV3RFD6CUhHmEA8QjlgA0BxKD98xOlDygBtqp5jAD4uQtw20=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msr: Rework rdmsr_safe() using asm goto() Message-Id: Date: Fri, 22 Aug 2025 23:33:22 +0000 commit 16de294bed6e4817a7275fa11cf8d203c009a1f5 Author: Andrew Cooper AuthorDate: Fri Apr 18 17:09:40 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 x86/msr: Rework rdmsr_safe() using asm goto() ... on capable toolchains. This avoids needing to hold rc in a register across the RDMSR, and in most cases removes direct testing and branching based on rc, as the fault label can be rearranged to directly land on the out-of-line block. There is a subtle difference in behaviour. The old behaviour would, on fault, still produce 0's and write to val. The new behaviour only writes val on success, and write_msr() is the only place where this matters. Move temp out of switch() scope and initialise it to 0. While it is possible to retain the old behaviour, it's not great to do so because the compiler cannot optimise out the dead store when it's not to a local function variable, and Xen has a lot of msr infrastructure which passes a val pointer through the call-tree. We have compilers with ASM_GOTO_OUTPUT in CI, and they do notice. Resolves: https://gitlab.com/xen-project/xen/-/work_items/217 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/msr.h | 18 ++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 70e6796a45..901770555b 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -51,6 +51,23 @@ static inline void wrmsrns(uint32_t msr, uint64_t val) static inline int rdmsr_safe(unsigned int msr, uint64_t *val) { uint64_t lo, hi; + +#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT + asm_inline goto ( + "1: rdmsr\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : "=a" (lo), "=d" (hi) + : "c" (msr) + : + : fault ); + + *val = lo | (hi << 32); + + return 0; + + fault: + return -EFAULT; +#else int rc; asm_inline volatile ( @@ -68,6 +85,7 @@ static inline int rdmsr_safe(unsigned int msr, uint64_t *val) *val = lo | (hi << 32); return rc; +#endif } /* wrmsr with exception handling */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index f46aaf2a3b..225d4cff03 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1028,6 +1028,7 @@ static int cf_check write_msr( struct vcpu *curr = current; const struct domain *currd = curr->domain; const struct cpu_policy *cp = currd->arch.cpu_policy; + uint64_t temp = 0; bool vpmu_msr = false; int ret; @@ -1041,8 +1042,6 @@ static int cf_check write_msr( switch ( reg ) { - uint64_t temp; - case MSR_FS_BASE: case MSR_GS_BASE: case MSR_SHADOW_GS_BASE: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 23:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 23:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090672.1447798 (Exim 4.92) (envelope-from ) id 1upbGH-0004wI-UW; Fri, 22 Aug 2025 23:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090672.1447798; Fri, 22 Aug 2025 23:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbGH-0004wA-Rx; Fri, 22 Aug 2025 23:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1090672; Fri, 22 Aug 2025 23:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbGG-0004vo-7z for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upbGG-0012bO-01 for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upbGG-00DwyN-0X for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Gc78KHFXMBFDyvpjTO0cfuTFw387znrelyqa2nnFS9s=; b=ZuImnx1gDMEY8Eaf6TmhdT3fBl v4LeFmWBogOB82CAuE2XEe2vHaRmp1llt8ANl4MuU3VX7eefoiaOZzcPKngAO7ycO0TBO+mrhSaby zjRhiP/yu+40VjxHg7lpJeOo1fKwo1YoZYw4pCI1kl+gPD92i7Wpgp0zL97+NtQ7VhTg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Use 'watchdog' for x86 hardware Message-Id: Date: Fri, 22 Aug 2025 23:33:32 +0000 commit 011a9e2566564fb4c4dfadd3b1bfe94983b338f8 Author: Andrew Cooper AuthorDate: Wed Aug 20 11:57:57 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 CI: Use 'watchdog' for x86 hardware This detects various hangs and turns them into a crash with backtrace. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 2750d24eba..b49a44c5b1 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -260,14 +260,14 @@ TFTP=/scratch/gitlab-runner/tftp CONTROLLER=control@thor.testnet echo " -multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts +multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot watchdog $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe -kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot +kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot watchdog $extra_xen_opts || reboot module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot module /gitlab-ci/initrd-dom0 || reboot boot diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 6970a8658d..0ad8f658e3 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -15,7 +15,7 @@ WORKDIR="${PWD}" TEST="$1" PASS_MSG="Test passed: ${TEST}" XEN_CMD_DOM0="dom0=pvh dom0_max_vcpus=4 dom0_mem=4G" -XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot" +XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot watchdog" XEN_CMD_EXTRA="" DOM0_CMD="" DOMU_CMD="" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 22 23:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2025 23:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1090673.1447803 (Exim 4.92) (envelope-from ) id 1upbGR-0004yp-W6; Fri, 22 Aug 2025 23:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1090673.1447803; Fri, 22 Aug 2025 23:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbGR-0004yh-TZ; Fri, 22 Aug 2025 23:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1090673; Fri, 22 Aug 2025 23:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1upbGQ-0004yU-BO for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1upbGQ-0012bV-0N for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1upbGQ-00Dwyv-0t for xen-changelog@lists.xenproject.org; Fri, 22 Aug 2025 23:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BhAkt/ny74UtDTCn6k9QEvu3PP9vuT0pj8CXTp0zZcc=; b=t6rXe7ULe8bWx9KkcgjRJWNbwN fY5fRlxlBa3wRJFlFNPPBYLw+NT+I4jleKBcB2TRKpAvNEyFxfUJPCKAJ5ke3ZZVqo2Z25pI73NbH 3rDR6IF03mjqHbtPidFpVJ9yPrDfmnWLjwdNrKfEMppUATyrklCNPEVPdD1ycBgMOtIQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: hide xenstore-features behind option Message-Id: Date: Fri, 22 Aug 2025 23:33:42 +0000 commit 4efc1da300e3deb15f24ae3c3d4780c1941e3548 Author: Juergen Gross AuthorDate: Fri Aug 15 16:32:36 2025 +0200 Commit: Andrew Cooper CommitDate: Fri Aug 22 23:34:07 2025 +0100 tools/xl: hide xenstore-features behind option In order to be able to use "xl info" before Xenstore has been started or after it has crashed, hide obtaining the available Xenstore features behind the new option "-x". Fixes: ecce7970cfe7 ("tools/xl: add available Xenstore features to xl info output") Reported-by: Ross Lagerwall Signed-off-by: Juergen Gross Acked-by: Anthony PERARD --- docs/man/xl.1.pod.in | 4 ++++ docs/man/xl.cfg.5.pod.in | 2 +- tools/xl/xl_info.c | 14 ++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index fe38724b2b..88ccf7ad82 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -996,6 +996,10 @@ B List host NUMA topology information +=item B<-x>, B<--xenstore> + +Show Xenstore features available. + =back =item B diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index f0c920b39d..acff45d308 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -743,7 +743,7 @@ condition. =back The features supported by the running Xenstore instance can be retrieved -via the B command in dom0. +via the B command in dom0. The default value is B<0xffffffff>, meaning that all possible Xenstore features are visible by the guest. diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index eb019e3ee9..d3583cbf8f 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -353,7 +353,7 @@ static void output_xenstore_info(void) xs_close(xsh); } -static void print_info(int numa) +static void print_info(int numa, bool xs) { output_nodeinfo(); @@ -365,7 +365,8 @@ static void print_info(int numa) } output_xeninfo(); - output_xenstore_info(); + if (xs) + output_xenstore_info(); maybe_printf("xend_config_format : 4\n"); @@ -631,14 +632,19 @@ int main_info(int argc, char **argv) int opt; static struct option opts[] = { {"numa", 0, 0, 'n'}, + {"xenstore", 0, 0, 'x'}, COMMON_LONG_OPTS }; int numa = 0; + bool xs = false; - SWITCH_FOREACH_OPT(opt, "n", opts, "info", 0) { + SWITCH_FOREACH_OPT(opt, "nx", opts, "info", 0) { case 'n': numa = 1; break; + case 'x': + xs = true; + break; } /* @@ -648,7 +654,7 @@ int main_info(int argc, char **argv) if (numa == 0 && argc > optind) info_name = argv[optind]; - print_info(numa); + print_info(numa, xs); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:11:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093118.1448657 (Exim 4.92) (envelope-from ) id 1uqW2R-0003qB-HS; Mon, 25 Aug 2025 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093118.1448657; Mon, 25 Aug 2025 12:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2R-0003q3-Eh; Mon, 25 Aug 2025 12:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1093118; Mon, 25 Aug 2025 12:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2Q-0003px-M1 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW2Q-005rMt-0t for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW2Q-000MOM-1S for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TmD8o5rU8VrtFV6nId1f6HjkMiKyPBE63Jk/sZGMf6E=; b=zdEB94gVHS5k9/EyTLNL2VBGqE V5WD6ial4VvMYkBmKZUUQG3wo1Oowu8OhhAzI21AVGMhrhEN3JhtDBAjR9Wz+euTjdLIXBEVmHKu+ 3vkVbqAkdWwDWh2klbxMYPngGQ5As/Qgs6toFFvi7IQvJ55EQQ9UtXh8cnfcaGGYyH00=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] altp2m: Drop p2m_altp2m_check() stubs on non-x86, move prototype, and guard uses Message-Id: Date: Mon, 25 Aug 2025 12:11:02 +0000 commit 5fe316e479e8c6e335fd9aa0086911c8183ca96d Author: Petr Beneš AuthorDate: Mon Aug 25 12:44:58 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:44:58 2025 +0200 altp2m: Drop p2m_altp2m_check() stubs on non-x86, move prototype, and guard uses Remove the no-op stubs from the ARM, PPC, and RISC‑V p2m headers and stop providing a stub in arch/x86/include/asm/p2m.h. Declare p2m_altp2m_check() in xen/include/xen/p2m-common.h and gate all call sites with CONFIG_ALTP2M: - wrap the fast_single_step block in hvm/monitor.c with #ifdef CONFIG_ALTP2M (IS_ENABLED(CONFIG_ALTP2M) is not used here, because in the subsequent commit hvm_vcpu::fast_single_step will be guarded by CONFIG_ALTP2M) - make the vm_event.c path conditional via IS_ENABLED(CONFIG_ALTP2M) No functional change intended: on builds without ALTP2M the calls are compiled out; on builds with ALTP2M behavior is unchanged. Signed-off-by: Petr Beneš Reviewed-by: Jan Beulich Acked-by: Julien Grall # arm Acked-by: Tamas K Lengyel # vm_event/monitor --- xen/arch/arm/include/asm/p2m.h | 6 ------ xen/arch/ppc/include/asm/p2m.h | 5 ----- xen/arch/riscv/include/asm/p2m.h | 5 ----- xen/arch/x86/hvm/monitor.c | 2 ++ xen/arch/x86/include/asm/p2m.h | 8 +------- xen/common/vm_event.c | 3 ++- xen/include/xen/p2m-common.h | 3 +++ 7 files changed, 8 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/include/asm/p2m.h b/xen/arch/arm/include/asm/p2m.h index 2d53bf9b61..ef98bc5f4d 100644 --- a/xen/arch/arm/include/asm/p2m.h +++ b/xen/arch/arm/include/asm/p2m.h @@ -180,12 +180,6 @@ static inline bool arch_acquire_resource_check(struct domain *d) return true; } -static inline -void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - /* Not supported on ARM. */ -} - /* * Helper to restrict "p2m_ipa_bits" according the external entity * (e.g. IOMMU) requirements. diff --git a/xen/arch/ppc/include/asm/p2m.h b/xen/arch/ppc/include/asm/p2m.h index f144ef8e1a..c96149ef74 100644 --- a/xen/arch/ppc/include/asm/p2m.h +++ b/xen/arch/ppc/include/asm/p2m.h @@ -88,9 +88,4 @@ static inline bool arch_acquire_resource_check(struct domain *d) return false; } -static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - /* Not supported on PPC. */ -} - #endif /* __ASM_PPC_P2M_H__ */ diff --git a/xen/arch/riscv/include/asm/p2m.h b/xen/arch/riscv/include/asm/p2m.h index 28f57a74f2..e43c559e0c 100644 --- a/xen/arch/riscv/include/asm/p2m.h +++ b/xen/arch/riscv/include/asm/p2m.h @@ -88,11 +88,6 @@ static inline bool arch_acquire_resource_check(struct domain *d) return false; } -static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - /* Not supported on RISCV. */ -} - #endif /* ASM__RISCV__P2M_H */ /* diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index 523586ca98..d22a2e4644 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -178,6 +178,7 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monitor_debug_type type, break; case HVM_MONITOR_SINGLESTEP_BREAKPOINT: +#ifdef CONFIG_ALTP2M if ( curr->arch.hvm.fast_single_step.enabled ) { p2m_altp2m_check(curr, curr->arch.hvm.fast_single_step.p2midx); @@ -186,6 +187,7 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monitor_debug_type type, curr->arch.hvm.fast_single_step.p2midx = 0; return 0; } +#endif if ( !ad->monitor.singlestep_enabled ) return 0; req.reason = VM_EVENT_REASON_SINGLESTEP; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 58b56e575e..c53f4e487d 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -962,17 +962,11 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, /* Set a specific p2m view visibility */ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, uint8_t visible); + #else /* !CONFIG_HVM */ struct p2m_domain *p2m_get_altp2m(struct vcpu *v); #endif /* CONFIG_HVM */ -#ifdef CONFIG_ALTP2M -/* Check to see if vcpu should be switched to a different p2m. */ -void p2m_altp2m_check(struct vcpu *v, uint16_t idx); -#else -static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) {} -#endif - /* p2m access to IOMMU flags */ static inline unsigned int p2m_access_to_iommu_flags(p2m_access_t p2ma) { diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 1666ff615f..b2787c0108 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -431,7 +431,8 @@ static int vm_event_resume(struct domain *d, struct vm_event_domain *ved) vm_event_toggle_singlestep(d, v, &rsp); /* Check for altp2m switch */ - if ( rsp.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) + if ( IS_ENABLED(CONFIG_ALTP2M) && + rsp.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) p2m_altp2m_check(v, rsp.altp2m_idx); if ( rsp.flags & VM_EVENT_FLAG_SET_REGISTERS ) diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index a322e738ef..f0bd9a6b98 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -24,6 +24,9 @@ int unmap_mmio_regions(struct domain *d, unsigned long nr, mfn_t mfn); +/* Check to see if vcpu should be switched to a different p2m. */ +void p2m_altp2m_check(struct vcpu *v, uint16_t idx); + /* * Populate-on-Demand */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093120.1448661 (Exim 4.92) (envelope-from ) id 1uqW2b-0003uR-Ir; Mon, 25 Aug 2025 12:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093120.1448661; Mon, 25 Aug 2025 12:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2b-0003uK-G8; Mon, 25 Aug 2025 12:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1093120; Mon, 25 Aug 2025 12:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2a-0003uC-LX for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW2a-005rN4-1N for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW2a-000MOt-1q for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bO0syXEklppJMYZDPM3yRwMkr48wne2v5+yIt6TcbGw=; b=C+Z8GzaSioGxiaxJYeX43cJBYJ Eaqf3L6KnqFajeSt6Wz+pgXfGrrdDhMRUQTfop5lyjITIbtpuOeNRqF8naCAF19h+MedEF5MljMmy nFN5SLIMnpxJPAwcR0xsgTJ7ei0GWGkUQtEUF4HxncBAC3cgRt0vGe9tkF0gswaIsfp4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/altp2m: Wrap altp2m-specific code in #ifdef CONFIG_ALTP2M Message-Id: Date: Mon, 25 Aug 2025 12:11:12 +0000 commit 8f694f789efeff97d6e809a7ea856b032539d4a0 Author: Petr Beneš AuthorDate: Mon Aug 25 12:49:23 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:49:23 2025 +0200 x86/altp2m: Wrap altp2m-specific code in #ifdef CONFIG_ALTP2M This change consistently guards all altp2m-related functionality behind #ifdef CONFIG_ALTP2M, so that code and data structures related to alternate p2m views are only included when the feature is enabled. Apart from that: - hvmemul_vmfunc() returns X86EMUL_UNHANDLEABLE when altp2m is disabled. - do_altp2m_op() returns EOPNOTSUPP when altp2m is disabled. - struct hvm_vcpu, arch_domain, and hvm_function_table only define altp2m fields when the feature is enabled. - Moved several declarations under #ifdef CONFIG_ALTP2M in p2m.h to avoid polluting builds that don't require the feature. Signed-off-by: Petr Beneš Reviewed-by: Jan Beulich Acked-by: Tamas K Lengyel # mem_access --- xen/arch/x86/hvm/emulate.c | 4 ++++ xen/arch/x86/hvm/hvm.c | 10 ++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 8 ++++++++ xen/arch/x86/include/asm/domain.h | 2 ++ xen/arch/x86/include/asm/hvm/hvm.h | 6 ++++++ xen/arch/x86/include/asm/hvm/vcpu.h | 4 ++++ xen/arch/x86/include/asm/p2m.h | 31 ++++++++++++++++++++----------- xen/arch/x86/mm/hap/hap.c | 6 ++++++ xen/arch/x86/mm/mem_access.c | 8 ++++++++ xen/arch/x86/mm/p2m-ept.c | 4 ++++ xen/arch/x86/mm/p2m.c | 9 +++++++++ xen/arch/x86/vm_event.c | 2 +- 12 files changed, 82 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f1412d8c49..2af4f30359 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2704,6 +2704,7 @@ static int cf_check hvmemul_tlb_op( static int cf_check hvmemul_vmfunc( struct x86_emulate_ctxt *ctxt) { +#ifdef CONFIG_ALTP2M int rc; if ( !hvm_funcs.altp2m_vcpu_emulate_vmfunc ) @@ -2713,6 +2714,9 @@ static int cf_check hvmemul_vmfunc( x86_emul_hw_exception(X86_EXC_UD, X86_EVENT_NO_EC, ctxt); return rc; +#else + return X86EMUL_UNHANDLEABLE; +#endif } static const struct x86_emulate_ops hvm_emulate_ops = { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index bd64faf207..646a0b682d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4611,6 +4611,7 @@ static int hvmop_get_param( static int do_altp2m_op( XEN_GUEST_HANDLE_PARAM(void) arg) { +#ifdef CONFIG_ALTP2M struct xen_hvm_altp2m_op a; struct domain *d = NULL; int rc = 0; @@ -4947,6 +4948,9 @@ static int do_altp2m_op( rcu_unlock_domain(d); return rc; +#else /* !CONFIG_ALTP2M */ + return -EOPNOTSUPP; +#endif /* CONFIG_ALTP2M */ } DEFINE_XEN_GUEST_HANDLE(compat_hvm_altp2m_op_t); @@ -5238,8 +5242,12 @@ int hvm_debug_op(struct vcpu *v, int32_t op) case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF: v->arch.hvm.single_step = false; + +#ifdef CONFIG_ALTP2M v->arch.hvm.fast_single_step.enabled = false; v->arch.hvm.fast_single_step.p2midx = 0; +#endif + break; default: /* Excluded above */ @@ -5262,6 +5270,7 @@ void hvm_toggle_singlestep(struct vcpu *v) v->arch.hvm.single_step = !v->arch.hvm.single_step; } +#ifdef CONFIG_ALTP2M void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) { ASSERT(atomic_read(&v->pause_count)); @@ -5276,6 +5285,7 @@ void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) v->arch.hvm.fast_single_step.enabled = true; v->arch.hvm.fast_single_step.p2midx = p2midx; } +#endif /* * Segment caches in VMCB/VMCS are inconsistent about which bits are checked, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f97a774653..9894a029ca 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2420,6 +2420,8 @@ static void cf_check vmx_enable_msr_interception(struct domain *d, uint32_t msr) vmx_set_msr_intercept(v, msr, VMX_MSR_W); } +#ifdef CONFIG_ALTP2M + static void cf_check vmx_vcpu_update_eptp(struct vcpu *v) { struct domain *d = v->domain; @@ -2539,6 +2541,8 @@ static bool cf_check vmx_vcpu_emulate_ve(struct vcpu *v) return rc; } +#endif /* CONFIG_ALTP2M */ + static bool cf_check vmx_get_pending_event( struct vcpu *v, struct x86_event *info) { @@ -2867,10 +2871,12 @@ static struct hvm_function_table __initdata_cf_clobber vmx_function_table = { .update_vlapic_mode = vmx_vlapic_msr_changed, .nhvm_hap_walk_L1_p2m = nvmx_hap_walk_L1_p2m, .enable_msr_interception = vmx_enable_msr_interception, +#ifdef CONFIG_ALTP2M .altp2m_vcpu_update_p2m = vmx_vcpu_update_eptp, .altp2m_vcpu_update_vmfunc_ve = vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve = vmx_vcpu_emulate_ve, .altp2m_vcpu_emulate_vmfunc = vmx_vcpu_emulate_vmfunc, +#endif .vmtrace_control = vmtrace_control, .vmtrace_output_position = vmtrace_output_position, .vmtrace_set_option = vmtrace_set_option, @@ -4967,6 +4973,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) single = ept; } +#ifdef CONFIG_ALTP2M if ( altp2m_active(currd) ) { unsigned int i; @@ -4985,6 +4992,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) } } } +#endif if ( inv ) __invept(inv == 1 ? INVEPT_SINGLE_CONTEXT : INVEPT_ALL_CONTEXT, diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index c31e74c6fa..ffcec69a15 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -351,12 +351,14 @@ struct arch_domain struct p2m_domain *nested_p2m[MAX_NESTEDP2M]; mm_lock_t nested_p2m_lock; +#ifdef CONFIG_ALTP2M /* altp2m: allow multiple copies of host p2m */ bool altp2m_active; struct p2m_domain *altp2m_p2m[MAX_ALTP2M]; mm_lock_t altp2m_list_lock; uint64_t *altp2m_eptp; uint64_t *altp2m_visible_eptp; +#endif #endif /* NB. protected by d->event_lock and by irq_desc[irq].lock */ diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 5c5a790f9e..f02183691e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -226,11 +226,13 @@ struct hvm_function_table { void (*enable_msr_interception)(struct domain *d, uint32_t msr); +#ifdef CONFIG_ALTP2M /* Alternate p2m */ void (*altp2m_vcpu_update_p2m)(struct vcpu *v); void (*altp2m_vcpu_update_vmfunc_ve)(struct vcpu *v); bool (*altp2m_vcpu_emulate_ve)(struct vcpu *v); int (*altp2m_vcpu_emulate_vmfunc)(const struct cpu_user_regs *regs); +#endif /* vmtrace */ int (*vmtrace_control)(struct vcpu *v, bool enable, bool reset); @@ -704,6 +706,7 @@ static inline bool hvm_nested_virt_supported(void) return hvm_funcs.caps.nested_virt; } +#ifdef CONFIG_ALTP2M /* updates the current hardware p2m */ static inline void altp2m_vcpu_update_p2m(struct vcpu *v) { @@ -728,6 +731,9 @@ static inline bool altp2m_vcpu_emulate_ve(struct vcpu *v) } return false; } +#else /* !CONFIG_ALTP2M */ +bool altp2m_vcpu_emulate_ve(struct vcpu *v); +#endif /* CONFIG_ALTP2M */ static inline int hvm_vmtrace_control(struct vcpu *v, bool enable, bool reset) { diff --git a/xen/arch/x86/include/asm/hvm/vcpu.h b/xen/arch/x86/include/asm/hvm/vcpu.h index 196fed6d5d..924af890c5 100644 --- a/xen/arch/x86/include/asm/hvm/vcpu.h +++ b/xen/arch/x86/include/asm/hvm/vcpu.h @@ -133,10 +133,12 @@ struct hvm_vcpu { bool flag_dr_dirty; bool debug_state_latch; bool single_step; +#ifdef CONFIG_ALTP2M struct { bool enabled; uint16_t p2midx; } fast_single_step; +#endif /* (MFN) hypervisor page table */ pagetable_t monitor_table; @@ -154,7 +156,9 @@ struct hvm_vcpu { struct nestedvcpu nvcpu; +#ifdef CONFIG_ALTP2M struct altp2mvcpu avcpu; +#endif struct mtrr_state mtrr; u64 pat_cr; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index c53f4e487d..5ce0dc936f 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -889,6 +889,8 @@ void shadow_p2m_init(struct p2m_domain *p2m); void cf_check nestedp2m_write_p2m_entry_post( struct p2m_domain *p2m, unsigned int oflags); +#ifdef CONFIG_ALTP2M + /* * Alternate p2m: shadow p2m tables used for alternate memory views */ @@ -932,11 +934,6 @@ bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx); /* Flush all the alternate p2m's for a domain */ void p2m_flush_altp2m(struct domain *d); -/* Alternate p2m paging */ -bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, - mfn_t *mfn, p2m_type_t *p2mt, - p2m_access_t *p2ma, unsigned int *page_order); - /* Make a specific alternate p2m valid */ int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx); @@ -954,17 +951,29 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx); int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, gfn_t old_gfn, gfn_t new_gfn); -/* Propagate a host p2m change to all alternate p2m's */ -int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, - mfn_t mfn, unsigned int page_order, - p2m_type_t p2mt, p2m_access_t p2ma); - /* Set a specific p2m view visibility */ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, uint8_t visible); -#else /* !CONFIG_HVM */ +#else /* !CONFIG_ALTP2M */ struct p2m_domain *p2m_get_altp2m(struct vcpu *v); +bool p2m_set_altp2m(struct vcpu *v, unsigned int idx); +#endif /* CONFIG_ALTP2M */ + +/* + * Common alternate p2m declarations that need to be visible + * regardless of CONFIG_ALTP2M + */ + +/* Alternate p2m paging */ +bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, + mfn_t *mfn, p2m_type_t *p2mt, + p2m_access_t *p2ma, unsigned int *page_order); + +/* Propagate a host p2m change to all alternate p2m's */ +int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, + mfn_t mfn, unsigned int page_order, + p2m_type_t p2mt, p2m_access_t p2ma); #endif /* CONFIG_HVM */ /* p2m access to IOMMU flags */ diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index ec5043a8aa..384c24028f 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -494,6 +494,7 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) { /* Init alternate p2m data */ @@ -524,6 +525,7 @@ int hap_enable(struct domain *d, u32 mode) d->arch.altp2m_active = false; } +#endif /* CONFIG_ALTP2M */ /* Now let other users see the new mode */ d->arch.paging.mode = mode | PG_HAP_enable; @@ -537,9 +539,11 @@ void hap_final_teardown(struct domain *d) { unsigned int i; +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) for ( i = 0; i < MAX_ALTP2M; i++ ) p2m_teardown(d->arch.altp2m_p2m[i], true, NULL); +#endif /* Destroy nestedp2m's first */ for (i = 0; i < MAX_NESTEDP2M; i++) { @@ -578,6 +582,7 @@ void hap_teardown(struct domain *d, bool *preempted) for_each_vcpu ( d, v ) hap_vcpu_teardown(v); +#ifdef CONFIG_ALTP2M /* Leave the root pt in case we get further attempts to modify the p2m. */ if ( hvm_altp2m_supported() ) { @@ -597,6 +602,7 @@ void hap_teardown(struct domain *d, bool *preempted) return; } } +#endif /* Destroy nestedp2m's after altp2m. */ for ( i = 0; i < MAX_NESTEDP2M; i++ ) diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index 21b5b7ecda..0779c41161 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -347,6 +347,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, unsigned long gfn_l; long rc = 0; +#ifdef CONFIG_ALTP2M /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { @@ -357,6 +358,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); } +#endif if ( !xenmem_access_to_p2m_access(p2m, access, &a) ) return -EINVAL; @@ -403,6 +405,7 @@ long p2m_set_mem_access_multi(struct domain *d, struct p2m_domain *p2m = p2m_get_hostp2m(d), *ap2m = NULL; long rc = 0; +#ifdef CONFIG_ALTP2M /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { @@ -413,6 +416,7 @@ long p2m_set_mem_access_multi(struct domain *d, ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); } +#endif p2m_lock(p2m); if ( ap2m ) @@ -462,6 +466,7 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, { struct p2m_domain *p2m = p2m_get_hostp2m(d); +#ifdef CONFIG_ALTP2M if ( !altp2m_active(d) ) { if ( altp2m_idx ) @@ -476,6 +481,7 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, p2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); } +#endif return _p2m_get_mem_access(p2m, gfn, access); } @@ -486,6 +492,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required) p2m_get_hostp2m(d)->access_required = access_required; +#ifdef CONFIG_ALTP2M if ( altp2m_active(d) ) { unsigned int i; @@ -497,6 +504,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required) p2m->access_required = access_required; } } +#endif } bool p2m_mem_access_sanity_check(const struct domain *d) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 62fc8e5068..ae262bfcc2 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1297,6 +1297,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) hostp2m->ept.ad = value; +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -1315,6 +1316,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) p2m_unlock(p2m); } } +#endif } static void ept_enable_pml(struct p2m_domain *p2m) @@ -1571,6 +1573,7 @@ void __init setup_ept_dump(void) register_keyhandler('D', ept_dump_p2m_table, "dump VT-x EPT tables", 0); } +#ifdef CONFIG_ALTP2M void p2m_init_altp2m_ept(struct domain *d, unsigned int i) { struct p2m_domain *p2m = array_access_nospec(d->arch.altp2m_p2m, i); @@ -1610,6 +1613,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp) altp2m_list_unlock(d); return i; } +#endif /* CONFIG_ALTP2M */ /* * Local variables: diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b9a7c2dc53..5a3fda903e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -101,6 +101,7 @@ void p2m_change_entry_type_global(struct domain *d, change_entry_type_global(hostp2m, ot, nt); +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -117,6 +118,7 @@ void p2m_change_entry_type_global(struct domain *d, } } } +#endif p2m_unlock(hostp2m); } @@ -145,6 +147,7 @@ bool p2m_memory_type_changed(struct domain *d) _memory_type_changed(hostp2m); +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -161,6 +164,7 @@ bool p2m_memory_type_changed(struct domain *d) } } } +#endif p2m_unlock(hostp2m); @@ -930,6 +934,7 @@ void p2m_change_type_range(struct domain *d, change_type_range(hostp2m, start, end, ot, nt); +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -946,6 +951,8 @@ void p2m_change_type_range(struct domain *d, } } } +#endif + hostp2m->defer_nested_flush = false; if ( nestedhvm_enabled(d) ) p2m_flush_nestedp2m(d); @@ -1003,6 +1010,7 @@ int p2m_finish_type_change(struct domain *d, if ( rc < 0 ) goto out; +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -1022,6 +1030,7 @@ int p2m_finish_type_change(struct domain *d, } } } +#endif out: p2m_unlock(hostp2m); diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index 0d15d363c3..fc349270b9 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -72,7 +72,7 @@ void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v, if ( rsp->flags & VM_EVENT_FLAG_TOGGLE_SINGLESTEP ) hvm_toggle_singlestep(v); - else + else if ( IS_ENABLED(CONFIG_ALTP2M) ) hvm_fast_singlestep(v, rsp->u.fast_singlestep.p2midx); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093122.1448664 (Exim 4.92) (envelope-from ) id 1uqW2l-0003yB-KZ; Mon, 25 Aug 2025 12:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093122.1448664; Mon, 25 Aug 2025 12:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2l-0003y4-Hi; Mon, 25 Aug 2025 12:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1093122; Mon, 25 Aug 2025 12:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2k-0003xs-Pq for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW2k-005rN8-1o for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW2k-000MPb-2M for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jECTmirYnFR4/X9SECnT4kPO0rugJHoPNo06Jow/bv0=; b=ex8qrstLkM6tn7R3FqBr82I/Ir 9Z72/vGbWFxCkN++NRBfFXsfmELQQSUFh/0bYvUgtzliliwlIv9Y3BH74O2soIuryYLHbGc1v+Kdh ljKITa99G1UPxtCN5W4n/cRCjuFeXmjS+xKvGU3723kbKkK9HiyC0hBy+kI9Sz0ziwRw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Make the maximum number of altp2m views configurable for x86 Message-Id: Date: Mon, 25 Aug 2025 12:11:22 +0000 commit 06cf6cdab42141e8ada13ce9dec132b924ec95d9 Author: Petr Beneš AuthorDate: Mon Aug 25 12:50:20 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:50:20 2025 +0200 xen: Make the maximum number of altp2m views configurable for x86 This commit introduces the ability to configure the maximum number of altp2m views for the domain during its creation. Previously, the limits were hardcoded to a maximum of 10. This change allows for greater flexibility in environments that require more or fewer altp2m views. The maximum configurable limit for nr_altp2m on x86 is now set to MAX_NR_ALTP2M (which currently holds the MAX_EPTP value - 512). This cap is linked to the architectural limit of the EPTP-switching VMFUNC, which supports up to 512 entries. Despite there being no inherent need for limiting nr_altp2m in scenarios not utilizing VMFUNC, decoupling these components would necessitate substantial code changes. xen_domctl_createdomain::altp2m is extended for a new field `nr`, that will configure this limit for a domain. Additionally, previous altp2m.opts value has been reduced from uint32_t to uint16_t so that both of these fields occupy as little space as possible. Accesses to the altp2m_p2m array are modified to respect the new nr_altp2m value. Accesses to the altp2m_(visible_)eptp arrays are unmodified, since these arrays always have fixed size of MAX_EPTP. Additional sanitization is introduced in the x86/arch_sanitise_domain_config to fix the altp2m.nr value to 10 if it is previously set to 0. This behavior is only temporary and immediately removed in the upcoming commit (which will disallow creating a domain with enabled altp2m with zero nr_altp2m). The reason for this temporary workaround is to retain the legacy behavior until the feature is fully activated in libxl. Also, arm/arch_sanitise_domain_config is extended to not allow requesting non-zero altp2ms. Signed-off-by: Petr Beneš Acked-by: Jan Beulich Acked-by: Tamas K Lengyel # mem_access/mem_sharing Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 +- xen/arch/x86/domain.c | 40 ++++++++++++++++++---- xen/arch/x86/hvm/hvm.c | 8 ++++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/altp2m.h | 28 +++++++++++++-- xen/arch/x86/include/asm/domain.h | 9 ++--- xen/arch/x86/include/asm/p2m.h | 4 +-- xen/arch/x86/mm/altp2m.c | 72 +++++++++++++++++++++------------------ xen/arch/x86/mm/hap/hap.c | 6 ++-- xen/arch/x86/mm/mem_access.c | 20 ++++------- xen/arch/x86/mm/mem_sharing.c | 4 ++- xen/arch/x86/mm/p2m-ept.c | 7 ++-- xen/arch/x86/mm/p2m-pt.c | 2 ++ xen/arch/x86/mm/p2m.c | 8 ++--- xen/common/domain.c | 6 ++++ xen/include/public/domctl.h | 5 ++- xen/include/xen/sched.h | 4 +++ 17 files changed, 149 insertions(+), 78 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 310c578909..863ae18157 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -693,7 +693,7 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } - if ( config->altp2m.opts ) + if ( config->altp2m.opts || config->altp2m.nr ) { dprintk(XENLOG_INFO, "Altp2m not supported\n"); return -EINVAL; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index cd56f5821a..fc7ede0705 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -718,16 +718,42 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } - if ( altp2m_mode && nested_virt ) + if ( altp2m_mode ) { - dprintk(XENLOG_INFO, - "Nested virt and altp2m are not supported together\n"); - return -EINVAL; - } + if ( !hvm_altp2m_supported() ) + { + dprintk(XENLOG_INFO, "altp2m is not supported\n"); + return -EINVAL; + } + + if ( !hap ) + { + dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + return -EINVAL; + } + + if ( nested_virt ) + { + dprintk(XENLOG_INFO, + "Nested virt and altp2m are not supported together\n"); + return -EINVAL; + } + + if ( !config->altp2m.nr ) + { + /* Fix the value to the legacy default */ + config->altp2m.nr = 10; + } - if ( altp2m_mode && !hap ) + if ( config->altp2m.nr > MAX_NR_ALTP2M ) + { + dprintk(XENLOG_INFO, "altp2m.nr must be <= %lu\n", MAX_NR_ALTP2M); + return -EINVAL; + } + } + else if ( config->altp2m.nr ) { - dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + dprintk(XENLOG_INFO, "altp2m.nr must be zero when altp2m is off\n"); return -EINVAL; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 646a0b682d..23bd7f078a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4678,6 +4678,12 @@ static int do_altp2m_op( goto out; } + if ( d->nr_altp2m == 0 ) + { + rc = -EOPNOTSUPP; + goto out; + } + if ( (rc = xsm_hvm_altp2mhvm_op(XSM_OTHER, d, mode, a.cmd)) ) goto out; @@ -5278,7 +5284,7 @@ void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) if ( !hvm_is_singlestep_supported() ) return; - if ( p2midx >= MAX_ALTP2M ) + if ( p2midx >= v->domain->nr_altp2m ) return; v->arch.hvm.single_step = true; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9894a029ca..e2b5077654 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4978,7 +4978,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; ++i ) + for ( i = 0; i < currd->nr_altp2m; ++i ) { if ( currd->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) continue; diff --git a/xen/arch/x86/include/asm/altp2m.h b/xen/arch/x86/include/asm/altp2m.h index c57a8c5588..8ecd74f363 100644 --- a/xen/arch/x86/include/asm/altp2m.h +++ b/xen/arch/x86/include/asm/altp2m.h @@ -13,12 +13,32 @@ #include /* for struct vcpu, struct domain */ #include /* for vcpu_altp2m */ +static inline bool altp2m_is_eptp_valid(const struct domain *d, + unsigned int idx) +{ + /* There must be enough EPTP entries to cover all altp2m indices */ + BUILD_BUG_ON(MAX_EPTP < MAX_NR_ALTP2M); + + /* Domain should not have more altp2m entries than MAX_NR_ALTP2M */ + ASSERT(d->nr_altp2m <= MAX_NR_ALTP2M); + + /* EPTP index is used as altp2m index */ + return idx < d->nr_altp2m && + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != + mfn_x(INVALID_MFN); +} + /* Alternate p2m HVM on/off per domain */ static inline bool altp2m_active(const struct domain *d) { return d->arch.altp2m_active; } +static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +{ + return vcpu_altp2m(v).p2midx; +} + /* Alternate p2m VCPU */ void altp2m_vcpu_initialise(struct vcpu *v); void altp2m_vcpu_destroy(struct vcpu *v); @@ -26,11 +46,13 @@ void altp2m_vcpu_destroy(struct vcpu *v); int altp2m_vcpu_enable_ve(struct vcpu *v, gfn_t gfn); void altp2m_vcpu_disable_ve(struct vcpu *v); -static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +#else + +static inline bool altp2m_is_eptp_valid(const struct domain *d, + unsigned int idx) { - return vcpu_altp2m(v).p2midx; + return false; } -#else static inline bool altp2m_active(const struct domain *d) { diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index ffcec69a15..5df8c78253 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -258,11 +258,12 @@ struct paging_vcpu { struct shadow_vcpu shadow; }; -#define MAX_NESTEDP2M 10 +#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) +#define MAX_NR_ALTP2M MAX_EPTP +#define MAX_NESTEDP2M 10 -#define MAX_ALTP2M 10 /* arbitrary */ #define INVALID_ALTP2M 0xffff -#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) + struct p2m_domain; struct time_scale { int shift; @@ -354,7 +355,7 @@ struct arch_domain #ifdef CONFIG_ALTP2M /* altp2m: allow multiple copies of host p2m */ bool altp2m_active; - struct p2m_domain *altp2m_p2m[MAX_ALTP2M]; + struct p2m_domain **altp2m_p2m; mm_lock_t altp2m_list_lock; uint64_t *altp2m_eptp; uint64_t *altp2m_visible_eptp; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 5ce0dc936f..3b860e30c3 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -903,7 +903,7 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) if ( index == INVALID_ALTP2M ) return NULL; - BUG_ON(index >= MAX_ALTP2M); + BUG_ON(index >= v->domain->nr_altp2m); return v->domain->arch.altp2m_p2m[index]; } @@ -913,7 +913,7 @@ static inline bool p2m_set_altp2m(struct vcpu *v, unsigned int idx) { struct p2m_domain *orig; - BUG_ON(idx >= MAX_ALTP2M); + BUG_ON(idx >= v->domain->nr_altp2m); if ( idx == vcpu_altp2m(v).p2midx ) return false; diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index 6fe1e9ed6b..0261360aae 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -9,12 +9,16 @@ #include #include #include +#include #include "mm-locks.h" #include "p2m.h" void altp2m_vcpu_initialise(struct vcpu *v) { + if ( !v->domain->nr_altp2m ) + return; + if ( v != current ) vcpu_pause(v); @@ -32,6 +36,9 @@ altp2m_vcpu_destroy(struct vcpu *v) { struct p2m_domain *p2m; + if ( !v->domain->nr_altp2m ) + return; + if ( v != current ) vcpu_pause(v); @@ -122,7 +129,12 @@ int p2m_init_altp2m(struct domain *d) struct p2m_domain *hostp2m = p2m_get_hostp2m(d); mm_lock_init(&d->arch.altp2m_list_lock); - for ( i = 0; i < MAX_ALTP2M; i++ ) + d->arch.altp2m_p2m = xvzalloc_array(struct p2m_domain *, d->nr_altp2m); + + if ( !d->arch.altp2m_p2m ) + return -ENOMEM; + + for ( i = 0; i < d->nr_altp2m; i++ ) { d->arch.altp2m_p2m[i] = p2m = p2m_init_one(d); if ( p2m == NULL ) @@ -143,7 +155,7 @@ void p2m_teardown_altp2m(struct domain *d) unsigned int i; struct p2m_domain *p2m; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( !d->arch.altp2m_p2m[i] ) continue; @@ -151,6 +163,8 @@ void p2m_teardown_altp2m(struct domain *d) d->arch.altp2m_p2m[i] = NULL; p2m_free_one(p2m); } + + XVFREE(d->arch.altp2m_p2m); } int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn, @@ -200,7 +214,7 @@ bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) struct domain *d = v->domain; bool rc = false; - if ( idx >= MAX_ALTP2M ) + if ( idx >= d->nr_altp2m ) return rc; altp2m_list_lock(d); @@ -306,8 +320,8 @@ static void p2m_reset_altp2m(struct domain *d, unsigned int idx, { struct p2m_domain *p2m; - ASSERT(idx < MAX_ALTP2M); - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + ASSERT(idx < d->nr_altp2m); + p2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; p2m_lock(p2m); @@ -332,7 +346,7 @@ void p2m_flush_altp2m(struct domain *d) altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); @@ -348,9 +362,9 @@ static int p2m_activate_altp2m(struct domain *d, unsigned int idx, struct p2m_domain *hostp2m, *p2m; int rc; - ASSERT(idx < MAX_ALTP2M); + ASSERT(idx < d->nr_altp2m); - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + p2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; hostp2m = p2m_get_hostp2m(d); p2m_lock(p2m); @@ -388,7 +402,7 @@ int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) int rc = -EINVAL; struct p2m_domain *hostp2m = p2m_get_hostp2m(d); - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + if ( idx >= d->nr_altp2m ) return rc; altp2m_list_lock(d); @@ -415,7 +429,7 @@ int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) continue; @@ -437,7 +451,7 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) struct p2m_domain *p2m; int rc = -EBUSY; - if ( !idx || idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + if ( !idx || idx >= d->nr_altp2m ) return rc; rc = domain_pause_except_self(d); @@ -450,7 +464,7 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != mfn_x(INVALID_MFN) ) { - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + p2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; if ( !_atomic_read(p2m->active_vcpus) ) { @@ -475,7 +489,7 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) struct vcpu *v; int rc = -EINVAL; - if ( idx >= MAX_ALTP2M ) + if ( idx >= d->nr_altp2m ) return rc; rc = domain_pause_except_self(d); @@ -510,13 +524,11 @@ int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, mfn_t mfn; int rc = -EINVAL; - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, idx) ) return rc; hp2m = p2m_get_hostp2m(d); - ap2m = array_access_nospec(d->arch.altp2m_p2m, idx); + ap2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; p2m_lock(hp2m); p2m_lock(ap2m); @@ -572,7 +584,7 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { p2m_type_t t; p2m_access_t a; @@ -595,7 +607,7 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, else { /* At least 2 altp2m's impacted, so reset everything */ - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( i == last_reset_idx || d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) @@ -659,12 +671,11 @@ int p2m_set_suppress_ve_multi(struct domain *d, if ( sve->view > 0 ) { - if ( sve->view >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, sve->view) ) return -EINVAL; - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, sve->view); + p2m = ap2m = + d->arch.altp2m_p2m[array_index_nospec(sve->view, d->nr_altp2m)]; } p2m_lock(host_p2m); @@ -727,12 +738,11 @@ int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, if ( altp2m_idx > 0 ) { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + p2m = ap2m = + d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } else p2m = host_p2m; @@ -761,13 +771,7 @@ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, altp2m_list_lock(d); - /* - * Eptp index is correlated with altp2m index and should not exceed - * min(MAX_ALTP2M, MAX_EPTP). - */ - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) rc = -EINVAL; else if ( visible ) d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 384c24028f..4aec98109d 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -516,7 +516,7 @@ int hap_enable(struct domain *d, u32 mode) d->arch.altp2m_visible_eptp[i] = mfn_x(INVALID_MFN); } - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { rv = p2m_alloc_table(d->arch.altp2m_p2m[i]); if ( rv != 0 ) @@ -541,7 +541,7 @@ void hap_final_teardown(struct domain *d) #ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) p2m_teardown(d->arch.altp2m_p2m[i], true, NULL); #endif @@ -595,7 +595,7 @@ void hap_teardown(struct domain *d, bool *preempted) FREE_XENHEAP_PAGE(d->arch.altp2m_eptp); FREE_XENHEAP_PAGE(d->arch.altp2m_visible_eptp); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { p2m_teardown(d->arch.altp2m_p2m[i], false, preempted); if ( preempted && *preempted ) diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index 0779c41161..e6b609064c 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -351,12 +351,10 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } #endif @@ -409,12 +407,10 @@ long p2m_set_mem_access_multi(struct domain *d, /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } #endif @@ -474,12 +470,10 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, } else if ( altp2m_idx ) /* altp2m view 0 is treated as the hostp2m */ { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - p2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + p2m = d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } #endif @@ -496,7 +490,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required) if ( altp2m_active(d) ) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { struct p2m_domain *p2m = d->arch.altp2m_p2m[i]; diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index da28266ef0..4787b27964 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -901,6 +901,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, if ( !page || is_special_page(page) ) goto out; +#ifdef CONFIG_ALTP2M /* Check if there are mem_access/remapped altp2m entries for this page */ if ( altp2m_active(d) ) { @@ -912,7 +913,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { ap2m = d->arch.altp2m_p2m[i]; if ( !ap2m ) @@ -929,6 +930,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, altp2m_list_unlock(d); } +#endif /* CONFIG_ALTP2M */ /* Try to convert the mfn to the sharable type */ ret = page_make_sharable(d, page, expected_refcnt, validate_only); diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index ae262bfcc2..b854a08b4c 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1302,7 +1302,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { struct p2m_domain *p2m; @@ -1576,7 +1576,8 @@ void __init setup_ept_dump(void) #ifdef CONFIG_ALTP2M void p2m_init_altp2m_ept(struct domain *d, unsigned int i) { - struct p2m_domain *p2m = array_access_nospec(d->arch.altp2m_p2m, i); + struct p2m_domain *p2m = + d->arch.altp2m_p2m[array_index_nospec(i, d->nr_altp2m)]; struct p2m_domain *hostp2m = p2m_get_hostp2m(d); struct ept_data *ept; @@ -1595,7 +1596,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp) altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) continue; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 666abd46be..5a6ce2f8bc 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -519,12 +519,14 @@ int p2m_pt_handle_deferred_changes(uint64_t gpa) struct p2m_domain *p2m = p2m_get_hostp2m(current->domain); int rc; +#ifdef CONFIG_ALTP2M /* * Should altp2m ever be enabled for NPT / shadow use, this code * should be updated to make use of the active altp2m, like * ept_handle_misconfig(). */ ASSERT(!altp2m_active(current->domain)); +#endif p2m_lock(p2m); rc = do_recalc(p2m, PFN_DOWN(gpa)); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 5a3fda903e..e802f2e4e6 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -106,7 +106,7 @@ void p2m_change_entry_type_global(struct domain *d, { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { @@ -152,7 +152,7 @@ bool p2m_memory_type_changed(struct domain *d) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { @@ -939,7 +939,7 @@ void p2m_change_type_range(struct domain *d, { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { @@ -1015,7 +1015,7 @@ int p2m_finish_type_change(struct domain *d, { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { diff --git a/xen/common/domain.c b/xen/common/domain.c index 5241a1629e..104e917f07 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -822,6 +822,12 @@ struct domain *domain_create(domid_t domid, if ( config ) { d->options = config->flags; +#ifdef CONFIG_ALTP2M + d->nr_altp2m = config->altp2m.nr; +#else + ASSERT(!config->altp2m.nr); +#endif + d->vmtrace_size = config->vmtrace_size; } diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 0c75d9d27f..8f6708c0a7 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -116,7 +116,10 @@ struct xen_domctl_createdomain { /* Altp2m mode signaling uses bits [0, 1]. */ #define XEN_DOMCTL_ALTP2M_mode_mask (0x3U) #define XEN_DOMCTL_ALTP2M_mode(m) ((m) & XEN_DOMCTL_ALTP2M_mode_mask) - uint32_t opts; + uint16_t opts; + + /* Number of altp2ms to permit. */ + uint16_t nr; } altp2m; /* Per-vCPU buffer size in bytes. 0 to disable. */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fd5c9f9333..02bdc256ce 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -619,6 +619,10 @@ struct domain unsigned int guest_request_sync : 1; } monitor; +#ifdef CONFIG_ALTP2M + unsigned int nr_altp2m; /* Number of altp2m tables. */ +#endif + unsigned int vmtrace_size; /* Buffer size in bytes, or 0 to disable. */ #ifdef CONFIG_ARGO -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093123.1448669 (Exim 4.92) (envelope-from ) id 1uqW2w-00041E-O3; Mon, 25 Aug 2025 12:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093123.1448669; Mon, 25 Aug 2025 12:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2w-000416-Kt; Mon, 25 Aug 2025 12:11:34 +0000 Received: by outflank-mailman (input) for mailman id 1093123; Mon, 25 Aug 2025 12:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW2u-00040a-UO for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW2u-005rNF-26 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW2u-000MQD-2f for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HjIPJXgb9rNYORYPXwy57jR3KUTEGtH4J/DeH3VN8uY=; b=uSQBjNJj3SdcHe14I6NJEXeUWd apETJHxsuOd9+KLnUKjeLWMHKGRiCQeFU7tQa/NhOtYUJdo0lA24NYt+6pp4By7s4DIIMn05jrIjq X7ZHSBvNaZQXd3XU/3myJYVjoGykLwCDUyt5+NBv6Wj1kL+uBuWEJ3+YCou7PqveWooU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: Activate the altp2m_count feature Message-Id: Date: Mon, 25 Aug 2025 12:11:32 +0000 commit 445253c853a6f95de1456839302da1f1f37c4b62 Author: Petr Beneš AuthorDate: Mon Aug 25 12:50:55 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:50:55 2025 +0200 tools/libxl: Activate the altp2m_count feature This commit activates the previously introduced altp2m_count parameter, establishing the connection between libxl and Xen. Signed-off-by: Petr Beneš Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 85c5b26ec0..bfc9149096 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -596,6 +596,10 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, .max_grant_frames = b_info->max_grant_frames, .max_maptrack_frames = b_info->max_maptrack_frames, .grant_opts = XEN_DOMCTL_GRANT_version(b_info->max_grant_version), + .altp2m = { + .opts = 0, /* .opts will be set below */ + .nr = b_info->altp2m_count, + }, .vmtrace_size = ROUNDUP(b_info->vmtrace_buf_kb << 10, XC_PAGE_SHIFT), .cpupool_id = info->poolid, }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093125.1448673 (Exim 4.92) (envelope-from ) id 1uqW36-00043K-Q8; Mon, 25 Aug 2025 12:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093125.1448673; Mon, 25 Aug 2025 12:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW36-00043D-Mn; Mon, 25 Aug 2025 12:11:44 +0000 Received: by outflank-mailman (input) for mailman id 1093125; Mon, 25 Aug 2025 12:11:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW34-00042w-W0 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW34-005rNJ-2Q for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW34-000MT3-2x for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GjO6cyKLSrv33Pc12oG2BdM0mbLJ93uYhs8NSzKKeu8=; b=XRKGwky4mmZ74wGnW7lHky5hSP ts6DM9k/UjxuZntyWmiy5ifFZFpl8PZq9fEiCJJbGoTqvHtxe7ffAtNGb1FCBiQSdvw6ibuKYiP9B yt87AVT73hSbkiqFSFvNNi7fYICl5ImYQirT2vjUihQwBWZ4+nAR6y/vAuLPpD+wXe9A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: Disallow creating domains with altp2m enabled and altp2m.nr == 0 Message-Id: Date: Mon, 25 Aug 2025 12:11:42 +0000 commit ae81cfa4d4a2717c5a151f4d1d1bbeb56523395a Author: Petr Beneš AuthorDate: Mon Aug 25 12:51:10 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:51:10 2025 +0200 xen/x86: Disallow creating domains with altp2m enabled and altp2m.nr == 0 Since libxl finally sends the altp2m.nr value, we can remove the previously introduced temporary workaround. Creating domain with enabled altp2m while setting altp2m.nr == 0 doesn't make sense and it's probably not what user wants. Signed-off-by: Petr Beneš Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fc7ede0705..19fd86ce88 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -741,8 +741,9 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) if ( !config->altp2m.nr ) { - /* Fix the value to the legacy default */ - config->altp2m.nr = 10; + dprintk(XENLOG_INFO, + "altp2m must be requested with altp2m.nr > 0\n"); + return -EINVAL; } if ( config->altp2m.nr > MAX_NR_ALTP2M ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093128.1448678 (Exim 4.92) (envelope-from ) id 1uqW3G-00046D-Rv; Mon, 25 Aug 2025 12:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093128.1448678; Mon, 25 Aug 2025 12:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3G-000465-OD; Mon, 25 Aug 2025 12:11:54 +0000 Received: by outflank-mailman (input) for mailman id 1093128; Mon, 25 Aug 2025 12:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3F-000459-2S for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW3E-005rNR-2i for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW3F-000MTo-04 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:11:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kn8RBV/O509TGNbBkVt5kNFpN/hubX38ee7WY3TFA14=; b=RnCa3LFL1OZ0n5rsF8E89eEc6Y pysnYS8Rl8Lj//YDlVAn951YE0MS/xZ+yRcnsuqsVIgb3kbkfzV6PpWf2yf60+5hlQ2C0Rub5ECXA Io+GtvoVli6yWt/ebTTH8q9BJ9HChUd2oEFupim9NtYVUaf2jZztidGSeF0ZySnAI3ho=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/ocaml: Add altp2m_count parameter Message-Id: Date: Mon, 25 Aug 2025 12:11:53 +0000 commit 5699554de9a934d986e9b2a400deda03dd883d98 Author: Petr Beneš AuthorDate: Mon Aug 25 12:51:35 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:51:35 2025 +0200 tools/ocaml: Add altp2m_count parameter Allow developers using the OCaml bindings to set the altp2m_count parameter. Signed-off-by: Petr Beneš Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/ocaml/libs/xc/xenctrl_stubs.c | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7e1aabad6c..97108b9d86 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -87,6 +87,7 @@ type domctl_create_config = max_maptrack_frames: int; max_grant_version: int; altp2m_opts: int32; + altp2m_count: int32; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index f44dba61ae..9fccb2c2c2 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -79,6 +79,7 @@ type domctl_create_config = { max_maptrack_frames: int; max_grant_version: int; altp2m_opts: int32; + altp2m_count: int32; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index b51fd66788..ac2a7537d6 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -205,13 +205,22 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #define VAL_MAX_MAPTRACK_FRAMES Field(config, 7) #define VAL_MAX_GRANT_VERSION Field(config, 8) #define VAL_ALTP2M_OPTS Field(config, 9) -#define VAL_VMTRACE_BUF_KB Field(config, 10) -#define VAL_CPUPOOL_ID Field(config, 11) -#define VAL_ARCH Field(config, 12) +#define VAL_ALTP2M_COUNT Field(config, 10) +#define VAL_VMTRACE_BUF_KB Field(config, 11) +#define VAL_CPUPOOL_ID Field(config, 12) +#define VAL_ARCH Field(config, 13) uint32_t domid = Int_val(wanted_domid); + uint32_t altp2m_opts = Int32_val(VAL_ALTP2M_OPTS); + uint32_t altp2m_nr = Int32_val(VAL_ALTP2M_COUNT); uint64_t vmtrace_size = Int32_val(VAL_VMTRACE_BUF_KB); + if ( altp2m_opts != (uint16_t)altp2m_opts ) + caml_invalid_argument("altp2m_opts"); + + if ( altp2m_nr != (uint16_t)altp2m_nr ) + caml_invalid_argument("altp2m_count"); + vmtrace_size = ROUNDUP(vmtrace_size << 10, XC_PAGE_SHIFT); if ( vmtrace_size != (uint32_t)vmtrace_size ) caml_invalid_argument("vmtrace_buf_kb"); @@ -226,7 +235,8 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co .grant_opts = XEN_DOMCTL_GRANT_version(Int_val(VAL_MAX_GRANT_VERSION)), .altp2m = { - .opts = Int32_val(VAL_ALTP2M_OPTS), + .opts = altp2m_opts, + .nr = altp2m_nr, }, .vmtrace_size = vmtrace_size, .cpupool_id = Int32_val(VAL_CPUPOOL_ID), @@ -286,6 +296,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #undef VAL_ARCH #undef VAL_CPUPOOL_ID #undef VAL_VMTRACE_BUF_KB +#undef VAL_ALTP2M_COUNT #undef VAL_ALTP2M_OPTS #undef VAL_MAX_GRANT_VERSION #undef VAL_MAX_MAPTRACK_FRAMES -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093129.1448681 (Exim 4.92) (envelope-from ) id 1uqW3Q-00048y-SZ; Mon, 25 Aug 2025 12:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093129.1448681; Mon, 25 Aug 2025 12:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3Q-00048q-Pj; Mon, 25 Aug 2025 12:12:04 +0000 Received: by outflank-mailman (input) for mailman id 1093129; Mon, 25 Aug 2025 12:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3P-00048e-5E for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW3O-005rO3-2z for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW3P-000MVX-0K for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+/UiuWe5K4fpRs+VeRcsPoMDQUEA0uecwiPdzymtJJY=; b=vHkayzcrQG1vTRfndjNFrv43SS Xs5hNrdyPbgSzXdzCKJUtlJTz6RTqg59/lSR0eCBBiVTUBFOHhW94gPglGlIj0/GbsfK/zCSb2GPl yV1smYIbnYP2m2IY7ce9gMQ5gZZlyQvAvxJuq3wuNUAGvi2BSIqa8SkbA5BN9EQx4I6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: drop "has_num" condition check for cppc mode Message-Id: Date: Mon, 25 Aug 2025 12:12:03 +0000 commit e28d97d598214155b59bc2789b69ed5e4b38159e Author: Penny Zheng AuthorDate: Mon Aug 25 12:51:50 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:51:50 2025 +0200 tools: drop "has_num" condition check for cppc mode In `xenpm get-cpufreq-para `, ->freq_num and ->cpu_num checking are tied together via variable "has_num", while ->freq_num only has non-zero value when cpufreq driver in legacy P-states mode. So we drop the "has_num" condition check, and mirror the ->gov_num check for both ->freq_num and ->cpu_num in xc_get_cpufreq_para(). Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich Reviewed-by: Anthony PERARD --- tools/libs/ctrl/xc_pm.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tools/libs/ctrl/xc_pm.c b/tools/libs/ctrl/xc_pm.c index 1f2430cac2..6fda973f1f 100644 --- a/tools/libs/ctrl/xc_pm.c +++ b/tools/libs/ctrl/xc_pm.c @@ -210,33 +210,36 @@ int xc_get_cpufreq_para(xc_interface *xch, int cpuid, DECLARE_NAMED_HYPERCALL_BOUNCE(scaling_available_governors, user_para->scaling_available_governors, user_para->gov_num * CPUFREQ_NAME_LEN * sizeof(char), XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - bool has_num = user_para->cpu_num && user_para->freq_num; - if ( has_num ) + if ( (user_para->cpu_num && !user_para->affected_cpus) || + (user_para->freq_num && !user_para->scaling_available_frequencies) || + (user_para->gov_num && !user_para->scaling_available_governors) ) + { + errno = EINVAL; + return -1; + } + if ( user_para->cpu_num ) { - if ( (!user_para->affected_cpus) || - (!user_para->scaling_available_frequencies) || - (user_para->gov_num && !user_para->scaling_available_governors) ) - { - errno = EINVAL; - return -1; - } ret = xc_hypercall_bounce_pre(xch, affected_cpus); if ( ret ) return ret; + set_xen_guest_handle(sys_para->affected_cpus, affected_cpus); + } + if ( user_para->freq_num ) + { ret = xc_hypercall_bounce_pre(xch, scaling_available_frequencies); if ( ret ) goto unlock_2; - if ( user_para->gov_num ) - ret = xc_hypercall_bounce_pre(xch, scaling_available_governors); + set_xen_guest_handle(sys_para->scaling_available_frequencies, + scaling_available_frequencies); + } + if ( user_para->gov_num ) + { + ret = xc_hypercall_bounce_pre(xch, scaling_available_governors); if ( ret ) goto unlock_3; - - set_xen_guest_handle(sys_para->affected_cpus, affected_cpus); - set_xen_guest_handle(sys_para->scaling_available_frequencies, scaling_available_frequencies); - if ( user_para->gov_num ) - set_xen_guest_handle(sys_para->scaling_available_governors, - scaling_available_governors); + set_xen_guest_handle(sys_para->scaling_available_governors, + scaling_available_governors); } sysctl.cmd = XEN_SYSCTL_pm_op; @@ -256,9 +259,7 @@ int xc_get_cpufreq_para(xc_interface *xch, int cpuid, user_para->gov_num = sys_para->gov_num; } - if ( has_num ) - goto unlock_4; - return ret; + goto unlock_4; } else { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093130.1448685 (Exim 4.92) (envelope-from ) id 1uqW3a-0004B6-Td; Mon, 25 Aug 2025 12:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093130.1448685; Mon, 25 Aug 2025 12:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3a-0004Ax-R6; Mon, 25 Aug 2025 12:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1093130; Mon, 25 Aug 2025 12:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3Z-0004Ak-8O for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW3Z-005rOE-04 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW3Z-000MW6-0c for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eEunbvVQ4dteEqBChkps//6ne4d0ZhOF1Idj7OcZORw=; b=6+GMB6G6hhpaCewUbqPnyzDudg IX9Ou2JvX356NSitfJVw74tYws30nla/tQWMW51dryNsOsLo6PD6DtylALd7MsV0nB6ySDPcByiMe 1mza1LZnUHS8Y4OUpD9Ri3rUVH+1++89QR9k8WyaJLjxnHH7J8EUvI5jnq8AJ1CD8Nwc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] common/efi: fix Rule 2.1 violation in read_file() Message-Id: Date: Mon, 25 Aug 2025 12:12:13 +0000 commit 9e5a9b53f65058b095c2e6e44afeb50a0fc81eef Author: Dmytro Prokopchuk AuthorDate: Mon Aug 25 12:52:03 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:52:03 2025 +0200 common/efi: fix Rule 2.1 violation in read_file() MISRA C Rule 2.1 states: "A project shall not contain unreachable code." The final return statement in the 'read_file()' function is unreachable due to function 'PrintErrMesg()' which has 'noreturn' attribute: PrintErrMesg(name, ret); /* not reached */ return false; } No explicit return statement is needed here because 'PrintErrMesg()' is marked as 'noreturn', which guarantees that it never returns control to the caller. If the 'noreturn' attribute of 'PrintErrMesg()' is removed in the future, compiler will emit an error about the missing return statement (build-time safeguard). No functional changes. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 50ff1d1bd2..b7fdb031d0 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -853,7 +853,6 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, PrintErrMesg(name, ret); /* not reached */ - return false; } static bool __init read_section(const EFI_LOADED_IMAGE *image, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 12:12:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 12:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093132.1448689 (Exim 4.92) (envelope-from ) id 1uqW3k-0004DY-V7; Mon, 25 Aug 2025 12:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093132.1448689; Mon, 25 Aug 2025 12:12:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3k-0004DQ-SU; Mon, 25 Aug 2025 12:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1093132; Mon, 25 Aug 2025 12:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqW3j-0004Cq-Av for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqW3j-005rOI-0L for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqW3j-000MWr-0v for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 12:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=t0wgW9VHSdsjZQ1ZY23fH62+1dwhgFH6C4xj9zwhE1I=; b=IZMi9tjGxokvphK00CT5t75NX1 iycBvbQ2pBJGms6TQG2enGtvNvJG6xn50diGiC7xXP3U9bKJyBwLK+yYqsbhHvq9vmre8L41ulT6T MrOMkAipVvIzL+2CK1YrfbpyudG2GeqAQeStAsKh9XumHXOgRBk+bIwrEwyn895w6jRw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/misra: fix sphinx-build issues Message-Id: Date: Mon, 25 Aug 2025 12:12:23 +0000 commit abd6ec8874afb5782d041d8f655363d6f97e90b0 Author: Dmytro Prokopchuk AuthorDate: Mon Aug 25 12:52:44 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:52:44 2025 +0200 docs/misra: fix sphinx-build issues Fix the following issues: 1. xen/docs/misra/deviations.rst:90: WARNING: Inline interpreted text or phrase reference start-string without end-string. [docutils] 2. xen/docs/misra/deviations.rst:54: ERROR: Error parsing content block for the "list-table" directive: uniform two-level bullet list expected, but row 6 does not contain the same number of items as row 1 (2 vs 3). * - R2.1 - Calls to the `__builtin_unreachable()` function inside the expansion of the `ASSERT_UNREACHABLE()` macro may cause a function to be marked as non-returning. This behavior occurs only in configurations where assertions are enabled. To address this, the `noreturn` property for `__builtin_unreachable()` is overridden in these contexts, resulting in the absence of reports that do not have an impact on safety, despite being true positives. Xen expects developers to ensure code remains safe and reliable in builds, even when debug-only assertions like `ASSERT_UNREACHABLE() are removed. 3. xen/docs/misra/rules.rst:127: WARNING: Inline interpreted text or phrase reference start-string without end-string. [docutils] Signed-off-by: Dmytro Prokopchuk Reviewed-by: Nicola Vetrini Reviewed-by: Andrew Cooper --- docs/misra/deviations.rst | 3 ++- docs/misra/rules.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 2119066531..3271317206 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -95,7 +95,8 @@ Deviations related to MISRA C:2012 Rules: the absence of reports that do not have an impact on safety, despite being true positives. Xen expects developers to ensure code remains safe and reliable in builds, - even when debug-only assertions like `ASSERT_UNREACHABLE() are removed. + even when debug-only assertions like `ASSERT_UNREACHABLE()` are removed. + - ECLAIR has been configured to ignore those statements. * - R2.2 - Proving compliance with respect to Rule 2.2 is generally impossible: diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index a2e4e9f4ff..4388010ec9 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -124,7 +124,7 @@ maintainers if you want to suggest a change. they are used to generate definitions for asm modules - Declarations without initializer are safe, as they are not executed - - Functions that are no-return due to calls to the `ASSERT_UNREACHABLE()' + - Functions that are no-return due to calls to the `ASSERT_UNREACHABLE()` macro in debug build configurations are not considered violations:: static inline bool -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 13:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 13:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093172.1448722 (Exim 4.92) (envelope-from ) id 1uqWyV-0004v7-Kl; Mon, 25 Aug 2025 13:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093172.1448722; Mon, 25 Aug 2025 13:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqWyV-0004uz-Ht; Mon, 25 Aug 2025 13:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1093172; Mon, 25 Aug 2025 13:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqWyU-0004ut-1O for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqWyT-005saO-29 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqWyT-000RF4-2d for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UWvxi228W/pZ5CV7skYmCRfvtWuvIxixiZ/Yo5/8f/U=; b=duykycFwueP3c0oaq69skx22fB 1pQ2HN3q20f8w8ZcTM7jdqr6PVnLLT86bbTapOEW3nVCsybl6E6t7XY/K7gjsL/6xwnG+h7ShhCrs tog6KY/w9p7ljNgwE8Phipl3wxo4pydj8CJttslFAytrIl4/Q97Wl22OhsgVN8eneIpY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpu-policy: Drop workaround for pre-GCC-5 PIC issue Message-Id: Date: Mon, 25 Aug 2025 13:11:01 +0000 commit a41fdcaf1e520d4a28fac7669fde9b32d1e1c2eb Author: Andrew Cooper AuthorDate: Wed Aug 13 23:57:57 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 25 14:04:41 2025 +0100 x86/cpu-policy: Drop workaround for pre-GCC-5 PIC issue GCC 5.1 is the minimum supported toolchain version now. Drop the workaround for the PIC hard register in earlier versions. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/xen/lib/x86/cpu-policy.h | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index dd204a825b..f94f23e159 100644 --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -29,45 +29,18 @@ struct cpuid_leaf uint32_t a, b, c, d; }; -/* - * Versions of GCC before 5 unconditionally reserve %rBX as the PIC hard - * register, and are unable to cope with spilling it. This results in a - * rather cryptic error: - * error: inconsistent operand constraints in an ‘asm’ - * - * In affected situations, work around the issue by using a separate register - * to hold the the %rBX output, and xchg twice to leave %rBX preserved around - * the asm() statement. - */ -#if defined(__PIC__) && __GNUC__ < 5 && !defined(__clang__) && defined(__i386__) -# define XCHG_BX "xchg %%ebx, %[bx];" -# define BX_CON [bx] "=&r" -#elif defined(__PIC__) && __GNUC__ < 5 && !defined(__clang__) && \ - defined(__x86_64__) && (defined(__code_model_medium__) || \ - defined(__code_model_large__)) -# define XCHG_BX "xchg %%rbx, %q[bx];" -# define BX_CON [bx] "=&r" -#else -# define XCHG_BX "" -# define BX_CON "=&b" -#endif - static inline void cpuid_leaf(uint32_t leaf, struct cpuid_leaf *l) { - asm ( XCHG_BX - "cpuid;" - XCHG_BX - : "=a" (l->a), BX_CON (l->b), "=&c" (l->c), "=&d" (l->d) + asm ( "cpuid" + : "=a" (l->a), "=b" (l->b), "=c" (l->c), "=d" (l->d) : "a" (leaf) ); } static inline void cpuid_count_leaf( uint32_t leaf, uint32_t subleaf, struct cpuid_leaf *l) { - asm ( XCHG_BX - "cpuid;" - XCHG_BX - : "=a" (l->a), BX_CON (l->b), "=c" (l->c), "=&d" (l->d) + asm ( "cpuid" + : "=a" (l->a), "=b" (l->b), "=c" (l->c), "=d" (l->d) : "a" (leaf), "c" (subleaf) ); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 13:11:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 13:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093173.1448727 (Exim 4.92) (envelope-from ) id 1uqWyf-0004xW-Ne; Mon, 25 Aug 2025 13:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093173.1448727; Mon, 25 Aug 2025 13:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqWyf-0004xO-L3; Mon, 25 Aug 2025 13:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1093173; Mon, 25 Aug 2025 13:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqWye-0004wz-0B for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqWyd-005saS-2S for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqWyd-000RFi-30 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hD34SoiBjMZVfNsf9ztrqP7NjmgUfgpJw6S8snM26DQ=; b=cnB3+6FzbyhZsXM6O1rziafbUq Sxqkyw5RRTx4bQwIECLNlGW58cvLf2g/yHGsXW/hbNYSpQAOG75YKmJY1J8cdcJ1HApoIFKfenSmk QkX3lTAnK4KZm4aSz71ioekHh/AQ4OcB7ULggUSMcvGEMseMRDsfT0yVbdqQkOJ1KFwk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mce: Sort headers Message-Id: Date: Mon, 25 Aug 2025 13:11:11 +0000 commit f2697bb2d4d790831cabad167533f64d8af776b3 Author: Andrew Cooper AuthorDate: Thu Aug 21 16:43:46 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 25 14:04:41 2025 +0100 x86/mce: Sort headers No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce_intel.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index fac60f2d37..d4b39e84b3 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1,29 +1,30 @@ +#include +#include +#include #include -#include #include -#include #include -#include +#include #include #include -#include -#include -#include -#include -#include + +#include +#include #include #include -#include -#include +#include +#include #include -#include "mce.h" -#include "x86_mca.h" +#include + #include "barrier.h" +#include "mcaction.h" +#include "mce.h" #include "util.h" #include "vmce.h" -#include "mcaction.h" +#include "x86_mca.h" static DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, mce_banks_owned); static bool __read_mostly ser_support; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 13:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 13:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093174.1448731 (Exim 4.92) (envelope-from ) id 1uqWyp-0004zn-P0; Mon, 25 Aug 2025 13:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093174.1448731; Mon, 25 Aug 2025 13:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqWyp-0004zf-MQ; Mon, 25 Aug 2025 13:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1093174; Mon, 25 Aug 2025 13:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqWyo-0004zT-2y for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqWyn-005saa-2k for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqWyo-000RGJ-05 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 13:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=flN0r7YPcpzVurZRntoxrrWKg3iXWPN1TBx06Oh9nz4=; b=Y2nn510IvTCIRE8tQgMmuOPmRr 4btCafmMHtyPnD3hI+AS2jXDTyke/uM5f5t10HhGEgTG7qIL/LHbcznYQ6kWygQkcgYfYaYta72Ng Jdopm0WnIed2NjNiALV37Uc36cvk7I1NzZpjlmrbO+6e3d2pj6pltuFmuiBr9K/MFpoE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mce: Adjustments to intel_init_ppin() Message-Id: Date: Mon, 25 Aug 2025 13:11:22 +0000 commit 49e6eb744eba01f5d4b4cfce49154c0802d4f5c6 Author: Andrew Cooper AuthorDate: Thu Aug 21 16:35:09 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 25 14:04:41 2025 +0100 x86/mce: Adjustments to intel_init_ppin() There's no family check gating intel_init_ppin(), making it incorrect to use on non Fam6 CPUs. Switch to using VFM. Emerald Rapids is the final CPU to have PPIN but lack the the architectural enumeration, so include it too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce_intel.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index d4b39e84b3..839a0e5ba9 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -859,7 +860,7 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) * other purposes. Despite the late addition of a CPUID bit (rendering * the MSR architectural), keep using the same detection logic there. */ - switch ( c->x86_model ) + switch ( c->vfm ) { uint64_t val; @@ -870,14 +871,15 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) return; } fallthrough; - case 0x3e: /* IvyBridge X */ - case 0x3f: /* Haswell X */ - case 0x4f: /* Broadwell X */ - case 0x55: /* Skylake X */ - case 0x56: /* Broadwell Xeon D */ - case 0x6a: /* Icelake X */ - case 0x6c: /* Icelake D */ - case 0x8f: /* Sapphire Rapids X */ + case INTEL_IVYBRIDGE_X: + case INTEL_HASWELL_X: + case INTEL_BROADWELL_X: + case INTEL_BROADWELL_D: + case INTEL_SKYLAKE_X: + case INTEL_ICELAKE_X: + case INTEL_ICELAKE_D: + case INTEL_SAPPHIRERAPIDS_X: + case INTEL_EMERALDRAPIDS_X: if ( (c != &boot_cpu_data && !ppin_msr) || rdmsr_safe(MSR_PPIN_CTL, &val) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093610.1449060 (Exim 4.92) (envelope-from ) id 1uqaik-000485-Oi; Mon, 25 Aug 2025 17:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093610.1449060; Mon, 25 Aug 2025 17:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaik-00047x-M5; Mon, 25 Aug 2025 17:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1093610; Mon, 25 Aug 2025 17:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaij-00047r-R0 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqaij-005yM0-1X for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqaij-000oPJ-23 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bJEEBZGMcs/4Gs3mgP+j9IPO/Wk+XjNB3tdgMwTTQeY=; b=grQTUOLhmzvF0UEaK/K/fLZNzx 8cPFvq0sjJd/oHDUAb/Jom/ItoglvEpc77GGAwd9cmRQBcjob3oAvdoA77WB+blvPO72C9o3x1zg0 TfnpfQtTw1Zmn5kAIOuoUJ0w7Nt4FpLuS/+/+k+5a3XvE/yVPtN85X43uuBTF0T//eGM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] altp2m: Drop p2m_altp2m_check() stubs on non-x86, move prototype, and guard uses Message-Id: Date: Mon, 25 Aug 2025 17:11:01 +0000 commit 5fe316e479e8c6e335fd9aa0086911c8183ca96d Author: Petr Beneš AuthorDate: Mon Aug 25 12:44:58 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:44:58 2025 +0200 altp2m: Drop p2m_altp2m_check() stubs on non-x86, move prototype, and guard uses Remove the no-op stubs from the ARM, PPC, and RISC‑V p2m headers and stop providing a stub in arch/x86/include/asm/p2m.h. Declare p2m_altp2m_check() in xen/include/xen/p2m-common.h and gate all call sites with CONFIG_ALTP2M: - wrap the fast_single_step block in hvm/monitor.c with #ifdef CONFIG_ALTP2M (IS_ENABLED(CONFIG_ALTP2M) is not used here, because in the subsequent commit hvm_vcpu::fast_single_step will be guarded by CONFIG_ALTP2M) - make the vm_event.c path conditional via IS_ENABLED(CONFIG_ALTP2M) No functional change intended: on builds without ALTP2M the calls are compiled out; on builds with ALTP2M behavior is unchanged. Signed-off-by: Petr Beneš Reviewed-by: Jan Beulich Acked-by: Julien Grall # arm Acked-by: Tamas K Lengyel # vm_event/monitor --- xen/arch/arm/include/asm/p2m.h | 6 ------ xen/arch/ppc/include/asm/p2m.h | 5 ----- xen/arch/riscv/include/asm/p2m.h | 5 ----- xen/arch/x86/hvm/monitor.c | 2 ++ xen/arch/x86/include/asm/p2m.h | 8 +------- xen/common/vm_event.c | 3 ++- xen/include/xen/p2m-common.h | 3 +++ 7 files changed, 8 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/include/asm/p2m.h b/xen/arch/arm/include/asm/p2m.h index 2d53bf9b61..ef98bc5f4d 100644 --- a/xen/arch/arm/include/asm/p2m.h +++ b/xen/arch/arm/include/asm/p2m.h @@ -180,12 +180,6 @@ static inline bool arch_acquire_resource_check(struct domain *d) return true; } -static inline -void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - /* Not supported on ARM. */ -} - /* * Helper to restrict "p2m_ipa_bits" according the external entity * (e.g. IOMMU) requirements. diff --git a/xen/arch/ppc/include/asm/p2m.h b/xen/arch/ppc/include/asm/p2m.h index f144ef8e1a..c96149ef74 100644 --- a/xen/arch/ppc/include/asm/p2m.h +++ b/xen/arch/ppc/include/asm/p2m.h @@ -88,9 +88,4 @@ static inline bool arch_acquire_resource_check(struct domain *d) return false; } -static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - /* Not supported on PPC. */ -} - #endif /* __ASM_PPC_P2M_H__ */ diff --git a/xen/arch/riscv/include/asm/p2m.h b/xen/arch/riscv/include/asm/p2m.h index 28f57a74f2..e43c559e0c 100644 --- a/xen/arch/riscv/include/asm/p2m.h +++ b/xen/arch/riscv/include/asm/p2m.h @@ -88,11 +88,6 @@ static inline bool arch_acquire_resource_check(struct domain *d) return false; } -static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - /* Not supported on RISCV. */ -} - #endif /* ASM__RISCV__P2M_H */ /* diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index 523586ca98..d22a2e4644 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -178,6 +178,7 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monitor_debug_type type, break; case HVM_MONITOR_SINGLESTEP_BREAKPOINT: +#ifdef CONFIG_ALTP2M if ( curr->arch.hvm.fast_single_step.enabled ) { p2m_altp2m_check(curr, curr->arch.hvm.fast_single_step.p2midx); @@ -186,6 +187,7 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monitor_debug_type type, curr->arch.hvm.fast_single_step.p2midx = 0; return 0; } +#endif if ( !ad->monitor.singlestep_enabled ) return 0; req.reason = VM_EVENT_REASON_SINGLESTEP; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 58b56e575e..c53f4e487d 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -962,17 +962,11 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, /* Set a specific p2m view visibility */ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, uint8_t visible); + #else /* !CONFIG_HVM */ struct p2m_domain *p2m_get_altp2m(struct vcpu *v); #endif /* CONFIG_HVM */ -#ifdef CONFIG_ALTP2M -/* Check to see if vcpu should be switched to a different p2m. */ -void p2m_altp2m_check(struct vcpu *v, uint16_t idx); -#else -static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) {} -#endif - /* p2m access to IOMMU flags */ static inline unsigned int p2m_access_to_iommu_flags(p2m_access_t p2ma) { diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 1666ff615f..b2787c0108 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -431,7 +431,8 @@ static int vm_event_resume(struct domain *d, struct vm_event_domain *ved) vm_event_toggle_singlestep(d, v, &rsp); /* Check for altp2m switch */ - if ( rsp.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) + if ( IS_ENABLED(CONFIG_ALTP2M) && + rsp.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) p2m_altp2m_check(v, rsp.altp2m_idx); if ( rsp.flags & VM_EVENT_FLAG_SET_REGISTERS ) diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h index a322e738ef..f0bd9a6b98 100644 --- a/xen/include/xen/p2m-common.h +++ b/xen/include/xen/p2m-common.h @@ -24,6 +24,9 @@ int unmap_mmio_regions(struct domain *d, unsigned long nr, mfn_t mfn); +/* Check to see if vcpu should be switched to a different p2m. */ +void p2m_altp2m_check(struct vcpu *v, uint16_t idx); + /* * Populate-on-Demand */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093611.1449065 (Exim 4.92) (envelope-from ) id 1uqaiu-00049j-R2; Mon, 25 Aug 2025 17:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093611.1449065; Mon, 25 Aug 2025 17:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaiu-00049b-Nb; Mon, 25 Aug 2025 17:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1093611; Mon, 25 Aug 2025 17:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqait-00049R-R5 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqait-005yMM-1v for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqait-000oPx-2U for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6WqlZUTHEEkwlvztI3pnIQna4ZO+GoaAacMqOMQXqPk=; b=Cjb2h6zfwTR1N/pYjYZTPCSyDC Hp1syp+qvmedNSToztB2/1rOU5AMRS4WujEVUEYWbOgHM83TNr4dX/sUtNSvcYpCp8AOY9Ox2j6/3 BdvtVzKf/CqTrhDIjqyyEGDKCCm+aB+hJBKKcEYKU1vGhIGws6cvy0Xswth7dh1dTK3g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/altp2m: Wrap altp2m-specific code in #ifdef CONFIG_ALTP2M Message-Id: Date: Mon, 25 Aug 2025 17:11:11 +0000 commit 8f694f789efeff97d6e809a7ea856b032539d4a0 Author: Petr Beneš AuthorDate: Mon Aug 25 12:49:23 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:49:23 2025 +0200 x86/altp2m: Wrap altp2m-specific code in #ifdef CONFIG_ALTP2M This change consistently guards all altp2m-related functionality behind #ifdef CONFIG_ALTP2M, so that code and data structures related to alternate p2m views are only included when the feature is enabled. Apart from that: - hvmemul_vmfunc() returns X86EMUL_UNHANDLEABLE when altp2m is disabled. - do_altp2m_op() returns EOPNOTSUPP when altp2m is disabled. - struct hvm_vcpu, arch_domain, and hvm_function_table only define altp2m fields when the feature is enabled. - Moved several declarations under #ifdef CONFIG_ALTP2M in p2m.h to avoid polluting builds that don't require the feature. Signed-off-by: Petr Beneš Reviewed-by: Jan Beulich Acked-by: Tamas K Lengyel # mem_access --- xen/arch/x86/hvm/emulate.c | 4 ++++ xen/arch/x86/hvm/hvm.c | 10 ++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 8 ++++++++ xen/arch/x86/include/asm/domain.h | 2 ++ xen/arch/x86/include/asm/hvm/hvm.h | 6 ++++++ xen/arch/x86/include/asm/hvm/vcpu.h | 4 ++++ xen/arch/x86/include/asm/p2m.h | 31 ++++++++++++++++++++----------- xen/arch/x86/mm/hap/hap.c | 6 ++++++ xen/arch/x86/mm/mem_access.c | 8 ++++++++ xen/arch/x86/mm/p2m-ept.c | 4 ++++ xen/arch/x86/mm/p2m.c | 9 +++++++++ xen/arch/x86/vm_event.c | 2 +- 12 files changed, 82 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index f1412d8c49..2af4f30359 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2704,6 +2704,7 @@ static int cf_check hvmemul_tlb_op( static int cf_check hvmemul_vmfunc( struct x86_emulate_ctxt *ctxt) { +#ifdef CONFIG_ALTP2M int rc; if ( !hvm_funcs.altp2m_vcpu_emulate_vmfunc ) @@ -2713,6 +2714,9 @@ static int cf_check hvmemul_vmfunc( x86_emul_hw_exception(X86_EXC_UD, X86_EVENT_NO_EC, ctxt); return rc; +#else + return X86EMUL_UNHANDLEABLE; +#endif } static const struct x86_emulate_ops hvm_emulate_ops = { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index bd64faf207..646a0b682d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4611,6 +4611,7 @@ static int hvmop_get_param( static int do_altp2m_op( XEN_GUEST_HANDLE_PARAM(void) arg) { +#ifdef CONFIG_ALTP2M struct xen_hvm_altp2m_op a; struct domain *d = NULL; int rc = 0; @@ -4947,6 +4948,9 @@ static int do_altp2m_op( rcu_unlock_domain(d); return rc; +#else /* !CONFIG_ALTP2M */ + return -EOPNOTSUPP; +#endif /* CONFIG_ALTP2M */ } DEFINE_XEN_GUEST_HANDLE(compat_hvm_altp2m_op_t); @@ -5238,8 +5242,12 @@ int hvm_debug_op(struct vcpu *v, int32_t op) case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF: v->arch.hvm.single_step = false; + +#ifdef CONFIG_ALTP2M v->arch.hvm.fast_single_step.enabled = false; v->arch.hvm.fast_single_step.p2midx = 0; +#endif + break; default: /* Excluded above */ @@ -5262,6 +5270,7 @@ void hvm_toggle_singlestep(struct vcpu *v) v->arch.hvm.single_step = !v->arch.hvm.single_step; } +#ifdef CONFIG_ALTP2M void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) { ASSERT(atomic_read(&v->pause_count)); @@ -5276,6 +5285,7 @@ void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) v->arch.hvm.fast_single_step.enabled = true; v->arch.hvm.fast_single_step.p2midx = p2midx; } +#endif /* * Segment caches in VMCB/VMCS are inconsistent about which bits are checked, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f97a774653..9894a029ca 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2420,6 +2420,8 @@ static void cf_check vmx_enable_msr_interception(struct domain *d, uint32_t msr) vmx_set_msr_intercept(v, msr, VMX_MSR_W); } +#ifdef CONFIG_ALTP2M + static void cf_check vmx_vcpu_update_eptp(struct vcpu *v) { struct domain *d = v->domain; @@ -2539,6 +2541,8 @@ static bool cf_check vmx_vcpu_emulate_ve(struct vcpu *v) return rc; } +#endif /* CONFIG_ALTP2M */ + static bool cf_check vmx_get_pending_event( struct vcpu *v, struct x86_event *info) { @@ -2867,10 +2871,12 @@ static struct hvm_function_table __initdata_cf_clobber vmx_function_table = { .update_vlapic_mode = vmx_vlapic_msr_changed, .nhvm_hap_walk_L1_p2m = nvmx_hap_walk_L1_p2m, .enable_msr_interception = vmx_enable_msr_interception, +#ifdef CONFIG_ALTP2M .altp2m_vcpu_update_p2m = vmx_vcpu_update_eptp, .altp2m_vcpu_update_vmfunc_ve = vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve = vmx_vcpu_emulate_ve, .altp2m_vcpu_emulate_vmfunc = vmx_vcpu_emulate_vmfunc, +#endif .vmtrace_control = vmtrace_control, .vmtrace_output_position = vmtrace_output_position, .vmtrace_set_option = vmtrace_set_option, @@ -4967,6 +4973,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) single = ept; } +#ifdef CONFIG_ALTP2M if ( altp2m_active(currd) ) { unsigned int i; @@ -4985,6 +4992,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) } } } +#endif if ( inv ) __invept(inv == 1 ? INVEPT_SINGLE_CONTEXT : INVEPT_ALL_CONTEXT, diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index c31e74c6fa..ffcec69a15 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -351,12 +351,14 @@ struct arch_domain struct p2m_domain *nested_p2m[MAX_NESTEDP2M]; mm_lock_t nested_p2m_lock; +#ifdef CONFIG_ALTP2M /* altp2m: allow multiple copies of host p2m */ bool altp2m_active; struct p2m_domain *altp2m_p2m[MAX_ALTP2M]; mm_lock_t altp2m_list_lock; uint64_t *altp2m_eptp; uint64_t *altp2m_visible_eptp; +#endif #endif /* NB. protected by d->event_lock and by irq_desc[irq].lock */ diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 5c5a790f9e..f02183691e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -226,11 +226,13 @@ struct hvm_function_table { void (*enable_msr_interception)(struct domain *d, uint32_t msr); +#ifdef CONFIG_ALTP2M /* Alternate p2m */ void (*altp2m_vcpu_update_p2m)(struct vcpu *v); void (*altp2m_vcpu_update_vmfunc_ve)(struct vcpu *v); bool (*altp2m_vcpu_emulate_ve)(struct vcpu *v); int (*altp2m_vcpu_emulate_vmfunc)(const struct cpu_user_regs *regs); +#endif /* vmtrace */ int (*vmtrace_control)(struct vcpu *v, bool enable, bool reset); @@ -704,6 +706,7 @@ static inline bool hvm_nested_virt_supported(void) return hvm_funcs.caps.nested_virt; } +#ifdef CONFIG_ALTP2M /* updates the current hardware p2m */ static inline void altp2m_vcpu_update_p2m(struct vcpu *v) { @@ -728,6 +731,9 @@ static inline bool altp2m_vcpu_emulate_ve(struct vcpu *v) } return false; } +#else /* !CONFIG_ALTP2M */ +bool altp2m_vcpu_emulate_ve(struct vcpu *v); +#endif /* CONFIG_ALTP2M */ static inline int hvm_vmtrace_control(struct vcpu *v, bool enable, bool reset) { diff --git a/xen/arch/x86/include/asm/hvm/vcpu.h b/xen/arch/x86/include/asm/hvm/vcpu.h index 196fed6d5d..924af890c5 100644 --- a/xen/arch/x86/include/asm/hvm/vcpu.h +++ b/xen/arch/x86/include/asm/hvm/vcpu.h @@ -133,10 +133,12 @@ struct hvm_vcpu { bool flag_dr_dirty; bool debug_state_latch; bool single_step; +#ifdef CONFIG_ALTP2M struct { bool enabled; uint16_t p2midx; } fast_single_step; +#endif /* (MFN) hypervisor page table */ pagetable_t monitor_table; @@ -154,7 +156,9 @@ struct hvm_vcpu { struct nestedvcpu nvcpu; +#ifdef CONFIG_ALTP2M struct altp2mvcpu avcpu; +#endif struct mtrr_state mtrr; u64 pat_cr; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index c53f4e487d..5ce0dc936f 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -889,6 +889,8 @@ void shadow_p2m_init(struct p2m_domain *p2m); void cf_check nestedp2m_write_p2m_entry_post( struct p2m_domain *p2m, unsigned int oflags); +#ifdef CONFIG_ALTP2M + /* * Alternate p2m: shadow p2m tables used for alternate memory views */ @@ -932,11 +934,6 @@ bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx); /* Flush all the alternate p2m's for a domain */ void p2m_flush_altp2m(struct domain *d); -/* Alternate p2m paging */ -bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, - mfn_t *mfn, p2m_type_t *p2mt, - p2m_access_t *p2ma, unsigned int *page_order); - /* Make a specific alternate p2m valid */ int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx); @@ -954,17 +951,29 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx); int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, gfn_t old_gfn, gfn_t new_gfn); -/* Propagate a host p2m change to all alternate p2m's */ -int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, - mfn_t mfn, unsigned int page_order, - p2m_type_t p2mt, p2m_access_t p2ma); - /* Set a specific p2m view visibility */ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, uint8_t visible); -#else /* !CONFIG_HVM */ +#else /* !CONFIG_ALTP2M */ struct p2m_domain *p2m_get_altp2m(struct vcpu *v); +bool p2m_set_altp2m(struct vcpu *v, unsigned int idx); +#endif /* CONFIG_ALTP2M */ + +/* + * Common alternate p2m declarations that need to be visible + * regardless of CONFIG_ALTP2M + */ + +/* Alternate p2m paging */ +bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, + mfn_t *mfn, p2m_type_t *p2mt, + p2m_access_t *p2ma, unsigned int *page_order); + +/* Propagate a host p2m change to all alternate p2m's */ +int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, + mfn_t mfn, unsigned int page_order, + p2m_type_t p2mt, p2m_access_t p2ma); #endif /* CONFIG_HVM */ /* p2m access to IOMMU flags */ diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index ec5043a8aa..384c24028f 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -494,6 +494,7 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) { /* Init alternate p2m data */ @@ -524,6 +525,7 @@ int hap_enable(struct domain *d, u32 mode) d->arch.altp2m_active = false; } +#endif /* CONFIG_ALTP2M */ /* Now let other users see the new mode */ d->arch.paging.mode = mode | PG_HAP_enable; @@ -537,9 +539,11 @@ void hap_final_teardown(struct domain *d) { unsigned int i; +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) for ( i = 0; i < MAX_ALTP2M; i++ ) p2m_teardown(d->arch.altp2m_p2m[i], true, NULL); +#endif /* Destroy nestedp2m's first */ for (i = 0; i < MAX_NESTEDP2M; i++) { @@ -578,6 +582,7 @@ void hap_teardown(struct domain *d, bool *preempted) for_each_vcpu ( d, v ) hap_vcpu_teardown(v); +#ifdef CONFIG_ALTP2M /* Leave the root pt in case we get further attempts to modify the p2m. */ if ( hvm_altp2m_supported() ) { @@ -597,6 +602,7 @@ void hap_teardown(struct domain *d, bool *preempted) return; } } +#endif /* Destroy nestedp2m's after altp2m. */ for ( i = 0; i < MAX_NESTEDP2M; i++ ) diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index 21b5b7ecda..0779c41161 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -347,6 +347,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, unsigned long gfn_l; long rc = 0; +#ifdef CONFIG_ALTP2M /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { @@ -357,6 +358,7 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); } +#endif if ( !xenmem_access_to_p2m_access(p2m, access, &a) ) return -EINVAL; @@ -403,6 +405,7 @@ long p2m_set_mem_access_multi(struct domain *d, struct p2m_domain *p2m = p2m_get_hostp2m(d), *ap2m = NULL; long rc = 0; +#ifdef CONFIG_ALTP2M /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { @@ -413,6 +416,7 @@ long p2m_set_mem_access_multi(struct domain *d, ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); } +#endif p2m_lock(p2m); if ( ap2m ) @@ -462,6 +466,7 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, { struct p2m_domain *p2m = p2m_get_hostp2m(d); +#ifdef CONFIG_ALTP2M if ( !altp2m_active(d) ) { if ( altp2m_idx ) @@ -476,6 +481,7 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, p2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); } +#endif return _p2m_get_mem_access(p2m, gfn, access); } @@ -486,6 +492,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required) p2m_get_hostp2m(d)->access_required = access_required; +#ifdef CONFIG_ALTP2M if ( altp2m_active(d) ) { unsigned int i; @@ -497,6 +504,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required) p2m->access_required = access_required; } } +#endif } bool p2m_mem_access_sanity_check(const struct domain *d) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 62fc8e5068..ae262bfcc2 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1297,6 +1297,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) hostp2m->ept.ad = value; +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -1315,6 +1316,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) p2m_unlock(p2m); } } +#endif } static void ept_enable_pml(struct p2m_domain *p2m) @@ -1571,6 +1573,7 @@ void __init setup_ept_dump(void) register_keyhandler('D', ept_dump_p2m_table, "dump VT-x EPT tables", 0); } +#ifdef CONFIG_ALTP2M void p2m_init_altp2m_ept(struct domain *d, unsigned int i) { struct p2m_domain *p2m = array_access_nospec(d->arch.altp2m_p2m, i); @@ -1610,6 +1613,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp) altp2m_list_unlock(d); return i; } +#endif /* CONFIG_ALTP2M */ /* * Local variables: diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b9a7c2dc53..5a3fda903e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -101,6 +101,7 @@ void p2m_change_entry_type_global(struct domain *d, change_entry_type_global(hostp2m, ot, nt); +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -117,6 +118,7 @@ void p2m_change_entry_type_global(struct domain *d, } } } +#endif p2m_unlock(hostp2m); } @@ -145,6 +147,7 @@ bool p2m_memory_type_changed(struct domain *d) _memory_type_changed(hostp2m); +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -161,6 +164,7 @@ bool p2m_memory_type_changed(struct domain *d) } } } +#endif p2m_unlock(hostp2m); @@ -930,6 +934,7 @@ void p2m_change_type_range(struct domain *d, change_type_range(hostp2m, start, end, ot, nt); +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -946,6 +951,8 @@ void p2m_change_type_range(struct domain *d, } } } +#endif + hostp2m->defer_nested_flush = false; if ( nestedhvm_enabled(d) ) p2m_flush_nestedp2m(d); @@ -1003,6 +1010,7 @@ int p2m_finish_type_change(struct domain *d, if ( rc < 0 ) goto out; +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -1022,6 +1030,7 @@ int p2m_finish_type_change(struct domain *d, } } } +#endif out: p2m_unlock(hostp2m); diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index 0d15d363c3..fc349270b9 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -72,7 +72,7 @@ void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v, if ( rsp->flags & VM_EVENT_FLAG_TOGGLE_SINGLESTEP ) hvm_toggle_singlestep(v); - else + else if ( IS_ENABLED(CONFIG_ALTP2M) ) hvm_fast_singlestep(v, rsp->u.fast_singlestep.p2midx); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:11:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093612.1449069 (Exim 4.92) (envelope-from ) id 1uqaj4-0004CN-Tp; Mon, 25 Aug 2025 17:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093612.1449069; Mon, 25 Aug 2025 17:11:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaj4-0004CF-Qz; Mon, 25 Aug 2025 17:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1093612; Mon, 25 Aug 2025 17:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaj3-0004C4-WB for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqaj3-005yMQ-2O for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqaj3-000oQX-2v for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3AvJtusTa1LCJyxYasKD7H5mlU3WWPUMSn5V8kyAAU4=; b=dXN2oWUhg+fAiqxTg85KjMqPTH RLF+1jmI9EVpSkPNjclku8WaBgc4B5IP4zV+NG+MkQXY7KyIC1EJAoUnsTtYtjsVpkvmmnXRFtLTW e00xCd11FQ+3mCu3sxjTOyj3z6pCtc/R3EUIs2H+eh8DCRF6GDIP1dgZsMND9XX3jrJQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Make the maximum number of altp2m views configurable for x86 Message-Id: Date: Mon, 25 Aug 2025 17:11:21 +0000 commit 06cf6cdab42141e8ada13ce9dec132b924ec95d9 Author: Petr Beneš AuthorDate: Mon Aug 25 12:50:20 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:50:20 2025 +0200 xen: Make the maximum number of altp2m views configurable for x86 This commit introduces the ability to configure the maximum number of altp2m views for the domain during its creation. Previously, the limits were hardcoded to a maximum of 10. This change allows for greater flexibility in environments that require more or fewer altp2m views. The maximum configurable limit for nr_altp2m on x86 is now set to MAX_NR_ALTP2M (which currently holds the MAX_EPTP value - 512). This cap is linked to the architectural limit of the EPTP-switching VMFUNC, which supports up to 512 entries. Despite there being no inherent need for limiting nr_altp2m in scenarios not utilizing VMFUNC, decoupling these components would necessitate substantial code changes. xen_domctl_createdomain::altp2m is extended for a new field `nr`, that will configure this limit for a domain. Additionally, previous altp2m.opts value has been reduced from uint32_t to uint16_t so that both of these fields occupy as little space as possible. Accesses to the altp2m_p2m array are modified to respect the new nr_altp2m value. Accesses to the altp2m_(visible_)eptp arrays are unmodified, since these arrays always have fixed size of MAX_EPTP. Additional sanitization is introduced in the x86/arch_sanitise_domain_config to fix the altp2m.nr value to 10 if it is previously set to 0. This behavior is only temporary and immediately removed in the upcoming commit (which will disallow creating a domain with enabled altp2m with zero nr_altp2m). The reason for this temporary workaround is to retain the legacy behavior until the feature is fully activated in libxl. Also, arm/arch_sanitise_domain_config is extended to not allow requesting non-zero altp2ms. Signed-off-by: Petr Beneš Acked-by: Jan Beulich Acked-by: Tamas K Lengyel # mem_access/mem_sharing Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 +- xen/arch/x86/domain.c | 40 ++++++++++++++++++---- xen/arch/x86/hvm/hvm.c | 8 ++++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/altp2m.h | 28 +++++++++++++-- xen/arch/x86/include/asm/domain.h | 9 ++--- xen/arch/x86/include/asm/p2m.h | 4 +-- xen/arch/x86/mm/altp2m.c | 72 +++++++++++++++++++++------------------ xen/arch/x86/mm/hap/hap.c | 6 ++-- xen/arch/x86/mm/mem_access.c | 20 ++++------- xen/arch/x86/mm/mem_sharing.c | 4 ++- xen/arch/x86/mm/p2m-ept.c | 7 ++-- xen/arch/x86/mm/p2m-pt.c | 2 ++ xen/arch/x86/mm/p2m.c | 8 ++--- xen/common/domain.c | 6 ++++ xen/include/public/domctl.h | 5 ++- xen/include/xen/sched.h | 4 +++ 17 files changed, 149 insertions(+), 78 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 310c578909..863ae18157 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -693,7 +693,7 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } - if ( config->altp2m.opts ) + if ( config->altp2m.opts || config->altp2m.nr ) { dprintk(XENLOG_INFO, "Altp2m not supported\n"); return -EINVAL; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index cd56f5821a..fc7ede0705 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -718,16 +718,42 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } - if ( altp2m_mode && nested_virt ) + if ( altp2m_mode ) { - dprintk(XENLOG_INFO, - "Nested virt and altp2m are not supported together\n"); - return -EINVAL; - } + if ( !hvm_altp2m_supported() ) + { + dprintk(XENLOG_INFO, "altp2m is not supported\n"); + return -EINVAL; + } + + if ( !hap ) + { + dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + return -EINVAL; + } + + if ( nested_virt ) + { + dprintk(XENLOG_INFO, + "Nested virt and altp2m are not supported together\n"); + return -EINVAL; + } + + if ( !config->altp2m.nr ) + { + /* Fix the value to the legacy default */ + config->altp2m.nr = 10; + } - if ( altp2m_mode && !hap ) + if ( config->altp2m.nr > MAX_NR_ALTP2M ) + { + dprintk(XENLOG_INFO, "altp2m.nr must be <= %lu\n", MAX_NR_ALTP2M); + return -EINVAL; + } + } + else if ( config->altp2m.nr ) { - dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + dprintk(XENLOG_INFO, "altp2m.nr must be zero when altp2m is off\n"); return -EINVAL; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 646a0b682d..23bd7f078a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4678,6 +4678,12 @@ static int do_altp2m_op( goto out; } + if ( d->nr_altp2m == 0 ) + { + rc = -EOPNOTSUPP; + goto out; + } + if ( (rc = xsm_hvm_altp2mhvm_op(XSM_OTHER, d, mode, a.cmd)) ) goto out; @@ -5278,7 +5284,7 @@ void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) if ( !hvm_is_singlestep_supported() ) return; - if ( p2midx >= MAX_ALTP2M ) + if ( p2midx >= v->domain->nr_altp2m ) return; v->arch.hvm.single_step = true; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9894a029ca..e2b5077654 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4978,7 +4978,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; ++i ) + for ( i = 0; i < currd->nr_altp2m; ++i ) { if ( currd->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) continue; diff --git a/xen/arch/x86/include/asm/altp2m.h b/xen/arch/x86/include/asm/altp2m.h index c57a8c5588..8ecd74f363 100644 --- a/xen/arch/x86/include/asm/altp2m.h +++ b/xen/arch/x86/include/asm/altp2m.h @@ -13,12 +13,32 @@ #include /* for struct vcpu, struct domain */ #include /* for vcpu_altp2m */ +static inline bool altp2m_is_eptp_valid(const struct domain *d, + unsigned int idx) +{ + /* There must be enough EPTP entries to cover all altp2m indices */ + BUILD_BUG_ON(MAX_EPTP < MAX_NR_ALTP2M); + + /* Domain should not have more altp2m entries than MAX_NR_ALTP2M */ + ASSERT(d->nr_altp2m <= MAX_NR_ALTP2M); + + /* EPTP index is used as altp2m index */ + return idx < d->nr_altp2m && + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != + mfn_x(INVALID_MFN); +} + /* Alternate p2m HVM on/off per domain */ static inline bool altp2m_active(const struct domain *d) { return d->arch.altp2m_active; } +static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +{ + return vcpu_altp2m(v).p2midx; +} + /* Alternate p2m VCPU */ void altp2m_vcpu_initialise(struct vcpu *v); void altp2m_vcpu_destroy(struct vcpu *v); @@ -26,11 +46,13 @@ void altp2m_vcpu_destroy(struct vcpu *v); int altp2m_vcpu_enable_ve(struct vcpu *v, gfn_t gfn); void altp2m_vcpu_disable_ve(struct vcpu *v); -static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +#else + +static inline bool altp2m_is_eptp_valid(const struct domain *d, + unsigned int idx) { - return vcpu_altp2m(v).p2midx; + return false; } -#else static inline bool altp2m_active(const struct domain *d) { diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index ffcec69a15..5df8c78253 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -258,11 +258,12 @@ struct paging_vcpu { struct shadow_vcpu shadow; }; -#define MAX_NESTEDP2M 10 +#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) +#define MAX_NR_ALTP2M MAX_EPTP +#define MAX_NESTEDP2M 10 -#define MAX_ALTP2M 10 /* arbitrary */ #define INVALID_ALTP2M 0xffff -#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) + struct p2m_domain; struct time_scale { int shift; @@ -354,7 +355,7 @@ struct arch_domain #ifdef CONFIG_ALTP2M /* altp2m: allow multiple copies of host p2m */ bool altp2m_active; - struct p2m_domain *altp2m_p2m[MAX_ALTP2M]; + struct p2m_domain **altp2m_p2m; mm_lock_t altp2m_list_lock; uint64_t *altp2m_eptp; uint64_t *altp2m_visible_eptp; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 5ce0dc936f..3b860e30c3 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -903,7 +903,7 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) if ( index == INVALID_ALTP2M ) return NULL; - BUG_ON(index >= MAX_ALTP2M); + BUG_ON(index >= v->domain->nr_altp2m); return v->domain->arch.altp2m_p2m[index]; } @@ -913,7 +913,7 @@ static inline bool p2m_set_altp2m(struct vcpu *v, unsigned int idx) { struct p2m_domain *orig; - BUG_ON(idx >= MAX_ALTP2M); + BUG_ON(idx >= v->domain->nr_altp2m); if ( idx == vcpu_altp2m(v).p2midx ) return false; diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index 6fe1e9ed6b..0261360aae 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -9,12 +9,16 @@ #include #include #include +#include #include "mm-locks.h" #include "p2m.h" void altp2m_vcpu_initialise(struct vcpu *v) { + if ( !v->domain->nr_altp2m ) + return; + if ( v != current ) vcpu_pause(v); @@ -32,6 +36,9 @@ altp2m_vcpu_destroy(struct vcpu *v) { struct p2m_domain *p2m; + if ( !v->domain->nr_altp2m ) + return; + if ( v != current ) vcpu_pause(v); @@ -122,7 +129,12 @@ int p2m_init_altp2m(struct domain *d) struct p2m_domain *hostp2m = p2m_get_hostp2m(d); mm_lock_init(&d->arch.altp2m_list_lock); - for ( i = 0; i < MAX_ALTP2M; i++ ) + d->arch.altp2m_p2m = xvzalloc_array(struct p2m_domain *, d->nr_altp2m); + + if ( !d->arch.altp2m_p2m ) + return -ENOMEM; + + for ( i = 0; i < d->nr_altp2m; i++ ) { d->arch.altp2m_p2m[i] = p2m = p2m_init_one(d); if ( p2m == NULL ) @@ -143,7 +155,7 @@ void p2m_teardown_altp2m(struct domain *d) unsigned int i; struct p2m_domain *p2m; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( !d->arch.altp2m_p2m[i] ) continue; @@ -151,6 +163,8 @@ void p2m_teardown_altp2m(struct domain *d) d->arch.altp2m_p2m[i] = NULL; p2m_free_one(p2m); } + + XVFREE(d->arch.altp2m_p2m); } int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn, @@ -200,7 +214,7 @@ bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) struct domain *d = v->domain; bool rc = false; - if ( idx >= MAX_ALTP2M ) + if ( idx >= d->nr_altp2m ) return rc; altp2m_list_lock(d); @@ -306,8 +320,8 @@ static void p2m_reset_altp2m(struct domain *d, unsigned int idx, { struct p2m_domain *p2m; - ASSERT(idx < MAX_ALTP2M); - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + ASSERT(idx < d->nr_altp2m); + p2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; p2m_lock(p2m); @@ -332,7 +346,7 @@ void p2m_flush_altp2m(struct domain *d) altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); @@ -348,9 +362,9 @@ static int p2m_activate_altp2m(struct domain *d, unsigned int idx, struct p2m_domain *hostp2m, *p2m; int rc; - ASSERT(idx < MAX_ALTP2M); + ASSERT(idx < d->nr_altp2m); - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + p2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; hostp2m = p2m_get_hostp2m(d); p2m_lock(p2m); @@ -388,7 +402,7 @@ int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) int rc = -EINVAL; struct p2m_domain *hostp2m = p2m_get_hostp2m(d); - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + if ( idx >= d->nr_altp2m ) return rc; altp2m_list_lock(d); @@ -415,7 +429,7 @@ int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) continue; @@ -437,7 +451,7 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) struct p2m_domain *p2m; int rc = -EBUSY; - if ( !idx || idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + if ( !idx || idx >= d->nr_altp2m ) return rc; rc = domain_pause_except_self(d); @@ -450,7 +464,7 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != mfn_x(INVALID_MFN) ) { - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + p2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; if ( !_atomic_read(p2m->active_vcpus) ) { @@ -475,7 +489,7 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) struct vcpu *v; int rc = -EINVAL; - if ( idx >= MAX_ALTP2M ) + if ( idx >= d->nr_altp2m ) return rc; rc = domain_pause_except_self(d); @@ -510,13 +524,11 @@ int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, mfn_t mfn; int rc = -EINVAL; - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, idx) ) return rc; hp2m = p2m_get_hostp2m(d); - ap2m = array_access_nospec(d->arch.altp2m_p2m, idx); + ap2m = d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; p2m_lock(hp2m); p2m_lock(ap2m); @@ -572,7 +584,7 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { p2m_type_t t; p2m_access_t a; @@ -595,7 +607,7 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, else { /* At least 2 altp2m's impacted, so reset everything */ - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( i == last_reset_idx || d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) @@ -659,12 +671,11 @@ int p2m_set_suppress_ve_multi(struct domain *d, if ( sve->view > 0 ) { - if ( sve->view >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, sve->view) ) return -EINVAL; - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, sve->view); + p2m = ap2m = + d->arch.altp2m_p2m[array_index_nospec(sve->view, d->nr_altp2m)]; } p2m_lock(host_p2m); @@ -727,12 +738,11 @@ int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, if ( altp2m_idx > 0 ) { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + p2m = ap2m = + d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } else p2m = host_p2m; @@ -761,13 +771,7 @@ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, altp2m_list_lock(d); - /* - * Eptp index is correlated with altp2m index and should not exceed - * min(MAX_ALTP2M, MAX_EPTP). - */ - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) rc = -EINVAL; else if ( visible ) d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 384c24028f..4aec98109d 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -516,7 +516,7 @@ int hap_enable(struct domain *d, u32 mode) d->arch.altp2m_visible_eptp[i] = mfn_x(INVALID_MFN); } - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { rv = p2m_alloc_table(d->arch.altp2m_p2m[i]); if ( rv != 0 ) @@ -541,7 +541,7 @@ void hap_final_teardown(struct domain *d) #ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) p2m_teardown(d->arch.altp2m_p2m[i], true, NULL); #endif @@ -595,7 +595,7 @@ void hap_teardown(struct domain *d, bool *preempted) FREE_XENHEAP_PAGE(d->arch.altp2m_eptp); FREE_XENHEAP_PAGE(d->arch.altp2m_visible_eptp); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { p2m_teardown(d->arch.altp2m_p2m[i], false, preempted); if ( preempted && *preempted ) diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index 0779c41161..e6b609064c 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -351,12 +351,10 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr, /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } #endif @@ -409,12 +407,10 @@ long p2m_set_mem_access_multi(struct domain *d, /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } #endif @@ -474,12 +470,10 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, } else if ( altp2m_idx ) /* altp2m view 0 is treated as the hostp2m */ { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; - p2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + p2m = d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m)]; } #endif @@ -496,7 +490,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required) if ( altp2m_active(d) ) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { struct p2m_domain *p2m = d->arch.altp2m_p2m[i]; diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index da28266ef0..4787b27964 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -901,6 +901,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, if ( !page || is_special_page(page) ) goto out; +#ifdef CONFIG_ALTP2M /* Check if there are mem_access/remapped altp2m entries for this page */ if ( altp2m_active(d) ) { @@ -912,7 +913,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { ap2m = d->arch.altp2m_p2m[i]; if ( !ap2m ) @@ -929,6 +930,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, altp2m_list_unlock(d); } +#endif /* CONFIG_ALTP2M */ /* Try to convert the mfn to the sharable type */ ret = page_make_sharable(d, page, expected_refcnt, validate_only); diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index ae262bfcc2..b854a08b4c 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1302,7 +1302,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { struct p2m_domain *p2m; @@ -1576,7 +1576,8 @@ void __init setup_ept_dump(void) #ifdef CONFIG_ALTP2M void p2m_init_altp2m_ept(struct domain *d, unsigned int i) { - struct p2m_domain *p2m = array_access_nospec(d->arch.altp2m_p2m, i); + struct p2m_domain *p2m = + d->arch.altp2m_p2m[array_index_nospec(i, d->nr_altp2m)]; struct p2m_domain *hostp2m = p2m_get_hostp2m(d); struct ept_data *ept; @@ -1595,7 +1596,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp) altp2m_list_lock(d); - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) continue; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 666abd46be..5a6ce2f8bc 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -519,12 +519,14 @@ int p2m_pt_handle_deferred_changes(uint64_t gpa) struct p2m_domain *p2m = p2m_get_hostp2m(current->domain); int rc; +#ifdef CONFIG_ALTP2M /* * Should altp2m ever be enabled for NPT / shadow use, this code * should be updated to make use of the active altp2m, like * ept_handle_misconfig(). */ ASSERT(!altp2m_active(current->domain)); +#endif p2m_lock(p2m); rc = do_recalc(p2m, PFN_DOWN(gpa)); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 5a3fda903e..e802f2e4e6 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -106,7 +106,7 @@ void p2m_change_entry_type_global(struct domain *d, { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { @@ -152,7 +152,7 @@ bool p2m_memory_type_changed(struct domain *d) { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { @@ -939,7 +939,7 @@ void p2m_change_type_range(struct domain *d, { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { @@ -1015,7 +1015,7 @@ int p2m_finish_type_change(struct domain *d, { unsigned int i; - for ( i = 0; i < MAX_ALTP2M; i++ ) + for ( i = 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { diff --git a/xen/common/domain.c b/xen/common/domain.c index 5241a1629e..104e917f07 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -822,6 +822,12 @@ struct domain *domain_create(domid_t domid, if ( config ) { d->options = config->flags; +#ifdef CONFIG_ALTP2M + d->nr_altp2m = config->altp2m.nr; +#else + ASSERT(!config->altp2m.nr); +#endif + d->vmtrace_size = config->vmtrace_size; } diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 0c75d9d27f..8f6708c0a7 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -116,7 +116,10 @@ struct xen_domctl_createdomain { /* Altp2m mode signaling uses bits [0, 1]. */ #define XEN_DOMCTL_ALTP2M_mode_mask (0x3U) #define XEN_DOMCTL_ALTP2M_mode(m) ((m) & XEN_DOMCTL_ALTP2M_mode_mask) - uint32_t opts; + uint16_t opts; + + /* Number of altp2ms to permit. */ + uint16_t nr; } altp2m; /* Per-vCPU buffer size in bytes. 0 to disable. */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fd5c9f9333..02bdc256ce 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -619,6 +619,10 @@ struct domain unsigned int guest_request_sync : 1; } monitor; +#ifdef CONFIG_ALTP2M + unsigned int nr_altp2m; /* Number of altp2m tables. */ +#endif + unsigned int vmtrace_size; /* Buffer size in bytes, or 0 to disable. */ #ifdef CONFIG_ARGO -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093613.1449074 (Exim 4.92) (envelope-from ) id 1uqajG-0004Ea-0C; Mon, 25 Aug 2025 17:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093613.1449074; Mon, 25 Aug 2025 17:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajF-0004ES-SZ; Mon, 25 Aug 2025 17:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1093613; Mon, 25 Aug 2025 17:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajE-0004EE-2h for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqajD-005yMa-2g for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqajE-000oRX-01 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aCDQWH5EL3i8GCwzpz0AZgDXy5amCs4NAPk6Wr1p1m0=; b=G0aFewocc/m7xR9gzTvH0USXWH oopn6v+gvB3WG+ofMuCWypnpUTcDDUhpxnwXCk1iq8nSxyeMpJbpWAOpjtqwGpkQX3IDFeNT7++ML 8RKApT6gNhgaHYehNll5xh97oMpu2PLRXGYXCVv2AGjVB3YSiCfD5XG6Z9UcDoz9o9ZA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxl: Activate the altp2m_count feature Message-Id: Date: Mon, 25 Aug 2025 17:11:32 +0000 commit 445253c853a6f95de1456839302da1f1f37c4b62 Author: Petr Beneš AuthorDate: Mon Aug 25 12:50:55 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:50:55 2025 +0200 tools/libxl: Activate the altp2m_count feature This commit activates the previously introduced altp2m_count parameter, establishing the connection between libxl and Xen. Signed-off-by: Petr Beneš Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 85c5b26ec0..bfc9149096 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -596,6 +596,10 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, .max_grant_frames = b_info->max_grant_frames, .max_maptrack_frames = b_info->max_maptrack_frames, .grant_opts = XEN_DOMCTL_GRANT_version(b_info->max_grant_version), + .altp2m = { + .opts = 0, /* .opts will be set below */ + .nr = b_info->altp2m_count, + }, .vmtrace_size = ROUNDUP(b_info->vmtrace_buf_kb << 10, XC_PAGE_SHIFT), .cpupool_id = info->poolid, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093614.1449077 (Exim 4.92) (envelope-from ) id 1uqajQ-0004Hu-2B; Mon, 25 Aug 2025 17:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093614.1449077; Mon, 25 Aug 2025 17:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajP-0004Hm-VW; Mon, 25 Aug 2025 17:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1093614; Mon, 25 Aug 2025 17:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajO-0004HT-6A for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqajN-005yMe-31 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqajO-000oSy-0K for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DMQ+Hu1nMpblx5BhOOfhQEJ+kj5gh7GOdccwgsMgQMc=; b=YpiseFflr05nUE+zwHdH4tXOr2 YLpcDIIWE+3Zp4mrtHYcYua3SKnhREtxB33y7sRnvwh85uT97JLgNHmoY6lvsny4JFjmJ5iBDINkt huAFPyHAIsRBcWwat+RNwtNCSxqTkoXLGiGuVdFVf10NjTTEgcPCKUK+N2EbTlbRU/8Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Disallow creating domains with altp2m enabled and altp2m.nr == 0 Message-Id: Date: Mon, 25 Aug 2025 17:11:42 +0000 commit ae81cfa4d4a2717c5a151f4d1d1bbeb56523395a Author: Petr Beneš AuthorDate: Mon Aug 25 12:51:10 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:51:10 2025 +0200 xen/x86: Disallow creating domains with altp2m enabled and altp2m.nr == 0 Since libxl finally sends the altp2m.nr value, we can remove the previously introduced temporary workaround. Creating domain with enabled altp2m while setting altp2m.nr == 0 doesn't make sense and it's probably not what user wants. Signed-off-by: Petr Beneš Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fc7ede0705..19fd86ce88 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -741,8 +741,9 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) if ( !config->altp2m.nr ) { - /* Fix the value to the legacy default */ - config->altp2m.nr = 10; + dprintk(XENLOG_INFO, + "altp2m must be requested with altp2m.nr > 0\n"); + return -EINVAL; } if ( config->altp2m.nr > MAX_NR_ALTP2M ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093615.1449081 (Exim 4.92) (envelope-from ) id 1uqaja-0004KE-3U; Mon, 25 Aug 2025 17:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093615.1449081; Mon, 25 Aug 2025 17:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaja-0004K6-0n; Mon, 25 Aug 2025 17:11:54 +0000 Received: by outflank-mailman (input) for mailman id 1093615; Mon, 25 Aug 2025 17:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajY-0004Jx-8n for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqajY-005yMi-04 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqajY-000oTq-0e for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:11:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JMuqUYhmkQy6OUgIImYFJcFNLat2KsHEsqt09iXzjRU=; b=uPzIzexqk5oy4hWfDotDuO4uid VwDsAFCnldn2tw6g9/9aQHfwbgXj8irxxkv206BSJAaS/0671osHtSO0oIc+Q9i/puDI+MRUuHnQ+ cjDGt3aFgLgEefqh2pdydD73i/XQIJeI/1ymb3pH2wNxpYmtfiDPdRfFruhYM/B+j2l8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/ocaml: Add altp2m_count parameter Message-Id: Date: Mon, 25 Aug 2025 17:11:52 +0000 commit 5699554de9a934d986e9b2a400deda03dd883d98 Author: Petr Beneš AuthorDate: Mon Aug 25 12:51:35 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:51:35 2025 +0200 tools/ocaml: Add altp2m_count parameter Allow developers using the OCaml bindings to set the altp2m_count parameter. Signed-off-by: Petr Beneš Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/ocaml/libs/xc/xenctrl_stubs.c | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7e1aabad6c..97108b9d86 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -87,6 +87,7 @@ type domctl_create_config = max_maptrack_frames: int; max_grant_version: int; altp2m_opts: int32; + altp2m_count: int32; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index f44dba61ae..9fccb2c2c2 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -79,6 +79,7 @@ type domctl_create_config = { max_maptrack_frames: int; max_grant_version: int; altp2m_opts: int32; + altp2m_count: int32; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index b51fd66788..ac2a7537d6 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -205,13 +205,22 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #define VAL_MAX_MAPTRACK_FRAMES Field(config, 7) #define VAL_MAX_GRANT_VERSION Field(config, 8) #define VAL_ALTP2M_OPTS Field(config, 9) -#define VAL_VMTRACE_BUF_KB Field(config, 10) -#define VAL_CPUPOOL_ID Field(config, 11) -#define VAL_ARCH Field(config, 12) +#define VAL_ALTP2M_COUNT Field(config, 10) +#define VAL_VMTRACE_BUF_KB Field(config, 11) +#define VAL_CPUPOOL_ID Field(config, 12) +#define VAL_ARCH Field(config, 13) uint32_t domid = Int_val(wanted_domid); + uint32_t altp2m_opts = Int32_val(VAL_ALTP2M_OPTS); + uint32_t altp2m_nr = Int32_val(VAL_ALTP2M_COUNT); uint64_t vmtrace_size = Int32_val(VAL_VMTRACE_BUF_KB); + if ( altp2m_opts != (uint16_t)altp2m_opts ) + caml_invalid_argument("altp2m_opts"); + + if ( altp2m_nr != (uint16_t)altp2m_nr ) + caml_invalid_argument("altp2m_count"); + vmtrace_size = ROUNDUP(vmtrace_size << 10, XC_PAGE_SHIFT); if ( vmtrace_size != (uint32_t)vmtrace_size ) caml_invalid_argument("vmtrace_buf_kb"); @@ -226,7 +235,8 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co .grant_opts = XEN_DOMCTL_GRANT_version(Int_val(VAL_MAX_GRANT_VERSION)), .altp2m = { - .opts = Int32_val(VAL_ALTP2M_OPTS), + .opts = altp2m_opts, + .nr = altp2m_nr, }, .vmtrace_size = vmtrace_size, .cpupool_id = Int32_val(VAL_CPUPOOL_ID), @@ -286,6 +296,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #undef VAL_ARCH #undef VAL_CPUPOOL_ID #undef VAL_VMTRACE_BUF_KB +#undef VAL_ALTP2M_COUNT #undef VAL_ALTP2M_OPTS #undef VAL_MAX_GRANT_VERSION #undef VAL_MAX_MAPTRACK_FRAMES -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093616.1449085 (Exim 4.92) (envelope-from ) id 1uqajk-0004Nw-54; Mon, 25 Aug 2025 17:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093616.1449085; Mon, 25 Aug 2025 17:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajk-0004Np-2A; Mon, 25 Aug 2025 17:12:04 +0000 Received: by outflank-mailman (input) for mailman id 1093616; Mon, 25 Aug 2025 17:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaji-0004Nh-B4 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqaji-005yMx-0K for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqaji-000oV7-0u for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gATBNMk8wFRDyhV0UtxNlPnLwsHPfNKS9F0UBBnG3yo=; b=ibmJciFdP8ng0FBv272Vq51gRM KC3SHqnV1QqaC8vT5QEbStUEQaPM3y2usVWfcCE6ZgOF+RLw7YpWfnjgGP+W6R6V+c0dKa9Bwx97t NFgR72BkWdYTUS6vBymdEeMc3jvbAfFEpSRH82EuokfVdplKPcuEjpWMiQdJAxn9fFJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: drop "has_num" condition check for cppc mode Message-Id: Date: Mon, 25 Aug 2025 17:12:02 +0000 commit e28d97d598214155b59bc2789b69ed5e4b38159e Author: Penny Zheng AuthorDate: Mon Aug 25 12:51:50 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:51:50 2025 +0200 tools: drop "has_num" condition check for cppc mode In `xenpm get-cpufreq-para `, ->freq_num and ->cpu_num checking are tied together via variable "has_num", while ->freq_num only has non-zero value when cpufreq driver in legacy P-states mode. So we drop the "has_num" condition check, and mirror the ->gov_num check for both ->freq_num and ->cpu_num in xc_get_cpufreq_para(). Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich Reviewed-by: Anthony PERARD --- tools/libs/ctrl/xc_pm.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tools/libs/ctrl/xc_pm.c b/tools/libs/ctrl/xc_pm.c index 1f2430cac2..6fda973f1f 100644 --- a/tools/libs/ctrl/xc_pm.c +++ b/tools/libs/ctrl/xc_pm.c @@ -210,33 +210,36 @@ int xc_get_cpufreq_para(xc_interface *xch, int cpuid, DECLARE_NAMED_HYPERCALL_BOUNCE(scaling_available_governors, user_para->scaling_available_governors, user_para->gov_num * CPUFREQ_NAME_LEN * sizeof(char), XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - bool has_num = user_para->cpu_num && user_para->freq_num; - if ( has_num ) + if ( (user_para->cpu_num && !user_para->affected_cpus) || + (user_para->freq_num && !user_para->scaling_available_frequencies) || + (user_para->gov_num && !user_para->scaling_available_governors) ) + { + errno = EINVAL; + return -1; + } + if ( user_para->cpu_num ) { - if ( (!user_para->affected_cpus) || - (!user_para->scaling_available_frequencies) || - (user_para->gov_num && !user_para->scaling_available_governors) ) - { - errno = EINVAL; - return -1; - } ret = xc_hypercall_bounce_pre(xch, affected_cpus); if ( ret ) return ret; + set_xen_guest_handle(sys_para->affected_cpus, affected_cpus); + } + if ( user_para->freq_num ) + { ret = xc_hypercall_bounce_pre(xch, scaling_available_frequencies); if ( ret ) goto unlock_2; - if ( user_para->gov_num ) - ret = xc_hypercall_bounce_pre(xch, scaling_available_governors); + set_xen_guest_handle(sys_para->scaling_available_frequencies, + scaling_available_frequencies); + } + if ( user_para->gov_num ) + { + ret = xc_hypercall_bounce_pre(xch, scaling_available_governors); if ( ret ) goto unlock_3; - - set_xen_guest_handle(sys_para->affected_cpus, affected_cpus); - set_xen_guest_handle(sys_para->scaling_available_frequencies, scaling_available_frequencies); - if ( user_para->gov_num ) - set_xen_guest_handle(sys_para->scaling_available_governors, - scaling_available_governors); + set_xen_guest_handle(sys_para->scaling_available_governors, + scaling_available_governors); } sysctl.cmd = XEN_SYSCTL_pm_op; @@ -256,9 +259,7 @@ int xc_get_cpufreq_para(xc_interface *xch, int cpuid, user_para->gov_num = sys_para->gov_num; } - if ( has_num ) - goto unlock_4; - return ret; + goto unlock_4; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093617.1449089 (Exim 4.92) (envelope-from ) id 1uqaju-0004Q2-79; Mon, 25 Aug 2025 17:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093617.1449089; Mon, 25 Aug 2025 17:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqaju-0004Pu-4W; Mon, 25 Aug 2025 17:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1093617; Mon, 25 Aug 2025 17:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqajs-0004Ph-EH for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqajs-005yNM-0e for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqajs-000oWF-1C for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ywl1jeRladz3Qqh+vThEHcl0IlVNVtYFTphhyKbVtpU=; b=mDzfVfVM57S89xTRqtfh59ugky gtP7XVmiZVM17NSdr9MHhSsP+4xKluaRGJUgrjd0PERPYK4FkV5EwUfV2byE5AbzDt4Lf6iGU/Xrg EwkaTI9hJIY5qjcGjCfeJ1r0dEXM/+FIHZSAPRZaatIdyiAFqrE8IWc0gJDn7xYqvu+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common/efi: fix Rule 2.1 violation in read_file() Message-Id: Date: Mon, 25 Aug 2025 17:12:12 +0000 commit 9e5a9b53f65058b095c2e6e44afeb50a0fc81eef Author: Dmytro Prokopchuk AuthorDate: Mon Aug 25 12:52:03 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:52:03 2025 +0200 common/efi: fix Rule 2.1 violation in read_file() MISRA C Rule 2.1 states: "A project shall not contain unreachable code." The final return statement in the 'read_file()' function is unreachable due to function 'PrintErrMesg()' which has 'noreturn' attribute: PrintErrMesg(name, ret); /* not reached */ return false; } No explicit return statement is needed here because 'PrintErrMesg()' is marked as 'noreturn', which guarantees that it never returns control to the caller. If the 'noreturn' attribute of 'PrintErrMesg()' is removed in the future, compiler will emit an error about the missing return statement (build-time safeguard). No functional changes. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 50ff1d1bd2..b7fdb031d0 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -853,7 +853,6 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, PrintErrMesg(name, ret); /* not reached */ - return false; } static bool __init read_section(const EFI_LOADED_IMAGE *image, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:12:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093618.1449093 (Exim 4.92) (envelope-from ) id 1uqak4-0004S7-8k; Mon, 25 Aug 2025 17:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093618.1449093; Mon, 25 Aug 2025 17:12:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqak4-0004Rz-60; Mon, 25 Aug 2025 17:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1093618; Mon, 25 Aug 2025 17:12:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqak2-0004Rn-Gm for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqak2-005yNQ-0v for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqak2-000oX1-1V for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QdM4tK+eNJvEQjVNcRwQc0CyRLs2lEfYOIpUpPA6jrc=; b=npz0kbYLfqMvLWRQ78K+2CKYYJ x2RCccJh87CfFfNPI+895v+5eV5gHfL5hT2E9VTI4xFcWrHXJE7zmCyuXh+Gt3bp9Xr/fzUP9EhIU lYRiUy1cwuTAgV6wdlC7ijh08NFlYkBGOH1RlKPlTNivowhgwl1BQn/HNEtn3jzzLbGM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: fix sphinx-build issues Message-Id: Date: Mon, 25 Aug 2025 17:12:22 +0000 commit abd6ec8874afb5782d041d8f655363d6f97e90b0 Author: Dmytro Prokopchuk AuthorDate: Mon Aug 25 12:52:44 2025 +0200 Commit: Jan Beulich CommitDate: Mon Aug 25 12:52:44 2025 +0200 docs/misra: fix sphinx-build issues Fix the following issues: 1. xen/docs/misra/deviations.rst:90: WARNING: Inline interpreted text or phrase reference start-string without end-string. [docutils] 2. xen/docs/misra/deviations.rst:54: ERROR: Error parsing content block for the "list-table" directive: uniform two-level bullet list expected, but row 6 does not contain the same number of items as row 1 (2 vs 3). * - R2.1 - Calls to the `__builtin_unreachable()` function inside the expansion of the `ASSERT_UNREACHABLE()` macro may cause a function to be marked as non-returning. This behavior occurs only in configurations where assertions are enabled. To address this, the `noreturn` property for `__builtin_unreachable()` is overridden in these contexts, resulting in the absence of reports that do not have an impact on safety, despite being true positives. Xen expects developers to ensure code remains safe and reliable in builds, even when debug-only assertions like `ASSERT_UNREACHABLE() are removed. 3. xen/docs/misra/rules.rst:127: WARNING: Inline interpreted text or phrase reference start-string without end-string. [docutils] Signed-off-by: Dmytro Prokopchuk Reviewed-by: Nicola Vetrini Reviewed-by: Andrew Cooper --- docs/misra/deviations.rst | 3 ++- docs/misra/rules.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 2119066531..3271317206 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -95,7 +95,8 @@ Deviations related to MISRA C:2012 Rules: the absence of reports that do not have an impact on safety, despite being true positives. Xen expects developers to ensure code remains safe and reliable in builds, - even when debug-only assertions like `ASSERT_UNREACHABLE() are removed. + even when debug-only assertions like `ASSERT_UNREACHABLE()` are removed. + - ECLAIR has been configured to ignore those statements. * - R2.2 - Proving compliance with respect to Rule 2.2 is generally impossible: diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index a2e4e9f4ff..4388010ec9 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -124,7 +124,7 @@ maintainers if you want to suggest a change. they are used to generate definitions for asm modules - Declarations without initializer are safe, as they are not executed - - Functions that are no-return due to calls to the `ASSERT_UNREACHABLE()' + - Functions that are no-return due to calls to the `ASSERT_UNREACHABLE()` macro in debug build configurations are not considered violations:: static inline bool -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:12:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093619.1449097 (Exim 4.92) (envelope-from ) id 1uqakE-0004UM-9t; Mon, 25 Aug 2025 17:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093619.1449097; Mon, 25 Aug 2025 17:12:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqakE-0004UE-7K; Mon, 25 Aug 2025 17:12:34 +0000 Received: by outflank-mailman (input) for mailman id 1093619; Mon, 25 Aug 2025 17:12:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqakC-0004Tz-Jq for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqakC-005yNU-1D for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqakC-000oXv-1l for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=q0IxIq7ufnPCT1LwAHg4vbdaOCigl5+L4CETcQV/1r0=; b=jsgh6IemQ6jsV4OsUrk6X8GTCo X1S9xGxHvupIikLF5fXRiMFRdp8qvSNtsLnopOQBSXU01mo4uKweqb5n7KUC9FNew/8k43jgDZSFW d2wWkUTwZtyKhlLn1ixAOaRx2m4EYTlZHGqDOm3xAnw+NoquSSMCw5kUiEL/nlnPVxlQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Drop workaround for pre-GCC-5 PIC issue Message-Id: Date: Mon, 25 Aug 2025 17:12:32 +0000 commit a41fdcaf1e520d4a28fac7669fde9b32d1e1c2eb Author: Andrew Cooper AuthorDate: Wed Aug 13 23:57:57 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 25 14:04:41 2025 +0100 x86/cpu-policy: Drop workaround for pre-GCC-5 PIC issue GCC 5.1 is the minimum supported toolchain version now. Drop the workaround for the PIC hard register in earlier versions. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/xen/lib/x86/cpu-policy.h | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index dd204a825b..f94f23e159 100644 --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -29,45 +29,18 @@ struct cpuid_leaf uint32_t a, b, c, d; }; -/* - * Versions of GCC before 5 unconditionally reserve %rBX as the PIC hard - * register, and are unable to cope with spilling it. This results in a - * rather cryptic error: - * error: inconsistent operand constraints in an ‘asm’ - * - * In affected situations, work around the issue by using a separate register - * to hold the the %rBX output, and xchg twice to leave %rBX preserved around - * the asm() statement. - */ -#if defined(__PIC__) && __GNUC__ < 5 && !defined(__clang__) && defined(__i386__) -# define XCHG_BX "xchg %%ebx, %[bx];" -# define BX_CON [bx] "=&r" -#elif defined(__PIC__) && __GNUC__ < 5 && !defined(__clang__) && \ - defined(__x86_64__) && (defined(__code_model_medium__) || \ - defined(__code_model_large__)) -# define XCHG_BX "xchg %%rbx, %q[bx];" -# define BX_CON [bx] "=&r" -#else -# define XCHG_BX "" -# define BX_CON "=&b" -#endif - static inline void cpuid_leaf(uint32_t leaf, struct cpuid_leaf *l) { - asm ( XCHG_BX - "cpuid;" - XCHG_BX - : "=a" (l->a), BX_CON (l->b), "=&c" (l->c), "=&d" (l->d) + asm ( "cpuid" + : "=a" (l->a), "=b" (l->b), "=c" (l->c), "=d" (l->d) : "a" (leaf) ); } static inline void cpuid_count_leaf( uint32_t leaf, uint32_t subleaf, struct cpuid_leaf *l) { - asm ( XCHG_BX - "cpuid;" - XCHG_BX - : "=a" (l->a), BX_CON (l->b), "=c" (l->c), "=&d" (l->d) + asm ( "cpuid" + : "=a" (l->a), "=b" (l->b), "=c" (l->c), "=d" (l->d) : "a" (leaf), "c" (subleaf) ); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:12:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093620.1449102 (Exim 4.92) (envelope-from ) id 1uqakO-0004Wp-CG; Mon, 25 Aug 2025 17:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093620.1449102; Mon, 25 Aug 2025 17:12:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqakO-0004Wf-8Z; Mon, 25 Aug 2025 17:12:44 +0000 Received: by outflank-mailman (input) for mailman id 1093620; Mon, 25 Aug 2025 17:12:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqakM-0004WT-Mk for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqakM-005yNZ-1V for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqakM-000oYi-24 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jCZlcmFi/BADYJELQf5yICvJUeqSZZHFW/fx1KMmXy8=; b=LRSxE0v6Vd23EVbClsj78fLQt8 /Lg3373C0DQp2ls2SztQj6q6jrkiXw4+oyp1/OyAvX7bEf9tlGuxs/RCwe5vnE1jpcs7QfnFPpr1V MKJWwBOUJ/xhM4KYhPk8PNSSYCFK/RF4heF+VQYzb9VawWA9lb9E213wadteZBaFg5tU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mce: Sort headers Message-Id: Date: Mon, 25 Aug 2025 17:12:42 +0000 commit f2697bb2d4d790831cabad167533f64d8af776b3 Author: Andrew Cooper AuthorDate: Thu Aug 21 16:43:46 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 25 14:04:41 2025 +0100 x86/mce: Sort headers No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce_intel.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index fac60f2d37..d4b39e84b3 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1,29 +1,30 @@ +#include +#include +#include #include -#include #include -#include #include -#include +#include #include #include -#include -#include -#include -#include -#include + +#include +#include #include #include -#include -#include +#include +#include #include -#include "mce.h" -#include "x86_mca.h" +#include + #include "barrier.h" +#include "mcaction.h" +#include "mce.h" #include "util.h" #include "vmce.h" -#include "mcaction.h" +#include "x86_mca.h" static DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, mce_banks_owned); static bool __read_mostly ser_support; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Aug 25 17:12:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Aug 2025 17:12:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1093621.1449104 (Exim 4.92) (envelope-from ) id 1uqakX-0004ZQ-EF; Mon, 25 Aug 2025 17:12:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1093621.1449104; Mon, 25 Aug 2025 17:12:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqakX-0004ZJ-Bq; Mon, 25 Aug 2025 17:12:53 +0000 Received: by outflank-mailman (input) for mailman id 1093621; Mon, 25 Aug 2025 17:12:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqakW-0004ZB-Q3 for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqakW-005yNd-1n for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqakW-000oZi-2M for xen-changelog@lists.xenproject.org; Mon, 25 Aug 2025 17:12:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4WH+tIFRc95rgu+xf7cagLAd4bI0q6Nr680AcerNz/E=; b=kVnJJx/ul91/m8R6jt7GSiNL2i v5K6nimEnwzywFt79LDuz7vBPtfyzbZHwh3C5jC9JDXxeNBLabE/kcWaPZQUw7NKb1W3Cju97zKKn J/z673XGW1gr88/NPRD9PysFtUo+zeVfYXNf8dAW4IWAG3Nyghz5QejQjuoRgXrwnPss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mce: Adjustments to intel_init_ppin() Message-Id: Date: Mon, 25 Aug 2025 17:12:52 +0000 commit 49e6eb744eba01f5d4b4cfce49154c0802d4f5c6 Author: Andrew Cooper AuthorDate: Thu Aug 21 16:35:09 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Aug 25 14:04:41 2025 +0100 x86/mce: Adjustments to intel_init_ppin() There's no family check gating intel_init_ppin(), making it incorrect to use on non Fam6 CPUs. Switch to using VFM. Emerald Rapids is the final CPU to have PPIN but lack the the architectural enumeration, so include it too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce_intel.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index d4b39e84b3..839a0e5ba9 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -859,7 +860,7 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) * other purposes. Despite the late addition of a CPUID bit (rendering * the MSR architectural), keep using the same detection logic there. */ - switch ( c->x86_model ) + switch ( c->vfm ) { uint64_t val; @@ -870,14 +871,15 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c) return; } fallthrough; - case 0x3e: /* IvyBridge X */ - case 0x3f: /* Haswell X */ - case 0x4f: /* Broadwell X */ - case 0x55: /* Skylake X */ - case 0x56: /* Broadwell Xeon D */ - case 0x6a: /* Icelake X */ - case 0x6c: /* Icelake D */ - case 0x8f: /* Sapphire Rapids X */ + case INTEL_IVYBRIDGE_X: + case INTEL_HASWELL_X: + case INTEL_BROADWELL_X: + case INTEL_BROADWELL_D: + case INTEL_SKYLAKE_X: + case INTEL_ICELAKE_X: + case INTEL_ICELAKE_D: + case INTEL_SAPPHIRERAPIDS_X: + case INTEL_EMERALDRAPIDS_X: if ( (c != &boot_cpu_data && !ppin_msr) || rdmsr_safe(MSR_PPIN_CTL, &val) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:44:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094121.1449449 (Exim 4.92) (envelope-from ) id 1uqpHg-0008I1-73; Tue, 26 Aug 2025 08:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094121.1449449; Tue, 26 Aug 2025 08:44:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpHg-0008Ht-47; Tue, 26 Aug 2025 08:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1094121; Tue, 26 Aug 2025 08:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpHe-0008Hm-Ez for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpHe-007TLG-0B for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpHe-001wZu-0j for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CN84EWuPw4djZQVIin/82SXqUjmUWCG2tK7iv2ye4GU=; b=DG/Dq5YAs+DIQMqaSNBrmO6jGn SreodeqrwIrMslDJL8uNlhq+O5lzREcNkbR/747PsKyr+Ot7t35HtPJX86Zup1jfe8cLwtotFccdw Iz2sCUhSMyQEmbsuHlPBmqqXPgn9iT4bLTGZYNA2guNrMCV09yZ8Pzt75L4mvx+kE1Js=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Arm: drop assertion from page_is_ram_type() Message-Id: Date: Tue, 26 Aug 2025 08:44:02 +0000 commit 2d5e91fe654e47b4053ba81112a8d36dd6cd4e1a Author: Jan Beulich AuthorDate: Tue Aug 26 08:36:43 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:36:43 2025 +0200 Arm: drop assertion from page_is_ram_type() Its uses in offline_page() and query_page_offline() make it reachable on Arm, as long as XEN_SYSCTL_page_offline_op doesn't have any Arm-specific code added. It being reachable was even mentioned in the commit introducing it, claiming it "clearly shouldn't be called on ARM just yet". However, dropping the assertion from a function of this name is deemed problematic. Rename it to better reflect its sole purpose outside of x86-specific code. Fixes: 214c4cd94a80 ("xen: arm: stub page_is_ram_type") Signed-off-by: Jan Beulich Reviewed-by: Oleksii Kurochko Reviewed-by: Jason Andryuk Acked-by: Michal Orzel --- xen/arch/arm/mm.c | 5 ++--- xen/arch/x86/mm.c | 5 +++++ xen/common/page_alloc.c | 6 +++--- xen/include/xen/mm.h | 2 ++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 77e21f5f29..3b05b46ee0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -64,10 +64,9 @@ int steal_page( return -EOPNOTSUPP; } -int page_is_ram_type(unsigned long mfn, unsigned long mem_type) +bool page_is_offlinable(mfn_t mfn) { - ASSERT_UNREACHABLE(); - return 0; + return false; } unsigned long domain_get_maximum_gpfn(struct domain *d) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 5682f600bb..dd48835d56 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -418,6 +418,11 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) return 0; } +bool page_is_offlinable(mfn_t mfn) +{ + return page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL); +} + unsigned int page_get_ram_type(mfn_t mfn) { uint64_t last = 0, maddr = mfn_to_maddr(mfn); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index ec9dec365e..1f67b88a89 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1635,7 +1635,7 @@ static unsigned long mark_page_offline(struct page_info *pg, int broken) { unsigned long nx, x, y = pg->count_info; - ASSERT(page_is_ram_type(mfn_x(page_to_mfn(pg)), RAM_TYPE_CONVENTIONAL)); + ASSERT(page_is_offlinable(page_to_mfn(pg))); ASSERT(spin_is_locked(&heap_lock)); do { @@ -1711,7 +1711,7 @@ int offline_page(mfn_t mfn, int broken, uint32_t *status) * N.B. xen's txt in x86_64 is marked reserved and handled already. * Also kexec range is reserved. */ - if ( !page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL) ) + if ( !page_is_offlinable(mfn) ) { *status = PG_OFFLINE_FAILED | PG_OFFLINE_NOT_CONV_RAM; return -EINVAL; @@ -1851,7 +1851,7 @@ int query_page_offline(mfn_t mfn, uint32_t *status) { struct page_info *pg; - if ( !mfn_valid(mfn) || !page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL) ) + if ( !mfn_valid(mfn) || !page_is_offlinable(mfn) ) { dprintk(XENLOG_WARNING, "call expand_pages() first\n"); return -EINVAL; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 93c037d618..3def57abf6 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -144,9 +144,11 @@ unsigned long avail_domheap_pages_region( unsigned long avail_node_heap_pages(unsigned int nodeid); #define alloc_domheap_page(d,f) (alloc_domheap_pages(d,0,f)) #define free_domheap_page(p) (free_domheap_pages(p,0)) + int online_page(mfn_t mfn, uint32_t *status); int offline_page(mfn_t mfn, int broken, uint32_t *status); int query_page_offline(mfn_t mfn, uint32_t *status); +bool page_is_offlinable(mfn_t mfn); void heap_init_late(void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:44:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094122.1449453 (Exim 4.92) (envelope-from ) id 1uqpHq-0008JU-8N; Tue, 26 Aug 2025 08:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094122.1449453; Tue, 26 Aug 2025 08:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpHq-0008JM-5Y; Tue, 26 Aug 2025 08:44:14 +0000 Received: by outflank-mailman (input) for mailman id 1094122; Tue, 26 Aug 2025 08:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpHo-0008JA-DW for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpHo-007TLM-0Y for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpHo-001wbN-13 for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jw+59Y9SAkJYf90NyjcGh2zacQr5ZSmfz6+U7uJGVY8=; b=F0Koj1pK+X5Ftj7ZEP7LUGv0Vx dQiWvGY3u3RClmNn5fWX+TdUt6oxqI240YyJ7Y6vQu29LHVdcX9tQWyueBot/qnZPwniIu3N0KjCb kPOpGYfd3adYTMPs+T3Md0JKhrPvokMxFQy8zQw+r1VwdxPyZdGvA0sRqyTbcs2Gnv3A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] common: make page_{is,get}_ram_type() x86-only Message-Id: Date: Tue, 26 Aug 2025 08:44:12 +0000 commit b5030589f3e6416b8b02eebe68adc1f018e8c3e3 Author: Jan Beulich AuthorDate: Tue Aug 26 08:37:36 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:37:36 2025 +0200 common: make page_{is,get}_ram_type() x86-only The classification is pretty E820-centric anyway, and all uses of the function are now in x86-only code. Switch the boolean return type to properly use bool while at it, and shrink the the parameter to "unsigned int". Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/include/asm/mm.h | 10 ++++++++++ xen/arch/x86/mm.c | 6 +++--- xen/include/xen/mm.h | 9 --------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index d6e80db71c..08153e6d6f 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -464,6 +464,16 @@ static inline int get_page_and_type(struct page_info *page, ASSERT(((_p)->count_info & PGC_count_mask) != 0); \ ASSERT(page_get_owner(_p) == (_d)) +#define RAM_TYPE_CONVENTIONAL 0x00000001 +#define RAM_TYPE_RESERVED 0x00000002 +#define RAM_TYPE_UNUSABLE 0x00000004 +#define RAM_TYPE_ACPI 0x00000008 +#define RAM_TYPE_UNKNOWN 0x00000010 +/* TRUE if the whole page at @mfn is of the requested RAM type(s) above. */ +bool page_is_ram_type(unsigned long mfn, unsigned int mem_type); +/* Returns the page type(s). */ +unsigned int page_get_ram_type(mfn_t mfn); + /****************************************************************************** * With shadow pagetables, the different kinds of address start * to get get confusing. diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index dd48835d56..b929d15d00 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -378,7 +378,7 @@ void __init arch_init_memory(void) ASM_CONSTANT(FIXADDR_X_SIZE, FIXADDR_X_SIZE); } -int page_is_ram_type(unsigned long mfn, unsigned long mem_type) +bool page_is_ram_type(unsigned long mfn, unsigned int mem_type) { uint64_t maddr = pfn_to_paddr(mfn); int i; @@ -412,10 +412,10 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) /* Test the range. */ if ( (e820.map[i].addr <= maddr) && ((e820.map[i].addr + e820.map[i].size) >= (maddr + PAGE_SIZE)) ) - return 1; + return true; } - return 0; + return false; } bool page_is_offlinable(mfn_t mfn) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 3def57abf6..b968f47b87 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -567,15 +567,6 @@ int __must_check guest_remove_page(struct domain *d, unsigned long gmfn); int __must_check steal_page(struct domain *d, struct page_info *page, unsigned int memflags); -#define RAM_TYPE_CONVENTIONAL 0x00000001 -#define RAM_TYPE_RESERVED 0x00000002 -#define RAM_TYPE_UNUSABLE 0x00000004 -#define RAM_TYPE_ACPI 0x00000008 -#define RAM_TYPE_UNKNOWN 0x00000010 -/* TRUE if the whole page at @mfn is of the requested RAM type(s) above. */ -int page_is_ram_type(unsigned long mfn, unsigned long mem_type); -/* Returns the page type(s). */ -unsigned int page_get_ram_type(mfn_t mfn); /* Check if a range falls into a hole in the memory map. */ bool is_memory_hole(mfn_t start, mfn_t end); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094123.1449457 (Exim 4.92) (envelope-from ) id 1uqpI0-0008M5-9f; Tue, 26 Aug 2025 08:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094123.1449457; Tue, 26 Aug 2025 08:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpI0-0008Lx-6y; Tue, 26 Aug 2025 08:44:24 +0000 Received: by outflank-mailman (input) for mailman id 1094123; Tue, 26 Aug 2025 08:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpHy-0008Lj-HK for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpHy-007TLj-0u for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpHy-001wcx-1Q for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jx4f5S1AyMaaaSab/+w9QOvWwYmsab1wudfF6pkhwKw=; b=xJV6Bsi90c+ETEuHvkaHhnfxhd ckLxW2OhQ5ZxpYru8XYZL4qMi/5g6/fqijc2qoLMift/GM7pfUTm4X07UaJiXoe+p2IigngjTmNVN mVt+XZ9Ey1AnTf+1Lnfn2rlTUgbJGC+PULXCMHK2PJ28/jWBf43O14o+SWe2Sw4WkGsQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] cpufreq: rename "xen_cppc_para" to "xen_get_cppc_para" Message-Id: Date: Tue, 26 Aug 2025 08:44:22 +0000 commit e8c605413fc45376e668c37317b9ebc869165f26 Author: Penny Zheng AuthorDate: Tue Aug 26 08:39:15 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:39:15 2025 +0200 cpufreq: rename "xen_cppc_para" to "xen_get_cppc_para" As we are going to add "struct xen_cppc_para" in "struct xen_sysctl_pm_op" as a new xenpm sub-op later to specifically dealing with CPPC-info, we need to follow the naming pattern, to change the struct name to "xen_get_cppc_para", which is more suitable than "xen_cppc_para". Signed-off-by: Penny Zheng Acked-by: Jan Beulich Acked-by: Anthony PERARD --- tools/include/xenctrl.h | 2 +- xen/arch/x86/acpi/cpufreq/hwp.c | 2 +- xen/include/acpi/cpufreq/cpufreq.h | 2 +- xen/include/public/sysctl.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 4955981231..965d3b585a 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1906,7 +1906,7 @@ int xc_smt_disable(xc_interface *xch); */ typedef struct xen_userspace xc_userspace_t; typedef struct xen_ondemand xc_ondemand_t; -typedef struct xen_cppc_para xc_cppc_para_t; +typedef struct xen_get_cppc_para xc_cppc_para_t; struct xc_get_cpufreq_para { /* IN/OUT variable */ diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index 38037d8300..240491c96a 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -529,7 +529,7 @@ hwp_cpufreq_driver = { #ifdef CONFIG_PM_OP int get_hwp_para(unsigned int cpu, - struct xen_cppc_para *cppc_para) + struct xen_get_cppc_para *cppc_para) { const struct hwp_drv_data *data = per_cpu(hwp_drv_data, cpu); diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index 0742aa9f44..fd530632b4 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -266,7 +266,7 @@ static inline bool hwp_active(void) { return false; } #endif int get_hwp_para(unsigned int cpu, - struct xen_cppc_para *cppc_para); + struct xen_get_cppc_para *cppc_para); int set_hwp_para(struct cpufreq_policy *policy, struct xen_set_cppc_para *set_cppc); diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b7325b0f72..aafa7fcf2b 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -336,7 +336,7 @@ struct xen_ondemand { uint32_t up_threshold; }; -struct xen_cppc_para { +struct xen_get_cppc_para { /* OUT */ /* activity_window supported if set */ #define XEN_SYSCTL_CPPC_FEAT_ACT_WINDOW (1 << 0) @@ -442,7 +442,7 @@ struct xen_set_cppc_para { XEN_SYSCTL_CPPC_SET_ACT_WINDOW ) /* IN/OUT */ uint32_t set_params; /* bitflags for valid values */ - /* See comments in struct xen_cppc_para. */ + /* See comments in struct xen_get_cppc_para. */ /* IN */ uint32_t minimum; uint32_t maximum; @@ -490,7 +490,7 @@ struct xen_get_cpufreq_para { struct xen_ondemand ondemand; } u; } s; - struct xen_cppc_para cppc_para; + struct xen_get_cppc_para cppc_para; } u; int32_t turbo_enabled; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094124.1449461 (Exim 4.92) (envelope-from ) id 1uqpIA-0008OO-B7; Tue, 26 Aug 2025 08:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094124.1449461; Tue, 26 Aug 2025 08:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpIA-0008OE-8I; Tue, 26 Aug 2025 08:44:34 +0000 Received: by outflank-mailman (input) for mailman id 1094124; Tue, 26 Aug 2025 08:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpI8-0008Nz-Jr for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpI8-007TOA-1D for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpI8-001wgV-1l for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nLPVVCN9bxFqi1Adc7VV0/PnUUfSIejNlxLdwMIaWTw=; b=4li5JdmBjE+j+ahug00ZtLKOAF +8GFFEZdIkIc+bDRo3nh+FUsvgHGAAUFmTkryEEv1MnIXaJHtVZ5yAWQFJLANBKI+wec8dJPFP9Oj VZr9yiXWr5+UbIbPf/A7rf2husUXpDpQsK8WWoizqBEGkao82vW+EnaIGpiJU/kwzn/M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: fix help info for "xenpm set-cpufreq-cppc" Message-Id: Date: Tue, 26 Aug 2025 08:44:32 +0000 commit a6acdc8f661846063d7ff1e962fcb686c5db6b5a Author: Penny Zheng AuthorDate: Tue Aug 26 08:39:35 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:39:35 2025 +0200 tools: fix help info for "xenpm set-cpufreq-cppc" Change "balance" to "ondemand" in help info for "xenpm set-cpufreq-cppc" Fixes: 81ce87fc5e36 (xen/cpufreq: rename cppc preset name to "XEN_SYSCTL_CPPC_SET_PRESET_ONDEMAND") Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- tools/misc/xenpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 6ba7cb2302..6b054b10a4 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -69,7 +69,7 @@ void show_help(void) " set-max-cstate |'unlimited' [|'unlimited']\n" " set the C-State limitation ( >= 0) and\n" " optionally the C-sub-state limitation ( >= 0)\n" - " set-cpufreq-cppc [cpuid] [balance|performance|powersave] *\n" + " set-cpufreq-cppc [cpuid] [ondemand|performance|powersave] *\n" " set Hardware P-State (HWP) parameters\n" " on CPU or all if omitted.\n" " optionally a preset of one of:\n" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094125.1449465 (Exim 4.92) (envelope-from ) id 1uqpIK-0008Qd-CC; Tue, 26 Aug 2025 08:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094125.1449465; Tue, 26 Aug 2025 08:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpIK-0008QV-9a; Tue, 26 Aug 2025 08:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1094125; Tue, 26 Aug 2025 08:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpII-0008QI-MY for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpII-007TOH-1V for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpII-001wjB-23 for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=894DLMF/UDcNPdK2u+243pRI8Sc4+m7FQhlAakGunCA=; b=2kQVs+vJT4S3P5BFMwxm9YC3mU ks4xmCAcTO+Bc2Ciph34F/YfcVk1eHQgR+2dvv1inFYshrhM3G432Ks0nbqlH9IzjtQXYWOV+cvXt o/u6/8IxxoTbRtIZfCEUrYDIMbSqCLc8fHIHNVO/6UzGmVmIZqtDVdK035JjQMJPFO5M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: add missing default: case for x86 vendor Message-Id: Date: Tue, 26 Aug 2025 08:44:42 +0000 commit a3bb13bac9ee127cf66a6609595d48e9d4052ac6 Author: Penny Zheng AuthorDate: Tue Aug 26 08:39:51 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:39:51 2025 +0200 xen/cpufreq: add missing default: case for x86 vendor Since we are missing default case for x86 vendor, there is possibility (i.e. new vendor introduced) that we will return successfully while missing the whole cpufreq driver initialization process. Move "ret = -ENOENT" forward to cover default case for x86 vendor, and add error log. Requested-by: Jan Beulich Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/cpufreq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index d18735c7ae..e227376bab 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -131,11 +131,11 @@ static int __init cf_check cpufreq_driver_init(void) if ( cpufreq_controller == FREQCTL_xen ) { + ret = -ENOENT; + switch ( boot_cpu_data.x86_vendor ) { case X86_VENDOR_INTEL: - ret = -ENOENT; - for ( unsigned int i = 0; i < cpufreq_xen_cnt; i++ ) { switch ( cpufreq_xen_opts[i] ) @@ -162,6 +162,10 @@ static int __init cf_check cpufreq_driver_init(void) case X86_VENDOR_HYGON: ret = IS_ENABLED(CONFIG_AMD) ? powernow_register_driver() : -ENODEV; break; + + default: + printk(XENLOG_ERR "Cpufreq: unsupported x86 vendor\n"); + break; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094126.1449468 (Exim 4.92) (envelope-from ) id 1uqpIU-0008Su-Dc; Tue, 26 Aug 2025 08:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094126.1449468; Tue, 26 Aug 2025 08:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpIU-0008Sm-Ax; Tue, 26 Aug 2025 08:44:54 +0000 Received: by outflank-mailman (input) for mailman id 1094126; Tue, 26 Aug 2025 08:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpIS-0008Sc-Pv for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpIS-007TOL-1m for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpIS-001wje-2L for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ihmKr8n/Nswg3fAsrM4f8YgXxHsRQDTD1xpRTXsanpU=; b=K7JMYY8CN9pdoPanFRCR+w8guC ajHBx3/se30DzS3Mr0SBK+SbLa3RJy55cIDJ/9VD0OQEQwQfMQ0TEFKxk1eMcyRVkjo/POVKuHJAV o6FYCXKT3hCP1nzkzoPL7A57r7jLxBtoZpSC5rtp0oNgxEnO8J06Z20uXj7k4ft74wko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: refactor cmdline "cpufreq=xxx" Message-Id: Date: Tue, 26 Aug 2025 08:44:52 +0000 commit 7a1ad11bdb69fac53aad293965ff46462c0d6217 Author: Penny Zheng AuthorDate: Tue Aug 26 08:40:56 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 09:33:30 2025 +0200 xen/cpufreq: refactor cmdline "cpufreq=xxx" A helper function handle_cpufreq_cmdline() is introduced to tidy different handling pathes. We also add a new helper cpufreq_opts_contain() to ignore redundant setting, like "cpufreq=hwp;hwp;xen" As only slot 0 of cpufreq_xen_opts[] needs explicit initializing with non-zero CPUFREQ_xen, dropping full array initializer could avoid touching initializer every time it grows Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq.c | 55 +++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index efba141418..267e4d3f3b 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -64,12 +64,49 @@ LIST_HEAD_READ_MOSTLY(cpufreq_governor_list); /* set xen as default cpufreq */ enum cpufreq_controller cpufreq_controller = FREQCTL_xen; -enum cpufreq_xen_opt __initdata cpufreq_xen_opts[2] = { CPUFREQ_xen, - CPUFREQ_none }; +enum cpufreq_xen_opt __initdata cpufreq_xen_opts[2] = { [0] = CPUFREQ_xen }; unsigned int __initdata cpufreq_xen_cnt = 1; static int __init cpufreq_cmdline_parse(const char *s, const char *e); +static bool __init cpufreq_opts_contain(enum cpufreq_xen_opt option) +{ + unsigned int count = cpufreq_xen_cnt; + + while ( count-- ) + { + if ( cpufreq_xen_opts[count] == option ) + return true; + } + + return false; +} + +static int __init handle_cpufreq_cmdline(enum cpufreq_xen_opt option) +{ + int ret = 0; + + if ( cpufreq_opts_contain(option) ) + return 0; + + cpufreq_controller = FREQCTL_xen; + cpufreq_xen_opts[cpufreq_xen_cnt++] = option; + switch ( option ) + { + case CPUFREQ_hwp: + case CPUFREQ_xen: + xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; + break; + + default: + ASSERT_UNREACHABLE(); + ret = -EINVAL; + break; + } + + return ret; +} + static int __init cf_check setup_cpufreq_option(const char *str) { const char *arg = strpbrk(str, ",:;"); @@ -113,21 +150,15 @@ static int __init cf_check setup_cpufreq_option(const char *str) if ( choice > 0 || !cmdline_strcmp(str, "xen") ) { - xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; - cpufreq_controller = FREQCTL_xen; - cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_xen; - ret = 0; - if ( arg[0] && arg[1] ) + ret = handle_cpufreq_cmdline(CPUFREQ_xen); + if ( !ret && arg[0] && arg[1] ) ret = cpufreq_cmdline_parse(arg + 1, end); } else if ( IS_ENABLED(CONFIG_INTEL) && choice < 0 && !cmdline_strcmp(str, "hwp") ) { - xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; - cpufreq_controller = FREQCTL_xen; - cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_hwp; - ret = 0; - if ( arg[0] && arg[1] ) + ret = handle_cpufreq_cmdline(CPUFREQ_hwp); + if ( !ret && arg[0] && arg[1] ) ret = hwp_cmdline_parse(arg + 1, end); } else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 08:45:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 08:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094127.1449472 (Exim 4.92) (envelope-from ) id 1uqpId-0008Vf-Gr; Tue, 26 Aug 2025 08:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094127.1449472; Tue, 26 Aug 2025 08:45:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpId-0008VY-EN; Tue, 26 Aug 2025 08:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1094127; Tue, 26 Aug 2025 08:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqpIc-0008VQ-Sa for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqpIc-007TOm-24 for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqpIc-001wkb-2d for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 08:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Qo06VyhWBryyjWsSoiOj7fV5TlHfR7bt/VNMh5VOP30=; b=3FPrfieTCsWn5XrmG0wuPhtxAa Md+TbbA8/yj/6pAFKNKf1+SjE2BAgOVEvrZ/SZ8/LXLG0ERuYSh2e7eGBP0KWTTsQXqRKNhc/L9li VVmxMzrvSONDCOD+lJKEubfKMSaXoe+TrdZunhbQkPci+/6yrrGJBZNU4nk3ZZwxa/KE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Arm/platforms: fix build with gcc15 Message-Id: Date: Tue, 26 Aug 2025 08:45:02 +0000 commit 39f95089e2ba15c5438ce904c0cbbd8d79d3e6e7 Author: Jan Beulich AuthorDate: Tue Aug 26 08:41:18 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 09:33:48 2025 +0200 Arm/platforms: fix build with gcc15 For two of the headers gcc15 complains "header guard ... followed by '#define' of a different macro". Misra certainly wouldn't have liked this either, if these headers were covered by a scan. Signed-off-by: Jan Beulich Acked-by: Michal Orzel --- xen/arch/arm/include/asm/platforms/midway.h | 2 +- xen/arch/arm/include/asm/platforms/omap5.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/platforms/midway.h b/xen/arch/arm/include/asm/platforms/midway.h index 099e4350f9..69143931c2 100644 --- a/xen/arch/arm/include/asm/platforms/midway.h +++ b/xen/arch/arm/include/asm/platforms/midway.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H -#define __ASM_ASM_PLATFORMS_MIDWAY_H +#define __ASM_ARM_PLATFORMS_MIDWAY_H /* addresses of SREG registers for resetting the SoC */ #define MW_SREG_PWR_REQ 0xfff3cf00 diff --git a/xen/arch/arm/include/asm/platforms/omap5.h b/xen/arch/arm/include/asm/platforms/omap5.h index c559c84b61..8867b4589a 100644 --- a/xen/arch/arm/include/asm/platforms/omap5.h +++ b/xen/arch/arm/include/asm/platforms/omap5.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_OMAP5_H -#define __ASM_ASM_PLATFORMS_OMAP5_H +#define __ASM_ARM_PLATFORMS_OMAP5_H #define REALTIME_COUNTER_BASE 0x48243200 #define INCREMENTER_NUMERATOR_OFFSET 0x10 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094342.1449657 (Exim 4.92) (envelope-from ) id 1uqrvE-0007E9-6K; Tue, 26 Aug 2025 11:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094342.1449657; Tue, 26 Aug 2025 11:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvE-0007E2-3c; Tue, 26 Aug 2025 11:33:04 +0000 Received: by outflank-mailman (input) for mailman id 1094342; Tue, 26 Aug 2025 11:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvC-0007Dw-Oi for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrvB-007Wqn-3D for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrvC-002AlT-0X for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=td9msX3Sjm2yROmSfyENHRsSmZOZk+tBINyYC4piXts=; b=42L6A00weTBPB9ghNINQkDyyv9 z8ju657gN0NEw9y86MGDn2XN+FVxozdk2QcOJdkoiM00XZs6112QZqM+W7gl6uD70VNKWOmTDYy1I 5OxGLxMHZbmAVBuojfyjYHL1dlSNVwxluGeoDBrNTP+91qLhemr77y5ypDsuEVt/MPus=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm: drop assertion from page_is_ram_type() Message-Id: Date: Tue, 26 Aug 2025 11:33:02 +0000 commit 2d5e91fe654e47b4053ba81112a8d36dd6cd4e1a Author: Jan Beulich AuthorDate: Tue Aug 26 08:36:43 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:36:43 2025 +0200 Arm: drop assertion from page_is_ram_type() Its uses in offline_page() and query_page_offline() make it reachable on Arm, as long as XEN_SYSCTL_page_offline_op doesn't have any Arm-specific code added. It being reachable was even mentioned in the commit introducing it, claiming it "clearly shouldn't be called on ARM just yet". However, dropping the assertion from a function of this name is deemed problematic. Rename it to better reflect its sole purpose outside of x86-specific code. Fixes: 214c4cd94a80 ("xen: arm: stub page_is_ram_type") Signed-off-by: Jan Beulich Reviewed-by: Oleksii Kurochko Reviewed-by: Jason Andryuk Acked-by: Michal Orzel --- xen/arch/arm/mm.c | 5 ++--- xen/arch/x86/mm.c | 5 +++++ xen/common/page_alloc.c | 6 +++--- xen/include/xen/mm.h | 2 ++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 77e21f5f29..3b05b46ee0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -64,10 +64,9 @@ int steal_page( return -EOPNOTSUPP; } -int page_is_ram_type(unsigned long mfn, unsigned long mem_type) +bool page_is_offlinable(mfn_t mfn) { - ASSERT_UNREACHABLE(); - return 0; + return false; } unsigned long domain_get_maximum_gpfn(struct domain *d) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 5682f600bb..dd48835d56 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -418,6 +418,11 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) return 0; } +bool page_is_offlinable(mfn_t mfn) +{ + return page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL); +} + unsigned int page_get_ram_type(mfn_t mfn) { uint64_t last = 0, maddr = mfn_to_maddr(mfn); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index ec9dec365e..1f67b88a89 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1635,7 +1635,7 @@ static unsigned long mark_page_offline(struct page_info *pg, int broken) { unsigned long nx, x, y = pg->count_info; - ASSERT(page_is_ram_type(mfn_x(page_to_mfn(pg)), RAM_TYPE_CONVENTIONAL)); + ASSERT(page_is_offlinable(page_to_mfn(pg))); ASSERT(spin_is_locked(&heap_lock)); do { @@ -1711,7 +1711,7 @@ int offline_page(mfn_t mfn, int broken, uint32_t *status) * N.B. xen's txt in x86_64 is marked reserved and handled already. * Also kexec range is reserved. */ - if ( !page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL) ) + if ( !page_is_offlinable(mfn) ) { *status = PG_OFFLINE_FAILED | PG_OFFLINE_NOT_CONV_RAM; return -EINVAL; @@ -1851,7 +1851,7 @@ int query_page_offline(mfn_t mfn, uint32_t *status) { struct page_info *pg; - if ( !mfn_valid(mfn) || !page_is_ram_type(mfn_x(mfn), RAM_TYPE_CONVENTIONAL) ) + if ( !mfn_valid(mfn) || !page_is_offlinable(mfn) ) { dprintk(XENLOG_WARNING, "call expand_pages() first\n"); return -EINVAL; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 93c037d618..3def57abf6 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -144,9 +144,11 @@ unsigned long avail_domheap_pages_region( unsigned long avail_node_heap_pages(unsigned int nodeid); #define alloc_domheap_page(d,f) (alloc_domheap_pages(d,0,f)) #define free_domheap_page(p) (free_domheap_pages(p,0)) + int online_page(mfn_t mfn, uint32_t *status); int offline_page(mfn_t mfn, int broken, uint32_t *status); int query_page_offline(mfn_t mfn, uint32_t *status); +bool page_is_offlinable(mfn_t mfn); void heap_init_late(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:33:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094343.1449660 (Exim 4.92) (envelope-from ) id 1uqrvO-0007Fk-7g; Tue, 26 Aug 2025 11:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094343.1449660; Tue, 26 Aug 2025 11:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvO-0007Fc-58; Tue, 26 Aug 2025 11:33:14 +0000 Received: by outflank-mailman (input) for mailman id 1094343; Tue, 26 Aug 2025 11:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvM-0007FO-Ct for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrvM-007Wqr-0L for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrvM-002Alz-0t for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6+0ko8ylU3iWnZWl7cMSp/1Kl7AtoidNdTLxUb1rQqw=; b=eMvWa5QYfGLRYKG1LpCCVlbQlX bDN0/Rh6HO7vkbeXr5zCItA1XF2EOJKvp5T5ITEfviFYUwfT58fUszQ8F63YAEOW0bhHlVvWAQfd1 U+Hzzhtkb5WyT/EOWshvntQY/xCHB+yJJVYiW9ZemjNMuwCsPFBEhW+2nxCZ63C2ZcRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common: make page_{is,get}_ram_type() x86-only Message-Id: Date: Tue, 26 Aug 2025 11:33:12 +0000 commit b5030589f3e6416b8b02eebe68adc1f018e8c3e3 Author: Jan Beulich AuthorDate: Tue Aug 26 08:37:36 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:37:36 2025 +0200 common: make page_{is,get}_ram_type() x86-only The classification is pretty E820-centric anyway, and all uses of the function are now in x86-only code. Switch the boolean return type to properly use bool while at it, and shrink the the parameter to "unsigned int". Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/include/asm/mm.h | 10 ++++++++++ xen/arch/x86/mm.c | 6 +++--- xen/include/xen/mm.h | 9 --------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index d6e80db71c..08153e6d6f 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -464,6 +464,16 @@ static inline int get_page_and_type(struct page_info *page, ASSERT(((_p)->count_info & PGC_count_mask) != 0); \ ASSERT(page_get_owner(_p) == (_d)) +#define RAM_TYPE_CONVENTIONAL 0x00000001 +#define RAM_TYPE_RESERVED 0x00000002 +#define RAM_TYPE_UNUSABLE 0x00000004 +#define RAM_TYPE_ACPI 0x00000008 +#define RAM_TYPE_UNKNOWN 0x00000010 +/* TRUE if the whole page at @mfn is of the requested RAM type(s) above. */ +bool page_is_ram_type(unsigned long mfn, unsigned int mem_type); +/* Returns the page type(s). */ +unsigned int page_get_ram_type(mfn_t mfn); + /****************************************************************************** * With shadow pagetables, the different kinds of address start * to get get confusing. diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index dd48835d56..b929d15d00 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -378,7 +378,7 @@ void __init arch_init_memory(void) ASM_CONSTANT(FIXADDR_X_SIZE, FIXADDR_X_SIZE); } -int page_is_ram_type(unsigned long mfn, unsigned long mem_type) +bool page_is_ram_type(unsigned long mfn, unsigned int mem_type) { uint64_t maddr = pfn_to_paddr(mfn); int i; @@ -412,10 +412,10 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) /* Test the range. */ if ( (e820.map[i].addr <= maddr) && ((e820.map[i].addr + e820.map[i].size) >= (maddr + PAGE_SIZE)) ) - return 1; + return true; } - return 0; + return false; } bool page_is_offlinable(mfn_t mfn) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 3def57abf6..b968f47b87 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -567,15 +567,6 @@ int __must_check guest_remove_page(struct domain *d, unsigned long gmfn); int __must_check steal_page(struct domain *d, struct page_info *page, unsigned int memflags); -#define RAM_TYPE_CONVENTIONAL 0x00000001 -#define RAM_TYPE_RESERVED 0x00000002 -#define RAM_TYPE_UNUSABLE 0x00000004 -#define RAM_TYPE_ACPI 0x00000008 -#define RAM_TYPE_UNKNOWN 0x00000010 -/* TRUE if the whole page at @mfn is of the requested RAM type(s) above. */ -int page_is_ram_type(unsigned long mfn, unsigned long mem_type); -/* Returns the page type(s). */ -unsigned int page_get_ram_type(mfn_t mfn); /* Check if a range falls into a hole in the memory map. */ bool is_memory_hole(mfn_t start, mfn_t end); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:33:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094344.1449664 (Exim 4.92) (envelope-from ) id 1uqrvY-0007IG-8w; Tue, 26 Aug 2025 11:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094344.1449664; Tue, 26 Aug 2025 11:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvY-0007I8-6P; Tue, 26 Aug 2025 11:33:24 +0000 Received: by outflank-mailman (input) for mailman id 1094344; Tue, 26 Aug 2025 11:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvW-0007Hr-En for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrvW-007WrB-0h for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrvW-002Ao1-1D for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U5t+A2BnnI6cPTMJhZpYQYKVk+FvZPXzgZsh7+vwtkM=; b=ypvtsNCB29mCcPECGBUjUf0+wo q/oCZ1D4r4UDNYazv9VOs6oIYWcb83xzroZU6JKLjoshZJUoanWvwLH4a3P+qC0D++3X+pqih52q/ FZcEanScbaL2nGPFMI9tPC0c1en4I/z2YXRRG5VoD2I0dpokXyQJ2o9iqAlFxXOJ6DCk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] cpufreq: rename "xen_cppc_para" to "xen_get_cppc_para" Message-Id: Date: Tue, 26 Aug 2025 11:33:22 +0000 commit e8c605413fc45376e668c37317b9ebc869165f26 Author: Penny Zheng AuthorDate: Tue Aug 26 08:39:15 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:39:15 2025 +0200 cpufreq: rename "xen_cppc_para" to "xen_get_cppc_para" As we are going to add "struct xen_cppc_para" in "struct xen_sysctl_pm_op" as a new xenpm sub-op later to specifically dealing with CPPC-info, we need to follow the naming pattern, to change the struct name to "xen_get_cppc_para", which is more suitable than "xen_cppc_para". Signed-off-by: Penny Zheng Acked-by: Jan Beulich Acked-by: Anthony PERARD --- tools/include/xenctrl.h | 2 +- xen/arch/x86/acpi/cpufreq/hwp.c | 2 +- xen/include/acpi/cpufreq/cpufreq.h | 2 +- xen/include/public/sysctl.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 4955981231..965d3b585a 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1906,7 +1906,7 @@ int xc_smt_disable(xc_interface *xch); */ typedef struct xen_userspace xc_userspace_t; typedef struct xen_ondemand xc_ondemand_t; -typedef struct xen_cppc_para xc_cppc_para_t; +typedef struct xen_get_cppc_para xc_cppc_para_t; struct xc_get_cpufreq_para { /* IN/OUT variable */ diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index 38037d8300..240491c96a 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -529,7 +529,7 @@ hwp_cpufreq_driver = { #ifdef CONFIG_PM_OP int get_hwp_para(unsigned int cpu, - struct xen_cppc_para *cppc_para) + struct xen_get_cppc_para *cppc_para) { const struct hwp_drv_data *data = per_cpu(hwp_drv_data, cpu); diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index 0742aa9f44..fd530632b4 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -266,7 +266,7 @@ static inline bool hwp_active(void) { return false; } #endif int get_hwp_para(unsigned int cpu, - struct xen_cppc_para *cppc_para); + struct xen_get_cppc_para *cppc_para); int set_hwp_para(struct cpufreq_policy *policy, struct xen_set_cppc_para *set_cppc); diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b7325b0f72..aafa7fcf2b 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -336,7 +336,7 @@ struct xen_ondemand { uint32_t up_threshold; }; -struct xen_cppc_para { +struct xen_get_cppc_para { /* OUT */ /* activity_window supported if set */ #define XEN_SYSCTL_CPPC_FEAT_ACT_WINDOW (1 << 0) @@ -442,7 +442,7 @@ struct xen_set_cppc_para { XEN_SYSCTL_CPPC_SET_ACT_WINDOW ) /* IN/OUT */ uint32_t set_params; /* bitflags for valid values */ - /* See comments in struct xen_cppc_para. */ + /* See comments in struct xen_get_cppc_para. */ /* IN */ uint32_t minimum; uint32_t maximum; @@ -490,7 +490,7 @@ struct xen_get_cpufreq_para { struct xen_ondemand ondemand; } u; } s; - struct xen_cppc_para cppc_para; + struct xen_get_cppc_para cppc_para; } u; int32_t turbo_enabled; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:33:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094345.1449669 (Exim 4.92) (envelope-from ) id 1uqrvi-0007KL-AU; Tue, 26 Aug 2025 11:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094345.1449669; Tue, 26 Aug 2025 11:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvi-0007KD-7h; Tue, 26 Aug 2025 11:33:34 +0000 Received: by outflank-mailman (input) for mailman id 1094345; Tue, 26 Aug 2025 11:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvg-0007Jz-HT for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrvg-007WrJ-0y for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrvg-002Ap4-1Y for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+UzeyeIHrR5YDQ6nh4JQmT/O+ft2IAglLEmqC/LxMeM=; b=xl9EDJwUviArZvMiZp6TDkkcqr tTF4j0ZfHzgi/Osgv1Uy2Bm7Gr5draFOJkkL2c6c9wE4L9BFAMBqS099/LmNva7cUUEmk9+VdhaQH lB2wDPPBN+1OObL+YqRjSrr+ey7r6zqUGMW5vGsieBh3vG6zGBuWU/CUmsi7q52RaPLQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: fix help info for "xenpm set-cpufreq-cppc" Message-Id: Date: Tue, 26 Aug 2025 11:33:32 +0000 commit a6acdc8f661846063d7ff1e962fcb686c5db6b5a Author: Penny Zheng AuthorDate: Tue Aug 26 08:39:35 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:39:35 2025 +0200 tools: fix help info for "xenpm set-cpufreq-cppc" Change "balance" to "ondemand" in help info for "xenpm set-cpufreq-cppc" Fixes: 81ce87fc5e36 (xen/cpufreq: rename cppc preset name to "XEN_SYSCTL_CPPC_SET_PRESET_ONDEMAND") Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- tools/misc/xenpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 6ba7cb2302..6b054b10a4 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -69,7 +69,7 @@ void show_help(void) " set-max-cstate |'unlimited' [|'unlimited']\n" " set the C-State limitation ( >= 0) and\n" " optionally the C-sub-state limitation ( >= 0)\n" - " set-cpufreq-cppc [cpuid] [balance|performance|powersave] *\n" + " set-cpufreq-cppc [cpuid] [ondemand|performance|powersave] *\n" " set Hardware P-State (HWP) parameters\n" " on CPU or all if omitted.\n" " optionally a preset of one of:\n" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:33:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094346.1449673 (Exim 4.92) (envelope-from ) id 1uqrvr-0007Ma-Bb; Tue, 26 Aug 2025 11:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094346.1449673; Tue, 26 Aug 2025 11:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvr-0007MQ-8x; Tue, 26 Aug 2025 11:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1094346; Tue, 26 Aug 2025 11:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrvq-0007MI-Lx for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrvq-007WrS-1Q for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrvq-002Apc-1p for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kEIuaGwvkw9/zYvKAXBaZm50d1NiflIlyuKIFT+/Y80=; b=CT2ICavOhOloQ4SKH8n8j1s0wP 38QKMGtEPj3P6ZePIMtWFpbUPzyMLuikGyWZQwNawZ/A236Gy0AYFmcfMbFT7E50YEeUw5C5S0r1m cFiYwjKrkHWdvChhv/Mc6Vf3o+7qR2rQfwlNs2JJuOYSaCG0RGkmViLdEpxO9yF8INW0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: add missing default: case for x86 vendor Message-Id: Date: Tue, 26 Aug 2025 11:33:42 +0000 commit a3bb13bac9ee127cf66a6609595d48e9d4052ac6 Author: Penny Zheng AuthorDate: Tue Aug 26 08:39:51 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 08:39:51 2025 +0200 xen/cpufreq: add missing default: case for x86 vendor Since we are missing default case for x86 vendor, there is possibility (i.e. new vendor introduced) that we will return successfully while missing the whole cpufreq driver initialization process. Move "ret = -ENOENT" forward to cover default case for x86 vendor, and add error log. Requested-by: Jan Beulich Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/cpufreq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index d18735c7ae..e227376bab 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -131,11 +131,11 @@ static int __init cf_check cpufreq_driver_init(void) if ( cpufreq_controller == FREQCTL_xen ) { + ret = -ENOENT; + switch ( boot_cpu_data.x86_vendor ) { case X86_VENDOR_INTEL: - ret = -ENOENT; - for ( unsigned int i = 0; i < cpufreq_xen_cnt; i++ ) { switch ( cpufreq_xen_opts[i] ) @@ -162,6 +162,10 @@ static int __init cf_check cpufreq_driver_init(void) case X86_VENDOR_HYGON: ret = IS_ENABLED(CONFIG_AMD) ? powernow_register_driver() : -ENODEV; break; + + default: + printk(XENLOG_ERR "Cpufreq: unsupported x86 vendor\n"); + break; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:33:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094347.1449677 (Exim 4.92) (envelope-from ) id 1uqrw1-0007Ow-D3; Tue, 26 Aug 2025 11:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094347.1449677; Tue, 26 Aug 2025 11:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrw1-0007Oo-AK; Tue, 26 Aug 2025 11:33:53 +0000 Received: by outflank-mailman (input) for mailman id 1094347; Tue, 26 Aug 2025 11:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrw0-0007Og-Ok for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrw0-007Wra-1h for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrw0-002AqP-2G for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hT+pwG3/LY6g57RO+/7i1OXvUe04nPDWGde90thGsRw=; b=pxzd4n4puuui4zK7+uBc5GtkUM vVWph55Xw6m5pfRWV17drSfJUfDjTgPW7MxX270IE5RAhkbXjJoA4yMjW7sGM7FpYE4Q2/3ynXmZ4 lQKN5uHxK/pWGQRebMVnBhRY+4HA3QHaeYkuaKbnCuJ53poMAfhq7Z1kAoKwVojFBdO4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: refactor cmdline "cpufreq=xxx" Message-Id: Date: Tue, 26 Aug 2025 11:33:52 +0000 commit 7a1ad11bdb69fac53aad293965ff46462c0d6217 Author: Penny Zheng AuthorDate: Tue Aug 26 08:40:56 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 09:33:30 2025 +0200 xen/cpufreq: refactor cmdline "cpufreq=xxx" A helper function handle_cpufreq_cmdline() is introduced to tidy different handling pathes. We also add a new helper cpufreq_opts_contain() to ignore redundant setting, like "cpufreq=hwp;hwp;xen" As only slot 0 of cpufreq_xen_opts[] needs explicit initializing with non-zero CPUFREQ_xen, dropping full array initializer could avoid touching initializer every time it grows Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq.c | 55 +++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index efba141418..267e4d3f3b 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -64,12 +64,49 @@ LIST_HEAD_READ_MOSTLY(cpufreq_governor_list); /* set xen as default cpufreq */ enum cpufreq_controller cpufreq_controller = FREQCTL_xen; -enum cpufreq_xen_opt __initdata cpufreq_xen_opts[2] = { CPUFREQ_xen, - CPUFREQ_none }; +enum cpufreq_xen_opt __initdata cpufreq_xen_opts[2] = { [0] = CPUFREQ_xen }; unsigned int __initdata cpufreq_xen_cnt = 1; static int __init cpufreq_cmdline_parse(const char *s, const char *e); +static bool __init cpufreq_opts_contain(enum cpufreq_xen_opt option) +{ + unsigned int count = cpufreq_xen_cnt; + + while ( count-- ) + { + if ( cpufreq_xen_opts[count] == option ) + return true; + } + + return false; +} + +static int __init handle_cpufreq_cmdline(enum cpufreq_xen_opt option) +{ + int ret = 0; + + if ( cpufreq_opts_contain(option) ) + return 0; + + cpufreq_controller = FREQCTL_xen; + cpufreq_xen_opts[cpufreq_xen_cnt++] = option; + switch ( option ) + { + case CPUFREQ_hwp: + case CPUFREQ_xen: + xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; + break; + + default: + ASSERT_UNREACHABLE(); + ret = -EINVAL; + break; + } + + return ret; +} + static int __init cf_check setup_cpufreq_option(const char *str) { const char *arg = strpbrk(str, ",:;"); @@ -113,21 +150,15 @@ static int __init cf_check setup_cpufreq_option(const char *str) if ( choice > 0 || !cmdline_strcmp(str, "xen") ) { - xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; - cpufreq_controller = FREQCTL_xen; - cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_xen; - ret = 0; - if ( arg[0] && arg[1] ) + ret = handle_cpufreq_cmdline(CPUFREQ_xen); + if ( !ret && arg[0] && arg[1] ) ret = cpufreq_cmdline_parse(arg + 1, end); } else if ( IS_ENABLED(CONFIG_INTEL) && choice < 0 && !cmdline_strcmp(str, "hwp") ) { - xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; - cpufreq_controller = FREQCTL_xen; - cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_hwp; - ret = 0; - if ( arg[0] && arg[1] ) + ret = handle_cpufreq_cmdline(CPUFREQ_hwp); + if ( !ret && arg[0] && arg[1] ) ret = hwp_cmdline_parse(arg + 1, end); } else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Aug 26 11:34:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Aug 2025 11:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1094348.1449681 (Exim 4.92) (envelope-from ) id 1uqrwB-0007Ru-Fe; Tue, 26 Aug 2025 11:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1094348.1449681; Tue, 26 Aug 2025 11:34:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrwB-0007Rk-D0; Tue, 26 Aug 2025 11:34:03 +0000 Received: by outflank-mailman (input) for mailman id 1094348; Tue, 26 Aug 2025 11:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uqrwA-0007RT-Rq for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uqrwA-007Wrp-1y for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uqrwA-002Ard-2X for xen-changelog@lists.xenproject.org; Tue, 26 Aug 2025 11:34:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=h33TBNc3I/0rU5+5o5PHZONAVYYWI46IdKpWlmgzW68=; b=FB46N/7B5CbXhySlqk8ogQDBaO nkz+qxCZyiLjTUBTmJgDaaUkXsFWqLhc8ULTtqAWSey/fk5EGIJvkgsDyavW8lrVeB1JRa6i9bdKf rZvMn3rSvhIMcqE2KFsdN70y2IYZw31a7Ug+qbytOTfXyungnTB0kcbourVzg6StyPQk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm/platforms: fix build with gcc15 Message-Id: Date: Tue, 26 Aug 2025 11:34:02 +0000 commit 39f95089e2ba15c5438ce904c0cbbd8d79d3e6e7 Author: Jan Beulich AuthorDate: Tue Aug 26 08:41:18 2025 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 09:33:48 2025 +0200 Arm/platforms: fix build with gcc15 For two of the headers gcc15 complains "header guard ... followed by '#define' of a different macro". Misra certainly wouldn't have liked this either, if these headers were covered by a scan. Signed-off-by: Jan Beulich Acked-by: Michal Orzel --- xen/arch/arm/include/asm/platforms/midway.h | 2 +- xen/arch/arm/include/asm/platforms/omap5.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/platforms/midway.h b/xen/arch/arm/include/asm/platforms/midway.h index 099e4350f9..69143931c2 100644 --- a/xen/arch/arm/include/asm/platforms/midway.h +++ b/xen/arch/arm/include/asm/platforms/midway.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H -#define __ASM_ASM_PLATFORMS_MIDWAY_H +#define __ASM_ARM_PLATFORMS_MIDWAY_H /* addresses of SREG registers for resetting the SoC */ #define MW_SREG_PWR_REQ 0xfff3cf00 diff --git a/xen/arch/arm/include/asm/platforms/omap5.h b/xen/arch/arm/include/asm/platforms/omap5.h index c559c84b61..8867b4589a 100644 --- a/xen/arch/arm/include/asm/platforms/omap5.h +++ b/xen/arch/arm/include/asm/platforms/omap5.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_OMAP5_H -#define __ASM_ASM_PLATFORMS_OMAP5_H +#define __ASM_ARM_PLATFORMS_OMAP5_H #define REALTIME_COUNTER_BASE 0x48243200 #define INCREMENTER_NUMERATOR_OFFSET 0x10 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 09:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 09:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095783.1450667 (Exim 4.92) (envelope-from ) id 1urCBM-0006sY-2S; Wed, 27 Aug 2025 09:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095783.1450667; Wed, 27 Aug 2025 09:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCBL-0006sO-W8; Wed, 27 Aug 2025 09:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1095783; Wed, 27 Aug 2025 09:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCBK-0006qL-Gq for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urCBK-009AGs-0C for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urCBK-003k7k-0j for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WhrFm1+uTmCAtNbN+fjagtHznmUybHfcQ/HfODSCLOU=; b=RtxR6B4HQI3gJQdnndLSl77tCq HwjnR2rpVFA8gItz6bsn1YEwTRDMMb12RqMV76WSJT6GgKAVXk96bssY5VrFH1r3QBqOCv9whfVZo om/WeXoS0QZAjjdB9VebM9bVfhPCSGWp6M/5nOsH1gkNKFjUoq1uOpQFwkfmFL6P2m9w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/suspend: unconditionally raise a timer softirq on resume Message-Id: Date: Wed, 27 Aug 2025 09:11:02 +0000 commit 757abedabbb64f18a28ae61a7bd67a927bb03130 Author: Roger Pau Monne AuthorDate: Wed Aug 13 09:28:35 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Aug 27 09:33:12 2025 +0200 x86/suspend: unconditionally raise a timer softirq on resume The current code to restore the timer state on resume is incomplete. While the local APIC Initial Count Register is saved and restored across suspension (even if possibly no longer accurate since it's not adjusted to account for the time spent in suspension), the TSC deadline MSR is not saved and restored, hence hosts using the TSC deadline timer will likely get stuck when resuming from suspension. The lack of restoring of the TSC deadline MSR was mitigated by the raising of a timer softirq in mwait_idle_with_hints() if the timer had expired, previous to commit 3faf0866a33070b926ab78e6298290403f85e76c, which removed that logic. This patch fixes the usage of the TSC deadline timer with suspension, by unconditionally raising a timer softirq on resume, that will take care of rearming the hardware timer. Given that a timer softirq will be unconditionally risen, there's no need to save and restore the APIC Initial Count Register anymore either. Note that secondary processors don't need this special treatment when resuming, since they are offlined before suspension and brought back up during resume, the first timer that gets setup will trigger a timer softirq unconditionally, for example from sched_migrate_timers() that gets called for each secondary processor. Link: https://github.com/QubesOS/qubes-issues/issues/10110 Reported-by: Marek Marczykowski-Górecki Fixes: fd1291a826e1 ('X86: Prefer TSC-deadline timer in Xen') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Tested-by: Marek Marczykowski-Górecki --- xen/arch/x86/acpi/power.c | 2 ++ xen/arch/x86/apic.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 2ac162c997..27d672ad5d 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -310,6 +311,7 @@ static int enter_state(u32 state) thaw_domains(); system_state = SYS_STATE_active; spin_unlock(&pm_lock); + raise_softirq(TIMER_SOFTIRQ); return error; } diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index cac5ba39e6..e3a2b84f1a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -65,7 +65,6 @@ static struct { unsigned int apic_lvt0; unsigned int apic_lvt1; unsigned int apic_lvterr; - unsigned int apic_tmict; unsigned int apic_tdcr; unsigned int apic_thmr; } apic_pm_state; @@ -658,7 +657,6 @@ int lapic_suspend(void) apic_pm_state.apic_lvt0 = apic_read(APIC_LVT0); apic_pm_state.apic_lvt1 = apic_read(APIC_LVT1); apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR); - apic_pm_state.apic_tmict = apic_read(APIC_TMICT); apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); if (maxlvt >= 5) apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); @@ -718,7 +716,6 @@ int lapic_resume(void) apic_write(APIC_LVTPC, apic_pm_state.apic_lvtpc); apic_write(APIC_LVTT, apic_pm_state.apic_lvtt); apic_write(APIC_TDCR, apic_pm_state.apic_tdcr); - apic_write(APIC_TMICT, apic_pm_state.apic_tmict); apic_write(APIC_ESR, 0); apic_read(APIC_ESR); apic_write(APIC_LVTERR, apic_pm_state.apic_lvterr); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 09:33:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 09:33:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095819.1450685 (Exim 4.92) (envelope-from ) id 1urCWc-0001qn-T0; Wed, 27 Aug 2025 09:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095819.1450685; Wed, 27 Aug 2025 09:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCWc-0001qf-QT; Wed, 27 Aug 2025 09:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1095819; Wed, 27 Aug 2025 09:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCWc-0001qZ-Bu for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urCWb-009Af9-2l for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urCWc-003m0Y-03 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V5rg6wBp5F/mkPPZChYBnJD/5jLi7pwRBhM5qLtSFGc=; b=aTgMbJRtQ36usK8d0KycYnwSMj 9f2DyNcQJuhWkS48a7GD/zg8lbnIQVZzeNVixFXZIeS9TODzkT2iueflaSOk4LDMW+5WNOSYKo0ZF KYEwJbalrP3E0cQ8tEECfM6nGwJm4iynm9q+sPJSMNARD6lrh8eQjWgMJuMUKqiqkD4U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: add sizeof_field and endof_field macros Message-Id: Date: Wed, 27 Aug 2025 09:33:02 +0000 commit 17e66ca9188b423eee35e6b4bf878e62d3879a04 Author: Petr Beneš AuthorDate: Wed Aug 27 10:28:44 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 tools: add sizeof_field and endof_field macros * `sizeof_field` returns the size of a specific struct member * `endof_field` returns the offset to the end of the member within the struct It will be useful in upcoming layout checks of SMBIOS structs. Signed-off-by: Petr Beneš Acked-by: Anthony PERARD --- tools/include/xen-tools/common-macros.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 0088208c2e..9838a108aa 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -83,6 +83,11 @@ #define __packed __attribute__((__packed__)) #endif +#define sizeof_field(type, member) sizeof(((type *)NULL)->member) + +#define endof_field(type, member) \ + (offsetof(type, member) + sizeof_field(type, member)) + #define container_of(ptr, type, member) ({ \ typeof(((type *)0)->member) *mptr__ = (ptr); \ (type *)((char *)mptr__ - offsetof(type, member)); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 09:33:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 09:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095820.1450689 (Exim 4.92) (envelope-from ) id 1urCWm-0001so-Ua; Wed, 27 Aug 2025 09:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095820.1450689; Wed, 27 Aug 2025 09:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCWm-0001sg-Rr; Wed, 27 Aug 2025 09:33:12 +0000 Received: by outflank-mailman (input) for mailman id 1095820; Wed, 27 Aug 2025 09:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCWm-0001sU-63 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urCWl-009AfD-33 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urCWm-003m1J-0N for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=unbExI6o84TTJ0XtqG2TlMKmDfofNqsDsmCoOMUeG+Q=; b=a/sxcswMSYC93BF7aUEPFqmVKS hiYBO1jI7J/15cny/JRVOhgSxIyS3cuMHzW5MJaw/BaMekPfzSFW3ahtBB5+dIEbbhVJFHLi6dlDE xXK1wvy0LyRd37gcLjdLtGlNlBLIoN3Y/vek+LtWqqLhV/8+svG11QxKhzhkFcQCerTE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] hvmloader: fix SMBIOS table length checks Message-Id: Date: Wed, 27 Aug 2025 09:33:12 +0000 commit 2f7d52f0165a5b62dbec1e507d0de427abe9b5d5 Author: Petr Beneš AuthorDate: Wed Aug 27 10:29:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 hvmloader: fix SMBIOS table length checks SMBIOS specification dictates that tables should have a minimal length. This commit introduces further validation for user-input SMBIOS tables. As per SMBIOS Reference Specification: * Type 0: For version 2.3 and later implementations, the length is at least 14h * Type 1: 1Bh for 2.4 and later * Type 2: at least 08h * Type 3: 0Dh for version 2.1 and later * Type 11: 5h (+ strings) * Type 22: 1Ah (+ strings) * Type 39: a minimum of 10h Notably, this also fixes previously incorrect check for chassis handle in smbios_type_2_init. Chassis handle is a WORD, therefore, the condition now correctly checks for >= 13 instead of > 13. hvmloader currently implements version 2.4 Furthermore, this commit introduces smbios_pt_copy helper function to substitute previously repeating pattern of locating the struct in physical memory (via get_smbios_pt_struct), checking the length and copying it into SMBIOS region. Fixes: 4d23036e7096 ("HVM firmware passthrough SMBIOS processing") Signed-off-by: Petr Beneš Acked-by: Jan Beulich --- tools/firmware/hvmloader/smbios.c | 178 +++++++++++++++++++------------- tools/firmware/hvmloader/smbios_types.h | 32 +++--- 2 files changed, 123 insertions(+), 87 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 6bcdcc233a..de3ba78e87 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -47,6 +47,8 @@ static void smbios_pt_init(void); static void* get_smbios_pt_struct(uint8_t type, uint32_t *length_out); +static void * +smbios_pt_copy(void *start, uint8_t type, uint16_t handle, size_t table_size); static void get_cpu_manufacturer(char *buf, int len); static int @@ -154,6 +156,24 @@ get_smbios_pt_struct(uint8_t type, uint32_t *length_out) return NULL; } +static void * +smbios_pt_copy(void *start, uint8_t type, uint16_t handle, size_t min_size) +{ + struct smbios_structure_header *header = start; + void *pts; + uint32_t length; + + pts = get_smbios_pt_struct(type, &length); + if ( pts != NULL && length >= min_size ) + { + memcpy(start, pts, length); + header->handle = handle; + return start + length; + } + + return start; +} + static void get_cpu_manufacturer(char *buf, int len) { @@ -381,16 +401,17 @@ smbios_type_0_init(void *start, const char *xen_version, struct smbios_type_0 *p = start; static const char *smbios_release_date = __SMBIOS_DATE__; const char *s; - void *pts; - uint32_t length; + void *next; - pts = get_smbios_pt_struct(0, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE0; - return start + length; - } + /* + * Specification says Type 0 table has length of at least 18h for v2.4-3.0. + */ + + BUILD_BUG_ON(sizeof(*p) != 24); + + next = smbios_pt_copy(start, 0, SMBIOS_HANDLE_TYPE0, sizeof(*p)); + if ( next != start ) + return next; memset(p, 0, sizeof(*p)); @@ -440,16 +461,14 @@ smbios_type_1_init(void *start, const char *xen_version, char uuid_str[37]; struct smbios_type_1 *p = start; const char *s; - void *pts; - uint32_t length; + void *next; - pts = get_smbios_pt_struct(1, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE1; - return start + length; - } + /* Specification says Type 1 table has length of 1Bh for v2.4 and later. */ + BUILD_BUG_ON(sizeof(*p) != 27); + + next = smbios_pt_copy(start, 1, SMBIOS_HANDLE_TYPE1, sizeof(*p)); + if ( next != start ) + return next; memset(p, 0, sizeof(*p)); @@ -498,26 +517,29 @@ smbios_type_2_init(void *start) { struct smbios_type_2 *p = start; const char *s; - uint8_t *ptr; - void *pts; - uint32_t length; + void *next; unsigned int counter = 0; - pts = get_smbios_pt_struct(2, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE2; + /* + * Specification says Type 2 table has length of at least 08h, + * which corresponds with the end of the "Serial Number" field. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_2, serial_number_str) != 8); + next = smbios_pt_copy(start, 2, SMBIOS_HANDLE_TYPE2, + endof_field(struct smbios_type_2, serial_number_str)); + if ( next != start ) + { /* Set current chassis handle if present */ - if ( p->header.length > 13 ) + if ( p->header.length >= endof_field(struct smbios_type_2, + chassis_handle) ) { - ptr = ((uint8_t*)start) + 11; - if ( *((uint16_t*)ptr) != 0 ) - *((uint16_t*)ptr) = SMBIOS_HANDLE_TYPE3; + if ( p->chassis_handle != 0 ) + p->chassis_handle = SMBIOS_HANDLE_TYPE3; } - return start + length; + return next; } memset(p, 0, sizeof(*p)); @@ -593,18 +615,21 @@ smbios_type_3_init(void *start) { struct smbios_type_3 *p = start; const char *s; - void *pts; - uint32_t length; + void *next; uint32_t counter = 0; - pts = get_smbios_pt_struct(3, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE3; - return start + length; - } - + /* + * Specification says Type 3 table has length of at least 0Dh (for v2.1+), + * which corresponds with the end of the "Security Status" field. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_3, security_status) != 13); + + next = smbios_pt_copy(start, 3, SMBIOS_HANDLE_TYPE3, + offsetof(struct smbios_type_3, security_status)); + if ( next != start ) + return next; + memset(p, 0, sizeof(*p)); p->header.type = 3; @@ -656,6 +681,9 @@ smbios_type_4_init( struct smbios_type_4 *p = start; uint32_t eax, ebx, ecx, edx; + /* Specification says Type 4 table has length of 23h for v2.3+. */ + BUILD_BUG_ON(sizeof(*p) != 35); + memset(p, 0, sizeof(*p)); p->header.type = 4; @@ -707,17 +735,15 @@ smbios_type_11_init(void *start) struct smbios_type_11 *p = start; char path[20]; const char *s; + void *next; int i; - void *pts; - uint32_t length; - pts = get_smbios_pt_struct(11, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE11; - return start + length; - } + /* Specification says Type 11 table has length of 05h. */ + BUILD_BUG_ON(sizeof(*p) != 5); + + next = smbios_pt_copy(start, 11, SMBIOS_HANDLE_TYPE11, sizeof(*p)); + if ( next != start ) + return next; p->header.type = 11; p->header.length = sizeof(*p); @@ -756,6 +782,9 @@ smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs) { struct smbios_type_16 *p = start; + /* Specification says Type 16 table has length of 0Fh for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) != 15); + memset(p, 0, sizeof(*p)); p->header.type = 16; @@ -781,6 +810,9 @@ smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance) char buf[16]; struct smbios_type_17 *p = start; + /* Specification says Type 17 table has length of 1Bh for v2.3-2.6. */ + BUILD_BUG_ON(sizeof(*p) != 27); + memset(p, 0, sizeof(*p)); p->header.type = 17; @@ -816,6 +848,9 @@ smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_19 *p = start; + /* Specification says Type 19 table has length of 0Fh for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) != 15); + memset(p, 0, sizeof(*p)); p->header.type = 19; @@ -838,6 +873,9 @@ smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_20 *p = start; + /* Specification says Type 20 table has length of 13h for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) != 19); + memset(p, 0, sizeof(*p)); p->header.type = 20; @@ -865,16 +903,14 @@ smbios_type_22_init(void *start) struct smbios_type_22 *p = start; static const char *smbios_release_date = __SMBIOS_DATE__; const char *s; - void *pts; - uint32_t length; + void *next; - pts = get_smbios_pt_struct(22, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE22; - return start + length; - } + /* Specification says Type 22 table has length of 1Ah. */ + BUILD_BUG_ON(sizeof(*p) != 26); + + next = smbios_pt_copy(start, 22, SMBIOS_HANDLE_TYPE22, sizeof(*p)); + if ( next != start ) + return next; s = xenstore_read(HVM_XS_SMBIOS_DEFAULT_BATTERY, "0"); if ( strncmp(s, "1", 1) != 0 ) @@ -929,6 +965,9 @@ smbios_type_32_init(void *start) { struct smbios_type_32 *p = start; + /* Specification says Type 32 table has length of at least 0Bh. */ + BUILD_BUG_ON(sizeof(*p) != 11); + memset(p, 0, sizeof(*p)); p->header.type = 32; @@ -946,20 +985,17 @@ smbios_type_32_init(void *start) static void * smbios_type_39_init(void *start) { - struct smbios_type_39 *p = start; - void *pts; - uint32_t length; + /* + * Specification says Type 39 table has length of at least 10h, + * which corresponds with the end of the "Characteristics" field. + * + * Only present when passed in. + */ - pts = get_smbios_pt_struct(39, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE39; - return start + length; - } + BUILD_BUG_ON(endof_field(struct smbios_type_39, characteristics) != 16); - /* Only present when passed in */ - return start; + return smbios_pt_copy(start, 39, SMBIOS_HANDLE_TYPE39, + endof_field(struct smbios_type_39, characteristics)); } static void * diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h index 7c648ece71..a04d194975 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -90,13 +90,13 @@ struct smbios_type_2 { uint8_t product_name_str; uint8_t version_str; uint8_t serial_number_str; - uint8_t asset_tag_str; - uint8_t feature_flags; - uint8_t location_in_chassis_str; - uint16_t chassis_handle; - uint8_t board_type; - uint8_t contained_handle_count; - uint16_t contained_handles[]; + uint8_t asset_tag_str; /* Optional */ + uint8_t feature_flags; /* Optional */ + uint8_t location_in_chassis_str; /* Optional */ + uint16_t chassis_handle; /* Optional */ + uint8_t board_type; /* Optional */ + uint8_t contained_handle_count; /* Optional */ + uint16_t contained_handles[]; /* Optional */ } __attribute__ ((packed)); /* System Enclosure - Contained Elements */ @@ -118,12 +118,12 @@ struct smbios_type_3 { uint8_t power_supply_state; uint8_t thermal_state; uint8_t security_status; - uint32_t oem_specific; - uint8_t height; - uint8_t number_of_power_cords; - uint8_t contained_element_count; - uint8_t contained_element_length; - struct smbios_contained_element contained_elements[]; + uint32_t oem_specific; /* Optional */ + uint8_t height; /* Optional */ + uint8_t number_of_power_cords; /* Optional */ + uint8_t contained_element_count; /* Optional */ + uint8_t contained_element_length; /* Optional */ + struct smbios_contained_element contained_elements[]; /* Optional */ } __attribute__ ((packed)); /* SMBIOS type 4 - Processor Information */ @@ -252,9 +252,9 @@ struct smbios_type_39 { uint8_t revision_level_str; uint16_t max_capacity; uint16_t characteristics; - uint16_t input_voltage_probe_handle; - uint16_t cooling_device_handle; - uint16_t input_current_probe_handle; + uint16_t input_voltage_probe_handle; /* Optional */ + uint16_t cooling_device_handle; /* Optional */ + uint16_t input_current_probe_handle; /* Optional */ } __attribute__ ((packed)); /* SMBIOS type 127 -- End-of-table */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 09:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 09:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095821.1450693 (Exim 4.92) (envelope-from ) id 1urCWw-0001v7-Vs; Wed, 27 Aug 2025 09:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095821.1450693; Wed, 27 Aug 2025 09:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCWw-0001uz-TH; Wed, 27 Aug 2025 09:33:22 +0000 Received: by outflank-mailman (input) for mailman id 1095821; Wed, 27 Aug 2025 09:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCWw-0001ur-8p for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urCWw-009AfH-06 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urCWw-003m1f-0g for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ufGcxEEB1Y8FqprlPgFGOltM5wCOC1NsEPw7OVFNQj4=; b=MK1fFLcd/pmOUmDE8wSVGUKVUK wkjW1myq4+JpCgXByfgoayKlm1UZkFl42gA2rxnRPDraKoJ3Yll0+HaPnjg5jNAyV3E+wF+SQrawl CR5r5P/+7MIexepNwTRXJjSdz4o2XeHZuIL7F+emR+WJ2MlkwCD3dNF8Gf5Xns7v7AXc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] hvmloader: add new SMBIOS tables (7, 8, 9, 26, 27, 28) Message-Id: Date: Wed, 27 Aug 2025 09:33:22 +0000 commit 9f114abb37f42df858ed658f2d1149c818c12f11 Author: Anton Belousov AuthorDate: Wed Aug 27 10:29:20 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 hvmloader: add new SMBIOS tables (7, 8, 9, 26, 27, 28) Some SMBIOS tables are used by certain malware families to detect virtualized environments via WMI queries. To improve stealth for sandboxing purposes, this patch adds support for populating these SMBIOS tables from an external binary specified via the "smbios_firmware" domain config option: * 7 - Cache Info * 8 - Port Connector * 9 - System Slots * 26 - Voltage Probe * 27 - Cooling Device * 28 - Temperature Probe If particular table is absent in binary file, then it will not be mapped to memory. This method works for Windows domains as tables 7,8,9,26,27,28 are not critical for OS boot and runtime. Also if "smbios_firmware" parameter is not provided, these tables will be skipped in write_smbios_tables function. From: Anton Belousov Signed-off-by: Petr Beneš Acked-by: Jan Beulich --- tools/firmware/hvmloader/smbios.c | 111 ++++++++++++++++++++++++++++++++ tools/firmware/hvmloader/smbios_types.h | 77 ++++++++++++++++++++++ 2 files changed, 188 insertions(+) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index de3ba78e87..76c7090d16 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -33,12 +33,18 @@ #define SMBIOS_HANDLE_TYPE2 0x0200 #define SMBIOS_HANDLE_TYPE3 0x0300 #define SMBIOS_HANDLE_TYPE4 0x0400 +#define SMBIOS_HANDLE_TYPE7 0x0700 +#define SMBIOS_HANDLE_TYPE8 0x0800 +#define SMBIOS_HANDLE_TYPE9 0x0900 #define SMBIOS_HANDLE_TYPE11 0x0B00 #define SMBIOS_HANDLE_TYPE16 0x1000 #define SMBIOS_HANDLE_TYPE17 0x1100 #define SMBIOS_HANDLE_TYPE19 0x1300 #define SMBIOS_HANDLE_TYPE20 0x1400 #define SMBIOS_HANDLE_TYPE22 0x1600 +#define SMBIOS_HANDLE_TYPE26 0x1A00 +#define SMBIOS_HANDLE_TYPE27 0x1B00 +#define SMBIOS_HANDLE_TYPE28 0x1C00 #define SMBIOS_HANDLE_TYPE32 0x2000 #define SMBIOS_HANDLE_TYPE39 0x2700 #define SMBIOS_HANDLE_TYPE127 0x7f00 @@ -79,6 +85,12 @@ static void * smbios_type_4_init(void *start, unsigned int cpu_number, char *cpu_manufacturer); static void * +smbios_type_7_init(void *start); +static void * +smbios_type_8_init(void *start); +static void * +smbios_type_9_init(void *start); +static void * smbios_type_11_init(void *start); static void * smbios_type_16_init(void *start, uint32_t memory_size_mb, int nr_mem_devs); @@ -91,6 +103,12 @@ smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance); static void * smbios_type_22_init(void *start); static void * +smbios_type_26_init(void *start); +static void * +smbios_type_27_init(void *start); +static void * +smbios_type_28_init(void *start); +static void * smbios_type_32_init(void *start); static void * smbios_type_39_init(void *start); @@ -225,6 +243,9 @@ write_smbios_tables(void *ep, void *start, do_struct(smbios_type_3_init(p)); for ( cpu_num = 1; cpu_num <= vcpus; cpu_num++ ) do_struct(smbios_type_4_init(p, cpu_num, cpu_manufacturer)); + do_struct(smbios_type_7_init(p)); + do_struct(smbios_type_8_init(p)); + do_struct(smbios_type_9_init(p)); do_struct(smbios_type_11_init(p)); /* Each 'memory device' covers up to 16GB of address space. */ @@ -241,6 +262,9 @@ write_smbios_tables(void *ep, void *start, } do_struct(smbios_type_22_init(p)); + do_struct(smbios_type_26_init(p)); + do_struct(smbios_type_27_init(p)); + do_struct(smbios_type_28_init(p)); do_struct(smbios_type_32_init(p)); do_struct(smbios_type_39_init(p)); do_struct(smbios_type_vendor_oem_init(p)); @@ -728,6 +752,42 @@ smbios_type_4_init( return start+1; } +/* Type 7 -- Cache Information */ +static void * +smbios_type_7_init(void *start) +{ + /* Specification says Type 7 table has length of 13h for v2.1+. */ + BUILD_BUG_ON(sizeof(struct smbios_type_7) != 19); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 7, SMBIOS_HANDLE_TYPE7, + sizeof(struct smbios_type_7)); +} + +/* Type 8 -- Port Connector Information */ +static void * +smbios_type_8_init(void *start) +{ + /* Specification says Type 8 table has length of 09h. */ + BUILD_BUG_ON(sizeof(struct smbios_type_8) != 9); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 8, SMBIOS_HANDLE_TYPE8, + sizeof(struct smbios_type_8)); +} + +/* Type 9 -- System Slots */ +static void * +smbios_type_9_init(void *start) +{ + /* Specification says Type 9 table has length of 0Dh for v2.1-2.5. */ + BUILD_BUG_ON(sizeof(struct smbios_type_9) != 13); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 9, SMBIOS_HANDLE_TYPE9, + sizeof(struct smbios_type_9)); +} + /* Type 11 -- OEM Strings */ static void * smbios_type_11_init(void *start) @@ -959,6 +1019,57 @@ smbios_type_22_init(void *start) return start + 1; } +/* Type 26 -- Voltage Probe */ +static void * +smbios_type_26_init(void *start) +{ + /* + * Specification says Type 26 table has length of at least 14h, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_26, oem_defined) != 20); + + return smbios_pt_copy(start, 26, SMBIOS_HANDLE_TYPE26, + endof_field(struct smbios_type_26, oem_defined)); +} + +/* Type 27 -- Cooling Device */ +static void * +smbios_type_27_init(void *start) +{ + /* + * Specification says Type 27 table has length of at least 0Ch, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_27, oem_defined) != 12); + + return smbios_pt_copy(start, 27, SMBIOS_HANDLE_TYPE27, + endof_field(struct smbios_type_27, oem_defined)); +} + +/* Type 28 -- Temperature Probe */ +static void * +smbios_type_28_init(void *start) +{ + /* + * Specification says Type 28 table has length of at least 14h, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_28, oem_defined) != 20); + + return smbios_pt_copy(start, 28, SMBIOS_HANDLE_TYPE28, + endof_field(struct smbios_type_28, oem_defined)); +} + /* Type 32 -- System Boot Information */ static void * smbios_type_32_init(void *start) diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h index a04d194975..c04b435d31 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -149,6 +149,44 @@ struct smbios_type_4 { uint8_t part_number_str; } __attribute__ ((packed)); +/* SMBIOS type 7 - Cache Information */ +struct smbios_type_7 { + struct smbios_structure_header header; + uint8_t socket_designation_str; + uint16_t cache_configuration; + uint16_t maximum_cache_size; + uint16_t installed_size; + uint16_t supported_SRAM_type; + uint16_t current_SRAM_type; + uint8_t cache_speed; + uint8_t error_connection_type; + uint8_t system_cache_type; + uint8_t associativity; +} __attribute__ ((packed)); + +/* SMBIOS type 8 - Port Connector Information */ +struct smbios_type_8 { + struct smbios_structure_header header; + uint8_t internal_reference_designator_str; + uint8_t internal_connector_type; + uint8_t external_reference_designator_str; + uint8_t external_connector_type; + uint8_t port_type; +} __attribute__ ((packed)); + +/* SMBIOS type 9 - System Slots */ +struct smbios_type_9 { + struct smbios_structure_header header; + uint8_t slot_designation_str; + uint8_t slot_type; + uint8_t slot_data_bus_width; + uint8_t current_usage; + uint8_t slot_length; + uint16_t slot_id; + uint8_t slot_characteristics_1; + uint8_t slot_characteristics_2; +} __attribute__ ((packed)); + /* SMBIOS type 11 - OEM Strings */ struct smbios_type_11 { struct smbios_structure_header header; @@ -232,6 +270,45 @@ struct smbios_type_22 { uint32_t oem_specific; } __attribute__ ((packed)); +/* SMBIOS type 26 - Voltage Probe */ +struct smbios_type_26 { + struct smbios_structure_header header; + uint8_t description_str; + uint8_t location_and_status; + uint16_t maximum_value; + uint16_t minimum_value; + uint16_t resolution; + uint16_t tolerance; + uint16_t accuracy; + uint32_t oem_defined; + uint16_t nominal_value; /* Optional */ +} __attribute__ ((packed)); + +/* SMBIOS type 27 - Cooling Device */ +struct smbios_type_27 { + struct smbios_structure_header header; + uint16_t temperature_probe_handle; + uint8_t device_type_and_status; + uint8_t cooling_unit_group; + uint32_t oem_defined; + uint16_t nominal_speed; /* Optional */ + uint8_t description_str; /* Optional */ +} __attribute__ ((packed)); + +/* SMBIOS type 28 - Temperature Probe */ +struct smbios_type_28 { + struct smbios_structure_header header; + uint8_t description_str; + uint8_t location_and_status; + uint16_t maximum_value; + uint16_t minimum_value; + uint16_t resolution; + uint16_t tolerance; + uint16_t accuracy; + uint32_t oem_defined; + uint16_t nominal_value; /* Optional */ +} __attribute__ ((packed)); + /* SMBIOS type 32 - System Boot Information */ struct smbios_type_32 { struct smbios_structure_header header; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 09:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 09:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095822.1450699 (Exim 4.92) (envelope-from ) id 1urCX7-0001y8-49; Wed, 27 Aug 2025 09:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095822.1450699; Wed, 27 Aug 2025 09:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCX6-0001xt-WA; Wed, 27 Aug 2025 09:33:32 +0000 Received: by outflank-mailman (input) for mailman id 1095822; Wed, 27 Aug 2025 09:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urCX6-0001xe-D2 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urCX6-009AfL-0X for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urCX6-003m2E-0w for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 09:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WEKAwv16GBeF2/Gv88iPtTznMlYPvONaZBvsT8X4Xww=; b=SSqiCKj4jlWOERBnRdEEUn/JPS aRKs49uqq3bATWaZBq61OQZ6GQ0lOqfargJKS/gB1lvfphT2/Z9w5j42vCgsLGfwXVSW2JWo40rNt vrnR2C363hsUnS3Qr3A7EnohhgUeLvugb0fx89rvtZvpW2caeAuBKpzvKiabBMhOM4h4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG.md: hvmloader new SMBIOS tables (7, 8, 9, 26, 27, 28) Message-Id: Date: Wed, 27 Aug 2025 09:33:32 +0000 commit 0522ca13a69becb347ab67b782a36bec6d229072 Author: Petr Beneš AuthorDate: Wed Aug 27 10:30:10 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 CHANGELOG.md: hvmloader new SMBIOS tables (7, 8, 9, 26, 27, 28) Signed-off-by: Petr Beneš Signed-off-by: Jan Beulich Acked-by: Oleksii Kurochko --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e03e2526f7..cd34ea87b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) capability usage is not yet supported on PVH dom0). - Smoke tests for the FreeBSD Xen builds in Cirrus CI. - PVH xenstore-stubdom now supports Live Update. + - Support in hvmloader for new SMBIOS tables: 7 (Cache Info), 8 (Port + Connector), 9 (System Slots), 26 (Voltage Probe), 27 (Cooling Device), + and 28 (Temperature Probe). - On Arm: - Ability to enable stack protector -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 10:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 10:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095912.1450760 (Exim 4.92) (envelope-from ) id 1urDSh-00048s-KE; Wed, 27 Aug 2025 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095912.1450760; Wed, 27 Aug 2025 10:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDSh-00048l-Ho; Wed, 27 Aug 2025 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1095912; Wed, 27 Aug 2025 10:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDSg-00048b-Bi for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urDSf-009Bru-2H for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urDSf-003qEI-2f for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6xcVFr8jcCIE7oHqB9YbxVzDdT2ltI2ZVxpuCeUAOrg=; b=dNvebFm5SSzN2pKpkGfkeXX3s6 yWA6xV16SB5sA5wKiWrdXuwMGAaWk7Ousdy3CxXOvUyNrkJ5ZraGkmwKPKZTROSneXtyMQkjQ0Fl3 4XC/+anQr9qN2HoQg0AxATivpJ1Q3ea2EOhlhy1XnSq4L4sUAsynxyoyuZS1K46/rRTA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/suspend: unconditionally raise a timer softirq on resume Message-Id: Date: Wed, 27 Aug 2025 10:33:01 +0000 commit 757abedabbb64f18a28ae61a7bd67a927bb03130 Author: Roger Pau Monne AuthorDate: Wed Aug 13 09:28:35 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Aug 27 09:33:12 2025 +0200 x86/suspend: unconditionally raise a timer softirq on resume The current code to restore the timer state on resume is incomplete. While the local APIC Initial Count Register is saved and restored across suspension (even if possibly no longer accurate since it's not adjusted to account for the time spent in suspension), the TSC deadline MSR is not saved and restored, hence hosts using the TSC deadline timer will likely get stuck when resuming from suspension. The lack of restoring of the TSC deadline MSR was mitigated by the raising of a timer softirq in mwait_idle_with_hints() if the timer had expired, previous to commit 3faf0866a33070b926ab78e6298290403f85e76c, which removed that logic. This patch fixes the usage of the TSC deadline timer with suspension, by unconditionally raising a timer softirq on resume, that will take care of rearming the hardware timer. Given that a timer softirq will be unconditionally risen, there's no need to save and restore the APIC Initial Count Register anymore either. Note that secondary processors don't need this special treatment when resuming, since they are offlined before suspension and brought back up during resume, the first timer that gets setup will trigger a timer softirq unconditionally, for example from sched_migrate_timers() that gets called for each secondary processor. Link: https://github.com/QubesOS/qubes-issues/issues/10110 Reported-by: Marek Marczykowski-Górecki Fixes: fd1291a826e1 ('X86: Prefer TSC-deadline timer in Xen') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Tested-by: Marek Marczykowski-Górecki --- xen/arch/x86/acpi/power.c | 2 ++ xen/arch/x86/apic.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 2ac162c997..27d672ad5d 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -310,6 +311,7 @@ static int enter_state(u32 state) thaw_domains(); system_state = SYS_STATE_active; spin_unlock(&pm_lock); + raise_softirq(TIMER_SOFTIRQ); return error; } diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index cac5ba39e6..e3a2b84f1a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -65,7 +65,6 @@ static struct { unsigned int apic_lvt0; unsigned int apic_lvt1; unsigned int apic_lvterr; - unsigned int apic_tmict; unsigned int apic_tdcr; unsigned int apic_thmr; } apic_pm_state; @@ -658,7 +657,6 @@ int lapic_suspend(void) apic_pm_state.apic_lvt0 = apic_read(APIC_LVT0); apic_pm_state.apic_lvt1 = apic_read(APIC_LVT1); apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR); - apic_pm_state.apic_tmict = apic_read(APIC_TMICT); apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); if (maxlvt >= 5) apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); @@ -718,7 +716,6 @@ int lapic_resume(void) apic_write(APIC_LVTPC, apic_pm_state.apic_lvtpc); apic_write(APIC_LVTT, apic_pm_state.apic_lvtt); apic_write(APIC_TDCR, apic_pm_state.apic_tdcr); - apic_write(APIC_TMICT, apic_pm_state.apic_tmict); apic_write(APIC_ESR, 0); apic_read(APIC_ESR); apic_write(APIC_LVTERR, apic_pm_state.apic_lvterr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 10:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095913.1450765 (Exim 4.92) (envelope-from ) id 1urDSr-0004B9-Lw; Wed, 27 Aug 2025 10:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095913.1450765; Wed, 27 Aug 2025 10:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDSr-0004B1-JG; Wed, 27 Aug 2025 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1095913; Wed, 27 Aug 2025 10:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDSq-0004Ak-38 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urDSp-009Bs0-2l for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urDSp-003qEe-39 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XaPgS4rnVo4qtDyC7qDhqmWFxc4NuM5vrWU2+a3iuhY=; b=gcXEzDoy2hEzAvN9VzUgyxcrsC +VRkvu5kswf+TjbPEZPiUmZb0JNv8aaIHpoRKNF+PgFuO6Crm7ViGjc54pBxOrmHquWsSCdrDtFrK aUEAp2gvHMZnlXwnF2s2IkDVVVJc8AhZulQJh02x0j4aM1yTjq5OEpysIubwoGs7mScI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: add sizeof_field and endof_field macros Message-Id: Date: Wed, 27 Aug 2025 10:33:11 +0000 commit 17e66ca9188b423eee35e6b4bf878e62d3879a04 Author: Petr Beneš AuthorDate: Wed Aug 27 10:28:44 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 tools: add sizeof_field and endof_field macros * `sizeof_field` returns the size of a specific struct member * `endof_field` returns the offset to the end of the member within the struct It will be useful in upcoming layout checks of SMBIOS structs. Signed-off-by: Petr Beneš Acked-by: Anthony PERARD --- tools/include/xen-tools/common-macros.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 0088208c2e..9838a108aa 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -83,6 +83,11 @@ #define __packed __attribute__((__packed__)) #endif +#define sizeof_field(type, member) sizeof(((type *)NULL)->member) + +#define endof_field(type, member) \ + (offsetof(type, member) + sizeof_field(type, member)) + #define container_of(ptr, type, member) ({ \ typeof(((type *)0)->member) *mptr__ = (ptr); \ (type *)((char *)mptr__ - offsetof(type, member)); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 10:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 10:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095914.1450768 (Exim 4.92) (envelope-from ) id 1urDT1-0004Di-NN; Wed, 27 Aug 2025 10:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095914.1450768; Wed, 27 Aug 2025 10:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDT1-0004Da-Kd; Wed, 27 Aug 2025 10:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1095914; Wed, 27 Aug 2025 10:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDT0-0004DQ-6l for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urDSz-009Bs4-38 for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urDT0-003qHZ-0O for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f4o3GIczCqLfDqnSAoHUp3YBPGZ9cqZ99pqTcrae6Zg=; b=UZTdTO5NGNSf4Dx2Xmfc8vXdri X0mxrNM7GZVKcobH1jtGURgyR8U+dTDh/Uc1k+iXshZhtzKhyD/qkgFFAm7YRNlNN+pZoYMXzaFXe rIhel9v5MVCCGG2zNEyDhhpfB29NcZOnSjk1fu9LSKs0PgwK6j5MOgdk0IOO4L9pT56c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] hvmloader: fix SMBIOS table length checks Message-Id: Date: Wed, 27 Aug 2025 10:33:22 +0000 commit 2f7d52f0165a5b62dbec1e507d0de427abe9b5d5 Author: Petr Beneš AuthorDate: Wed Aug 27 10:29:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 hvmloader: fix SMBIOS table length checks SMBIOS specification dictates that tables should have a minimal length. This commit introduces further validation for user-input SMBIOS tables. As per SMBIOS Reference Specification: * Type 0: For version 2.3 and later implementations, the length is at least 14h * Type 1: 1Bh for 2.4 and later * Type 2: at least 08h * Type 3: 0Dh for version 2.1 and later * Type 11: 5h (+ strings) * Type 22: 1Ah (+ strings) * Type 39: a minimum of 10h Notably, this also fixes previously incorrect check for chassis handle in smbios_type_2_init. Chassis handle is a WORD, therefore, the condition now correctly checks for >= 13 instead of > 13. hvmloader currently implements version 2.4 Furthermore, this commit introduces smbios_pt_copy helper function to substitute previously repeating pattern of locating the struct in physical memory (via get_smbios_pt_struct), checking the length and copying it into SMBIOS region. Fixes: 4d23036e7096 ("HVM firmware passthrough SMBIOS processing") Signed-off-by: Petr Beneš Acked-by: Jan Beulich --- tools/firmware/hvmloader/smbios.c | 178 +++++++++++++++++++------------- tools/firmware/hvmloader/smbios_types.h | 32 +++--- 2 files changed, 123 insertions(+), 87 deletions(-) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 6bcdcc233a..de3ba78e87 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -47,6 +47,8 @@ static void smbios_pt_init(void); static void* get_smbios_pt_struct(uint8_t type, uint32_t *length_out); +static void * +smbios_pt_copy(void *start, uint8_t type, uint16_t handle, size_t table_size); static void get_cpu_manufacturer(char *buf, int len); static int @@ -154,6 +156,24 @@ get_smbios_pt_struct(uint8_t type, uint32_t *length_out) return NULL; } +static void * +smbios_pt_copy(void *start, uint8_t type, uint16_t handle, size_t min_size) +{ + struct smbios_structure_header *header = start; + void *pts; + uint32_t length; + + pts = get_smbios_pt_struct(type, &length); + if ( pts != NULL && length >= min_size ) + { + memcpy(start, pts, length); + header->handle = handle; + return start + length; + } + + return start; +} + static void get_cpu_manufacturer(char *buf, int len) { @@ -381,16 +401,17 @@ smbios_type_0_init(void *start, const char *xen_version, struct smbios_type_0 *p = start; static const char *smbios_release_date = __SMBIOS_DATE__; const char *s; - void *pts; - uint32_t length; + void *next; - pts = get_smbios_pt_struct(0, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE0; - return start + length; - } + /* + * Specification says Type 0 table has length of at least 18h for v2.4-3.0. + */ + + BUILD_BUG_ON(sizeof(*p) != 24); + + next = smbios_pt_copy(start, 0, SMBIOS_HANDLE_TYPE0, sizeof(*p)); + if ( next != start ) + return next; memset(p, 0, sizeof(*p)); @@ -440,16 +461,14 @@ smbios_type_1_init(void *start, const char *xen_version, char uuid_str[37]; struct smbios_type_1 *p = start; const char *s; - void *pts; - uint32_t length; + void *next; - pts = get_smbios_pt_struct(1, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE1; - return start + length; - } + /* Specification says Type 1 table has length of 1Bh for v2.4 and later. */ + BUILD_BUG_ON(sizeof(*p) != 27); + + next = smbios_pt_copy(start, 1, SMBIOS_HANDLE_TYPE1, sizeof(*p)); + if ( next != start ) + return next; memset(p, 0, sizeof(*p)); @@ -498,26 +517,29 @@ smbios_type_2_init(void *start) { struct smbios_type_2 *p = start; const char *s; - uint8_t *ptr; - void *pts; - uint32_t length; + void *next; unsigned int counter = 0; - pts = get_smbios_pt_struct(2, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE2; + /* + * Specification says Type 2 table has length of at least 08h, + * which corresponds with the end of the "Serial Number" field. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_2, serial_number_str) != 8); + next = smbios_pt_copy(start, 2, SMBIOS_HANDLE_TYPE2, + endof_field(struct smbios_type_2, serial_number_str)); + if ( next != start ) + { /* Set current chassis handle if present */ - if ( p->header.length > 13 ) + if ( p->header.length >= endof_field(struct smbios_type_2, + chassis_handle) ) { - ptr = ((uint8_t*)start) + 11; - if ( *((uint16_t*)ptr) != 0 ) - *((uint16_t*)ptr) = SMBIOS_HANDLE_TYPE3; + if ( p->chassis_handle != 0 ) + p->chassis_handle = SMBIOS_HANDLE_TYPE3; } - return start + length; + return next; } memset(p, 0, sizeof(*p)); @@ -593,18 +615,21 @@ smbios_type_3_init(void *start) { struct smbios_type_3 *p = start; const char *s; - void *pts; - uint32_t length; + void *next; uint32_t counter = 0; - pts = get_smbios_pt_struct(3, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE3; - return start + length; - } - + /* + * Specification says Type 3 table has length of at least 0Dh (for v2.1+), + * which corresponds with the end of the "Security Status" field. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_3, security_status) != 13); + + next = smbios_pt_copy(start, 3, SMBIOS_HANDLE_TYPE3, + offsetof(struct smbios_type_3, security_status)); + if ( next != start ) + return next; + memset(p, 0, sizeof(*p)); p->header.type = 3; @@ -656,6 +681,9 @@ smbios_type_4_init( struct smbios_type_4 *p = start; uint32_t eax, ebx, ecx, edx; + /* Specification says Type 4 table has length of 23h for v2.3+. */ + BUILD_BUG_ON(sizeof(*p) != 35); + memset(p, 0, sizeof(*p)); p->header.type = 4; @@ -707,17 +735,15 @@ smbios_type_11_init(void *start) struct smbios_type_11 *p = start; char path[20]; const char *s; + void *next; int i; - void *pts; - uint32_t length; - pts = get_smbios_pt_struct(11, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE11; - return start + length; - } + /* Specification says Type 11 table has length of 05h. */ + BUILD_BUG_ON(sizeof(*p) != 5); + + next = smbios_pt_copy(start, 11, SMBIOS_HANDLE_TYPE11, sizeof(*p)); + if ( next != start ) + return next; p->header.type = 11; p->header.length = sizeof(*p); @@ -756,6 +782,9 @@ smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs) { struct smbios_type_16 *p = start; + /* Specification says Type 16 table has length of 0Fh for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) != 15); + memset(p, 0, sizeof(*p)); p->header.type = 16; @@ -781,6 +810,9 @@ smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance) char buf[16]; struct smbios_type_17 *p = start; + /* Specification says Type 17 table has length of 1Bh for v2.3-2.6. */ + BUILD_BUG_ON(sizeof(*p) != 27); + memset(p, 0, sizeof(*p)); p->header.type = 17; @@ -816,6 +848,9 @@ smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_19 *p = start; + /* Specification says Type 19 table has length of 0Fh for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) != 15); + memset(p, 0, sizeof(*p)); p->header.type = 19; @@ -838,6 +873,9 @@ smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_20 *p = start; + /* Specification says Type 20 table has length of 13h for v2.1-2.7. */ + BUILD_BUG_ON(sizeof(*p) != 19); + memset(p, 0, sizeof(*p)); p->header.type = 20; @@ -865,16 +903,14 @@ smbios_type_22_init(void *start) struct smbios_type_22 *p = start; static const char *smbios_release_date = __SMBIOS_DATE__; const char *s; - void *pts; - uint32_t length; + void *next; - pts = get_smbios_pt_struct(22, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE22; - return start + length; - } + /* Specification says Type 22 table has length of 1Ah. */ + BUILD_BUG_ON(sizeof(*p) != 26); + + next = smbios_pt_copy(start, 22, SMBIOS_HANDLE_TYPE22, sizeof(*p)); + if ( next != start ) + return next; s = xenstore_read(HVM_XS_SMBIOS_DEFAULT_BATTERY, "0"); if ( strncmp(s, "1", 1) != 0 ) @@ -929,6 +965,9 @@ smbios_type_32_init(void *start) { struct smbios_type_32 *p = start; + /* Specification says Type 32 table has length of at least 0Bh. */ + BUILD_BUG_ON(sizeof(*p) != 11); + memset(p, 0, sizeof(*p)); p->header.type = 32; @@ -946,20 +985,17 @@ smbios_type_32_init(void *start) static void * smbios_type_39_init(void *start) { - struct smbios_type_39 *p = start; - void *pts; - uint32_t length; + /* + * Specification says Type 39 table has length of at least 10h, + * which corresponds with the end of the "Characteristics" field. + * + * Only present when passed in. + */ - pts = get_smbios_pt_struct(39, &length); - if ( pts != NULL && length > 0 ) - { - memcpy(start, pts, length); - p->header.handle = SMBIOS_HANDLE_TYPE39; - return start + length; - } + BUILD_BUG_ON(endof_field(struct smbios_type_39, characteristics) != 16); - /* Only present when passed in */ - return start; + return smbios_pt_copy(start, 39, SMBIOS_HANDLE_TYPE39, + endof_field(struct smbios_type_39, characteristics)); } static void * diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h index 7c648ece71..a04d194975 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -90,13 +90,13 @@ struct smbios_type_2 { uint8_t product_name_str; uint8_t version_str; uint8_t serial_number_str; - uint8_t asset_tag_str; - uint8_t feature_flags; - uint8_t location_in_chassis_str; - uint16_t chassis_handle; - uint8_t board_type; - uint8_t contained_handle_count; - uint16_t contained_handles[]; + uint8_t asset_tag_str; /* Optional */ + uint8_t feature_flags; /* Optional */ + uint8_t location_in_chassis_str; /* Optional */ + uint16_t chassis_handle; /* Optional */ + uint8_t board_type; /* Optional */ + uint8_t contained_handle_count; /* Optional */ + uint16_t contained_handles[]; /* Optional */ } __attribute__ ((packed)); /* System Enclosure - Contained Elements */ @@ -118,12 +118,12 @@ struct smbios_type_3 { uint8_t power_supply_state; uint8_t thermal_state; uint8_t security_status; - uint32_t oem_specific; - uint8_t height; - uint8_t number_of_power_cords; - uint8_t contained_element_count; - uint8_t contained_element_length; - struct smbios_contained_element contained_elements[]; + uint32_t oem_specific; /* Optional */ + uint8_t height; /* Optional */ + uint8_t number_of_power_cords; /* Optional */ + uint8_t contained_element_count; /* Optional */ + uint8_t contained_element_length; /* Optional */ + struct smbios_contained_element contained_elements[]; /* Optional */ } __attribute__ ((packed)); /* SMBIOS type 4 - Processor Information */ @@ -252,9 +252,9 @@ struct smbios_type_39 { uint8_t revision_level_str; uint16_t max_capacity; uint16_t characteristics; - uint16_t input_voltage_probe_handle; - uint16_t cooling_device_handle; - uint16_t input_current_probe_handle; + uint16_t input_voltage_probe_handle; /* Optional */ + uint16_t cooling_device_handle; /* Optional */ + uint16_t input_current_probe_handle; /* Optional */ } __attribute__ ((packed)); /* SMBIOS type 127 -- End-of-table */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 10:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 10:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095915.1450773 (Exim 4.92) (envelope-from ) id 1urDTB-0004G2-Oo; Wed, 27 Aug 2025 10:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095915.1450773; Wed, 27 Aug 2025 10:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDTB-0004Fu-M9; Wed, 27 Aug 2025 10:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1095915; Wed, 27 Aug 2025 10:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDTA-0004Fg-BW for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urDTA-009Bs8-0M for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urDTA-003qI1-0l for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CUzQT4G7xlkFNvKjH1WCl+VtL40nwVKx+J35o7snjXU=; b=M/k4eDQqATS9wai3KfZ6iNKZ82 rI43CDX8hcODaaUK/TeFCudcuLdoNNNlXpm9Hw4Z17zkiDybQB9DJhV6AKJ7usqn9LhfhoJJvJWL0 0UnsT95VIuuiHMokd1S3PijiQy2ImH5ot7KjSFgD6GqqweFaWaM2c3aXJhcpt0y2Dt1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] hvmloader: add new SMBIOS tables (7, 8, 9, 26, 27, 28) Message-Id: Date: Wed, 27 Aug 2025 10:33:32 +0000 commit 9f114abb37f42df858ed658f2d1149c818c12f11 Author: Anton Belousov AuthorDate: Wed Aug 27 10:29:20 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 hvmloader: add new SMBIOS tables (7, 8, 9, 26, 27, 28) Some SMBIOS tables are used by certain malware families to detect virtualized environments via WMI queries. To improve stealth for sandboxing purposes, this patch adds support for populating these SMBIOS tables from an external binary specified via the "smbios_firmware" domain config option: * 7 - Cache Info * 8 - Port Connector * 9 - System Slots * 26 - Voltage Probe * 27 - Cooling Device * 28 - Temperature Probe If particular table is absent in binary file, then it will not be mapped to memory. This method works for Windows domains as tables 7,8,9,26,27,28 are not critical for OS boot and runtime. Also if "smbios_firmware" parameter is not provided, these tables will be skipped in write_smbios_tables function. From: Anton Belousov Signed-off-by: Petr Beneš Acked-by: Jan Beulich --- tools/firmware/hvmloader/smbios.c | 111 ++++++++++++++++++++++++++++++++ tools/firmware/hvmloader/smbios_types.h | 77 ++++++++++++++++++++++ 2 files changed, 188 insertions(+) diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index de3ba78e87..76c7090d16 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -33,12 +33,18 @@ #define SMBIOS_HANDLE_TYPE2 0x0200 #define SMBIOS_HANDLE_TYPE3 0x0300 #define SMBIOS_HANDLE_TYPE4 0x0400 +#define SMBIOS_HANDLE_TYPE7 0x0700 +#define SMBIOS_HANDLE_TYPE8 0x0800 +#define SMBIOS_HANDLE_TYPE9 0x0900 #define SMBIOS_HANDLE_TYPE11 0x0B00 #define SMBIOS_HANDLE_TYPE16 0x1000 #define SMBIOS_HANDLE_TYPE17 0x1100 #define SMBIOS_HANDLE_TYPE19 0x1300 #define SMBIOS_HANDLE_TYPE20 0x1400 #define SMBIOS_HANDLE_TYPE22 0x1600 +#define SMBIOS_HANDLE_TYPE26 0x1A00 +#define SMBIOS_HANDLE_TYPE27 0x1B00 +#define SMBIOS_HANDLE_TYPE28 0x1C00 #define SMBIOS_HANDLE_TYPE32 0x2000 #define SMBIOS_HANDLE_TYPE39 0x2700 #define SMBIOS_HANDLE_TYPE127 0x7f00 @@ -79,6 +85,12 @@ static void * smbios_type_4_init(void *start, unsigned int cpu_number, char *cpu_manufacturer); static void * +smbios_type_7_init(void *start); +static void * +smbios_type_8_init(void *start); +static void * +smbios_type_9_init(void *start); +static void * smbios_type_11_init(void *start); static void * smbios_type_16_init(void *start, uint32_t memory_size_mb, int nr_mem_devs); @@ -91,6 +103,12 @@ smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance); static void * smbios_type_22_init(void *start); static void * +smbios_type_26_init(void *start); +static void * +smbios_type_27_init(void *start); +static void * +smbios_type_28_init(void *start); +static void * smbios_type_32_init(void *start); static void * smbios_type_39_init(void *start); @@ -225,6 +243,9 @@ write_smbios_tables(void *ep, void *start, do_struct(smbios_type_3_init(p)); for ( cpu_num = 1; cpu_num <= vcpus; cpu_num++ ) do_struct(smbios_type_4_init(p, cpu_num, cpu_manufacturer)); + do_struct(smbios_type_7_init(p)); + do_struct(smbios_type_8_init(p)); + do_struct(smbios_type_9_init(p)); do_struct(smbios_type_11_init(p)); /* Each 'memory device' covers up to 16GB of address space. */ @@ -241,6 +262,9 @@ write_smbios_tables(void *ep, void *start, } do_struct(smbios_type_22_init(p)); + do_struct(smbios_type_26_init(p)); + do_struct(smbios_type_27_init(p)); + do_struct(smbios_type_28_init(p)); do_struct(smbios_type_32_init(p)); do_struct(smbios_type_39_init(p)); do_struct(smbios_type_vendor_oem_init(p)); @@ -728,6 +752,42 @@ smbios_type_4_init( return start+1; } +/* Type 7 -- Cache Information */ +static void * +smbios_type_7_init(void *start) +{ + /* Specification says Type 7 table has length of 13h for v2.1+. */ + BUILD_BUG_ON(sizeof(struct smbios_type_7) != 19); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 7, SMBIOS_HANDLE_TYPE7, + sizeof(struct smbios_type_7)); +} + +/* Type 8 -- Port Connector Information */ +static void * +smbios_type_8_init(void *start) +{ + /* Specification says Type 8 table has length of 09h. */ + BUILD_BUG_ON(sizeof(struct smbios_type_8) != 9); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 8, SMBIOS_HANDLE_TYPE8, + sizeof(struct smbios_type_8)); +} + +/* Type 9 -- System Slots */ +static void * +smbios_type_9_init(void *start) +{ + /* Specification says Type 9 table has length of 0Dh for v2.1-2.5. */ + BUILD_BUG_ON(sizeof(struct smbios_type_9) != 13); + + /* Only present when passed in. */ + return smbios_pt_copy(start, 9, SMBIOS_HANDLE_TYPE9, + sizeof(struct smbios_type_9)); +} + /* Type 11 -- OEM Strings */ static void * smbios_type_11_init(void *start) @@ -959,6 +1019,57 @@ smbios_type_22_init(void *start) return start + 1; } +/* Type 26 -- Voltage Probe */ +static void * +smbios_type_26_init(void *start) +{ + /* + * Specification says Type 26 table has length of at least 14h, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_26, oem_defined) != 20); + + return smbios_pt_copy(start, 26, SMBIOS_HANDLE_TYPE26, + endof_field(struct smbios_type_26, oem_defined)); +} + +/* Type 27 -- Cooling Device */ +static void * +smbios_type_27_init(void *start) +{ + /* + * Specification says Type 27 table has length of at least 0Ch, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_27, oem_defined) != 12); + + return smbios_pt_copy(start, 27, SMBIOS_HANDLE_TYPE27, + endof_field(struct smbios_type_27, oem_defined)); +} + +/* Type 28 -- Temperature Probe */ +static void * +smbios_type_28_init(void *start) +{ + /* + * Specification says Type 28 table has length of at least 14h, + * which corresponds with the end of the "OEM-defined" field. + * + * Only present when passed in. + */ + + BUILD_BUG_ON(endof_field(struct smbios_type_28, oem_defined) != 20); + + return smbios_pt_copy(start, 28, SMBIOS_HANDLE_TYPE28, + endof_field(struct smbios_type_28, oem_defined)); +} + /* Type 32 -- System Boot Information */ static void * smbios_type_32_init(void *start) diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h index a04d194975..c04b435d31 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -149,6 +149,44 @@ struct smbios_type_4 { uint8_t part_number_str; } __attribute__ ((packed)); +/* SMBIOS type 7 - Cache Information */ +struct smbios_type_7 { + struct smbios_structure_header header; + uint8_t socket_designation_str; + uint16_t cache_configuration; + uint16_t maximum_cache_size; + uint16_t installed_size; + uint16_t supported_SRAM_type; + uint16_t current_SRAM_type; + uint8_t cache_speed; + uint8_t error_connection_type; + uint8_t system_cache_type; + uint8_t associativity; +} __attribute__ ((packed)); + +/* SMBIOS type 8 - Port Connector Information */ +struct smbios_type_8 { + struct smbios_structure_header header; + uint8_t internal_reference_designator_str; + uint8_t internal_connector_type; + uint8_t external_reference_designator_str; + uint8_t external_connector_type; + uint8_t port_type; +} __attribute__ ((packed)); + +/* SMBIOS type 9 - System Slots */ +struct smbios_type_9 { + struct smbios_structure_header header; + uint8_t slot_designation_str; + uint8_t slot_type; + uint8_t slot_data_bus_width; + uint8_t current_usage; + uint8_t slot_length; + uint16_t slot_id; + uint8_t slot_characteristics_1; + uint8_t slot_characteristics_2; +} __attribute__ ((packed)); + /* SMBIOS type 11 - OEM Strings */ struct smbios_type_11 { struct smbios_structure_header header; @@ -232,6 +270,45 @@ struct smbios_type_22 { uint32_t oem_specific; } __attribute__ ((packed)); +/* SMBIOS type 26 - Voltage Probe */ +struct smbios_type_26 { + struct smbios_structure_header header; + uint8_t description_str; + uint8_t location_and_status; + uint16_t maximum_value; + uint16_t minimum_value; + uint16_t resolution; + uint16_t tolerance; + uint16_t accuracy; + uint32_t oem_defined; + uint16_t nominal_value; /* Optional */ +} __attribute__ ((packed)); + +/* SMBIOS type 27 - Cooling Device */ +struct smbios_type_27 { + struct smbios_structure_header header; + uint16_t temperature_probe_handle; + uint8_t device_type_and_status; + uint8_t cooling_unit_group; + uint32_t oem_defined; + uint16_t nominal_speed; /* Optional */ + uint8_t description_str; /* Optional */ +} __attribute__ ((packed)); + +/* SMBIOS type 28 - Temperature Probe */ +struct smbios_type_28 { + struct smbios_structure_header header; + uint8_t description_str; + uint8_t location_and_status; + uint16_t maximum_value; + uint16_t minimum_value; + uint16_t resolution; + uint16_t tolerance; + uint16_t accuracy; + uint32_t oem_defined; + uint16_t nominal_value; /* Optional */ +} __attribute__ ((packed)); + /* SMBIOS type 32 - System Boot Information */ struct smbios_type_32 { struct smbios_structure_header header; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Aug 27 10:33:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Aug 2025 10:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1095916.1450777 (Exim 4.92) (envelope-from ) id 1urDTL-0004Iq-RM; Wed, 27 Aug 2025 10:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1095916.1450777; Wed, 27 Aug 2025 10:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDTL-0004Ii-On; Wed, 27 Aug 2025 10:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1095916; Wed, 27 Aug 2025 10:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urDTK-0004IV-El for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urDTK-009BsV-0h for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urDTK-003qKh-1C for xen-changelog@lists.xenproject.org; Wed, 27 Aug 2025 10:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=222cfq3ixEOFOuhvnB1zdih4IDBV3HRbT7FdPJDEiuo=; b=O4wqJNRsyw+rjEAYMpquGPNP8n Epg5HiiedMTF0T6u3jFh+8nnt/O9FXDiwHof65ZNT9qS+OFu3FEIz0CI0pi7wVebmMC/vriQ4F3Xo 45fjxjFPSiy6rO5B0d58n51k1PZzKda6K8WqFehR8igPrzdnYv9967iNJxIucHBrMlak=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG.md: hvmloader new SMBIOS tables (7, 8, 9, 26, 27, 28) Message-Id: Date: Wed, 27 Aug 2025 10:33:42 +0000 commit 0522ca13a69becb347ab67b782a36bec6d229072 Author: Petr Beneš AuthorDate: Wed Aug 27 10:30:10 2025 +0200 Commit: Jan Beulich CommitDate: Wed Aug 27 11:26:33 2025 +0200 CHANGELOG.md: hvmloader new SMBIOS tables (7, 8, 9, 26, 27, 28) Signed-off-by: Petr Beneš Signed-off-by: Jan Beulich Acked-by: Oleksii Kurochko --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e03e2526f7..cd34ea87b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) capability usage is not yet supported on PVH dom0). - Smoke tests for the FreeBSD Xen builds in Cirrus CI. - PVH xenstore-stubdom now supports Live Update. + - Support in hvmloader for new SMBIOS tables: 7 (Cache Info), 8 (Port + Connector), 9 (System Slots), 26 (Voltage Probe), 27 (Cooling Device), + and 28 (Temperature Probe). - On Arm: - Ability to enable stack protector -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1098988.1452902 (Exim 4.92) (envelope-from ) id 1urdLD-0000It-Kr; Thu, 28 Aug 2025 14:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1098988.1452902; Thu, 28 Aug 2025 14:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLD-0000Il-IF; Thu, 28 Aug 2025 14:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1098988; Thu, 28 Aug 2025 14:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLC-0000If-Jr for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urdLC-00Awwb-07 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urdLC-005tqH-0e for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pSjYm862fvnJf9yW3ajdH8ogRL5wV3EA/OEfqDZqrJ4=; b=ucsuB+iveJ/HBe5CREvi0aSAjr doe7k1WMGav176xEy7tRUuy7Jz0dpAT5Voqq03KpyaR/QUaq5q9/bzBNty4b+yDbvukOn5vttzqWZ 3tiwBkP694MZvE7XWCCtwmpYQC7qvu+Y00xF1QPOFpyJPheb1EL2PcW8Ci5NQ7TdWyzc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] symbols: add minimal self-test Message-Id: Date: Thu, 28 Aug 2025 14:11:02 +0000 commit 1f09240beac7222d94c4241eb10068e7553578d7 Author: Jan Beulich AuthorDate: Thu Aug 28 13:34:21 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 13:34:21 2025 +0200 symbols: add minimal self-test ... before making changes to the involved logic. Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/common/symbols.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/xen/common/symbols.c b/xen/common/symbols.c index f8a7bde37b..1bc7ce7e05 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -260,6 +260,41 @@ unsigned long symbols_lookup_by_name(const char *symname) return 0; } +#ifdef CONFIG_SELF_TESTS + +static void __init test_lookup(unsigned long addr, const char *expected) +{ + char buf[KSYM_NAME_LEN + 1]; + const char *name, *symname; + unsigned long size, offs; + + name = symbols_lookup(addr, &size, &offs, buf); + if ( !name ) + panic("%s: address not found\n", expected); + if ( offs ) + panic("%s: non-zero offset (%#lx) unexpected\n", expected, offs); + + /* Cope with static symbols, where varying file names/paths may be used. */ + symname = strchr(name, '#'); + symname = symname ? symname + 1 : name; + if ( strcmp(symname, expected) ) + panic("%s: unexpected symbol name: '%s'\n", expected, symname); + + offs = symbols_lookup_by_name(name); + if ( offs != addr ) + panic("%s: address %#lx unexpected; wanted %#lx\n", + expected, offs, addr); +} + +static void __init __constructor test_symbols(void) +{ + /* Be sure to only try this for cf_check functions. */ + test_lookup((unsigned long)dump_execstate, "dump_execstate"); + test_lookup((unsigned long)test_symbols, __func__); +} + +#endif /* CONFIG_SELF_TESTS */ + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1098989.1452906 (Exim 4.92) (envelope-from ) id 1urdLN-0000N6-MA; Thu, 28 Aug 2025 14:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1098989.1452906; Thu, 28 Aug 2025 14:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLN-0000My-Ja; Thu, 28 Aug 2025 14:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1098989; Thu, 28 Aug 2025 14:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLM-0000Mq-FK for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urdLM-00Awwz-0b for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urdLM-005trB-0x for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qFpH0JGJ1DwPn3guzpOITMAjUrQ7HIXJxVcKqjDIVFM=; b=KyGIJz7J2Y7qUKSDGDTJ8iLVeQ wofEifJKlaOBsbvXUI7vbP0FuI3qjyeI5rgnkJdghZA0+yoKNCsW9m44nxqjjErBUK9ogWRhcj4fg USEfKLkRJriuTIwIbrjpPdU+o/TVkrdjB00SXwdiZBgLWmKZ+VqqFtJIHOLsWiSP3Eno=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PSR: move CPUID level check Message-Id: Date: Thu, 28 Aug 2025 14:11:12 +0000 commit 511eb31bd0545c9072bed88de6f41c5802f94a33 Author: Jan Beulich AuthorDate: Thu Aug 28 13:35:22 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 13:35:22 2025 +0200 x86/PSR: move CPUID level check At the first (and maybe second) glance the call to setup_clear_cpu_cap() (which is __init) from psr_cpu_init() (which isn't) looks wrong. The earlier cpu_has_pqe makes it safe, though. Nevertheless we can do better, by simply moving the check ahead of the BSP invocation of the function. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/psr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 9c7aab9f40..cce7020868 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -1583,12 +1583,6 @@ static void psr_cpu_init(void) if ( !psr_alloc_feat_enabled() || !cpu_has_pqe ) goto assoc_init; - if ( boot_cpu_data.cpuid_level < PSR_CPUID_LEVEL_CAT ) - { - setup_clear_cpu_cap(X86_FEATURE_PQE); - goto assoc_init; - } - socket = cpu_to_socket(cpu); info = socket_info + socket; if ( info->feat_init ) @@ -1708,6 +1702,9 @@ static int __init cf_check psr_presmp_init(void) if ( psr_cpu_prepare() ) psr_free(); + if ( boot_cpu_data.cpuid_level < PSR_CPUID_LEVEL_CAT ) + setup_clear_cpu_cap(X86_FEATURE_PQE); + psr_cpu_init(); if ( psr_cmt_enabled() || psr_alloc_feat_enabled() ) register_cpu_notifier(&cpu_nfb); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1098990.1452910 (Exim 4.92) (envelope-from ) id 1urdLX-0000P9-NU; Thu, 28 Aug 2025 14:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1098990.1452910; Thu, 28 Aug 2025 14:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLX-0000P2-Kw; Thu, 28 Aug 2025 14:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1098990; Thu, 28 Aug 2025 14:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLW-0000Ow-H6 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urdLW-00Awx5-0w for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urdLW-005tsN-1T for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dARXXr7VoMcmlL+y4mbbv92U+cbCNq2mp23h223gr1I=; b=ndbcFWvrKw/K/2gZ7xbaCXKJad CX+mUJGzmrWeM7sIgqv/5JoauaX/SKMNL+tnbTIeCHS8epbWbPm0G5SC6ffIytx9Yl28U+UQZIUJY ZAnxeE2HOUU0kI7UIJxuH1avaMoQlCXVQf9KaXOJPnTmhUhQSPam9XuXu1VPIE9ki61Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: introduce new sub-hypercall to propagate CPPC data Message-Id: Date: Thu, 28 Aug 2025 14:11:22 +0000 commit bceab282bf2f5a28485ba4b19a6f6353596fbca3 Author: Penny Zheng AuthorDate: Thu Aug 28 14:45:33 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 14:45:33 2025 +0200 xen/cpufreq: introduce new sub-hypercall to propagate CPPC data In order to provide backward compatibility with existing governors that represent performance as frequency, like ondemand, the _CPC table can optionally provide processor frequency range values, Lowest frequency and Nominal frequency, to let OS use Lowest Frequency/ Performance and Nominal Frequency/Performance as anchor points to create linear mapping of CPPC performance to CPU frequency. As Xen is uncapable of parsing the ACPI dynamic table, we'd like to introduce a new sub-hypercall "XEN_PM_CPPC" to propagate required CPPC data from dom0 kernel to Xen. In the according handler set_cppc_pminfo(), we do _CPC and _PSD sanitization check, as both _PSD and _CPC info are necessary for correctly initializing cpufreq cores in CPPC mode. Users shall be warned that if we failed at this point, no fallback scheme, like legacy P-state could be switched to. A new flag "XEN_CPPC_INIT" is also introduced for cpufreq core initialised in CPPC mode. Then all .init flag checking shall be updated to consider "XEN_CPPC_INIT" too. We want to bypass construction of px statistic info in cpufreq_statistic_init() for CPPC mode, while not bypassing cpufreq_statistic_lock initialization for a good reason. The same check is unnecessary for cpufreq_statistic_exit(), since it has already been covered by px statistic variable "cpufreq_statistic_data" check Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/arch/x86/platform_hypercall.c | 5 ++ xen/arch/x86/x86_64/cpufreq.c | 19 +++++ xen/arch/x86/x86_64/platform_hypercall.c | 3 + xen/drivers/acpi/pm-op.c | 7 +- xen/drivers/acpi/pmstat.c | 4 + xen/drivers/cpufreq/cpufreq.c | 124 +++++++++++++++++++++++++++++- xen/include/acpi/cpufreq/processor_perf.h | 4 +- xen/include/public/platform.h | 26 +++++++ xen/include/xen/pmstat.h | 5 ++ xen/include/xlat.lst | 1 + 10 files changed, 193 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 21f9f795c1..fafc176475 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -577,6 +577,11 @@ ret_t do_platform_op( break; } + case XEN_PM_CPPC: + ret = set_cppc_pminfo(op->u.set_pminfo.id, + &op->u.set_pminfo.u.cppc_data); + break; + default: ret = -EINVAL; break; diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c index e4f3d5b436..525b29da71 100644 --- a/xen/arch/x86/x86_64/cpufreq.c +++ b/xen/arch/x86/x86_64/cpufreq.c @@ -54,3 +54,22 @@ int compat_set_px_pminfo(uint32_t acpi_id, return set_px_pminfo(acpi_id, xen_perf); } + +int compat_set_cppc_pminfo(unsigned int acpi_id, + const struct compat_processor_cppc *cppc_data) + +{ + struct xen_processor_cppc *xen_cppc; + unsigned long xlat_page_current; + + xlat_malloc_init(xlat_page_current); + + xen_cppc = xlat_malloc_array(xlat_page_current, + struct xen_processor_cppc, 1); + if ( unlikely(xen_cppc == NULL) ) + return -ENOMEM; + + XLAT_processor_cppc(xen_cppc, cppc_data); + + return set_cppc_pminfo(acpi_id, xen_cppc); +} diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index 9ab631c17f..0288f68df9 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -14,6 +14,9 @@ EMIT_FILE; #define efi_get_info efi_compat_get_info #define efi_runtime_call(x) efi_compat_runtime_call(x) +#define xen_processor_cppc compat_processor_cppc +#define set_cppc_pminfo compat_set_cppc_pminfo + #define xen_processor_performance compat_processor_performance #define set_px_pminfo compat_set_px_pminfo diff --git a/xen/drivers/acpi/pm-op.c b/xen/drivers/acpi/pm-op.c index 9a1970df34..e3b5c8bcaa 100644 --- a/xen/drivers/acpi/pm-op.c +++ b/xen/drivers/acpi/pm-op.c @@ -91,7 +91,10 @@ static int get_cpufreq_para(struct xen_sysctl_pm_op *op) pmpt = processor_pminfo[op->cpuid]; policy = per_cpu(cpufreq_cpu_policy, op->cpuid); - if ( !pmpt || !pmpt->perf.states || + if ( !pmpt || + ((pmpt->init & XEN_PX_INIT) && !pmpt->perf.states) || + /* Avoid NULL deref of pmpt->perf.states[] */ + ((pmpt->init & XEN_CPPC_INIT) && pmpt->perf.state_count) || !policy || !policy->governor ) return -EINVAL; @@ -351,7 +354,7 @@ int do_pm_op(struct xen_sysctl_pm_op *op) case CPUFREQ_PARA: if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) return -ENODEV; - if ( !pmpt || !(pmpt->init & XEN_PX_INIT) ) + if ( !pmpt || !(pmpt->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; break; } diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 4fae0c14af..0f31736df2 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -108,6 +108,10 @@ int cpufreq_statistic_init(unsigned int cpu) if ( !pmpt ) return -EINVAL; + /* Only need to initialize in Px mode */ + if ( !(pmpt->init & XEN_PX_INIT) ) + return 0; + spin_lock(cpufreq_statistic_lock); pxpt = per_cpu(cpufreq_statistic_data, cpu); diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 267e4d3f3b..f553fbcb1c 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -234,6 +235,11 @@ static int get_psd_info(unsigned int cpu, unsigned int *shared_type, *domain_info = &processor_pminfo[cpu]->perf.domain_info; break; + case XEN_CPPC_INIT: + *shared_type = processor_pminfo[cpu]->cppc_data.shared_type; + *domain_info = &processor_pminfo[cpu]->cppc_data.domain_info; + break; + default: ret = -EINVAL; break; @@ -259,7 +265,7 @@ int cpufreq_add_cpu(unsigned int cpu) if ( !processor_pminfo[cpu] || !cpu_online(cpu) ) return -EINVAL; - if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; if (!cpufreq_driver.init) @@ -434,7 +440,7 @@ int cpufreq_del_cpu(unsigned int cpu) if ( !processor_pminfo[cpu] || !cpu_online(cpu) ) return -EINVAL; - if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; if (!per_cpu(cpufreq_cpu_policy, cpu)) @@ -693,6 +699,120 @@ int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32) pdc) return ret; } +static void print_CPPC(const struct xen_processor_cppc *cppc_data) +{ + printk("\t_CPC: highest_perf=%u, lowest_perf=%u, " + "nominal_perf=%u, lowest_nonlinear_perf=%u, " + "nominal_mhz=%uMHz, lowest_mhz=%uMHz\n", + cppc_data->cpc.highest_perf, cppc_data->cpc.lowest_perf, + cppc_data->cpc.nominal_perf, cppc_data->cpc.lowest_nonlinear_perf, + cppc_data->cpc.nominal_mhz, cppc_data->cpc.lowest_mhz); +} + +int set_cppc_pminfo(unsigned int acpi_id, + const struct xen_processor_cppc *cppc_data) +{ + int ret = 0, cpu_id; + struct processor_pminfo *pm_info; + + cpu_id = get_cpu_id(acpi_id); + if ( cpu_id < 0 ) + { + ret = -EINVAL; + goto out; + } + + if ( cppc_data->pad[0] || cppc_data->pad[1] || cppc_data->pad[2] ) + { + ret = -EINVAL; + goto out; + } + + if ( cpufreq_verbose ) + printk("Set CPU%d (ACPI ID %u) CPPC state info:\n", + cpu_id, acpi_id); + + pm_info = processor_pminfo[cpu_id]; + if ( !pm_info ) + { + pm_info = xvzalloc(struct processor_pminfo); + if ( !pm_info ) + { + ret = -ENOMEM; + goto out; + } + processor_pminfo[cpu_id] = pm_info; + } + pm_info->acpi_id = acpi_id; + pm_info->id = cpu_id; + pm_info->cppc_data = *cppc_data; + + if ( (cppc_data->flags & XEN_CPPC_PSD) && + !check_psd_pminfo(cppc_data->shared_type) ) + { + ret = -EINVAL; + goto out; + } + + if ( cppc_data->flags & XEN_CPPC_CPC ) + { + if ( cppc_data->cpc.highest_perf == 0 || + cppc_data->cpc.highest_perf > UINT8_MAX || + cppc_data->cpc.nominal_perf == 0 || + cppc_data->cpc.lowest_nonlinear_perf == 0 || + cppc_data->cpc.lowest_perf == 0 || + cppc_data->cpc.lowest_perf > + cppc_data->cpc.lowest_nonlinear_perf || + cppc_data->cpc.lowest_nonlinear_perf > + cppc_data->cpc.nominal_perf || + cppc_data->cpc.nominal_perf > cppc_data->cpc.highest_perf ) + /* + * Right now, Xen doesn't actually use highest_perf/nominal_perf/ + * lowest_nonlinear_perf/lowest_perf values read from ACPI _CPC + * table. Xen reads CPPC capability MSR to get these four values. + * So warning is enough. + */ + printk_once(XENLOG_WARNING + "Broken CPPC perf values: lowest(%u), nonlinear_lowest(%u), nominal(%u), highest(%u)\n", + cppc_data->cpc.lowest_perf, + cppc_data->cpc.lowest_nonlinear_perf, + cppc_data->cpc.nominal_perf, + cppc_data->cpc.highest_perf); + + /* lowest_mhz and nominal_mhz are optional value */ + if ( cppc_data->cpc.nominal_mhz && + cppc_data->cpc.lowest_mhz > cppc_data->cpc.nominal_mhz ) + { + printk_once(XENLOG_WARNING + "Broken CPPC freq values: lowest(%u), nominal(%u)\n", + cppc_data->cpc.lowest_mhz, + cppc_data->cpc.nominal_mhz); + /* Re-set with zero values, instead of keeping invalid values */ + pm_info->cppc_data.cpc.nominal_mhz = 0; + pm_info->cppc_data.cpc.lowest_mhz = 0; + } + } + + if ( cppc_data->flags == (XEN_CPPC_PSD | XEN_CPPC_CPC) ) + { + if ( cpufreq_verbose ) + { + print_PSD(&pm_info->cppc_data.domain_info); + print_CPPC(&pm_info->cppc_data); + } + + pm_info->init = XEN_CPPC_INIT; + ret = cpufreq_cpu_init(cpu_id); + if ( ret ) + printk_once(XENLOG_WARNING + "CPU%d failed amd-cppc mode init; use \"cpufreq=xen\" instead", + cpu_id); + } + + out: + return ret; +} + static void cpufreq_cmdline_common_para(struct cpufreq_policy *new_policy) { if (usr_max_freq) diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 4e045da983..e6576314f0 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -5,7 +5,8 @@ #include #include -#define XEN_PX_INIT 0x80000000U +#define XEN_CPPC_INIT 0x40000000U +#define XEN_PX_INIT 0x80000000U unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); @@ -43,6 +44,7 @@ struct processor_pminfo { uint32_t acpi_id; uint32_t id; struct processor_performance perf; + struct xen_processor_cppc cppc_data; uint32_t init; }; diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index 2725b8d104..94349fc5f5 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -363,6 +363,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_getidletime_t); #define XEN_PM_PX 1 #define XEN_PM_TX 2 #define XEN_PM_PDC 3 +#define XEN_PM_CPPC 4 /* Px sub info type */ #define XEN_PX_PCT 1 @@ -370,6 +371,10 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_getidletime_t); #define XEN_PX_PPC 4 #define XEN_PX_PSD 8 +/* CPPC sub info type */ +#define XEN_CPPC_PSD (1U << 0) +#define XEN_CPPC_CPC (1U << 1) + struct xen_power_register { uint32_t space_id; uint32_t bit_width; @@ -457,6 +462,26 @@ struct xen_processor_performance { typedef struct xen_processor_performance xen_processor_performance_t; DEFINE_XEN_GUEST_HANDLE(xen_processor_performance_t); +struct xen_processor_cppc { + uint8_t flags; /* IN: XEN_CPPC_xxx */ + uint8_t pad[3]; + /* + * IN: Subset _CPC fields useful for CPPC-compatible cpufreq + * driver's initialization + */ + struct { + uint32_t highest_perf; + uint32_t nominal_perf; + uint32_t lowest_nonlinear_perf; + uint32_t lowest_perf; + uint32_t lowest_mhz; + uint32_t nominal_mhz; + } cpc; + uint32_t shared_type; /* IN: XEN_CPUPERF_SHARED_TYPE_xxx */ + struct xen_psd_package domain_info; /* IN: _PSD */ +}; +typedef struct xen_processor_cppc xen_processor_cppc_t; + struct xenpf_set_processor_pminfo { /* IN variables */ uint32_t id; /* ACPI CPU ID */ @@ -465,6 +490,7 @@ struct xenpf_set_processor_pminfo { struct xen_processor_power power;/* Cx: _CST/_CSD */ struct xen_processor_performance perf; /* Px: _PPC/_PCT/_PSS/_PSD */ XEN_GUEST_HANDLE(uint32) pdc; /* _PDC */ + xen_processor_cppc_t cppc_data; /* CPPC: _CPC and _PSD */ } u; }; typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t; diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h index 8350403e95..6096560d3c 100644 --- a/xen/include/xen/pmstat.h +++ b/xen/include/xen/pmstat.h @@ -7,12 +7,17 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf); long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power); +int set_cppc_pminfo(unsigned int acpi_id, + const struct xen_processor_cppc *cppc_data); #ifdef CONFIG_COMPAT struct compat_processor_performance; int compat_set_px_pminfo(uint32_t acpi_id, struct compat_processor_performance *perf); struct compat_processor_power; long compat_set_cx_pminfo(uint32_t acpi_id, struct compat_processor_power *power); +struct compat_processor_cppc; +int compat_set_cppc_pminfo(unsigned int acpi_id, + const struct compat_processor_cppc *cppc_data); #endif uint32_t pmstat_get_cx_nr(unsigned int cpu); diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 6d6c6cfab2..9d08dcc4bb 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -160,6 +160,7 @@ ! pct_register platform.h ! power_register platform.h +! processor_cppc platform.h ? processor_csd platform.h ! processor_cx platform.h ! processor_flags platform.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1098991.1452914 (Exim 4.92) (envelope-from ) id 1urdLh-0000To-P7; Thu, 28 Aug 2025 14:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1098991.1452914; Thu, 28 Aug 2025 14:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLh-0000Tg-ML; Thu, 28 Aug 2025 14:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1098991; Thu, 28 Aug 2025 14:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urdLg-0000TU-KZ for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urdLg-00Awx9-1H for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urdLg-005ttW-1p for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Y778TuK+GBaOaXMhOmXV/dW5GMtKduNvUgaQ6fWiP14=; b=YKAYOEXl9jmXRHi+yRldFAlESg uFFOlTYTUrGFg+lcVDIa4oKb0jrpS3QulvVBIVhz9KeWFORnorc4LPSSBhD1Du+pmnt8/mozvmgYy 2rM5r354K6EoAXrnpZWtAXRqqqgZucNwjsrK3dA7ZaDOOhO+CphSgI42J8EEHExpduIU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: introduce "cpufreq=amd-cppc" xen cmdline and amd-cppc driver Message-Id: Date: Thu, 28 Aug 2025 14:11:32 +0000 commit cf55bb78722df362501fe8221aa8ca5993bd222c Author: Penny Zheng AuthorDate: Thu Aug 28 14:46:16 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 14:46:16 2025 +0200 xen/cpufreq: introduce "cpufreq=amd-cppc" xen cmdline and amd-cppc driver Users need to set "cpufreq=amd-cppc" in xen cmdline to enable amd-cppc driver, which selects ACPI Collaborative Performance and Power Control (CPPC) on supported AMD hardware to provide a finer grained frequency control mechanism. `verbose` option can also be included to support verbose print. When users setting "cpufreq=amd-cppc", a new amd-cppc driver shall be registered and used. All hooks for amd-cppc driver are transiently missing, and we temporarily make registration fail with -EOPNOTSUPP here. It will be fixed along with the implementation. New xen-pm internal flag XEN_PROCESSOR_PM_CPPC is introduced, to stand for cpufreq driver in CPPC mode. We define XEN_PROCESSOR_PM_CPPC 0x100, as it is the next value to use after 8-bits wide public xen-pm options. We also add sanity check on compile time. All XEN_PROCESSOR_PM_xxx checking shall be updated to consider "XEN_PROCESSOR_PM_CPPC" too. XEN_PROCESSOR_PM_CPPC and XEN_PROCESSOR_PM_PX are firstly set when Xen parsed relative driver signature from xen cmdline, and will become exclusive after cpufreq driver registration. It is because that platform could not support both or mixed mode (CPPC & legacy Px) operations, and only one cpufreq driver could be registerd in Xen at one time, such as on AMD, it is either amd-cppc or legacy P-states driver. Xen rely on XEN_PROCESSOR_PM_CPPC flag to tell current cpufreq driver is in CPPC mode, and accepts relative hypercall. It will neglect Px request and yields success. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 7 +++- xen/arch/x86/acpi/cpufreq/Makefile | 1 + xen/arch/x86/acpi/cpufreq/amd-cppc.c | 59 ++++++++++++++++++++++++++ xen/arch/x86/acpi/cpufreq/cpufreq.c | 69 ++++++++++++++++++++++++++++++- xen/arch/x86/platform_hypercall.c | 14 +++++++ xen/drivers/acpi/pm-op.c | 3 +- xen/drivers/cpufreq/cpufreq.c | 13 +++++- xen/include/acpi/cpufreq/cpufreq.h | 6 ++- xen/include/acpi/cpufreq/processor_perf.h | 10 +++++ 9 files changed, 175 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a75b6c9301..3916cc81f6 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -515,7 +515,7 @@ If set, force use of the performance counters for oprofile, rather than detectin available support. ### cpufreq -> `= none | {{ | xen } { [:[powersave|performance|ondemand|userspace][,[]][,[]]] } [,verbose]} | dom0-kernel | hwp[:[][,verbose]]` +> `= none | {{ | xen } { [:[powersave|performance|ondemand|userspace][,[]][,[]]] } [,verbose]} | dom0-kernel | hwp[:[][,verbose]] | amd-cppc[:[verbose]]` > Default: `xen` @@ -526,7 +526,7 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels. * `` and `` are integers which represent max and min processor frequencies respectively. * `verbose` option can be included as a string or also as `verbose=` - for `xen`. It is a boolean for `hwp`. + for `xen`. It is a boolean for `hwp` and `amd-cppc`. * `hwp` selects Hardware-Controlled Performance States (HWP) on supported Intel hardware. HWP is a Skylake+ feature which provides better CPU power management. The default is disabled. If `hwp` is selected, but hardware @@ -534,6 +534,9 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels. * `` is a boolean to enable Hardware Duty Cycling (HDC). HDC enables the processor to autonomously force physical package components into idle state. The default is enabled, but the option only applies when `hwp` is enabled. +* `amd-cppc` selects ACPI Collaborative Performance and Power Control (CPPC) + on supported AMD hardware to provide finer grained frequency control + mechanism. The default is disabled. There is also support for `;`-separated fallback options: `cpufreq=hwp;xen,verbose`. This first tries `hwp` and falls back to `xen` if diff --git a/xen/arch/x86/acpi/cpufreq/Makefile b/xen/arch/x86/acpi/cpufreq/Makefile index e7dbe434a8..a2ba34bda0 100644 --- a/xen/arch/x86/acpi/cpufreq/Makefile +++ b/xen/arch/x86/acpi/cpufreq/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_INTEL) += acpi.o +obj-$(CONFIG_AMD) += amd-cppc.o obj-y += cpufreq.o obj-$(CONFIG_INTEL) += hwp.o obj-$(CONFIG_AMD) += powernow.o diff --git a/xen/arch/x86/acpi/cpufreq/amd-cppc.c b/xen/arch/x86/acpi/cpufreq/amd-cppc.c new file mode 100644 index 0000000000..3377783f7e --- /dev/null +++ b/xen/arch/x86/acpi/cpufreq/amd-cppc.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * amd-cppc.c - AMD Processor CPPC Frequency Driver + * + * Copyright (C) 2025 Advanced Micro Devices, Inc. All Rights Reserved. + * + * Author: Penny Zheng + * + * AMD CPPC cpufreq driver introduces a new CPU performance scaling design + * for AMD processors using the ACPI Collaborative Performance and Power + * Control (CPPC) feature which provides finer grained frequency control range. + */ + +#include +#include +#include +#include + +static bool __init amd_cppc_handle_option(const char *s, const char *end) +{ + int ret; + + ret = parse_boolean("verbose", s, end); + if ( ret >= 0 ) + { + cpufreq_verbose = ret; + return true; + } + + return false; +} + +int __init amd_cppc_cmdline_parse(const char *s, const char *e) +{ + do { + const char *end = strpbrk(s, ",;"); + + if ( !amd_cppc_handle_option(s, end) ) + { + printk(XENLOG_WARNING + "cpufreq/amd-cppc: option '%.*s' not recognized\n", + (int)((end ?: e) - s), s); + + return -EINVAL; + } + + s = end ? end + 1 : NULL; + } while ( s && s < e ); + + return 0; +} + +int __init amd_cppc_register_driver(void) +{ + if ( !cpu_has_cppc ) + return -ENODEV; + + return -EOPNOTSUPP; +} diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index e227376bab..94e8e11c15 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -131,12 +131,14 @@ static int __init cf_check cpufreq_driver_init(void) if ( cpufreq_controller == FREQCTL_xen ) { + unsigned int i; + ret = -ENOENT; switch ( boot_cpu_data.x86_vendor ) { case X86_VENDOR_INTEL: - for ( unsigned int i = 0; i < cpufreq_xen_cnt; i++ ) + for ( i = 0; i < cpufreq_xen_cnt; i++ ) { switch ( cpufreq_xen_opts[i] ) { @@ -151,6 +153,11 @@ static int __init cf_check cpufreq_driver_init(void) case CPUFREQ_none: ret = 0; break; + + default: + printk(XENLOG_WARNING + "Unsupported cpufreq driver for vendor Intel\n"); + break; } if ( !ret || ret == -EBUSY ) @@ -160,13 +167,71 @@ static int __init cf_check cpufreq_driver_init(void) case X86_VENDOR_AMD: case X86_VENDOR_HYGON: - ret = IS_ENABLED(CONFIG_AMD) ? powernow_register_driver() : -ENODEV; +#ifdef CONFIG_AMD + for ( i = 0; i < cpufreq_xen_cnt; i++ ) + { + switch ( cpufreq_xen_opts[i] ) + { + case CPUFREQ_xen: + ret = powernow_register_driver(); + break; + + case CPUFREQ_amd_cppc: + ret = amd_cppc_register_driver(); + break; + + case CPUFREQ_none: + ret = 0; + break; + + default: + printk(XENLOG_WARNING + "Unsupported cpufreq driver for vendor AMD or Hygon\n"); + break; + } + + if ( !ret || ret == -EBUSY ) + break; + } +#else + ret = -ENODEV; +#endif /* CONFIG_AMD */ break; default: printk(XENLOG_ERR "Cpufreq: unsupported x86 vendor\n"); break; } + + /* + * After successful cpufreq driver registeration, XEN_PROCESSOR_PM_CPPC + * and XEN_PROCESSOR_PM_PX shall become exclusive flags. + */ + if ( !ret ) + { + ASSERT(i < cpufreq_xen_cnt); + switch ( cpufreq_xen_opts[i] ) + { + case CPUFREQ_amd_cppc: + xen_processor_pmbits &= ~XEN_PROCESSOR_PM_PX; + break; + + case CPUFREQ_hwp: + case CPUFREQ_xen: + xen_processor_pmbits &= ~XEN_PROCESSOR_PM_CPPC; + break; + + default: + break; + } + } + else if ( ret != -EBUSY ) + /* + * No cpufreq driver gets registered, clear both + * XEN_PROCESSOR_PM_CPPC and XEN_PROCESSOR_PM_PX + */ + xen_processor_pmbits &= ~(XEN_PROCESSOR_PM_CPPC | + XEN_PROCESSOR_PM_PX); } return ret; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index fafc176475..79bb99e0b6 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -546,6 +546,8 @@ ret_t do_platform_op( ret = 0; break; } + /* Xen doesn't support mixed mode */ + ASSERT(!(xen_processor_pmbits & XEN_PROCESSOR_PM_CPPC)); ret = set_px_pminfo(op->u.set_pminfo.id, &op->u.set_pminfo.u.perf); break; @@ -578,6 +580,18 @@ ret_t do_platform_op( } case XEN_PM_CPPC: + if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_CPPC) ) + { + /* + * Neglect CPPC-info when registered cpufreq driver + * isn't in CPPC mode + */ + ret = 0; + break; + } + /* Xen doesn't support mixed mode */ + ASSERT(!(xen_processor_pmbits & XEN_PROCESSOR_PM_PX)); + ret = set_cppc_pminfo(op->u.set_pminfo.id, &op->u.set_pminfo.u.cppc_data); break; diff --git a/xen/drivers/acpi/pm-op.c b/xen/drivers/acpi/pm-op.c index e3b5c8bcaa..2f516e62b1 100644 --- a/xen/drivers/acpi/pm-op.c +++ b/xen/drivers/acpi/pm-op.c @@ -352,7 +352,8 @@ int do_pm_op(struct xen_sysctl_pm_op *op) switch ( op->cmd & PM_PARA_CATEGORY_MASK ) { case CPUFREQ_PARA: - if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) + if ( !(xen_processor_pmbits & (XEN_PROCESSOR_PM_PX | + XEN_PROCESSOR_PM_CPPC)) ) return -ENODEV; if ( !pmpt || !(pmpt->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index f553fbcb1c..fe6bd7ff25 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -65,7 +65,7 @@ LIST_HEAD_READ_MOSTLY(cpufreq_governor_list); /* set xen as default cpufreq */ enum cpufreq_controller cpufreq_controller = FREQCTL_xen; -enum cpufreq_xen_opt __initdata cpufreq_xen_opts[2] = { [0] = CPUFREQ_xen }; +enum cpufreq_xen_opt __initdata cpufreq_xen_opts[3] = { [0] = CPUFREQ_xen }; unsigned int __initdata cpufreq_xen_cnt = 1; static int __init cpufreq_cmdline_parse(const char *s, const char *e); @@ -99,6 +99,10 @@ static int __init handle_cpufreq_cmdline(enum cpufreq_xen_opt option) xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; break; + case CPUFREQ_amd_cppc: + xen_processor_pmbits |= XEN_PROCESSOR_PM_CPPC; + break; + default: ASSERT_UNREACHABLE(); ret = -EINVAL; @@ -162,6 +166,13 @@ static int __init cf_check setup_cpufreq_option(const char *str) if ( !ret && arg[0] && arg[1] ) ret = hwp_cmdline_parse(arg + 1, end); } + else if ( IS_ENABLED(CONFIG_AMD) && choice < 0 && + !cmdline_strcmp(str, "amd-cppc") ) + { + ret = handle_cpufreq_cmdline(CPUFREQ_amd_cppc); + if ( !ret && arg[0] && arg[1] ) + ret = amd_cppc_cmdline_parse(arg + 1, end); + } else ret = -EINVAL; diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index fd530632b4..5d4881eea8 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -26,8 +26,9 @@ enum cpufreq_xen_opt { CPUFREQ_none, CPUFREQ_xen, CPUFREQ_hwp, + CPUFREQ_amd_cppc, }; -extern enum cpufreq_xen_opt cpufreq_xen_opts[2]; +extern enum cpufreq_xen_opt cpufreq_xen_opts[3]; extern unsigned int cpufreq_xen_cnt; struct cpufreq_governor; @@ -272,4 +273,7 @@ int set_hwp_para(struct cpufreq_policy *policy, int acpi_cpufreq_register(void); +int amd_cppc_cmdline_parse(const char *s, const char *e); +int amd_cppc_register_driver(void); + #endif /* __XEN_CPUFREQ_PM_H__ */ diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index e6576314f0..0a87bc0384 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -5,6 +5,16 @@ #include #include +/* + * Internal xen-pm options + * They are extension to public xen-pm options (XEN_PROCESSOR_PM_xxx) defined + * in public/platform.h, guarded by SIF_PM_MASK + */ +#define XEN_PROCESSOR_PM_CPPC 0x100 +#if XEN_PROCESSOR_PM_CPPC & MASK_EXTR(~0, SIF_PM_MASK) +# error "XEN_PROCESSOR_PM_CPPC shall not occupy bits reserved for public xen-pm options" +#endif + #define XEN_CPPC_INIT 0x40000000U #define XEN_PX_INIT 0x80000000U -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1099061.1452988 (Exim 4.92) (envelope-from ) id 1ure1n-0000my-Tx; Thu, 28 Aug 2025 14:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1099061.1452988; Thu, 28 Aug 2025 14:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure1n-0000mr-RA; Thu, 28 Aug 2025 14:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1099061; Thu, 28 Aug 2025 14:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure1m-0000l2-8b for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ure1l-00AxxM-1m for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ure1l-005xvv-2I for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nwikZ06hVKnR8e5WDEXXQ8z6pVOwGuh7q5F2R/K1VFk=; b=vbPwD/7PGQdVFCHAa+RqPUMK4N dq3d8a51ZS4zvWL0TF4e3N5WsSex95xgf+JrVFza5TI7+AP2yQHOK/EpKmM2CZKyeDYraYXl6i349 hFBazZhiihHMvnGcEqjamq4MXnYvRHF0haNfXuBptIZosg5xBgwJpSKeh+zvpL1Dp5lk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] symbols: add minimal self-test Message-Id: Date: Thu, 28 Aug 2025 14:55:01 +0000 commit 1f09240beac7222d94c4241eb10068e7553578d7 Author: Jan Beulich AuthorDate: Thu Aug 28 13:34:21 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 13:34:21 2025 +0200 symbols: add minimal self-test ... before making changes to the involved logic. Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/common/symbols.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/xen/common/symbols.c b/xen/common/symbols.c index f8a7bde37b..1bc7ce7e05 100644 --- a/xen/common/symbols.c +++ b/xen/common/symbols.c @@ -260,6 +260,41 @@ unsigned long symbols_lookup_by_name(const char *symname) return 0; } +#ifdef CONFIG_SELF_TESTS + +static void __init test_lookup(unsigned long addr, const char *expected) +{ + char buf[KSYM_NAME_LEN + 1]; + const char *name, *symname; + unsigned long size, offs; + + name = symbols_lookup(addr, &size, &offs, buf); + if ( !name ) + panic("%s: address not found\n", expected); + if ( offs ) + panic("%s: non-zero offset (%#lx) unexpected\n", expected, offs); + + /* Cope with static symbols, where varying file names/paths may be used. */ + symname = strchr(name, '#'); + symname = symname ? symname + 1 : name; + if ( strcmp(symname, expected) ) + panic("%s: unexpected symbol name: '%s'\n", expected, symname); + + offs = symbols_lookup_by_name(name); + if ( offs != addr ) + panic("%s: address %#lx unexpected; wanted %#lx\n", + expected, offs, addr); +} + +static void __init __constructor test_symbols(void) +{ + /* Be sure to only try this for cf_check functions. */ + test_lookup((unsigned long)dump_execstate, "dump_execstate"); + test_lookup((unsigned long)test_symbols, __func__); +} + +#endif /* CONFIG_SELF_TESTS */ + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1099062.1452993 (Exim 4.92) (envelope-from ) id 1ure1w-0000sM-VS; Thu, 28 Aug 2025 14:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1099062.1452993; Thu, 28 Aug 2025 14:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure1w-0000sE-SW; Thu, 28 Aug 2025 14:55:12 +0000 Received: by outflank-mailman (input) for mailman id 1099062; Thu, 28 Aug 2025 14:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure1v-0000rh-T1 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ure1v-00Axxn-26 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ure1v-005xwi-2d for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ok8C1CZx9lGp5gvnBtwptWLQmBj+nHy6nufKO1N7Tfg=; b=ZyWfx1xJJOJFrcG9WlKUmNPrJG wMcVIkixlL/gysnhl9hh6GcRb9HlU1ChOXhMnX5mmOo9y435X+v9TrKd8k1TGISQZkSUW4VoFJ+UW Bp5i+dqUoXHM8cqwD+zVTnDgQoAsOzM01j2dleUlR2I79FMVnBJ1SpeZeqJWrePNEoug=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PSR: move CPUID level check Message-Id: Date: Thu, 28 Aug 2025 14:55:11 +0000 commit 511eb31bd0545c9072bed88de6f41c5802f94a33 Author: Jan Beulich AuthorDate: Thu Aug 28 13:35:22 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 13:35:22 2025 +0200 x86/PSR: move CPUID level check At the first (and maybe second) glance the call to setup_clear_cpu_cap() (which is __init) from psr_cpu_init() (which isn't) looks wrong. The earlier cpu_has_pqe makes it safe, though. Nevertheless we can do better, by simply moving the check ahead of the BSP invocation of the function. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/psr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 9c7aab9f40..cce7020868 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -1583,12 +1583,6 @@ static void psr_cpu_init(void) if ( !psr_alloc_feat_enabled() || !cpu_has_pqe ) goto assoc_init; - if ( boot_cpu_data.cpuid_level < PSR_CPUID_LEVEL_CAT ) - { - setup_clear_cpu_cap(X86_FEATURE_PQE); - goto assoc_init; - } - socket = cpu_to_socket(cpu); info = socket_info + socket; if ( info->feat_init ) @@ -1708,6 +1702,9 @@ static int __init cf_check psr_presmp_init(void) if ( psr_cpu_prepare() ) psr_free(); + if ( boot_cpu_data.cpuid_level < PSR_CPUID_LEVEL_CAT ) + setup_clear_cpu_cap(X86_FEATURE_PQE); + psr_cpu_init(); if ( psr_cmt_enabled() || psr_alloc_feat_enabled() ) register_cpu_notifier(&cpu_nfb); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1099068.1452995 (Exim 4.92) (envelope-from ) id 1ure27-0000yW-0I; Thu, 28 Aug 2025 14:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1099068.1452995; Thu, 28 Aug 2025 14:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure26-0000yN-Ts; Thu, 28 Aug 2025 14:55:22 +0000 Received: by outflank-mailman (input) for mailman id 1099068; Thu, 28 Aug 2025 14:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure26-0000xx-0J for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ure25-00AxyH-2T for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ure25-005xxV-2y for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VLWqQgaROYTF5xolJ/11vDJrsszfCqJzfcbczFanFHs=; b=kU5s/NT10qh+OvrX85lPmbZRdd ie4HUlwQg4dL7s1rMelQcp4Z8X629w/Z68hMdbDN5D+43J3wVDGBqvTWeKqUDuEl1gaaWrz6JvHMY fynTrV0tVY5XV4dDA41+aBrGQZ11wfFo2+rqXvpSVwQtsYmWwan02VWjEAQFRoe2ryYg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: introduce new sub-hypercall to propagate CPPC data Message-Id: Date: Thu, 28 Aug 2025 14:55:21 +0000 commit bceab282bf2f5a28485ba4b19a6f6353596fbca3 Author: Penny Zheng AuthorDate: Thu Aug 28 14:45:33 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 14:45:33 2025 +0200 xen/cpufreq: introduce new sub-hypercall to propagate CPPC data In order to provide backward compatibility with existing governors that represent performance as frequency, like ondemand, the _CPC table can optionally provide processor frequency range values, Lowest frequency and Nominal frequency, to let OS use Lowest Frequency/ Performance and Nominal Frequency/Performance as anchor points to create linear mapping of CPPC performance to CPU frequency. As Xen is uncapable of parsing the ACPI dynamic table, we'd like to introduce a new sub-hypercall "XEN_PM_CPPC" to propagate required CPPC data from dom0 kernel to Xen. In the according handler set_cppc_pminfo(), we do _CPC and _PSD sanitization check, as both _PSD and _CPC info are necessary for correctly initializing cpufreq cores in CPPC mode. Users shall be warned that if we failed at this point, no fallback scheme, like legacy P-state could be switched to. A new flag "XEN_CPPC_INIT" is also introduced for cpufreq core initialised in CPPC mode. Then all .init flag checking shall be updated to consider "XEN_CPPC_INIT" too. We want to bypass construction of px statistic info in cpufreq_statistic_init() for CPPC mode, while not bypassing cpufreq_statistic_lock initialization for a good reason. The same check is unnecessary for cpufreq_statistic_exit(), since it has already been covered by px statistic variable "cpufreq_statistic_data" check Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/arch/x86/platform_hypercall.c | 5 ++ xen/arch/x86/x86_64/cpufreq.c | 19 +++++ xen/arch/x86/x86_64/platform_hypercall.c | 3 + xen/drivers/acpi/pm-op.c | 7 +- xen/drivers/acpi/pmstat.c | 4 + xen/drivers/cpufreq/cpufreq.c | 124 +++++++++++++++++++++++++++++- xen/include/acpi/cpufreq/processor_perf.h | 4 +- xen/include/public/platform.h | 26 +++++++ xen/include/xen/pmstat.h | 5 ++ xen/include/xlat.lst | 1 + 10 files changed, 193 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 21f9f795c1..fafc176475 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -577,6 +577,11 @@ ret_t do_platform_op( break; } + case XEN_PM_CPPC: + ret = set_cppc_pminfo(op->u.set_pminfo.id, + &op->u.set_pminfo.u.cppc_data); + break; + default: ret = -EINVAL; break; diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c index e4f3d5b436..525b29da71 100644 --- a/xen/arch/x86/x86_64/cpufreq.c +++ b/xen/arch/x86/x86_64/cpufreq.c @@ -54,3 +54,22 @@ int compat_set_px_pminfo(uint32_t acpi_id, return set_px_pminfo(acpi_id, xen_perf); } + +int compat_set_cppc_pminfo(unsigned int acpi_id, + const struct compat_processor_cppc *cppc_data) + +{ + struct xen_processor_cppc *xen_cppc; + unsigned long xlat_page_current; + + xlat_malloc_init(xlat_page_current); + + xen_cppc = xlat_malloc_array(xlat_page_current, + struct xen_processor_cppc, 1); + if ( unlikely(xen_cppc == NULL) ) + return -ENOMEM; + + XLAT_processor_cppc(xen_cppc, cppc_data); + + return set_cppc_pminfo(acpi_id, xen_cppc); +} diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index 9ab631c17f..0288f68df9 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -14,6 +14,9 @@ EMIT_FILE; #define efi_get_info efi_compat_get_info #define efi_runtime_call(x) efi_compat_runtime_call(x) +#define xen_processor_cppc compat_processor_cppc +#define set_cppc_pminfo compat_set_cppc_pminfo + #define xen_processor_performance compat_processor_performance #define set_px_pminfo compat_set_px_pminfo diff --git a/xen/drivers/acpi/pm-op.c b/xen/drivers/acpi/pm-op.c index 9a1970df34..e3b5c8bcaa 100644 --- a/xen/drivers/acpi/pm-op.c +++ b/xen/drivers/acpi/pm-op.c @@ -91,7 +91,10 @@ static int get_cpufreq_para(struct xen_sysctl_pm_op *op) pmpt = processor_pminfo[op->cpuid]; policy = per_cpu(cpufreq_cpu_policy, op->cpuid); - if ( !pmpt || !pmpt->perf.states || + if ( !pmpt || + ((pmpt->init & XEN_PX_INIT) && !pmpt->perf.states) || + /* Avoid NULL deref of pmpt->perf.states[] */ + ((pmpt->init & XEN_CPPC_INIT) && pmpt->perf.state_count) || !policy || !policy->governor ) return -EINVAL; @@ -351,7 +354,7 @@ int do_pm_op(struct xen_sysctl_pm_op *op) case CPUFREQ_PARA: if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) return -ENODEV; - if ( !pmpt || !(pmpt->init & XEN_PX_INIT) ) + if ( !pmpt || !(pmpt->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; break; } diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 4fae0c14af..0f31736df2 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -108,6 +108,10 @@ int cpufreq_statistic_init(unsigned int cpu) if ( !pmpt ) return -EINVAL; + /* Only need to initialize in Px mode */ + if ( !(pmpt->init & XEN_PX_INIT) ) + return 0; + spin_lock(cpufreq_statistic_lock); pxpt = per_cpu(cpufreq_statistic_data, cpu); diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 267e4d3f3b..f553fbcb1c 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -234,6 +235,11 @@ static int get_psd_info(unsigned int cpu, unsigned int *shared_type, *domain_info = &processor_pminfo[cpu]->perf.domain_info; break; + case XEN_CPPC_INIT: + *shared_type = processor_pminfo[cpu]->cppc_data.shared_type; + *domain_info = &processor_pminfo[cpu]->cppc_data.domain_info; + break; + default: ret = -EINVAL; break; @@ -259,7 +265,7 @@ int cpufreq_add_cpu(unsigned int cpu) if ( !processor_pminfo[cpu] || !cpu_online(cpu) ) return -EINVAL; - if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; if (!cpufreq_driver.init) @@ -434,7 +440,7 @@ int cpufreq_del_cpu(unsigned int cpu) if ( !processor_pminfo[cpu] || !cpu_online(cpu) ) return -EINVAL; - if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; if (!per_cpu(cpufreq_cpu_policy, cpu)) @@ -693,6 +699,120 @@ int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32) pdc) return ret; } +static void print_CPPC(const struct xen_processor_cppc *cppc_data) +{ + printk("\t_CPC: highest_perf=%u, lowest_perf=%u, " + "nominal_perf=%u, lowest_nonlinear_perf=%u, " + "nominal_mhz=%uMHz, lowest_mhz=%uMHz\n", + cppc_data->cpc.highest_perf, cppc_data->cpc.lowest_perf, + cppc_data->cpc.nominal_perf, cppc_data->cpc.lowest_nonlinear_perf, + cppc_data->cpc.nominal_mhz, cppc_data->cpc.lowest_mhz); +} + +int set_cppc_pminfo(unsigned int acpi_id, + const struct xen_processor_cppc *cppc_data) +{ + int ret = 0, cpu_id; + struct processor_pminfo *pm_info; + + cpu_id = get_cpu_id(acpi_id); + if ( cpu_id < 0 ) + { + ret = -EINVAL; + goto out; + } + + if ( cppc_data->pad[0] || cppc_data->pad[1] || cppc_data->pad[2] ) + { + ret = -EINVAL; + goto out; + } + + if ( cpufreq_verbose ) + printk("Set CPU%d (ACPI ID %u) CPPC state info:\n", + cpu_id, acpi_id); + + pm_info = processor_pminfo[cpu_id]; + if ( !pm_info ) + { + pm_info = xvzalloc(struct processor_pminfo); + if ( !pm_info ) + { + ret = -ENOMEM; + goto out; + } + processor_pminfo[cpu_id] = pm_info; + } + pm_info->acpi_id = acpi_id; + pm_info->id = cpu_id; + pm_info->cppc_data = *cppc_data; + + if ( (cppc_data->flags & XEN_CPPC_PSD) && + !check_psd_pminfo(cppc_data->shared_type) ) + { + ret = -EINVAL; + goto out; + } + + if ( cppc_data->flags & XEN_CPPC_CPC ) + { + if ( cppc_data->cpc.highest_perf == 0 || + cppc_data->cpc.highest_perf > UINT8_MAX || + cppc_data->cpc.nominal_perf == 0 || + cppc_data->cpc.lowest_nonlinear_perf == 0 || + cppc_data->cpc.lowest_perf == 0 || + cppc_data->cpc.lowest_perf > + cppc_data->cpc.lowest_nonlinear_perf || + cppc_data->cpc.lowest_nonlinear_perf > + cppc_data->cpc.nominal_perf || + cppc_data->cpc.nominal_perf > cppc_data->cpc.highest_perf ) + /* + * Right now, Xen doesn't actually use highest_perf/nominal_perf/ + * lowest_nonlinear_perf/lowest_perf values read from ACPI _CPC + * table. Xen reads CPPC capability MSR to get these four values. + * So warning is enough. + */ + printk_once(XENLOG_WARNING + "Broken CPPC perf values: lowest(%u), nonlinear_lowest(%u), nominal(%u), highest(%u)\n", + cppc_data->cpc.lowest_perf, + cppc_data->cpc.lowest_nonlinear_perf, + cppc_data->cpc.nominal_perf, + cppc_data->cpc.highest_perf); + + /* lowest_mhz and nominal_mhz are optional value */ + if ( cppc_data->cpc.nominal_mhz && + cppc_data->cpc.lowest_mhz > cppc_data->cpc.nominal_mhz ) + { + printk_once(XENLOG_WARNING + "Broken CPPC freq values: lowest(%u), nominal(%u)\n", + cppc_data->cpc.lowest_mhz, + cppc_data->cpc.nominal_mhz); + /* Re-set with zero values, instead of keeping invalid values */ + pm_info->cppc_data.cpc.nominal_mhz = 0; + pm_info->cppc_data.cpc.lowest_mhz = 0; + } + } + + if ( cppc_data->flags == (XEN_CPPC_PSD | XEN_CPPC_CPC) ) + { + if ( cpufreq_verbose ) + { + print_PSD(&pm_info->cppc_data.domain_info); + print_CPPC(&pm_info->cppc_data); + } + + pm_info->init = XEN_CPPC_INIT; + ret = cpufreq_cpu_init(cpu_id); + if ( ret ) + printk_once(XENLOG_WARNING + "CPU%d failed amd-cppc mode init; use \"cpufreq=xen\" instead", + cpu_id); + } + + out: + return ret; +} + static void cpufreq_cmdline_common_para(struct cpufreq_policy *new_policy) { if (usr_max_freq) diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 4e045da983..e6576314f0 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -5,7 +5,8 @@ #include #include -#define XEN_PX_INIT 0x80000000U +#define XEN_CPPC_INIT 0x40000000U +#define XEN_PX_INIT 0x80000000U unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); @@ -43,6 +44,7 @@ struct processor_pminfo { uint32_t acpi_id; uint32_t id; struct processor_performance perf; + struct xen_processor_cppc cppc_data; uint32_t init; }; diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index 2725b8d104..94349fc5f5 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -363,6 +363,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_getidletime_t); #define XEN_PM_PX 1 #define XEN_PM_TX 2 #define XEN_PM_PDC 3 +#define XEN_PM_CPPC 4 /* Px sub info type */ #define XEN_PX_PCT 1 @@ -370,6 +371,10 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_getidletime_t); #define XEN_PX_PPC 4 #define XEN_PX_PSD 8 +/* CPPC sub info type */ +#define XEN_CPPC_PSD (1U << 0) +#define XEN_CPPC_CPC (1U << 1) + struct xen_power_register { uint32_t space_id; uint32_t bit_width; @@ -457,6 +462,26 @@ struct xen_processor_performance { typedef struct xen_processor_performance xen_processor_performance_t; DEFINE_XEN_GUEST_HANDLE(xen_processor_performance_t); +struct xen_processor_cppc { + uint8_t flags; /* IN: XEN_CPPC_xxx */ + uint8_t pad[3]; + /* + * IN: Subset _CPC fields useful for CPPC-compatible cpufreq + * driver's initialization + */ + struct { + uint32_t highest_perf; + uint32_t nominal_perf; + uint32_t lowest_nonlinear_perf; + uint32_t lowest_perf; + uint32_t lowest_mhz; + uint32_t nominal_mhz; + } cpc; + uint32_t shared_type; /* IN: XEN_CPUPERF_SHARED_TYPE_xxx */ + struct xen_psd_package domain_info; /* IN: _PSD */ +}; +typedef struct xen_processor_cppc xen_processor_cppc_t; + struct xenpf_set_processor_pminfo { /* IN variables */ uint32_t id; /* ACPI CPU ID */ @@ -465,6 +490,7 @@ struct xenpf_set_processor_pminfo { struct xen_processor_power power;/* Cx: _CST/_CSD */ struct xen_processor_performance perf; /* Px: _PPC/_PCT/_PSS/_PSD */ XEN_GUEST_HANDLE(uint32) pdc; /* _PDC */ + xen_processor_cppc_t cppc_data; /* CPPC: _CPC and _PSD */ } u; }; typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t; diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h index 8350403e95..6096560d3c 100644 --- a/xen/include/xen/pmstat.h +++ b/xen/include/xen/pmstat.h @@ -7,12 +7,17 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf); long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power); +int set_cppc_pminfo(unsigned int acpi_id, + const struct xen_processor_cppc *cppc_data); #ifdef CONFIG_COMPAT struct compat_processor_performance; int compat_set_px_pminfo(uint32_t acpi_id, struct compat_processor_performance *perf); struct compat_processor_power; long compat_set_cx_pminfo(uint32_t acpi_id, struct compat_processor_power *power); +struct compat_processor_cppc; +int compat_set_cppc_pminfo(unsigned int acpi_id, + const struct compat_processor_cppc *cppc_data); #endif uint32_t pmstat_get_cx_nr(unsigned int cpu); diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 6d6c6cfab2..9d08dcc4bb 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -160,6 +160,7 @@ ! pct_register platform.h ! power_register platform.h +! processor_cppc platform.h ? processor_csd platform.h ! processor_cx platform.h ! processor_flags platform.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 14:55:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 14:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1099069.1452999 (Exim 4.92) (envelope-from ) id 1ure2I-000124-20; Thu, 28 Aug 2025 14:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1099069.1452999; Thu, 28 Aug 2025 14:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure2H-00011w-VV; Thu, 28 Aug 2025 14:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1099069; Thu, 28 Aug 2025 14:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ure2G-00011W-3h for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1ure2F-00Axyl-2p for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1ure2G-005y0v-09 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 14:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QhIigIqtElULNbSsw0UleTr1B45SYS15KF/7b88rQyI=; b=XxDgC/iiCKd07z5KnW8J2GqLwL 5aWiU7mhEJS+Vr5nx9jRKlzwYmuzAZpNZOYnqw1fRIl56wRQeu9g7+NbgJA5o/7J/jwpQaBU67joQ tAr9fVeHHlU46JU2ZB4ApikAa4eFPINEpgDSyePPksFiXusmiUewd4wgTm4OnEqmLs4M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: introduce "cpufreq=amd-cppc" xen cmdline and amd-cppc driver Message-Id: Date: Thu, 28 Aug 2025 14:55:32 +0000 commit cf55bb78722df362501fe8221aa8ca5993bd222c Author: Penny Zheng AuthorDate: Thu Aug 28 14:46:16 2025 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 14:46:16 2025 +0200 xen/cpufreq: introduce "cpufreq=amd-cppc" xen cmdline and amd-cppc driver Users need to set "cpufreq=amd-cppc" in xen cmdline to enable amd-cppc driver, which selects ACPI Collaborative Performance and Power Control (CPPC) on supported AMD hardware to provide a finer grained frequency control mechanism. `verbose` option can also be included to support verbose print. When users setting "cpufreq=amd-cppc", a new amd-cppc driver shall be registered and used. All hooks for amd-cppc driver are transiently missing, and we temporarily make registration fail with -EOPNOTSUPP here. It will be fixed along with the implementation. New xen-pm internal flag XEN_PROCESSOR_PM_CPPC is introduced, to stand for cpufreq driver in CPPC mode. We define XEN_PROCESSOR_PM_CPPC 0x100, as it is the next value to use after 8-bits wide public xen-pm options. We also add sanity check on compile time. All XEN_PROCESSOR_PM_xxx checking shall be updated to consider "XEN_PROCESSOR_PM_CPPC" too. XEN_PROCESSOR_PM_CPPC and XEN_PROCESSOR_PM_PX are firstly set when Xen parsed relative driver signature from xen cmdline, and will become exclusive after cpufreq driver registration. It is because that platform could not support both or mixed mode (CPPC & legacy Px) operations, and only one cpufreq driver could be registerd in Xen at one time, such as on AMD, it is either amd-cppc or legacy P-states driver. Xen rely on XEN_PROCESSOR_PM_CPPC flag to tell current cpufreq driver is in CPPC mode, and accepts relative hypercall. It will neglect Px request and yields success. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 7 +++- xen/arch/x86/acpi/cpufreq/Makefile | 1 + xen/arch/x86/acpi/cpufreq/amd-cppc.c | 59 ++++++++++++++++++++++++++ xen/arch/x86/acpi/cpufreq/cpufreq.c | 69 ++++++++++++++++++++++++++++++- xen/arch/x86/platform_hypercall.c | 14 +++++++ xen/drivers/acpi/pm-op.c | 3 +- xen/drivers/cpufreq/cpufreq.c | 13 +++++- xen/include/acpi/cpufreq/cpufreq.h | 6 ++- xen/include/acpi/cpufreq/processor_perf.h | 10 +++++ 9 files changed, 175 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a75b6c9301..3916cc81f6 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -515,7 +515,7 @@ If set, force use of the performance counters for oprofile, rather than detectin available support. ### cpufreq -> `= none | {{ | xen } { [:[powersave|performance|ondemand|userspace][,[]][,[]]] } [,verbose]} | dom0-kernel | hwp[:[][,verbose]]` +> `= none | {{ | xen } { [:[powersave|performance|ondemand|userspace][,[]][,[]]] } [,verbose]} | dom0-kernel | hwp[:[][,verbose]] | amd-cppc[:[verbose]]` > Default: `xen` @@ -526,7 +526,7 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels. * `` and `` are integers which represent max and min processor frequencies respectively. * `verbose` option can be included as a string or also as `verbose=` - for `xen`. It is a boolean for `hwp`. + for `xen`. It is a boolean for `hwp` and `amd-cppc`. * `hwp` selects Hardware-Controlled Performance States (HWP) on supported Intel hardware. HWP is a Skylake+ feature which provides better CPU power management. The default is disabled. If `hwp` is selected, but hardware @@ -534,6 +534,9 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels. * `` is a boolean to enable Hardware Duty Cycling (HDC). HDC enables the processor to autonomously force physical package components into idle state. The default is enabled, but the option only applies when `hwp` is enabled. +* `amd-cppc` selects ACPI Collaborative Performance and Power Control (CPPC) + on supported AMD hardware to provide finer grained frequency control + mechanism. The default is disabled. There is also support for `;`-separated fallback options: `cpufreq=hwp;xen,verbose`. This first tries `hwp` and falls back to `xen` if diff --git a/xen/arch/x86/acpi/cpufreq/Makefile b/xen/arch/x86/acpi/cpufreq/Makefile index e7dbe434a8..a2ba34bda0 100644 --- a/xen/arch/x86/acpi/cpufreq/Makefile +++ b/xen/arch/x86/acpi/cpufreq/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_INTEL) += acpi.o +obj-$(CONFIG_AMD) += amd-cppc.o obj-y += cpufreq.o obj-$(CONFIG_INTEL) += hwp.o obj-$(CONFIG_AMD) += powernow.o diff --git a/xen/arch/x86/acpi/cpufreq/amd-cppc.c b/xen/arch/x86/acpi/cpufreq/amd-cppc.c new file mode 100644 index 0000000000..3377783f7e --- /dev/null +++ b/xen/arch/x86/acpi/cpufreq/amd-cppc.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * amd-cppc.c - AMD Processor CPPC Frequency Driver + * + * Copyright (C) 2025 Advanced Micro Devices, Inc. All Rights Reserved. + * + * Author: Penny Zheng + * + * AMD CPPC cpufreq driver introduces a new CPU performance scaling design + * for AMD processors using the ACPI Collaborative Performance and Power + * Control (CPPC) feature which provides finer grained frequency control range. + */ + +#include +#include +#include +#include + +static bool __init amd_cppc_handle_option(const char *s, const char *end) +{ + int ret; + + ret = parse_boolean("verbose", s, end); + if ( ret >= 0 ) + { + cpufreq_verbose = ret; + return true; + } + + return false; +} + +int __init amd_cppc_cmdline_parse(const char *s, const char *e) +{ + do { + const char *end = strpbrk(s, ",;"); + + if ( !amd_cppc_handle_option(s, end) ) + { + printk(XENLOG_WARNING + "cpufreq/amd-cppc: option '%.*s' not recognized\n", + (int)((end ?: e) - s), s); + + return -EINVAL; + } + + s = end ? end + 1 : NULL; + } while ( s && s < e ); + + return 0; +} + +int __init amd_cppc_register_driver(void) +{ + if ( !cpu_has_cppc ) + return -ENODEV; + + return -EOPNOTSUPP; +} diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index e227376bab..94e8e11c15 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -131,12 +131,14 @@ static int __init cf_check cpufreq_driver_init(void) if ( cpufreq_controller == FREQCTL_xen ) { + unsigned int i; + ret = -ENOENT; switch ( boot_cpu_data.x86_vendor ) { case X86_VENDOR_INTEL: - for ( unsigned int i = 0; i < cpufreq_xen_cnt; i++ ) + for ( i = 0; i < cpufreq_xen_cnt; i++ ) { switch ( cpufreq_xen_opts[i] ) { @@ -151,6 +153,11 @@ static int __init cf_check cpufreq_driver_init(void) case CPUFREQ_none: ret = 0; break; + + default: + printk(XENLOG_WARNING + "Unsupported cpufreq driver for vendor Intel\n"); + break; } if ( !ret || ret == -EBUSY ) @@ -160,13 +167,71 @@ static int __init cf_check cpufreq_driver_init(void) case X86_VENDOR_AMD: case X86_VENDOR_HYGON: - ret = IS_ENABLED(CONFIG_AMD) ? powernow_register_driver() : -ENODEV; +#ifdef CONFIG_AMD + for ( i = 0; i < cpufreq_xen_cnt; i++ ) + { + switch ( cpufreq_xen_opts[i] ) + { + case CPUFREQ_xen: + ret = powernow_register_driver(); + break; + + case CPUFREQ_amd_cppc: + ret = amd_cppc_register_driver(); + break; + + case CPUFREQ_none: + ret = 0; + break; + + default: + printk(XENLOG_WARNING + "Unsupported cpufreq driver for vendor AMD or Hygon\n"); + break; + } + + if ( !ret || ret == -EBUSY ) + break; + } +#else + ret = -ENODEV; +#endif /* CONFIG_AMD */ break; default: printk(XENLOG_ERR "Cpufreq: unsupported x86 vendor\n"); break; } + + /* + * After successful cpufreq driver registeration, XEN_PROCESSOR_PM_CPPC + * and XEN_PROCESSOR_PM_PX shall become exclusive flags. + */ + if ( !ret ) + { + ASSERT(i < cpufreq_xen_cnt); + switch ( cpufreq_xen_opts[i] ) + { + case CPUFREQ_amd_cppc: + xen_processor_pmbits &= ~XEN_PROCESSOR_PM_PX; + break; + + case CPUFREQ_hwp: + case CPUFREQ_xen: + xen_processor_pmbits &= ~XEN_PROCESSOR_PM_CPPC; + break; + + default: + break; + } + } + else if ( ret != -EBUSY ) + /* + * No cpufreq driver gets registered, clear both + * XEN_PROCESSOR_PM_CPPC and XEN_PROCESSOR_PM_PX + */ + xen_processor_pmbits &= ~(XEN_PROCESSOR_PM_CPPC | + XEN_PROCESSOR_PM_PX); } return ret; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index fafc176475..79bb99e0b6 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -546,6 +546,8 @@ ret_t do_platform_op( ret = 0; break; } + /* Xen doesn't support mixed mode */ + ASSERT(!(xen_processor_pmbits & XEN_PROCESSOR_PM_CPPC)); ret = set_px_pminfo(op->u.set_pminfo.id, &op->u.set_pminfo.u.perf); break; @@ -578,6 +580,18 @@ ret_t do_platform_op( } case XEN_PM_CPPC: + if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_CPPC) ) + { + /* + * Neglect CPPC-info when registered cpufreq driver + * isn't in CPPC mode + */ + ret = 0; + break; + } + /* Xen doesn't support mixed mode */ + ASSERT(!(xen_processor_pmbits & XEN_PROCESSOR_PM_PX)); + ret = set_cppc_pminfo(op->u.set_pminfo.id, &op->u.set_pminfo.u.cppc_data); break; diff --git a/xen/drivers/acpi/pm-op.c b/xen/drivers/acpi/pm-op.c index e3b5c8bcaa..2f516e62b1 100644 --- a/xen/drivers/acpi/pm-op.c +++ b/xen/drivers/acpi/pm-op.c @@ -352,7 +352,8 @@ int do_pm_op(struct xen_sysctl_pm_op *op) switch ( op->cmd & PM_PARA_CATEGORY_MASK ) { case CPUFREQ_PARA: - if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) + if ( !(xen_processor_pmbits & (XEN_PROCESSOR_PM_PX | + XEN_PROCESSOR_PM_CPPC)) ) return -ENODEV; if ( !pmpt || !(pmpt->init & (XEN_PX_INIT | XEN_CPPC_INIT)) ) return -EINVAL; diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index f553fbcb1c..fe6bd7ff25 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -65,7 +65,7 @@ LIST_HEAD_READ_MOSTLY(cpufreq_governor_list); /* set xen as default cpufreq */ enum cpufreq_controller cpufreq_controller = FREQCTL_xen; -enum cpufreq_xen_opt __initdata cpufreq_xen_opts[2] = { [0] = CPUFREQ_xen }; +enum cpufreq_xen_opt __initdata cpufreq_xen_opts[3] = { [0] = CPUFREQ_xen }; unsigned int __initdata cpufreq_xen_cnt = 1; static int __init cpufreq_cmdline_parse(const char *s, const char *e); @@ -99,6 +99,10 @@ static int __init handle_cpufreq_cmdline(enum cpufreq_xen_opt option) xen_processor_pmbits |= XEN_PROCESSOR_PM_PX; break; + case CPUFREQ_amd_cppc: + xen_processor_pmbits |= XEN_PROCESSOR_PM_CPPC; + break; + default: ASSERT_UNREACHABLE(); ret = -EINVAL; @@ -162,6 +166,13 @@ static int __init cf_check setup_cpufreq_option(const char *str) if ( !ret && arg[0] && arg[1] ) ret = hwp_cmdline_parse(arg + 1, end); } + else if ( IS_ENABLED(CONFIG_AMD) && choice < 0 && + !cmdline_strcmp(str, "amd-cppc") ) + { + ret = handle_cpufreq_cmdline(CPUFREQ_amd_cppc); + if ( !ret && arg[0] && arg[1] ) + ret = amd_cppc_cmdline_parse(arg + 1, end); + } else ret = -EINVAL; diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index fd530632b4..5d4881eea8 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -26,8 +26,9 @@ enum cpufreq_xen_opt { CPUFREQ_none, CPUFREQ_xen, CPUFREQ_hwp, + CPUFREQ_amd_cppc, }; -extern enum cpufreq_xen_opt cpufreq_xen_opts[2]; +extern enum cpufreq_xen_opt cpufreq_xen_opts[3]; extern unsigned int cpufreq_xen_cnt; struct cpufreq_governor; @@ -272,4 +273,7 @@ int set_hwp_para(struct cpufreq_policy *policy, int acpi_cpufreq_register(void); +int amd_cppc_cmdline_parse(const char *s, const char *e); +int amd_cppc_register_driver(void); + #endif /* __XEN_CPUFREQ_PM_H__ */ diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index e6576314f0..0a87bc0384 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -5,6 +5,16 @@ #include #include +/* + * Internal xen-pm options + * They are extension to public xen-pm options (XEN_PROCESSOR_PM_xxx) defined + * in public/platform.h, guarded by SIF_PM_MASK + */ +#define XEN_PROCESSOR_PM_CPPC 0x100 +#if XEN_PROCESSOR_PM_CPPC & MASK_EXTR(~0, SIF_PM_MASK) +# error "XEN_PROCESSOR_PM_CPPC shall not occupy bits reserved for public xen-pm options" +#endif + #define XEN_CPPC_INIT 0x40000000U #define XEN_PX_INIT 0x80000000U -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 22:22:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 22:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100085.1453666 (Exim 4.92) (envelope-from ) id 1url0N-0000hs-51; Thu, 28 Aug 2025 22:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100085.1453666; Thu, 28 Aug 2025 22:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0N-0000hk-2T; Thu, 28 Aug 2025 22:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1100085; Thu, 28 Aug 2025 22:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0L-0000he-NV for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1url0L-00B893-1V for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1url0L-006aIl-1t for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WKEPTk7TcWhZBvWZWa47XdYSl3+gLhagnJk70vX5B1U=; b=GlaHKh9eVyNNlbLLs1gkJSTlFq AZXyit0sK47fpqrL0MI1oVjBx0lbqOC4jn9WKFne7B5QGaXH1rWWlFWzDckjcLyqetKnHBNuZ/8IU 0Ataadwx0xfjnDMKBDSHJ3wTB1sK83t5IVBYu66h+Mecg7Xg8qu7nDJn/ygOH/PWPEkw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: FRED enumerations Message-Id: Date: Thu, 28 Aug 2025 22:22:01 +0000 commit d45113dddff58b04c9c3dc2b9675ac0c8d658b89 Author: Andrew Cooper AuthorDate: Fri Sep 18 16:50:15 2020 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86: FRED enumerations Of note, CR4.FRED is bit 32 and cannot enabled outside of 64bit mode. Most supported toolchains don't understand the FRED instructions yet. Nevertheless, ERETU and ERETS are easy to wrap (they encoded as REPZ/REPNE CLAC), while LKGS turns out not to be needed by Xen. We will need some alternatives based on FRED, so add a synthetic X86_FEATURE_XEN_FRED. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/asm-defns.h | 8 ++++++++ xen/arch/x86/include/asm/cpufeature.h | 3 +++ xen/arch/x86/include/asm/cpufeatures.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 11 +++++++++++ xen/arch/x86/include/asm/x86-defns.h | 1 + xen/include/public/arch-x86/cpufeatureset.h | 3 +++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 61a5faf904..239dc3af09 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -4,6 +4,14 @@ .byte 0x0f, 0x01, 0xfc .endm +/* binutils >= 2.41 or LLVM >= 19 */ +.macro eretu + .byte 0xf3, 0x0f, 0x01, 0xca +.endm +.macro erets + .byte 0xf2, 0x0f, 0x01, 0xca +.endm + /* * Call a noreturn function. This could be JMP, but CALL results in a more * helpful backtrace. BUG is to catch functions which do decide to return... diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 441a7ecc49..b6cf0c8dfc 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -246,6 +246,9 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_avx_vnni boot_cpu_has(X86_FEATURE_AVX_VNNI) #define cpu_has_avx512_bf16 boot_cpu_has(X86_FEATURE_AVX512_BF16) #define cpu_has_cmpccxadd boot_cpu_has(X86_FEATURE_CMPCCXADD) +#define cpu_has_fred boot_cpu_has(X86_FEATURE_FRED) +#define cpu_has_lkgs boot_cpu_has(X86_FEATURE_LKGS) +#define cpu_has_nmi_src boot_cpu_has(X86_FEATURE_NMI_SRC) #define cpu_has_avx_ifma boot_cpu_has(X86_FEATURE_AVX_IFMA) /* CPUID level 0x80000021.eax */ diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index 71308d9daf..0a98676c16 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -18,7 +18,7 @@ XEN_CPUFEATURE(ARCH_PERFMON, X86_SYNTH( 3)) /* Intel Architectural PerfMon XEN_CPUFEATURE(TSC_RELIABLE, X86_SYNTH( 4)) /* TSC is known to be reliable */ XEN_CPUFEATURE(XTOPOLOGY, X86_SYNTH( 5)) /* cpu topology enum extensions */ XEN_CPUFEATURE(CPUID_FAULTING, X86_SYNTH( 6)) /* cpuid faulting */ -/* Bit 7 unused */ +XEN_CPUFEATURE(XEN_FRED, X86_SYNTH( 7)) /* Xen uses FRED */ XEN_CPUFEATURE(APERFMPERF, X86_SYNTH( 8)) /* APERFMPERF */ XEN_CPUFEATURE(MFENCE_RDTSC, X86_SYNTH( 9)) /* MFENCE synchronizes RDTSC */ XEN_CPUFEATURE(XEN_SMEP, X86_SYNTH(10)) /* SMEP gets used by Xen itself */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 428d993ee8..bb48d16f0c 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -115,6 +115,17 @@ #define MCU_OPT_CTRL_GDS_MIT_DIS (_AC(1, ULL) << 4) #define MCU_OPT_CTRL_GDS_MIT_LOCK (_AC(1, ULL) << 5) +#define MSR_FRED_RSP_SL0 0x000001cc +#define MSR_FRED_RSP_SL1 0x000001cd +#define MSR_FRED_RSP_SL2 0x000001ce +#define MSR_FRED_RSP_SL3 0x000001cf +#define MSR_FRED_STK_LVLS 0x000001d0 +#define MSR_FRED_SSP_SL0 MSR_PL0_SSP +#define MSR_FRED_SSP_SL1 0x000001d1 +#define MSR_FRED_SSP_SL2 0x000001d2 +#define MSR_FRED_SSP_SL3 0x000001d3 +#define MSR_FRED_CONFIG 0x000001d4 + #define MSR_RTIT_OUTPUT_BASE 0x00000560 #define MSR_RTIT_OUTPUT_MASK 0x00000561 #define MSR_RTIT_CTL 0x00000570 diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index 23579c471f..0a0ba83de7 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -75,6 +75,7 @@ #define X86_CR4_PKE 0x00400000 /* enable PKE */ #define X86_CR4_CET 0x00800000 /* Control-flow Enforcement Technology */ #define X86_CR4_PKS 0x01000000 /* Protection Key Supervisor */ +#define X86_CR4_FRED (_AC(1, ULL) << 32) /* Fast Return and Event Delivery */ #define X86_CR8_VALID_MASK 0xf diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index f7312e0b04..9cd778586f 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -310,7 +310,10 @@ XEN_CPUFEATURE(ARCH_PERF_MON, 10*32+8) /* Architectural Perfmon */ XEN_CPUFEATURE(FZRM, 10*32+10) /*A Fast Zero-length REP MOVSB */ XEN_CPUFEATURE(FSRS, 10*32+11) /*A Fast Short REP STOSB */ XEN_CPUFEATURE(FSRCS, 10*32+12) /*A Fast Short REP CMPSB/SCASB */ +XEN_CPUFEATURE(FRED, 10*32+17) /* Fast Return and Event Delivery */ +XEN_CPUFEATURE(LKGS, 10*32+18) /* Load Kernel GS instruction */ XEN_CPUFEATURE(WRMSRNS, 10*32+19) /*S WRMSR Non-Serialising */ +XEN_CPUFEATURE(NMI_SRC, 10*32+20) /* NMI-Source Reporting */ XEN_CPUFEATURE(AMX_FP16, 10*32+21) /* AMX FP16 instruction */ XEN_CPUFEATURE(AVX_IFMA, 10*32+23) /*A AVX-IFMA Instructions */ XEN_CPUFEATURE(LAM, 10*32+26) /* Linear Address Masking */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 22:22:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 22:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100086.1453671 (Exim 4.92) (envelope-from ) id 1url0W-0000jD-6W; Thu, 28 Aug 2025 22:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100086.1453671; Thu, 28 Aug 2025 22:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0W-0000j5-3p; Thu, 28 Aug 2025 22:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1100086; Thu, 28 Aug 2025 22:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0V-0000iz-QL for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1url0V-00B89S-1r for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1url0V-006aK5-2M for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U8PAbAcuBVeNho4NnS8MnpKdzJ2B2QkN1hiIVfPvblo=; b=MW3koGCZDfURj1/JZTNS+qyaeo TeWg2txD9pFAuo/NJdO7+od8WB5BIluk7Nm0SPpXOW4xgElVz9SJoDRpE2xK2P183Pf8v/5MJ6FR7 1x0Ju83SKBuK+yefgfERC4jzY+Sk+PMZuZiLXPqz3oTBHxw9FKYwKoi/U7t1w8Dcoakg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Extend struct cpu_user_regs/cpu_info with FRED fields Message-Id: Date: Thu, 28 Aug 2025 22:22:11 +0000 commit cb29eed2dae71b614751a11ccf176fa38598c477 Author: Andrew Cooper AuthorDate: Mon Dec 30 16:42:57 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/traps: Extend struct cpu_user_regs/cpu_info with FRED fields The FRED on-stack format is larger than the IDT format, but is by and large compatible. FRED reuses space above cs and ss for extra metadata, some of which is purely informational, and some of which causes additional effects in ERET{U,S}. Follow Linux's choice of naming for fred_{c,s}s structures, to make it very clear at the point of use that it's dependent on FRED. There is also the event data field and reserved fields, but we cannot include these in struct cpu_user_regs without reintroducing OoB structure accesses in the non-FRED case. See commit 6065a05adf15 ("x86/traps: 'Fix' safety of read_registers() in #DF path"). for more details. Instead, use a new struct fred_info and position it suitably in struct cpu_info. This boundary will be loaded into MSR_FRED_RSP_SL0, and must be 64-byte aligned. This does add 16 bytes back into struct cpu_info, undoing the saving we made by dropping the vm86 data segment selectors. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/cpu-user-regs.h | 71 ++++++++++++++++++++++++++++++-- xen/arch/x86/include/asm/current.h | 2 + xen/arch/x86/traps-setup.c | 5 +++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h index 5b283a2f6d..92aeca0aaa 100644 --- a/xen/arch/x86/include/asm/cpu-user-regs.h +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -30,6 +30,10 @@ struct cpu_user_regs /* * During IDT delivery for exceptions with an error code, hardware pushes * to this point. Entry_vector is filled in by software. + * + * During FRED delivery, hardware always pushes to this point. Software + * copies fred_ss.vector into entry_vector so most interrupt/exception + * handling can be FRED-agnostic. */ uint32_t error_code; @@ -42,18 +46,77 @@ struct cpu_user_regs */ union { uint64_t rip; uint32_t eip; uint16_t ip; }; - uint16_t cs, _pad0[1]; - uint8_t saved_upcall_mask; /* PV (v)rflags.IF == !saved_upcall_mask */ - uint8_t _pad1[3]; + union { + struct { + uint16_t cs; + unsigned long :16; + uint8_t saved_upcall_mask; /* PV (v)rflags.IF == !saved_upcall_mask */ + }; + unsigned long csx; + struct { + /* + * Bits 0 to 31 control ERET{U,S} behaviour, and are state of the + * interrupted context. + */ + uint16_t cs; + unsigned int sl:2; /* Stack Level */ + bool wfe:1; /* Wait-for-ENDBRANCH state */ + } fred_cs; + }; union { uint64_t rflags; uint32_t eflags; uint16_t flags; }; union { uint64_t rsp; uint32_t esp; uint16_t sp; uint8_t spl; }; - uint16_t ss, _pad2[3]; + union { + uint16_t ss; + unsigned long ssx; + struct { + /* + * Bits 0 to 31 control ERET{U,S} behaviour, and are state about + * the event which occured. + */ + uint16_t ss; + bool sti:1; /* Was blocked-by-STI, and not cancelled */ + bool swint:1; /* Was a SYSCALL/SYSENTER/INT $N. On ERETx, pend_DB iff TF */ + bool nmi:1; /* Was an NMI. */ + unsigned long :13; + + /* + * Bits 32 to 63 are ignored by ERET{U,S} and are informative + * only. + */ + uint8_t vector; + unsigned long :8; + unsigned int type:4; /* X86_ET_* */ + unsigned long :4; + bool enclave:1; /* Event taken in SGX mode */ + bool l:1; /* Event taken in 64bit mode (old %cs.l) */ + bool nested:1; /* Exception during event delivery (clear for #DF) */ + unsigned long :1; + unsigned int insnlen:4; /* .type >= SW_INT */ + } fred_ss; + }; /* * For IDT delivery, tss->rsp0 points to this boundary as embedded within * struct cpu_info. It must be 16-byte aligned. */ }; +struct fred_info +{ + /* + * Event Data. For: + * #DB: PENDING_DBG (%dr6 with positive polarity) + * NMI: NMI-Source Bitmap (on capable hardware) + * #PF: %cr2 + * #NM: MSR_XFD_ERR (only XFD-induced #NMs) + */ + uint64_t edata; + uint64_t _rsvd; + + /* + * For FRED delivery, MSR_FRED_RSP_SL0 points to this boundary as embedded + * within struct cpu_info. It must be 64-byte aligned. + */ +}; static inline uint64_t msr_fold(const struct cpu_user_regs *regs) { diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index fd30422707..c1eb27b1c4 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -38,6 +38,8 @@ struct vcpu; struct cpu_info { struct cpu_user_regs guest_cpu_user_regs; + struct fred_info _fred; /* Only used when FRED is active. */ + unsigned int processor_id; unsigned int verw_sel; struct vcpu *current_vcpu; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 25581acf11..c89280270f 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -354,7 +354,12 @@ static void __init __maybe_unused build_assertions(void) * * tss->rsp0, pointing at the end of cpu_info.guest_cpu_user_regs, must be * 16-byte aligned. + * + * MSR_FRED_RSP_SL0, pointing to the end of cpu_info._fred must be 64-byte + * aligned. */ BUILD_BUG_ON((sizeof(struct cpu_info) - endof_field(struct cpu_info, guest_cpu_user_regs)) & 15); + BUILD_BUG_ON((sizeof(struct cpu_info) - + endof_field(struct cpu_info, _fred)) & 63); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 22:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 22:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100087.1453675 (Exim 4.92) (envelope-from ) id 1url0h-0000la-7u; Thu, 28 Aug 2025 22:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100087.1453675; Thu, 28 Aug 2025 22:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0h-0000lS-5K; Thu, 28 Aug 2025 22:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1100087; Thu, 28 Aug 2025 22:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0f-0000lF-VE for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1url0f-00B89b-2B for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1url0f-006aKm-2j for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9tVllhhtom25sT4HeEGxSvZRCNbHWEgnI3YtmuiyyU0=; b=43fsXq5Ko7eN0oSOKvoXneBjss vsV2AfhEN0nS8RdUeQsSZvd7tZbz50oe7bbgcDcpvzYsaw5pmx7nH0Qyx/ihVd7heN60HiQ5/DFMo 3LhsCUzBmCehGqLmRORsOJ8MW2o813sOyVLfJrBfEZGtiUPfRw0nGkrcRzh2r2Zjnsac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Introduce opt_fred Message-Id: Date: Thu, 28 Aug 2025 22:22:21 +0000 commit 743fd27306b459b2c99c0e10f7a2c83fdd1f9365 Author: Andrew Cooper AuthorDate: Sat Dec 28 16:39:55 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/traps: Introduce opt_fred ... disabled by default. There is a lot of work before FRED can be enabled by default. One part of FRED, the LKGS (Load Kernel GS) instruction, is enumerated separately but expected to be mandatory as FRED disallows the SWAPGS instruction. Normally, we'd have to check both CPUID bits, but Xen does not use GS like most other software, and can manage without LKGS. FRED formally removes the use of Ring1 and Ring2, meaning we cannot run 32bit PV guests. As already done with CET, disable PV32 if using FRED, except in shim mode where FRED is disabled by default. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 10 ++++++++++ xen/arch/x86/include/asm/traps.h | 4 ++++ xen/arch/x86/traps-setup.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 3916cc81f6..4adcd7e762 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1287,6 +1287,16 @@ requirement can be relaxed. This option is particularly useful for nested virtualization, to allow the L1 hypervisor to use EPT even if the L0 hypervisor does not provide `VM_ENTRY_LOAD_GUEST_PAT`. +### fred (x86) +> `= ` + +> Default: `false` + +Flexible Return and Event Delivery is an overhaul of interrupt, exception and +system call handling, fixing many corner cases in the x86 architecture, and +expected in hardware from 2025. Support in Xen is a work in progress and +disabled by default. + ### gnttab > `= List of [ max-ver:, transitive=, transfer= ]` diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 6ae451d3fc..73097e957d 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -7,6 +7,10 @@ #ifndef ASM_TRAP_H #define ASM_TRAP_H +#include + +extern int8_t opt_fred; + void bsp_early_traps_init(void); void traps_init(void); void bsp_traps_reinit(void); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index c89280270f..6e2af58ba0 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include #include @@ -20,6 +22,9 @@ unsigned int __ro_after_init ler_msr; static bool __initdata opt_ler; boolean_param("ler", opt_ler); +int8_t __ro_after_init opt_fred = 0; +boolean_param("fred", opt_fred); + void nocall entry_PF(void); void nocall lstar_enter(void); void nocall cstar_enter(void); @@ -299,6 +304,37 @@ void __init traps_init(void) /* Replace early pagefault with real pagefault handler. */ _update_gate_addr_lower(&bsp_idt[X86_EXC_PF], entry_PF); + /* + * Xen doesn't use GS like most software does, and doesn't need the LKGS + * instruction in order to manage PV guests. No need to check for it. + */ + if ( !cpu_has_fred ) + { + if ( opt_fred == 1 ) + printk(XENLOG_WARNING "FRED not available, ignoring\n"); + opt_fred = 0; + } + + if ( opt_fred == -1 ) + opt_fred = !pv_shim; + + if ( opt_fred ) + { +#ifdef CONFIG_PV32 + if ( opt_pv32 ) + { + opt_pv32 = 0; + printk(XENLOG_INFO "Disabling PV32 due to FRED\n"); + } +#endif + setup_force_cpu_cap(X86_FEATURE_XEN_FRED); + printk("Using FRED event delivery\n"); + } + else + { + printk("Using IDT event delivery\n"); + } + load_system_tables(); init_ler(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 22:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 22:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100088.1453680 (Exim 4.92) (envelope-from ) id 1url0r-0000oP-9Y; Thu, 28 Aug 2025 22:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100088.1453680; Thu, 28 Aug 2025 22:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0r-0000oH-6h; Thu, 28 Aug 2025 22:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1100088; Thu, 28 Aug 2025 22:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url0q-0000o3-26 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1url0p-00B89j-2e for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1url0p-006aLr-31 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T3KIFQtJ+NLafqOmv4NftW1Yp/IRGpFr3eQs7m0w5Gg=; b=m+iXTbb22Cic/PWdHBVxDvJrcR p4Uco9L7i2Sky3bDjghqZ7R/RlwkZGKPI4FvWABApAVE6e0Pa+FZHT1dyoo2WPxIKX9/RC1nzowjT 3CEY0N0RBnmvfJapEyYBFdeAUcI+/uTrHvBi8RXWr8s5aUaOHWb17nbve+wOqM0wwBfM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Adjust CR4 handling around percpu_early_traps_init() Message-Id: Date: Thu, 28 Aug 2025 22:22:31 +0000 commit 8218f8cf452bfa701d18d61d8a8e0f3a61f511de Author: Andrew Cooper AuthorDate: Mon May 26 15:32:44 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/boot: Adjust CR4 handling around percpu_early_traps_init() percpu_early_traps_init() will shortly be setting CR4.FRED. This requires that cpu_info->cr4 is already set up, and that the enablement of CET doesn't truncate X86_CR4_FRED back out because of using 32bit logic. For __high_start(), defer re-loading XEN_MINIMAL_CR4 until after %rsp is set up and we can store the result in the cr4 field too. For s3_resume(), explicitly re-load XEN_MINIMAL_CR4. Later when loading all features, use the mmu_cr4_features variable which is how the rest of Xen performs this operation. No functional change, yet. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 18 ++++++++++++++---- xen/arch/x86/boot/x86_64.S | 15 ++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index cc40fddc38..0f02ea7b4b 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -63,6 +63,14 @@ LABEL(s3_resume) pushq %rax lretq 1: + + GET_STACK_END(15) + + /* Enable minimal CR4 features, sync cached state. */ + mov $XEN_MINIMAL_CR4, %eax + mov %rax, STACK_CPUINFO_FIELD(cr4)(%r15) + mov %rax, %cr4 + /* Set up early exceptions and CET before entering C properly. */ call percpu_early_traps_init @@ -77,7 +85,9 @@ LABEL(s3_resume) wrmsr /* Enable CR4.CET. */ - mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ecx + mov $X86_CR4_CET, %ecx + or STACK_CPUINFO_FIELD(cr4)(%r15), %rcx + mov %rcx, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rcx, %cr4 /* WARNING! call/ret now fatal (iff SHSTK) until SETSSBSY loads SSP */ @@ -120,9 +130,9 @@ LABEL(s3_resume) .L_cet_done: #endif /* CONFIG_XEN_SHSTK || CONFIG_XEN_IBT */ - /* Restore CR4 from the cpuinfo block. */ - GET_STACK_END(bx) - mov STACK_CPUINFO_FIELD(cr4)(%rbx), %rax + /* Load all CR4 settings. */ + mov mmu_cr4_features(%rip), %rax + mov %rax, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rax, %cr4 call mtrr_bp_restore diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index d0e7449a14..3a5ad27644 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -11,16 +11,19 @@ ENTRY(__high_start) mov %ecx,%gs mov %ecx,%ss - /* Enable minimal CR4 features. */ - mov $XEN_MINIMAL_CR4,%rcx - mov %rcx,%cr4 - mov stack_start(%rip),%rsp /* Reset EFLAGS (subsumes CLI and CLD). */ pushq $0 popf + GET_STACK_END(15) + + /* Enable minimal CR4 features, sync cached state. */ + mov $XEN_MINIMAL_CR4, %eax + mov %rax, STACK_CPUINFO_FIELD(cr4)(%r15) + mov %rax, %cr4 + /* Reload code selector. */ pushq $__HYPERVISOR_CS leaq 1f(%rip),%rax @@ -45,7 +48,9 @@ ENTRY(__high_start) wrmsr /* Enable CR4.CET. */ - mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ecx + mov $X86_CR4_CET, %ecx + or STACK_CPUINFO_FIELD(cr4)(%r15), %rcx + mov %rcx, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rcx, %cr4 /* WARNING! call/ret now fatal (iff SHSTK) until SETSSBSY loads SSP */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 22:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 22:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100089.1453683 (Exim 4.92) (envelope-from ) id 1url11-0000qW-Ak; Thu, 28 Aug 2025 22:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100089.1453683; Thu, 28 Aug 2025 22:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url11-0000qO-83; Thu, 28 Aug 2025 22:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1100089; Thu, 28 Aug 2025 22:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1url10-0000qG-51 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1url0z-00B89p-2w for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1url10-006aMS-0H for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 22:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z9JYHLaWUYmxhfM9roSDE1+f8oru/wFsul6dfU3zkzo=; b=ekIrx4I8ohyRAts4xJAlYIQp0W iuRPIN2bsOgGVtv8MjoG678X6HS9haIRpngo7ORMF51L04QfX8XV6wh5E0ImjzQzeTKnVyHcteoTS 4TMK6KvLZ1Lxru9MP5ZsJyqs2XoIJrFySaIsun7yabLYoEf76BQENRD41ga3VN+ywKLA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/S3: Switch to using RSTORSSP to recover SSP on resume Message-Id: Date: Thu, 28 Aug 2025 22:22:42 +0000 commit 81f834bff027776a9ff82481c90cc2e6fedf5e66 Author: Andrew Cooper AuthorDate: Mon May 26 18:48:26 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/S3: Switch to using RSTORSSP to recover SSP on resume Under FRED, SETSSBSY is disallowed, and we want to be setting up FRED prior to setting up shadow stacks. Luckily, RSTORSSP will also work in this case. This involves a new type of shadow stack token, the Restore Token, which is distinguished from the Supervisor Token by pointing to the adjacent slot on the shadow stack rather than pointing at itself. In the short term, this logic still needs to load MSR_PL0_SSP. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 0f02ea7b4b..fceb4ca353 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -90,7 +90,7 @@ LABEL(s3_resume) mov %rcx, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rcx, %cr4 - /* WARNING! call/ret now fatal (iff SHSTK) until SETSSBSY loads SSP */ + /* WARNING! CALL/RET now fatal (iff SHSTK) until RSTORSSP loads SSP */ #if defined(CONFIG_XEN_SHSTK) test $CET_SHSTK_EN, %al @@ -98,32 +98,31 @@ LABEL(s3_resume) /* * Restoring SSP is a little complicated, because we are intercepting - * an in-use shadow stack. Write a temporary token under the stack, - * so SETSSBSY will successfully load a value useful for us, then - * reset MSR_PL0_SSP to its usual value and pop the temporary token. + * an in-use shadow stack. Write a Restore Token under the stack, and + * use RSTORSSP to load it. RSTORSSP converts the token to a + * Previous-SSP Token, which we discard. */ mov saved_ssp(%rip), %rdi - /* Construct the temporary supervisor token under SSP. */ - sub $8, %rdi - - /* Load it into MSR_PL0_SSP. */ + /* Calculate MSR_PL0_SSP from SSP. */ mov $MSR_PL0_SSP, %ecx mov %rdi, %rdx shr $32, %rdx mov %edi, %eax - wrmsr - - /* Write the temporary token onto the shadow stack, and activate it. */ - wrssq %rdi, (%rdi) - setssbsy - - /* Reset MSR_PL0_SSP back to its normal value. */ and $~(STACK_SIZE - 1), %eax or $(PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8, %eax wrmsr - /* Pop the temporary token off the stack. */ + /* + * A Restore Token's value is &token + 8 + 64BIT (bit 0). + * We want to put this on the shstk at SSP - 8. + */ + lea 1(%rdi), %rax + sub $8, %rdi + wrssq %rax, (%rdi) + rstorssp (%rdi) + + /* Discard the Previous-SSP Token from the shstk. */ mov $2, %eax incsspd %eax #endif /* CONFIG_XEN_SHSTK */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 23:44:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 23:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100146.1453697 (Exim 4.92) (envelope-from ) id 1urmHi-00021b-W9; Thu, 28 Aug 2025 23:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100146.1453697; Thu, 28 Aug 2025 23:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmHi-00021T-TW; Thu, 28 Aug 2025 23:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1100146; Thu, 28 Aug 2025 23:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmHi-00021L-5a for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urmHh-00B9gT-2k for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urmHh-006gU8-3D for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kyS8rUKcaT8oT5DJoBdsQigh6BnWyjcdjIy9ZVMc23o=; b=IyyHEoo+aD58QzlLxmqghJh/nj CiJ307WBTA+tJGBzYX8I+FqXOu8OCgCGDf03kJ8V/gcvxaYB++JzbUwVpksSaxUlu5QDRbxPOSDPw z0d6fgHtKF7HmqsLlL+aUBDJw3DM/eaTu7P6bP9mubZGMm93eCYpIOlBfTjU2ivZSxbA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: FRED enumerations Message-Id: Date: Thu, 28 Aug 2025 23:44:01 +0000 commit d45113dddff58b04c9c3dc2b9675ac0c8d658b89 Author: Andrew Cooper AuthorDate: Fri Sep 18 16:50:15 2020 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86: FRED enumerations Of note, CR4.FRED is bit 32 and cannot enabled outside of 64bit mode. Most supported toolchains don't understand the FRED instructions yet. Nevertheless, ERETU and ERETS are easy to wrap (they encoded as REPZ/REPNE CLAC), while LKGS turns out not to be needed by Xen. We will need some alternatives based on FRED, so add a synthetic X86_FEATURE_XEN_FRED. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/asm-defns.h | 8 ++++++++ xen/arch/x86/include/asm/cpufeature.h | 3 +++ xen/arch/x86/include/asm/cpufeatures.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 11 +++++++++++ xen/arch/x86/include/asm/x86-defns.h | 1 + xen/include/public/arch-x86/cpufeatureset.h | 3 +++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 61a5faf904..239dc3af09 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -4,6 +4,14 @@ .byte 0x0f, 0x01, 0xfc .endm +/* binutils >= 2.41 or LLVM >= 19 */ +.macro eretu + .byte 0xf3, 0x0f, 0x01, 0xca +.endm +.macro erets + .byte 0xf2, 0x0f, 0x01, 0xca +.endm + /* * Call a noreturn function. This could be JMP, but CALL results in a more * helpful backtrace. BUG is to catch functions which do decide to return... diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 441a7ecc49..b6cf0c8dfc 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -246,6 +246,9 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_avx_vnni boot_cpu_has(X86_FEATURE_AVX_VNNI) #define cpu_has_avx512_bf16 boot_cpu_has(X86_FEATURE_AVX512_BF16) #define cpu_has_cmpccxadd boot_cpu_has(X86_FEATURE_CMPCCXADD) +#define cpu_has_fred boot_cpu_has(X86_FEATURE_FRED) +#define cpu_has_lkgs boot_cpu_has(X86_FEATURE_LKGS) +#define cpu_has_nmi_src boot_cpu_has(X86_FEATURE_NMI_SRC) #define cpu_has_avx_ifma boot_cpu_has(X86_FEATURE_AVX_IFMA) /* CPUID level 0x80000021.eax */ diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index 71308d9daf..0a98676c16 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -18,7 +18,7 @@ XEN_CPUFEATURE(ARCH_PERFMON, X86_SYNTH( 3)) /* Intel Architectural PerfMon XEN_CPUFEATURE(TSC_RELIABLE, X86_SYNTH( 4)) /* TSC is known to be reliable */ XEN_CPUFEATURE(XTOPOLOGY, X86_SYNTH( 5)) /* cpu topology enum extensions */ XEN_CPUFEATURE(CPUID_FAULTING, X86_SYNTH( 6)) /* cpuid faulting */ -/* Bit 7 unused */ +XEN_CPUFEATURE(XEN_FRED, X86_SYNTH( 7)) /* Xen uses FRED */ XEN_CPUFEATURE(APERFMPERF, X86_SYNTH( 8)) /* APERFMPERF */ XEN_CPUFEATURE(MFENCE_RDTSC, X86_SYNTH( 9)) /* MFENCE synchronizes RDTSC */ XEN_CPUFEATURE(XEN_SMEP, X86_SYNTH(10)) /* SMEP gets used by Xen itself */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 428d993ee8..bb48d16f0c 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -115,6 +115,17 @@ #define MCU_OPT_CTRL_GDS_MIT_DIS (_AC(1, ULL) << 4) #define MCU_OPT_CTRL_GDS_MIT_LOCK (_AC(1, ULL) << 5) +#define MSR_FRED_RSP_SL0 0x000001cc +#define MSR_FRED_RSP_SL1 0x000001cd +#define MSR_FRED_RSP_SL2 0x000001ce +#define MSR_FRED_RSP_SL3 0x000001cf +#define MSR_FRED_STK_LVLS 0x000001d0 +#define MSR_FRED_SSP_SL0 MSR_PL0_SSP +#define MSR_FRED_SSP_SL1 0x000001d1 +#define MSR_FRED_SSP_SL2 0x000001d2 +#define MSR_FRED_SSP_SL3 0x000001d3 +#define MSR_FRED_CONFIG 0x000001d4 + #define MSR_RTIT_OUTPUT_BASE 0x00000560 #define MSR_RTIT_OUTPUT_MASK 0x00000561 #define MSR_RTIT_CTL 0x00000570 diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index 23579c471f..0a0ba83de7 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -75,6 +75,7 @@ #define X86_CR4_PKE 0x00400000 /* enable PKE */ #define X86_CR4_CET 0x00800000 /* Control-flow Enforcement Technology */ #define X86_CR4_PKS 0x01000000 /* Protection Key Supervisor */ +#define X86_CR4_FRED (_AC(1, ULL) << 32) /* Fast Return and Event Delivery */ #define X86_CR8_VALID_MASK 0xf diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index f7312e0b04..9cd778586f 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -310,7 +310,10 @@ XEN_CPUFEATURE(ARCH_PERF_MON, 10*32+8) /* Architectural Perfmon */ XEN_CPUFEATURE(FZRM, 10*32+10) /*A Fast Zero-length REP MOVSB */ XEN_CPUFEATURE(FSRS, 10*32+11) /*A Fast Short REP STOSB */ XEN_CPUFEATURE(FSRCS, 10*32+12) /*A Fast Short REP CMPSB/SCASB */ +XEN_CPUFEATURE(FRED, 10*32+17) /* Fast Return and Event Delivery */ +XEN_CPUFEATURE(LKGS, 10*32+18) /* Load Kernel GS instruction */ XEN_CPUFEATURE(WRMSRNS, 10*32+19) /*S WRMSR Non-Serialising */ +XEN_CPUFEATURE(NMI_SRC, 10*32+20) /* NMI-Source Reporting */ XEN_CPUFEATURE(AMX_FP16, 10*32+21) /* AMX FP16 instruction */ XEN_CPUFEATURE(AVX_IFMA, 10*32+23) /*A AVX-IFMA Instructions */ XEN_CPUFEATURE(LAM, 10*32+26) /* Linear Address Masking */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 23:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 23:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100147.1453701 (Exim 4.92) (envelope-from ) id 1urmHt-00023X-1D; Thu, 28 Aug 2025 23:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100147.1453701; Thu, 28 Aug 2025 23:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmHs-00023P-Uv; Thu, 28 Aug 2025 23:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1100147; Thu, 28 Aug 2025 23:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmHs-00023J-65 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urmHr-00B9go-33 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urmHs-006gVl-0M for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V1ma8cPj8LQIoJv29AkrHj8txZOQpXYhAxgZ1IC2tY4=; b=xnELZ5wFPasAjOSXDhPy/owuNL yHobz7Wrq2RrvEh2iCPBtRFjEXiXRy32nO4FGNZwfP4ZC8LfTh1E64TgydYFg2SpD48y4imTgJcHZ PTrFPxoXo/KA5nAJKL9PtDDJyi1K5nf8Kj+mdj7Jp//9zbhX4c5KN6ktwbTPWHLxHyQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Extend struct cpu_user_regs/cpu_info with FRED fields Message-Id: Date: Thu, 28 Aug 2025 23:44:12 +0000 commit cb29eed2dae71b614751a11ccf176fa38598c477 Author: Andrew Cooper AuthorDate: Mon Dec 30 16:42:57 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/traps: Extend struct cpu_user_regs/cpu_info with FRED fields The FRED on-stack format is larger than the IDT format, but is by and large compatible. FRED reuses space above cs and ss for extra metadata, some of which is purely informational, and some of which causes additional effects in ERET{U,S}. Follow Linux's choice of naming for fred_{c,s}s structures, to make it very clear at the point of use that it's dependent on FRED. There is also the event data field and reserved fields, but we cannot include these in struct cpu_user_regs without reintroducing OoB structure accesses in the non-FRED case. See commit 6065a05adf15 ("x86/traps: 'Fix' safety of read_registers() in #DF path"). for more details. Instead, use a new struct fred_info and position it suitably in struct cpu_info. This boundary will be loaded into MSR_FRED_RSP_SL0, and must be 64-byte aligned. This does add 16 bytes back into struct cpu_info, undoing the saving we made by dropping the vm86 data segment selectors. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/cpu-user-regs.h | 71 ++++++++++++++++++++++++++++++-- xen/arch/x86/include/asm/current.h | 2 + xen/arch/x86/traps-setup.c | 5 +++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/cpu-user-regs.h b/xen/arch/x86/include/asm/cpu-user-regs.h index 5b283a2f6d..92aeca0aaa 100644 --- a/xen/arch/x86/include/asm/cpu-user-regs.h +++ b/xen/arch/x86/include/asm/cpu-user-regs.h @@ -30,6 +30,10 @@ struct cpu_user_regs /* * During IDT delivery for exceptions with an error code, hardware pushes * to this point. Entry_vector is filled in by software. + * + * During FRED delivery, hardware always pushes to this point. Software + * copies fred_ss.vector into entry_vector so most interrupt/exception + * handling can be FRED-agnostic. */ uint32_t error_code; @@ -42,18 +46,77 @@ struct cpu_user_regs */ union { uint64_t rip; uint32_t eip; uint16_t ip; }; - uint16_t cs, _pad0[1]; - uint8_t saved_upcall_mask; /* PV (v)rflags.IF == !saved_upcall_mask */ - uint8_t _pad1[3]; + union { + struct { + uint16_t cs; + unsigned long :16; + uint8_t saved_upcall_mask; /* PV (v)rflags.IF == !saved_upcall_mask */ + }; + unsigned long csx; + struct { + /* + * Bits 0 to 31 control ERET{U,S} behaviour, and are state of the + * interrupted context. + */ + uint16_t cs; + unsigned int sl:2; /* Stack Level */ + bool wfe:1; /* Wait-for-ENDBRANCH state */ + } fred_cs; + }; union { uint64_t rflags; uint32_t eflags; uint16_t flags; }; union { uint64_t rsp; uint32_t esp; uint16_t sp; uint8_t spl; }; - uint16_t ss, _pad2[3]; + union { + uint16_t ss; + unsigned long ssx; + struct { + /* + * Bits 0 to 31 control ERET{U,S} behaviour, and are state about + * the event which occured. + */ + uint16_t ss; + bool sti:1; /* Was blocked-by-STI, and not cancelled */ + bool swint:1; /* Was a SYSCALL/SYSENTER/INT $N. On ERETx, pend_DB iff TF */ + bool nmi:1; /* Was an NMI. */ + unsigned long :13; + + /* + * Bits 32 to 63 are ignored by ERET{U,S} and are informative + * only. + */ + uint8_t vector; + unsigned long :8; + unsigned int type:4; /* X86_ET_* */ + unsigned long :4; + bool enclave:1; /* Event taken in SGX mode */ + bool l:1; /* Event taken in 64bit mode (old %cs.l) */ + bool nested:1; /* Exception during event delivery (clear for #DF) */ + unsigned long :1; + unsigned int insnlen:4; /* .type >= SW_INT */ + } fred_ss; + }; /* * For IDT delivery, tss->rsp0 points to this boundary as embedded within * struct cpu_info. It must be 16-byte aligned. */ }; +struct fred_info +{ + /* + * Event Data. For: + * #DB: PENDING_DBG (%dr6 with positive polarity) + * NMI: NMI-Source Bitmap (on capable hardware) + * #PF: %cr2 + * #NM: MSR_XFD_ERR (only XFD-induced #NMs) + */ + uint64_t edata; + uint64_t _rsvd; + + /* + * For FRED delivery, MSR_FRED_RSP_SL0 points to this boundary as embedded + * within struct cpu_info. It must be 64-byte aligned. + */ +}; static inline uint64_t msr_fold(const struct cpu_user_regs *regs) { diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index fd30422707..c1eb27b1c4 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -38,6 +38,8 @@ struct vcpu; struct cpu_info { struct cpu_user_regs guest_cpu_user_regs; + struct fred_info _fred; /* Only used when FRED is active. */ + unsigned int processor_id; unsigned int verw_sel; struct vcpu *current_vcpu; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 25581acf11..c89280270f 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -354,7 +354,12 @@ static void __init __maybe_unused build_assertions(void) * * tss->rsp0, pointing at the end of cpu_info.guest_cpu_user_regs, must be * 16-byte aligned. + * + * MSR_FRED_RSP_SL0, pointing to the end of cpu_info._fred must be 64-byte + * aligned. */ BUILD_BUG_ON((sizeof(struct cpu_info) - endof_field(struct cpu_info, guest_cpu_user_regs)) & 15); + BUILD_BUG_ON((sizeof(struct cpu_info) - + endof_field(struct cpu_info, _fred)) & 63); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 23:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 23:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100148.1453704 (Exim 4.92) (envelope-from ) id 1urmI3-00026F-2h; Thu, 28 Aug 2025 23:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100148.1453704; Thu, 28 Aug 2025 23:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmI3-000267-0B; Thu, 28 Aug 2025 23:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1100148; Thu, 28 Aug 2025 23:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmI2-00025w-AZ for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urmI2-00B9gu-0H for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urmI2-006gWJ-0g for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eTwPMHGhYgqNb4+QBizgRhCA4weFoTUS+JwB0AVn91I=; b=Eg4Ey9SFVHro0lakV02U/jnUMm 0hyBWVyBJD2mmYWpnmfSkLVZucnQkmDRQBBTb0XUy6PIvIjWwvLlStRMS7nHXpcgHZ3yq73ieoI6U 9wB5gF6uX7WHG/LGw8Y9lliJqKQm3L5pdBlHvp8BHUSwKb+RHRDA8S4oNnQQ2IiM7BEw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Introduce opt_fred Message-Id: Date: Thu, 28 Aug 2025 23:44:22 +0000 commit 743fd27306b459b2c99c0e10f7a2c83fdd1f9365 Author: Andrew Cooper AuthorDate: Sat Dec 28 16:39:55 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/traps: Introduce opt_fred ... disabled by default. There is a lot of work before FRED can be enabled by default. One part of FRED, the LKGS (Load Kernel GS) instruction, is enumerated separately but expected to be mandatory as FRED disallows the SWAPGS instruction. Normally, we'd have to check both CPUID bits, but Xen does not use GS like most other software, and can manage without LKGS. FRED formally removes the use of Ring1 and Ring2, meaning we cannot run 32bit PV guests. As already done with CET, disable PV32 if using FRED, except in shim mode where FRED is disabled by default. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 10 ++++++++++ xen/arch/x86/include/asm/traps.h | 4 ++++ xen/arch/x86/traps-setup.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 3916cc81f6..4adcd7e762 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1287,6 +1287,16 @@ requirement can be relaxed. This option is particularly useful for nested virtualization, to allow the L1 hypervisor to use EPT even if the L0 hypervisor does not provide `VM_ENTRY_LOAD_GUEST_PAT`. +### fred (x86) +> `= ` + +> Default: `false` + +Flexible Return and Event Delivery is an overhaul of interrupt, exception and +system call handling, fixing many corner cases in the x86 architecture, and +expected in hardware from 2025. Support in Xen is a work in progress and +disabled by default. + ### gnttab > `= List of [ max-ver:, transitive=, transfer= ]` diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 6ae451d3fc..73097e957d 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -7,6 +7,10 @@ #ifndef ASM_TRAP_H #define ASM_TRAP_H +#include + +extern int8_t opt_fred; + void bsp_early_traps_init(void); void traps_init(void); void bsp_traps_reinit(void); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index c89280270f..6e2af58ba0 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include #include @@ -20,6 +22,9 @@ unsigned int __ro_after_init ler_msr; static bool __initdata opt_ler; boolean_param("ler", opt_ler); +int8_t __ro_after_init opt_fred = 0; +boolean_param("fred", opt_fred); + void nocall entry_PF(void); void nocall lstar_enter(void); void nocall cstar_enter(void); @@ -299,6 +304,37 @@ void __init traps_init(void) /* Replace early pagefault with real pagefault handler. */ _update_gate_addr_lower(&bsp_idt[X86_EXC_PF], entry_PF); + /* + * Xen doesn't use GS like most software does, and doesn't need the LKGS + * instruction in order to manage PV guests. No need to check for it. + */ + if ( !cpu_has_fred ) + { + if ( opt_fred == 1 ) + printk(XENLOG_WARNING "FRED not available, ignoring\n"); + opt_fred = 0; + } + + if ( opt_fred == -1 ) + opt_fred = !pv_shim; + + if ( opt_fred ) + { +#ifdef CONFIG_PV32 + if ( opt_pv32 ) + { + opt_pv32 = 0; + printk(XENLOG_INFO "Disabling PV32 due to FRED\n"); + } +#endif + setup_force_cpu_cap(X86_FEATURE_XEN_FRED); + printk("Using FRED event delivery\n"); + } + else + { + printk("Using IDT event delivery\n"); + } + load_system_tables(); init_ler(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 23:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 23:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100149.1453708 (Exim 4.92) (envelope-from ) id 1urmID-00028h-49; Thu, 28 Aug 2025 23:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100149.1453708; Thu, 28 Aug 2025 23:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmID-00028Z-1Z; Thu, 28 Aug 2025 23:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1100149; Thu, 28 Aug 2025 23:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmIC-00028R-Da for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urmIC-00B9h0-0a for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urmIC-006gWf-19 for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/ipF557F5/dBn2g/01DPVfVXgCGCRNiXYHwJZFzzPRI=; b=ky7wmdPMaTyNy9BOvstYliw6GS JJHs7ieEWe4CQ1VNtGG8CGkBSwR/XBVA+W3pR8SckmU5OW+Ew8TerGzEPKqcHuiUEl57S4UcuU1AN krXZeeA81TjHRRiQTUs2znvPDUrOo5PROJq27l1bbWZpujgK4V3K79dryi4Woyh1rme4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Adjust CR4 handling around percpu_early_traps_init() Message-Id: Date: Thu, 28 Aug 2025 23:44:32 +0000 commit 8218f8cf452bfa701d18d61d8a8e0f3a61f511de Author: Andrew Cooper AuthorDate: Mon May 26 15:32:44 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/boot: Adjust CR4 handling around percpu_early_traps_init() percpu_early_traps_init() will shortly be setting CR4.FRED. This requires that cpu_info->cr4 is already set up, and that the enablement of CET doesn't truncate X86_CR4_FRED back out because of using 32bit logic. For __high_start(), defer re-loading XEN_MINIMAL_CR4 until after %rsp is set up and we can store the result in the cr4 field too. For s3_resume(), explicitly re-load XEN_MINIMAL_CR4. Later when loading all features, use the mmu_cr4_features variable which is how the rest of Xen performs this operation. No functional change, yet. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 18 ++++++++++++++---- xen/arch/x86/boot/x86_64.S | 15 ++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index cc40fddc38..0f02ea7b4b 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -63,6 +63,14 @@ LABEL(s3_resume) pushq %rax lretq 1: + + GET_STACK_END(15) + + /* Enable minimal CR4 features, sync cached state. */ + mov $XEN_MINIMAL_CR4, %eax + mov %rax, STACK_CPUINFO_FIELD(cr4)(%r15) + mov %rax, %cr4 + /* Set up early exceptions and CET before entering C properly. */ call percpu_early_traps_init @@ -77,7 +85,9 @@ LABEL(s3_resume) wrmsr /* Enable CR4.CET. */ - mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ecx + mov $X86_CR4_CET, %ecx + or STACK_CPUINFO_FIELD(cr4)(%r15), %rcx + mov %rcx, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rcx, %cr4 /* WARNING! call/ret now fatal (iff SHSTK) until SETSSBSY loads SSP */ @@ -120,9 +130,9 @@ LABEL(s3_resume) .L_cet_done: #endif /* CONFIG_XEN_SHSTK || CONFIG_XEN_IBT */ - /* Restore CR4 from the cpuinfo block. */ - GET_STACK_END(bx) - mov STACK_CPUINFO_FIELD(cr4)(%rbx), %rax + /* Load all CR4 settings. */ + mov mmu_cr4_features(%rip), %rax + mov %rax, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rax, %cr4 call mtrr_bp_restore diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index d0e7449a14..3a5ad27644 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -11,16 +11,19 @@ ENTRY(__high_start) mov %ecx,%gs mov %ecx,%ss - /* Enable minimal CR4 features. */ - mov $XEN_MINIMAL_CR4,%rcx - mov %rcx,%cr4 - mov stack_start(%rip),%rsp /* Reset EFLAGS (subsumes CLI and CLD). */ pushq $0 popf + GET_STACK_END(15) + + /* Enable minimal CR4 features, sync cached state. */ + mov $XEN_MINIMAL_CR4, %eax + mov %rax, STACK_CPUINFO_FIELD(cr4)(%r15) + mov %rax, %cr4 + /* Reload code selector. */ pushq $__HYPERVISOR_CS leaq 1f(%rip),%rax @@ -45,7 +48,9 @@ ENTRY(__high_start) wrmsr /* Enable CR4.CET. */ - mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ecx + mov $X86_CR4_CET, %ecx + or STACK_CPUINFO_FIELD(cr4)(%r15), %rcx + mov %rcx, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rcx, %cr4 /* WARNING! call/ret now fatal (iff SHSTK) until SETSSBSY loads SSP */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Aug 28 23:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Aug 2025 23:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100150.1453713 (Exim 4.92) (envelope-from ) id 1urmIO-0002Ay-62; Thu, 28 Aug 2025 23:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100150.1453713; Thu, 28 Aug 2025 23:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmIO-0002Aq-35; Thu, 28 Aug 2025 23:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1100150; Thu, 28 Aug 2025 23:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urmIM-0002Ac-Gc for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urmIM-00B9h6-0r for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urmIM-006gX8-1Q for xen-changelog@lists.xenproject.org; Thu, 28 Aug 2025 23:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xiTRkJdbtYquugYeTG0h13h97zeKqY/w9hxAqH9XtC4=; b=KpGz8OZzJO4FMc+BwFcx+2frx6 xHv3Bnvh9rs75QSCtck/3MlLyvACqZScXlPcIM5Uq3RNnLq5FGmoxyBTa/iHcLqQ2Ce8mcfM5UB5G 3nj6mRuPla9B8RtGEpU9N0jAsUQIC0dMQk3/1EudK1VPiIjiI8Es1jUqIrgkIT8Ygb/0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/S3: Switch to using RSTORSSP to recover SSP on resume Message-Id: Date: Thu, 28 Aug 2025 23:44:42 +0000 commit 81f834bff027776a9ff82481c90cc2e6fedf5e66 Author: Andrew Cooper AuthorDate: Mon May 26 18:48:26 2025 +0100 Commit: Andrew Cooper CommitDate: Thu Aug 28 23:12:32 2025 +0100 x86/S3: Switch to using RSTORSSP to recover SSP on resume Under FRED, SETSSBSY is disallowed, and we want to be setting up FRED prior to setting up shadow stacks. Luckily, RSTORSSP will also work in this case. This involves a new type of shadow stack token, the Restore Token, which is distinguished from the Supervisor Token by pointing to the adjacent slot on the shadow stack rather than pointing at itself. In the short term, this logic still needs to load MSR_PL0_SSP. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 0f02ea7b4b..fceb4ca353 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -90,7 +90,7 @@ LABEL(s3_resume) mov %rcx, STACK_CPUINFO_FIELD(cr4)(%r15) mov %rcx, %cr4 - /* WARNING! call/ret now fatal (iff SHSTK) until SETSSBSY loads SSP */ + /* WARNING! CALL/RET now fatal (iff SHSTK) until RSTORSSP loads SSP */ #if defined(CONFIG_XEN_SHSTK) test $CET_SHSTK_EN, %al @@ -98,32 +98,31 @@ LABEL(s3_resume) /* * Restoring SSP is a little complicated, because we are intercepting - * an in-use shadow stack. Write a temporary token under the stack, - * so SETSSBSY will successfully load a value useful for us, then - * reset MSR_PL0_SSP to its usual value and pop the temporary token. + * an in-use shadow stack. Write a Restore Token under the stack, and + * use RSTORSSP to load it. RSTORSSP converts the token to a + * Previous-SSP Token, which we discard. */ mov saved_ssp(%rip), %rdi - /* Construct the temporary supervisor token under SSP. */ - sub $8, %rdi - - /* Load it into MSR_PL0_SSP. */ + /* Calculate MSR_PL0_SSP from SSP. */ mov $MSR_PL0_SSP, %ecx mov %rdi, %rdx shr $32, %rdx mov %edi, %eax - wrmsr - - /* Write the temporary token onto the shadow stack, and activate it. */ - wrssq %rdi, (%rdi) - setssbsy - - /* Reset MSR_PL0_SSP back to its normal value. */ and $~(STACK_SIZE - 1), %eax or $(PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8, %eax wrmsr - /* Pop the temporary token off the stack. */ + /* + * A Restore Token's value is &token + 8 + 64BIT (bit 0). + * We want to put this on the shstk at SSP - 8. + */ + lea 1(%rdi), %rax + sub $8, %rdi + wrssq %rax, (%rdi) + rstorssp (%rdi) + + /* Discard the Previous-SSP Token from the shstk. */ mov $2, %eax incsspd %eax #endif /* CONFIG_XEN_SHSTK */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Aug 29 09:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 Aug 2025 09:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1100991.1454215 (Exim 4.92) (envelope-from ) id 1urvp1-0005mL-Hg; Fri, 29 Aug 2025 09:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1100991.1454215; Fri, 29 Aug 2025 09:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urvp1-0005mC-Es; Fri, 29 Aug 2025 09:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1100991; Fri, 29 Aug 2025 09:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urvp0-0005m6-4y for xen-changelog@lists.xenproject.org; Fri, 29 Aug 2025 09:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urvoz-00CYcg-2j for xen-changelog@lists.xenproject.org; Fri, 29 Aug 2025 09:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urvoz-007MvC-3D for xen-changelog@lists.xenproject.org; Fri, 29 Aug 2025 09:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qzTJEjXqB+DclsGtVlMkRD+NUcdiG3V7vCrS+3kYeic=; b=mAWW0rCFgQ19F53FZZvVpcgS8z L2m+FsewPvEhwKCGSHSUQZamFJxaj5JfNWXjdW5MJ6gph+O4obchBJdHZnLEHxzvG6VyP9AUHkwdx zRnVh5ADnBXFiAGfptpjD3s4ck3e27MgsCIL5wSa6uOxjZ5fxorxhBFdxXUJJc8X8p1Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pvshim: disable PDX compression in PV shim defconfig Message-Id: Date: Fri, 29 Aug 2025 09:55:02 +0000 commit e7c689a249ca6b8d14a077bb0f3311eaeda2ca19 Author: Roger Pau Monne AuthorDate: Fri Aug 29 09:43:38 2025 +0200 Commit: Roger Pau Monne CommitDate: Fri Aug 29 11:42:12 2025 +0200 x86/pvshim: disable PDX compression in PV shim defconfig There's no need for PDX compression given the memory map provided by Xen to guests is contiguous, turn off the feature by default in the PV shim defconfig. Reported-by: Jan Beulich Fixes: c5c45bcbd6a1 ("pdx: introduce a new compression algorithm based on region offsets") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/configs/pvshim_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig index c58c29adb0..24f4e4857d 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -7,6 +7,7 @@ CONFIG_PV_SHIM_EXCLUSIVE=y CONFIG_NR_CPUS=32 CONFIG_EXPERT=y # Disable features not used by the PV shim +CONFIG_PDX_NONE=y # CONFIG_XEN_SHSTK is not set # CONFIG_XEN_IBT is not set # CONFIG_GRANT_TABLE is not set -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Aug 29 13:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 Aug 2025 13:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1101361.1454458 (Exim 4.92) (envelope-from ) id 1urz3L-0003El-4a; Fri, 29 Aug 2025 13:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1101361.1454458; Fri, 29 Aug 2025 13:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urz3L-0003Ed-23; Fri, 29 Aug 2025 13:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1101361; Fri, 29 Aug 2025 13:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1urz3K-0003EX-4A for xen-changelog@lists.xenproject.org; Fri, 29 Aug 2025 13:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1urz3J-00CclW-2r for xen-changelog@lists.xenproject.org; Fri, 29 Aug 2025 13:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1urz3K-007bCZ-0B for xen-changelog@lists.xenproject.org; Fri, 29 Aug 2025 13:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yfti7v+A9qpYOlUbR1Wt1RuxVhDGlNh8sI5eH0Jgxpw=; b=KApXv4rXMd3vudJMrdtQP78gAH ENfX4zHWS0L/f05ClZSJvnqosMHlT+09CPQ3akKCysdrD2jqVB8eNZjJehG0vTgi1s75Ds9/Qh6K0 xOl/Px9GykAaPgVsc7MsCSqAMqYgygYDpqmE4dUPgkf3ZnbKkonAuhz6JDhtPtWIPTu4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pvshim: disable PDX compression in PV shim defconfig Message-Id: Date: Fri, 29 Aug 2025 13:22:02 +0000 commit e7c689a249ca6b8d14a077bb0f3311eaeda2ca19 Author: Roger Pau Monne AuthorDate: Fri Aug 29 09:43:38 2025 +0200 Commit: Roger Pau Monne CommitDate: Fri Aug 29 11:42:12 2025 +0200 x86/pvshim: disable PDX compression in PV shim defconfig There's no need for PDX compression given the memory map provided by Xen to guests is contiguous, turn off the feature by default in the PV shim defconfig. Reported-by: Jan Beulich Fixes: c5c45bcbd6a1 ("pdx: introduce a new compression algorithm based on region offsets") Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/configs/pvshim_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig index c58c29adb0..24f4e4857d 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -7,6 +7,7 @@ CONFIG_PV_SHIM_EXCLUSIVE=y CONFIG_NR_CPUS=32 CONFIG_EXPERT=y # Disable features not used by the PV shim +CONFIG_PDX_NONE=y # CONFIG_XEN_SHSTK is not set # CONFIG_XEN_IBT is not set # CONFIG_GRANT_TABLE is not set -- generated by git-patchbot for /home/xen/git/xen.git#master