From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 08:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 08:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1002911.1382308 (Exim 4.92) (envelope-from ) id 1uM0bP-0002Pb-4J; Mon, 02 Jun 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 1002911.1382308; Mon, 02 Jun 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 1uM0bP-0002PT-1k; Mon, 02 Jun 2025 08:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1002911; Mon, 02 Jun 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 1uM0bO-0002PN-M3 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM0bO-00G3t2-1S for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM0bO-00Cvan-1F for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=ETuRQEn5faWp3C6jXJ2SgQYs5rqzu4utTUbbYYl6iIg=; b=mRYhpQP/m1W14B/Xeel9jLEgJP RdBeS++yaZGYKcsNs5QDlQdDu5ImnA8316DOOEq7qR2hAjxdmWj1yQpAy2eFSynTacRc3500jZ4m0 EQ9ScDLj6sxrtj/Rx9b9zNRy2t/VnTaKV6BKlEINIMcHKcT1t9RbeW3GJDluA9639vJI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: Only access legacy altp2m on HVM Message-Id: Date: Mon, 02 Jun 2025 08:33:02 +0000 commit 01dfd25509cc44011e83677e989dc7f55e2657d5 Author: Jason Andryuk AuthorDate: Tue May 13 11:44:19 2025 -0400 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 tools/libxl: Only access legacy altp2m on HVM Only access the HVM union b_info->u.hvm on HVM guests. The union access is not guarded, so this reads and sets the default even on non-HVM guests. Usually this doesn't matter as PV and PVH unions are smaller and zero-initialized, but the zero default will be re-written as a -1 boolean. Generally, it could incorrectly set b_info->altp2m through aliased data. Fixes: 0291089f6ea8 ("xen: enable altp2m at create domain domctl") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/libs/light/libxl_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 0b1c2d3a96..867addfcab 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -814,17 +814,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); - /* - * The config parameter "altp2m" replaces the parameter "altp2mhvm". - * For legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. - */ - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); - if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(b_info->u.hvm.altp2m)) - b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 08:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 08:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1002912.1382312 (Exim 4.92) (envelope-from ) id 1uM0bZ-0002RD-5o; Mon, 02 Jun 2025 08:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1002912.1382312; Mon, 02 Jun 2025 08: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 1uM0bZ-0002R5-39; Mon, 02 Jun 2025 08:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1002912; Mon, 02 Jun 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 1uM0bY-0002Qz-Il for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM0bY-00G3t6-1l for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM0bY-00Cvmb-1e for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=3FwHE7mS1qODuZ4iD+sXxdSZi09EmVulXnnVVO701nU=; b=YfRxkm0WnUTSQDOQTyjJ314l2T 7VMkYuAAqd5snS/Pc/IGTrsyOYfNw4i/5oyL1tlRDQ2LPOGGR9qcg1wk5SHFl9R5fn8Mmnz7oCSjD B1f8PGFNpM+LsQb7if94UnnWbb4Rdfas1PujH38JXUCgJju4RCIVMkavlJvIdu1omCSQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: remove qemu-traditional support from documentation Message-Id: Date: Mon, 02 Jun 2025 08:33:12 +0000 commit b1763edcead7fae81a3733d1f08d1c164a29b91d Author: Juergen Gross AuthorDate: Tue May 27 15:20:30 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 docs: remove qemu-traditional support from documentation In preparation to no longer support qemu-traditional (including qemu-stubdom), remove it from documentation. Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- docs/man/xl-pci-configuration.5.pod | 4 +-- docs/man/xl.cfg.5.pod.in | 49 +++++-------------------- docs/misc/stubdom.txt | 52 --------------------------- docs/misc/xenstore-paths.pandoc | 3 +- docs/process/branching-checklist.txt | 3 -- docs/process/release-technician-checklist.txt | 2 -- docs/process/xen-release-management.pandoc | 2 +- 7 files changed, 13 insertions(+), 102 deletions(-) diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configuration.5.pod index ec76f590b7..0691f06ad3 100644 --- a/docs/man/xl-pci-configuration.5.pod +++ b/docs/man/xl-pci-configuration.5.pod @@ -111,8 +111,8 @@ if this parameter is not specified. =item Description By default pciback only allows PV guests to write "known safe" values -into PCI configuration space, likewise QEMU (both qemu-xen and -qemu-xen-traditional) imposes the same constraint on HVM guests. +into PCI configuration space, likewise QEMU imposes the same constraint +on HVM guests. However, many devices require writes to other areas of the configuration space in order to operate properly. This option tells the backend (pciback or QEMU) to allow all writes to the PCI configuration space of this device by this diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 7339c44efd..c388899306 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -841,7 +841,7 @@ This option does not control the emulated graphics card presented to an HVM guest. See B below for how to configure the emulated device. If B options are used in a PV guest configuration, B will pick up B, B, -B, B, B, B, B and +B, B, B, B and B to construct the paravirtual framebuffer device for the guest. Each B is a comma-separated list of C @@ -895,12 +895,6 @@ is used. Specifies the path to the X authority file that should be used to connect to the X server when the B option is used. -=item B - -Enable OpenGL acceleration of the SDL display. Only effects machines -using B and only if the -device-model was compiled with OpenGL support. The default is 0 (disabled). - =item B Configure the keymap to use for the keyboard associated with this @@ -1215,17 +1209,11 @@ working graphics passthrough. See the XenVGAPassthroughTestedAdapters L wiki page for graphics cards currently supported by B. -B is currently supported both with the qemu-xen-traditional -device-model and upstream qemu-xen device-model. - When given as a boolean the B option either disables graphics card passthrough or enables autodetection. When given as a string the B option describes the type -of device to enable. Note that this behavior is only supported with the -upstream qemu-xen device-model. With qemu-xen-traditional IGD (Intel Graphics -Device) is always assumed and options other than autodetect or explicit IGD -will result in an error. +of device to enable. Currently, valid values for the option are: @@ -1903,10 +1891,7 @@ it may be useful to request a different one, like UEFI. =item B -Loads ROMBIOS, a 16-bit x86 compatible BIOS. This is used by default -when B. This is the only BIOS -option supported when B. This is -the BIOS used by all previous Xen versions. +Loads ROMBIOS, a 16-bit x86 compatible BIOS. =item B @@ -1926,8 +1911,7 @@ Override the path to the blob to be used as BIOS. The blob provided here MUST be consistent with the B which you have specified. You should not normally need to specify this option. -This option does not have any effect if using B or -B. +Requires B. =item B @@ -2516,15 +2500,10 @@ Sets the amount of RAM which the emulated video card will contain, which in turn limits the resolutions and bit depths which will be available. -When using the qemu-xen-traditional device-model, the default as well as -minimum amount of video RAM for stdvga is 8 MB, which is sufficient for e.g. -1600x1200 at 32bpp. For the upstream qemu-xen device-model, the default and -minimum is 16 MB. +When using stdvga, the default and minimum is 16 MB. -When using the emulated Cirrus graphics card (B) and the -qemu-xen-traditional device-model, the amount of video RAM is fixed at 4 MB, -which is sufficient for 1024x768 at 32 bpp. For the upstream qemu-xen -device-model, the default and minimum is 8 MB. +When using the emulated Cirrus graphics card (B), the +default and minimum is 8 MB. For QXL vga, both the default and minimal are 128MB. If B is set less than 128MB, an error will be triggered. @@ -2590,12 +2569,6 @@ B manpage. The default is B. Specifies that the display should be presented via an X window (using Simple DirectMedia Layer). The default is (0) not enabled. -=item B - -Enable OpenGL acceleration of the SDL display. Only effects machines -using B and only if the -device-model was compiled with OpenGL support. Default is (0) false. - =item B Enable or disable the virtual graphics device. The default is to @@ -2925,11 +2898,6 @@ Valid values are: Use the device-model merged into the upstream QEMU project. This device-model is the default for Linux dom0. -=item B - -Use the device-model based upon the historical Xen fork of QEMU. -This device-model is still the default for NetBSD dom0. - =back It is recommended to accept the default value for new guests. If @@ -2949,8 +2917,7 @@ to specify this option. Override the path to the kernel image used as device-model stubdomain. The binary provided here MUST be consistent with the B which you have specified. -In case of B it is expected to be MiniOS-based stubdomain -image, in case of B it is expected to be Linux-based stubdomain +In case of B it is expected to be Linux-based stubdomain kernel. =item B diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt index 64c220db20..cfcba4ba96 100644 --- a/docs/misc/stubdom.txt +++ b/docs/misc/stubdom.txt @@ -23,58 +23,6 @@ and https://wiki.xen.org/wiki/Device_Model_Stub_Domains for more information on device model stub domains -Toolstack to MiniOS ioemu stubdomain protocol ---------------------------------------------- - -This section describe communication protocol between toolstack and -qemu-traditional running in MiniOS stubdomain. The protocol include -expectations of both qemu and stubdomain itself. - -Setup (done by toolstack, expected by stubdomain): - - Block devices for target domain are connected as PV disks to stubdomain, - according to configuration order, starting with xvda - - Network devices for target domain are connected as PV nics to stubdomain, - according to configuration order, starting with 0 - - if graphics output is expected, VFB and VKB devices are set for stubdomain - (its backend is responsible for exposing them using appropriate protocol - like VNC or Spice) - - other target domain's devices are not connected at this point to stubdomain - (may be hot-plugged later) - - QEMU command line (space separated arguments) is stored in - /vm//image/dmargs xenstore path - - target domain id is stored in /local/domain//target xenstore path -?? - bios type is stored in /local/domain//hvmloader/bios - - stubdomain's console 0 is connected to qemu log file - - stubdomain's console 1 is connected to qemu save file (for saving state) - - stubdomain's console 2 is connected to qemu save file (for restoring state) - - next consoles are connected according to target guest's serial console configuration - -Startup: -1. PV stubdomain is started with ioemu-stubdom.gz kernel and no initrd -2. stubdomain initialize relevant devices -3. stubdomain signal readiness by writing "running" to /local/domain//device-model//state xenstore path -4. now stubdomain is considered running - -Runtime control (hotplug etc): -Toolstack can issue command through xenstore. The sequence is (from toolstack POV): -1. Write parameter to /local/domain//device-model//parameter. -2. Write command to /local/domain//device-model//command. -3. Wait for command result in /local/domain//device-model//state (command specific value). -4. Write "running" back to /local/domain//device-model//state. - -Defined commands: - - "pci-ins" - PCI hot plug, results: - - "pci-inserted" - success - - "pci-insert-failed" - failure - - "pci-rem" - PCI hot remove, results: - - "pci-removed" - success - - ?? - - "save" - save domain state to console 1, results: - - "paused" - success - - "continue" - resume domain execution, after loading state from console 2 (require -loadvm command argument), results: - - "running" - success - - Toolstack to Linux ioemu stubdomain protocol -------------------------------------------- diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index a604f6b1c6..01a340fafc 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -636,7 +636,8 @@ Trustworthy copy of /local/domain/$DOMID/backend/$KIND/$DEVID/$NODE. #### /libxl/$DOMID/dm-version ("qemu_xen"|"qemu_xen_traditional") = [n,INTERNAL] -The device model version for a domain. +The device model version for a domain. Note that "qemu_xen_traditional" is +a device model variant which has been removed from Xen. #### /libxl/$DOMID/remus/netbuf/$DEVID/ifb = STRING [n,INTERNAL] diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index 3dfa8ec257..aa7a27eed5 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -14,8 +14,6 @@ ov=4.0 cd ~/git/qemu-xen.git git branch staging-$v staging git branch stable-$v master - cd ~/git/qemu-xen-traditional.git - git branch stable-$v master # make branch in libvirt ssh xen@xenbits.xen.org @@ -63,7 +61,6 @@ ov=4.0 cp xen--staging.patchbot-reported-heads xen--staging-$v.patchbot-reported-heads cp qemu-xen--master.patchbot-reported-heads qemu-xen--stable-$v.patchbot-reported-heads cp qemu-xen--staging.patchbot-reported-heads qemu-xen--staging-$v.patchbot-reported-heads - cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads #emacs versions perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt index 7bbe7c1489..829e8ec47b 100644 --- a/docs/process/release-technician-checklist.txt +++ b/docs/process/release-technician-checklist.txt @@ -32,8 +32,6 @@ t=RELEASE-$r git show # should show appropriate intended commit git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v - git-push xenbits.xen.org:/home/xen/git/qemu-xen-traditional.git $s:stable-$x xen-$v - # consider making tag in minios, and updating xen.git Config.mk git checkout SOMETHING git show # should show appropriate intended commit diff --git a/docs/process/xen-release-management.pandoc b/docs/process/xen-release-management.pandoc index 7826419dad..5da18f6da1 100644 --- a/docs/process/xen-release-management.pandoc +++ b/docs/process/xen-release-management.pandoc @@ -193,7 +193,7 @@ from the last RC: 1. Send out commit moratorium emails to committers@. -2. Check all the trees (mini-os, qemu-trad, qemu-xen, seabios, ovmf etc). +2. Check all the trees (mini-os, qemu-xen, seabios, ovmf etc). They have the correct commits and all security patches applied. There will be tools provided. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 08:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 08:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1002913.1382316 (Exim 4.92) (envelope-from ) id 1uM0bj-0002T7-83; Mon, 02 Jun 2025 08:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1002913.1382316; Mon, 02 Jun 2025 08: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 1uM0bj-0002T0-58; Mon, 02 Jun 2025 08:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1002913; Mon, 02 Jun 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 1uM0bi-0002Su-Mx for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM0bi-00G3tA-2B for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM0bi-00Cvw6-25 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=PHDZ2ulmPxWFmps84b05K7hM1CpPhEhJk6kZ4WT521M=; b=V/nQqXLifl02dSyTA/nZ/IeqeH OrTEZtsSt0glWBWOqseG+pUMF7htHpX7ngWkLRW5/5Zt7qif4rBFmSKfhwN5ResQmm1V21S791V/g OFo9olEOrACUNGUKVNczTqmkUkcZAJWhKA9VSej+yRIF3jt2SqPuKAfWzFtX/s/12iiw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: remove support for running a guest with qemu-traditional Message-Id: Date: Mon, 02 Jun 2025 08:33:22 +0000 commit 19ab8356abe4acc0f203daad915b559f4b33019d Author: Juergen Gross AuthorDate: Tue May 27 15:20:31 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 tools: remove support for running a guest with qemu-traditional Remove the code in tools for running a guest with qemu-traditional. This covers xl, libxl, libacpi, hvmloader and the related python and go bindings. Signed-off-by: Juergen Gross Acked-by: Jan Beulich # hvmloader Reviewed-by: Anthony PERARD --- tools/firmware/hvmloader/Makefile | 4 +- tools/firmware/hvmloader/pci.c | 17 +- tools/firmware/hvmloader/util.c | 9 +- tools/libacpi/mk_dsdt.c | 185 ++++------------- tools/libs/light/libxl_create.c | 78 +------ tools/libs/light/libxl_device.c | 19 -- tools/libs/light/libxl_disk.c | 7 - tools/libs/light/libxl_dm.c | 327 +----------------------------- tools/libs/light/libxl_dom.c | 10 - tools/libs/light/libxl_dom_save.c | 140 ------------- tools/libs/light/libxl_dom_suspend.c | 65 ------ tools/libs/light/libxl_domain.c | 15 -- tools/libs/light/libxl_exec.c | 75 ------- tools/libs/light/libxl_internal.c | 6 +- tools/libs/light/libxl_internal.h | 68 +------ tools/libs/light/libxl_pci.c | 183 ----------------- tools/libs/light/libxl_sr_stream_format.h | 2 +- tools/libs/light/libxl_stream_write.c | 4 - tools/libs/light/libxl_types.idl | 2 +- tools/python/xen/migration/libxl.py | 2 - tools/xl/xl_parse.c | 5 +- 21 files changed, 77 insertions(+), 1146 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index cc5dc00498..21de72187d 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -53,12 +53,14 @@ endif endif ROMS := +DSDT_FILES := ifeq ($(CONFIG_ROMBIOS),y) OBJS += optionroms.o 32bitbios_support.o rombios.o CFLAGS += -DENABLE_ROMBIOS ROMBIOS_ROM := $(ROMBIOS_DIR)/BIOS-bochs-latest ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) +DSDT_FILES += dsdt_anycpu.c dsdt_15cpu.c endif # Suppress the warning about LOAD segments with RWX permissions, as what we @@ -76,7 +78,7 @@ rombios.o: roms.inc smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" ACPI_PATH = ../../libacpi -DSDT_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c +DSDT_FILES += dsdt_anycpu_qemu_xen.c ACPI_OBJS = $(patsubst %.c,%.o,$(DSDT_FILES)) build.o static_tables.o $(ACPI_OBJS): CFLAGS += -iquote . -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\" CFLAGS += -I$(ACPI_PATH) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index c3c61ca060..cc67b18c03 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -113,17 +113,7 @@ void pci_setup(void) * increase the size of the lowmem MMIO hole? Defaulting to 1 * here will mean that non-libxl toolstacks (including xend and * home-grown ones) means that those using qemu-xen will still - * experience the memory relocation bug described below; but it - * also means that those using qemu-traditional will *not* - * experience any change; and it also means that there is a - * work-around for those using qemu-xen, namely switching to - * qemu-traditional. - * - * If we defaulted to 0, and failing to resize the hole caused any - * problems with qemu-traditional, then there is no work-around. - * - * Since xend can only use qemu-traditional, I think this is the - * option that will have the least impact. + * experience the memory relocation bug described below. */ bool allow_memory_relocate = 1; @@ -347,9 +337,8 @@ void pci_setup(void) { /* * At the moment qemu-xen can't deal with relocated memory regions. - * It's too close to the release to make a proper fix; for now, - * only allow the MMIO hole to grow large enough to move guest memory - * if we're running qemu-traditional. Items that don't fit will be + * Only allow the MMIO hole to grow large enough to move guest memory + * if allow_memory_relocate is true. Items that don't fit will be * relocated into the 64-bit address space. * * This loop now does the following: diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 2d07ce1290..79c0e6bd4a 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -843,14 +843,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, /* If the device model is specified switch to the corresponding tables */ s = xenstore_read("platform/device-model", ""); - if ( !strncmp(s, "qemu_xen_traditional", 21) ) - { - config->dsdt_anycpu = dsdt_anycpu; - config->dsdt_anycpu_len = dsdt_anycpu_len; - config->dsdt_15cpu = dsdt_15cpu; - config->dsdt_15cpu_len = dsdt_15cpu_len; - } - else if ( !strncmp(s, "qemu_xen", 9) ) + if ( !strncmp(s, "qemu_xen", 9) ) { config->dsdt_anycpu = dsdt_anycpu_qemu_xen; config->dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len; diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index 34f6753f61..8ac4f9d0b4 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -19,8 +19,8 @@ static bool debug = false; typedef enum dm_version { QEMU_NONE, - QEMU_XEN_TRADITIONAL, QEMU_XEN, + QEMU_INVALID } dm_version; static void indent(void) @@ -68,30 +68,6 @@ static void pop_block(void) printf("}\n"); } -#ifdef CONFIG_X86 -static void pci_hotplug_notify(unsigned int slt) -{ - stmt("Notify", "\\_SB.PCI0.S%02X, EVT", slt); -} - -static void decision_tree( - unsigned int s, unsigned int e, char *var, void (*leaf)(unsigned int)) -{ - if ( s == (e-1) ) - { - (*leaf)(s); - return; - } - - push_block("If", "And(%s, 0x%02x)", var, (e-s)/2); - decision_tree((s+e)/2, e, var, leaf); - pop_block(); - push_block("Else", NULL); - decision_tree(s, (s+e)/2, var, leaf); - pop_block(); -} -#endif - static struct option options[] = { { "maxcpu", 1, 0, 'c' }, #ifdef CONFIG_X86 @@ -105,7 +81,7 @@ int main(int argc, char **argv) { unsigned int cpu, max_cpus; #if defined(CONFIG_X86) - dm_version dm_version = QEMU_XEN_TRADITIONAL; + dm_version dm_version = QEMU_INVALID; unsigned int slot, dev, intx, link; max_cpus = HVM_MAX_VCPUS; @@ -141,8 +117,6 @@ int main(int argc, char **argv) case 'q': if (strcmp(optarg, "qemu-xen") == 0) { dm_version = QEMU_XEN; - } else if (strcmp(optarg, "qemu-xen-traditional") == 0) { - dm_version = QEMU_XEN_TRADITIONAL; } else if (strcmp(optarg, "none") == 0) { dm_version = QEMU_NONE; } else { @@ -160,6 +134,13 @@ int main(int argc, char **argv) } } +#ifdef CONFIG_X86 + if (dm_version == QEMU_INVALID) { + fprintf(stderr, "--dm_version is a mandatory parameter.\n"); + return -1; + } +#endif + /**** DSDT DefinitionBlock start ****/ /* (we append to existing DSDT definition block) */ indent_level++; @@ -278,9 +259,7 @@ int main(int argc, char **argv) /* Define GPE control method. */ push_block("Scope", "\\_GPE"); - push_block("Method", - dm_version == QEMU_XEN_TRADITIONAL ? "_L%02d" : "_E%02d", - XEN_ACPI_GPE0_CPUHP_BIT); + push_block("Method", "_E%02d", XEN_ACPI_GPE0_CPUHP_BIT); stmt("\\_SB.PRSC ()", NULL); pop_block(); pop_block(); @@ -302,17 +281,10 @@ int main(int argc, char **argv) */ push_block("Device", "HP0"); { stmt("Name", "_HID, EISAID(\"PNP0C02\")"); - if (dm_version == QEMU_XEN_TRADITIONAL) { - stmt("Name", "_CRS, ResourceTemplate() {" - " IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x82)" - " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)" - "}"); - } else { - stmt("Name", "_CRS, ResourceTemplate() {" - " IO (Decode16, 0xae00, 0xae00, 0x00, 0x10)" - " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)" - "}"); - } + stmt("Name", "_CRS, ResourceTemplate() {" + " IO (Decode16, 0xae00, 0xae00, 0x00, 0x10)" + " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)" + "}"); } pop_block(); /*** PCI-ISA link definitions ***/ @@ -397,60 +369,27 @@ int main(int argc, char **argv) * QEMU provides a simple hotplug controller with some I/O to handle * the hotplug action and status, which is beyond the ACPI scope. */ - if (dm_version == QEMU_XEN_TRADITIONAL) { - for ( slot = 0; slot < 0x100; slot++ ) - { - push_block("Device", "S%02X", slot); - /* _ADR == dev:fn (16:16) */ - stmt("Name", "_ADR, 0x%08x", ((slot & ~7) << 13) | (slot & 7)); - /* _SUN == dev */ - stmt("Name", "_SUN, 0x%08x", slot >> 3); - push_block("Method", "_EJ0, 1"); - if (debug) - { - stmt("Store", "0x%02x, \\_GPE.DPT1", slot); - stmt("Store", "0x88, \\_GPE.DPT2"); - } - stmt("Store", "0x%02x, \\_GPE.PH%02X", /* eject */ - (slot & 1) ? 0x10 : 0x01, slot & ~1); - pop_block(); - push_block("Method", "_STA, 0"); - if (debug) - { - stmt("Store", "0x%02x, \\_GPE.DPT1", slot); - stmt("Store", "0x89, \\_GPE.DPT2"); - } - if ( slot & 1 ) - stmt("ShiftRight", "\\_GPE.PH%02X, 0x04, Local1", slot & ~1); - else - stmt("And", "\\_GPE.PH%02X, 0x0f, Local1", slot & ~1); - stmt("Return", "Local1"); /* IN status as the _STA */ - pop_block(); - pop_block(); - } - } else { - stmt("OperationRegion", "SEJ, SystemIO, 0xae08, 0x08"); - push_block("Field", "SEJ, DWordAcc, NoLock, WriteAsZeros"); - indent(); printf("B0EJ, 32,\n"); - indent(); printf("B0RM, 32,\n"); - pop_block(); + stmt("OperationRegion", "SEJ, SystemIO, 0xae08, 0x08"); + push_block("Field", "SEJ, DWordAcc, NoLock, WriteAsZeros"); + indent(); printf("B0EJ, 32,\n"); + indent(); printf("B0RM, 32,\n"); + pop_block(); - /* hotplug_slot */ - for (slot = 1; slot <= 31; slot++) { - push_block("Device", "S%i", slot); { - stmt("Name", "_ADR, %#06x0000", slot); - push_block("Method", "_EJ0,1"); { - stmt("Store", "%#010x, B0EJ", 1 << slot); - } pop_block(); - stmt("Name", "_SUN, %i", slot); - push_block("Method", "_STA, 0"); { - push_block("If", "And(B0RM, ShiftLeft(1, %i))", slot); - stmt("Return", "0xF"); - pop_block(); - stmt("Return", "0x0"); - } pop_block(); + /* hotplug_slot */ + for (slot = 1; slot <= 31; slot++) { + push_block("Device", "S%i", slot); { + stmt("Name", "_ADR, %#06x0000", slot); + push_block("Method", "_EJ0,1"); { + stmt("Store", "%#010x, B0EJ", 1 << slot); } pop_block(); - } + stmt("Name", "_SUN, %i", slot); + push_block("Method", "_STA, 0"); { + push_block("If", "And(B0RM, ShiftLeft(1, %i))", slot); + stmt("Return", "0xF"); + pop_block(); + stmt("Return", "0x0"); + } pop_block(); + } pop_block(); } pop_block(); @@ -460,26 +399,11 @@ int main(int argc, char **argv) /**** GPE start ****/ push_block("Scope", "\\_GPE"); - if (dm_version == QEMU_XEN_TRADITIONAL) { - stmt("OperationRegion", "PHP, SystemIO, 0x10c0, 0x82"); - - push_block("Field", "PHP, ByteAcc, NoLock, Preserve"); - indent(); printf("PSTA, 8,\n"); /* hotplug controller event reg */ - indent(); printf("PSTB, 8,\n"); /* hotplug controller slot reg */ - for ( slot = 0; slot < 0x100; slot += 2 ) - { - indent(); - /* Each hotplug control register manages a pair of pci functions. */ - printf("PH%02X, 8,\n", slot); - } - pop_block(); - } else { - stmt("OperationRegion", "PCST, SystemIO, 0xae00, 0x08"); - push_block("Field", "PCST, DWordAcc, NoLock, WriteAsZeros"); - indent(); printf("PCIU, 32,\n"); - indent(); printf("PCID, 32,\n"); - pop_block(); - } + stmt("OperationRegion", "PCST, SystemIO, 0xae00, 0x08"); + push_block("Field", "PCST, DWordAcc, NoLock, WriteAsZeros"); + indent(); printf("PCIU, 32,\n"); + indent(); printf("PCID, 32,\n"); + pop_block(); stmt("OperationRegion", "DG1, SystemIO, 0xb044, 0x04"); @@ -487,35 +411,16 @@ int main(int argc, char **argv) indent(); printf("DPT1, 8, DPT2, 8\n"); pop_block(); - if (dm_version == QEMU_XEN_TRADITIONAL) { - push_block("Method", "_L03, 0, Serialized"); - /* Detect slot and event (remove/add). */ - stmt("Name", "SLT, 0x0"); - stmt("Name", "EVT, 0x0"); - stmt("Store", "PSTA, Local1"); - stmt("And", "Local1, 0xf, EVT"); - stmt("Store", "PSTB, Local1"); /* XXX: Store (PSTB, SLT) ? */ - stmt("And", "Local1, 0xff, SLT"); - if (debug) - { - stmt("Store", "SLT, DPT1"); - stmt("Store", "EVT, DPT2"); - } - /* Decision tree */ - decision_tree(0x00, 0x100, "SLT", pci_hotplug_notify); + push_block("Method", "_E01"); + for (slot = 1; slot <= 31; slot++) { + push_block("If", "And(PCIU, ShiftLeft(1, %i))", slot); + stmt("Notify", "\\_SB.PCI0.S%i, 1", slot); pop_block(); - } else { - push_block("Method", "_E01"); - for (slot = 1; slot <= 31; slot++) { - push_block("If", "And(PCIU, ShiftLeft(1, %i))", slot); - stmt("Notify", "\\_SB.PCI0.S%i, 1", slot); - pop_block(); - push_block("If", "And(PCID, ShiftLeft(1, %i))", slot); - stmt("Notify", "\\_SB.PCI0.S%i, 3", slot); - pop_block(); - } + push_block("If", "And(PCID, ShiftLeft(1, %i))", slot); + stmt("Notify", "\\_SB.PCI0.S%i, 3", slot); pop_block(); } + pop_block(); pop_block(); /**** GPE end ****/ diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index e03599ea99..8bc768b515 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -99,35 +99,14 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->device_model_ssidref = SECINITSID_DOMDM; if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - if (libxl_defbool_val(b_info->device_model_stubdomain)) { - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else { - b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - } - } else { - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - } - if (b_info->device_model_version - == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - const char *dm; - - dm = libxl__domain_device_model(gc, b_info); - rc = access(dm, X_OK); - if (rc < 0) { - /* qemu-xen unavailable, use qemu-xen-traditional */ - if (errno == ENOENT) { - LOGE(INFO, "qemu-xen is unavailable" - ", using qemu-xen-traditional instead"); - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else { - LOGE(ERROR, "qemu-xen access error"); - return ERROR_FAIL; - } - } + const char *dm; + + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + 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; } } @@ -137,8 +116,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - b_info->u.hvm.bios = LIBXL_BIOS_TYPE_ROMBIOS; break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->u.hvm.bios = LIBXL_BIOS_TYPE_SEABIOS; break; default: @@ -148,12 +125,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, /* Enforce BIOS<->Device Model version relationship */ switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - if (b_info->u.hvm.bios != LIBXL_BIOS_TYPE_ROMBIOS) { - LOG(ERROR, "qemu-xen-traditional requires bios=rombios."); - return ERROR_INVAL; - } - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: if (b_info->u.hvm.bios == LIBXL_BIOS_TYPE_ROMBIOS) { LOG(ERROR, "qemu-xen does not support bios=rombios."); @@ -176,10 +147,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_val(b_info->device_model_stubdomain)) { if (!b_info->stubdomain_kernel) { switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - b_info->stubdomain_kernel = - libxl__abs_path(NOGC, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->stubdomain_kernel = libxl__abs_path(NOGC, @@ -192,8 +159,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } if (!b_info->stubdomain_ramdisk) { switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->stubdomain_ramdisk = libxl__abs_path(NOGC, @@ -299,33 +264,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->u.hvm.hdtype = LIBXL_HDTYPE_IDE; switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - switch (b_info->u.hvm.vga.kind) { - case LIBXL_VGA_INTERFACE_TYPE_NONE: - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 0; - break; - case LIBXL_VGA_INTERFACE_TYPE_QXL: - LOG(ERROR,"qemu upstream required for qxl vga"); - return ERROR_INVAL; - break; - case LIBXL_VGA_INTERFACE_TYPE_STD: - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 8 * 1024; - if (b_info->video_memkb < 8 * 1024) { - LOG(ERROR, "videoram must be at least 8 MB for STDVGA on QEMU_XEN_TRADITIONAL"); - return ERROR_INVAL; - } - break; - case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: - default: - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 4 * 1024; - if (b_info->video_memkb != 4 * 1024) - LOG(WARN, "ignoring videoram other than 4 MB for CIRRUS on QEMU_XEN_TRADITIONAL"); - break; - } - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: default: switch (b_info->u.hvm.vga.kind) { diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index 4faa5fa3bd..42d71c17bc 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -1440,25 +1440,6 @@ static void devices_remove_callback(libxl__egc *egc, return; } -int libxl__wait_for_device_model_deprecated(libxl__gc *gc, - uint32_t domid, char *state, - libxl__spawn_starting *spawning, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata) -{ - char *path; - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - return libxl__xenstore_child_wait_deprecated(gc, domid, - LIBXL_DEVICE_MODEL_START_TIMEOUT, - "Device Model", path, state, spawning, - check_callback, check_callback_userdata); -} - int libxl__wait_for_backend(libxl__gc *gc, const char *be_path, const char *state) { diff --git a/tools/libs/light/libxl_disk.c b/tools/libs/light/libxl_disk.c index 6a0b6e06fe..456b5450ca 100644 --- a/tools/libs/light/libxl_disk.c +++ b/tools/libs/light/libxl_disk.c @@ -1007,13 +1007,6 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, disk->backend = LIBXL_DISK_BACKEND_PHY; } - if (cis->dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - stubdomid) { - LOGD(ERROR, domid, "cdrom-insert doesn't work for Mini-OS stubdoms"); - rc = ERROR_INVAL; - goto out; - } - disks = libxl__device_list(gc, &libxl__disk_devtype, cis->disk_domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index 4627564c0d..511ec76a65 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.c @@ -328,9 +328,6 @@ const char *libxl__domain_device_model(libxl__gc *gc, dm = libxl__strdup(gc, info->device_model); } else { switch (info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - dm = libxl__abs_path(gc, "qemu-dm", libxl__private_bindir_path()); - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: { const char *configured_dm = qemu_xen_path(gc); if (configured_dm[0] == '/') @@ -704,272 +701,6 @@ static const char *dm_keymap(const libxl_domain_config *guest_config) return NULL; } -static int libxl__build_device_model_args_old(libxl__gc *gc, - const char *dm, int domid, - const libxl_domain_config *guest_config, - char ***args, char ***envs, - const libxl__domain_build_state *state) -{ - const libxl_domain_create_info *c_info = &guest_config->c_info; - const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_device_nic *nics = guest_config->nics; - const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); - const libxl_sdl_info *sdl = dm_sdl(guest_config); - const int num_nics = guest_config->num_nics; - const char *keymap = dm_keymap(guest_config); - int i; - flexarray_t *dm_args, *dm_envs; - dm_args = flexarray_make(gc, 16, 1); - dm_envs = flexarray_make(gc, 16, 1); - - assert(state->dm_monitor_fd == -1); - - flexarray_vappend(dm_args, dm, - "-d", GCSPRINTF("%d", domid), NULL); - - if (c_info->name) - flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); - - if (vnc) { - char *vncarg = NULL; - - flexarray_append(dm_args, "-vnc"); - - /* - * If vnc->listen is present and contains a :, and - * - vnc->display is 0, use vnc->listen - * - vnc->display is non-zero, be confused - * If vnc->listen is present but doesn't, use vnc->listen:vnc->display. - * If vnc->listen is not present, use 127.0.0.1:vnc->display - * (Remembering that vnc->display already defaults to 0.) - */ - if (vnc->listen) { - if (strchr(vnc->listen, ':') != NULL) { - if (vnc->display) { - LOGD(ERROR, domid, "vncdisplay set, vnclisten contains display"); - return ERROR_INVAL; - } - vncarg = vnc->listen; - } else { - vncarg = GCSPRINTF("%s:%d", vnc->listen, vnc->display); - } - } else - vncarg = GCSPRINTF("127.0.0.1:%d", vnc->display); - - if (vnc->passwd && vnc->passwd[0]) { - vncarg = GCSPRINTF("%s,password", vncarg); - } - - flexarray_append(dm_args, vncarg); - - if (libxl_defbool_val(vnc->findunused)) { - flexarray_append(dm_args, "-vncunused"); - } - } else if (!sdl) { - /* - * VNC is not enabled by default by qemu-xen-traditional, - * however skipping -vnc causes SDL to be - * (unexpectedly) enabled by default. If undesired, disable graphics at - * all. - */ - flexarray_append(dm_args, "-nographic"); - } - - if (sdl) { - flexarray_append(dm_args, "-sdl"); - if (!libxl_defbool_val(sdl->opengl)) { - flexarray_append(dm_args, "-disable-opengl"); - } - if (sdl->display) - flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); - if (sdl->xauthority) - flexarray_append_pair(dm_envs, "XAUTHORITY", sdl->xauthority); - } - if (keymap) { - flexarray_vappend(dm_args, "-k", keymap, NULL); - } - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - int ioemu_nics = 0; - int nr_set_cpus = 0; - char *s; - - flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", domid)); - - if (b_info->kernel) { - LOGD(ERROR, domid, "HVM direct kernel boot is not supported by " - "qemu-xen-traditional"); - return ERROR_INVAL; - } - - if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { - if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) - { - LOGD(ERROR, domid, "Both serial and serial_list set"); - return ERROR_INVAL; - } - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, - "-serial", b_info->u.hvm.serial, NULL); - } else if (b_info->u.hvm.serial_list) { - char **p; - for (p = b_info->u.hvm.serial_list; - *p; - p++) { - flexarray_vappend(dm_args, - "-serial", - *p, NULL); - } - } - } - - if (libxl_defbool_val(b_info->u.hvm.nographic) && (!sdl && !vnc)) { - flexarray_append(dm_args, "-nographic"); - } - - if (b_info->video_memkb) { - flexarray_vappend(dm_args, "-videoram", - GCSPRINTF("%d", libxl__sizekb_to_mb(b_info->video_memkb)), - NULL); - } - - switch (b_info->u.hvm.vga.kind) { - case LIBXL_VGA_INTERFACE_TYPE_STD: - flexarray_append(dm_args, "-std-vga"); - break; - case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: - break; - case LIBXL_VGA_INTERFACE_TYPE_NONE: - flexarray_append_pair(dm_args, "-vga", "none"); - break; - case LIBXL_VGA_INTERFACE_TYPE_QXL: - break; - default: - LOGD(ERROR, domid, "Invalid emulated video card specified"); - return ERROR_INVAL; - } - - if (b_info->u.hvm.boot) { - flexarray_vappend(dm_args, "-boot", b_info->u.hvm.boot, NULL); - } - if (libxl_defbool_val(b_info->u.hvm.usb) - || b_info->u.hvm.usbdevice - || libxl_string_list_length(&b_info->u.hvm.usbdevice_list)) { - if (b_info->u.hvm.usbdevice - && libxl_string_list_length(&b_info->u.hvm.usbdevice_list)) { - LOGD(ERROR, domid, "Both usbdevice and usbdevice_list set"); - return ERROR_INVAL; - } - flexarray_append(dm_args, "-usb"); - if (b_info->u.hvm.usbdevice) { - flexarray_vappend(dm_args, - "-usbdevice", b_info->u.hvm.usbdevice, NULL); - } else if (b_info->u.hvm.usbdevice_list) { - char **p; - for (p = b_info->u.hvm.usbdevice_list; - *p; - p++) { - flexarray_vappend(dm_args, - "-usbdevice", - *p, NULL); - } - } - } - if (b_info->u.hvm.soundhw) { - flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); - } - if (libxl__acpi_defbool_val(b_info)) { - flexarray_append(dm_args, "-acpi"); - } - if (b_info->max_vcpus > 1) { - flexarray_vappend(dm_args, "-vcpus", - GCSPRINTF("%d", b_info->max_vcpus), - NULL); - } - - nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus); - s = libxl_bitmap_to_hex_string(CTX, &b_info->avail_vcpus); - flexarray_vappend(dm_args, "-vcpu_avail", - GCSPRINTF("%s", s), NULL); - free(s); - - for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { - char *smac = GCSPRINTF( - LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); - const char *ifname = libxl__device_nic_devname(gc, - domid, nics[i].devid, - LIBXL_NIC_TYPE_VIF_IOEMU); - flexarray_vappend(dm_args, - "-net", - GCSPRINTF( - "nic,vlan=%d,macaddr=%s,model=%s", - nics[i].devid, smac, nics[i].model), - "-net", - GCSPRINTF( - "tap,vlan=%d,ifname=%s,bridge=%s," - "script=%s,downscript=%s", - nics[i].devid, ifname, nics[i].bridge, - libxl_tapif_script(gc), - libxl_tapif_script(gc)), - NULL); - ioemu_nics++; - } - } - /* If we have no emulated nics, tell qemu not to create any */ - if ( ioemu_nics == 0 ) { - flexarray_vappend(dm_args, "-net", "none", NULL); - } - if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { - switch (b_info->u.hvm.gfx_passthru_kind) { - case LIBXL_GFX_PASSTHRU_KIND_DEFAULT: - case LIBXL_GFX_PASSTHRU_KIND_IGD: - flexarray_append(dm_args, "-gfx_passthru"); - break; - default: - LOGD(ERROR, domid, "unsupported gfx_passthru_kind."); - return ERROR_INVAL; - } - } - } else { - if (!sdl && !vnc) - flexarray_append(dm_args, "-nographic"); - } - - if (libxl_defbool_val(b_info->dm_restrict)) { - LOGD(ERROR, domid, - "dm_restrict not supported by qemu-xen-traditional"); - return ERROR_INVAL; - } - - if (state->saved_state) { - flexarray_vappend(dm_args, "-loadvm", state->saved_state, NULL); - } - for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) - flexarray_append(dm_args, b_info->extra[i]); - flexarray_append(dm_args, "-M"); - switch (b_info->type) { - case LIBXL_DOMAIN_TYPE_PVH: - case LIBXL_DOMAIN_TYPE_PV: - flexarray_append(dm_args, "xenpv"); - for (i = 0; b_info->extra_pv && b_info->extra_pv[i] != NULL; i++) - flexarray_append(dm_args, b_info->extra_pv[i]); - break; - case LIBXL_DOMAIN_TYPE_HVM: - flexarray_append(dm_args, "xenfv"); - for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) - flexarray_append(dm_args, b_info->extra_hvm[i]); - break; - default: - abort(); - } - flexarray_append(dm_args, NULL); - *args = (char **) flexarray_contents(dm_args); - flexarray_append(dm_envs, NULL); - if (envs) - *envs = (char **) flexarray_contents(dm_envs); - return 0; -} - static char *dm_spice_options(libxl__gc *gc, const libxl_spice_info *spice) { @@ -2096,11 +1827,6 @@ static int libxl__build_device_model_args(libxl__gc *gc, * and therefore will be passing a filename rather than a fd. */ { switch (guest_config->b_info.device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, - guest_domid, guest_config, - args, envs, - state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: if (!libxl_defbool_val(guest_config->b_info.device_model_stubdomain)) { assert(dm_state_fd != NULL); @@ -2463,16 +2189,15 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) "%s", libxl_bios_type_to_string(guest_config->b_info.u.hvm.bios)); } - /* Disable relocating memory to make the MMIO hole larger - * unless we're running qemu-traditional and vNUMA is not - * configured. */ + + /* + * Disable relocating memory, having a larger MMIO hole isn't + * implemented with qemu-xen. + */ libxl__xs_printf(gc, XBT_NULL, libxl__sprintf(gc, "%s/hvmloader/allow-memory-relocate", libxl__xs_get_dompath(gc, guest_domid)), - "%d", - guest_config->b_info.device_model_version - == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - !libxl__vnuma_configured(&guest_config->b_info)); + "0"); ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { LOGED(ERROR, guest_domid, "setting target domain %d -> %d", @@ -3156,13 +2881,9 @@ static void device_model_launch(libxl__egc *egc, libxl_domain_config *guest_config = dmss->guest_config; const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); char *path; int logfile_w, null; char **args, **arg, **envs; - xs_transaction_t t; - char *vm_path; - char **pass_stuff; int dm_state_fd = -1; /* convenience aliases */ @@ -3196,26 +2917,19 @@ static void device_model_launch(libxl__egc *egc, libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/hvmloader/bios", path), "%s", libxl_bios_type_to_string(b_info->u.hvm.bios)); - /* Disable relocating memory to make the MMIO hole larger - * unless we're running qemu-traditional and vNUMA is not - * configured. */ + /* + * Disable relocating memory, having a larger MMIO hole isn't + * implemented with qemu-xen. + */ libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/hvmloader/allow-memory-relocate", path), - "%d", - b_info->device_model_version==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - !libxl__vnuma_configured(b_info)); + "0"); free(path); } path = DEVICE_MODEL_XS_PATH(gc, LIBXL_TOOLSTACK_DOMID, domid, ""); xs_mkdir(ctx->xsh, XBT_NULL, path); - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && - b_info->device_model_version - == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) - libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/disable_pf", path), - "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); - logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qemu-dm-%s", c_info->name)); if (logfile_w < 0) { @@ -3240,25 +2954,6 @@ static void device_model_launch(libxl__egc *egc, GCSPRINTF("%s/image/device-model-kill-uid", dom_path), "%s", state->dm_kill_uid); - if (vnc && vnc->passwd) { - /* This xenstore key will only be used by qemu-xen-traditionnal. - * The code to supply vncpasswd to qemu-xen is later. */ -retry_transaction: - /* Find uuid and the write the vnc password to xenstore for qemu. */ - t = xs_transaction_start(ctx->xsh); - vm_path = libxl__xs_read(gc,t,GCSPRINTF("%s/vm", dom_path)); - if (vm_path) { - /* Now write the vncpassword into it. */ - pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); - pass_stuff[0] = "vncpasswd"; - pass_stuff[1] = vnc->passwd; - libxl__xs_writev(gc,t,vm_path,pass_stuff); - if (!xs_transaction_end(ctx->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; - } - } - LOGD(DEBUG, domid, "Spawning device-model %s with arguments:", dm); for (arg = args; *arg; arg++) LOGD(DEBUG, domid, " %s", *arg); diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 94fef37401..4d67b0d282 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -881,7 +881,6 @@ static int libxl__domain_firmware(libxl__gc *gc, switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: firmware = "hvmloader"; break; default: @@ -1212,15 +1211,6 @@ out: return rc; } -int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, - const char *cmd) -{ - char *path = NULL; - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/command"); - return libxl__xs_printf(gc, XBT_NULL, path, "%s", cmd); -} - /*==================== Miscellaneous ====================*/ char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) diff --git a/tools/libs/light/libxl_dom_save.c b/tools/libs/light/libxl_dom_save.c index 32e3cb5a13..d64fd64f2e 100644 --- a/tools/libs/light/libxl_dom_save.c +++ b/tools/libs/light/libxl_dom_save.c @@ -28,19 +28,6 @@ static void domain_save_done(libxl__egc *egc, /*----- complicated callback, called by xc_domain_save -----*/ -/* - * We implement the other end of protocol for controlling qemu-dm's - * logdirty. There is no documentation for this protocol, but our - * counterparty's implementation is in - * qemu-xen-traditional.git:xenstore.c in the function - * xenstore_process_logdirty_event - */ - -static void domain_suspend_switch_qemu_xen_traditional_logdirty - (libxl__egc *egc, int domid, unsigned enable, - libxl__logdirty_switch *lds); -static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, - const char *watch_path, const char *event_path); static void domain_suspend_switch_qemu_xen_logdirty (libxl__egc *egc, int domid, unsigned enable, libxl__logdirty_switch *lds); @@ -69,10 +56,6 @@ void libxl__domain_common_switch_qemu_logdirty(libxl__egc *egc, STATE_AO_GC(lds->ao); switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - domain_suspend_switch_qemu_xen_traditional_logdirty(egc, domid, enable, - lds); - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: domain_suspend_switch_qemu_xen_logdirty(egc, domid, enable, lds); break; @@ -83,129 +66,6 @@ void libxl__domain_common_switch_qemu_logdirty(libxl__egc *egc, } } -static void domain_suspend_switch_qemu_xen_traditional_logdirty - (libxl__egc *egc, int domid, unsigned enable, - libxl__logdirty_switch *lds) -{ - STATE_AO_GC(lds->ao); - int rc; - xs_transaction_t t = 0; - const char *got; - - if (!lds->cmd_path) { - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - lds->cmd_path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, - "/logdirty/cmd"); - lds->ret_path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, - "/logdirty/ret"); - } - lds->cmd = enable ? "enable" : "disable"; - - rc = libxl__ev_xswatch_register(gc, &lds->watch, - switch_logdirty_xswatch, lds->ret_path); - if (rc) goto out; - - rc = libxl__ev_time_register_rel(ao, &lds->timeout, - switch_logdirty_timeout, 10*1000); - if (rc) goto out; - - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - rc = libxl__xs_read_checked(gc, t, lds->cmd_path, &got); - if (rc) goto out; - - if (got) { - const char *got_ret; - rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got_ret); - if (rc) goto out; - - if (!got_ret || strcmp(got, got_ret)) { - LOGD(ERROR, domid, "controlling logdirty: qemu was already sent" - " command `%s' (xenstore path `%s') but result is `%s'", - got, lds->cmd_path, got_ret ? got_ret : ""); - rc = ERROR_FAIL; - goto out; - } - rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); - if (rc) goto out; - } - - rc = libxl__xs_rm_checked(gc, t, lds->ret_path); - if (rc) goto out; - - rc = libxl__xs_write_checked(gc, t, lds->cmd_path, lds->cmd); - if (rc) goto out; - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc<0) goto out; - } - - /* OK, wait for some callback */ - return; - - out: - LOGD(ERROR, domid, "logdirty switch failed (rc=%d), abandoning suspend",rc); - libxl__xs_transaction_abort(gc, &t); - switch_logdirty_done(egc,lds,rc); -} - -static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, - const char *watch_path, const char *event_path) -{ - libxl__logdirty_switch *lds = CONTAINER_OF(watch, *lds, watch); - STATE_AO_GC(lds->ao); - const char *got; - xs_transaction_t t = 0; - int rc; - - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got); - if (rc) goto out; - - if (!got) { - rc = +1; - goto out; - } - - if (strcmp(got, lds->cmd)) { - LOG(ERROR,"logdirty switch: sent command `%s' but got reply `%s'" - " (xenstore paths `%s' / `%s')", lds->cmd, got, - lds->cmd_path, lds->ret_path); - rc = ERROR_FAIL; - goto out; - } - - rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); - if (rc) goto out; - - rc = libxl__xs_rm_checked(gc, t, lds->ret_path); - if (rc) goto out; - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc<0) goto out; - } - - out: - /* rc < 0: error - * rc == 0: ok, we are done - * rc == +1: need to keep waiting - */ - libxl__xs_transaction_abort(gc, &t); - - if (rc <= 0) { - if (rc < 0) - LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); - switch_logdirty_done(egc,lds,rc); - } -} - static void domain_suspend_switch_qemu_xen_logdirty (libxl__egc *egc, int domid, unsigned enable, libxl__logdirty_switch *lds) diff --git a/tools/libs/light/libxl_dom_suspend.c b/tools/libs/light/libxl_dom_suspend.c index 6091a5f3f6..f0a74fc82c 100644 --- a/tools/libs/light/libxl_dom_suspend.c +++ b/tools/libs/light/libxl_dom_suspend.c @@ -85,15 +85,8 @@ void libxl__domain_suspend_device_model(libxl__egc *egc, STATE_AO_GC(dsps->ao); int rc = 0; uint32_t const domid = dsps->domid; - const char *const filename = dsps->dm_savefile; switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { - LOGD(DEBUG, domid, "Saving device model state to %s", filename); - libxl__qemu_traditional_cmd(gc, domid, "save"); - libxl__wait_for_device_model_deprecated(gc, domid, "paused", NULL, NULL, NULL); - break; - } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: /* calls dsps->callback_device_model_done when done */ libxl__qmp_suspend_save(egc, dsps); /* must be last */ @@ -420,21 +413,7 @@ static void domain_suspend_callback_common_done(libxl__egc *egc, int libxl__domain_resume_device_model_deprecated(libxl__gc *gc, uint32_t domid) { - const char *path, *state; - switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - if (state != NULL && !strcmp(state, "paused")) { - libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model_deprecated(gc, domid, "running", - NULL, NULL, NULL); - } - break; - } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: if (libxl__qmp_resume(gc, domid)) return ERROR_FAIL; @@ -493,8 +472,6 @@ static void dm_resume_dispose(libxl__gc *gc, libxl__ev_xswatch_deregister(gc, &dmrs->watch); } -static void dm_resume_xswatch_cb(libxl__egc *egc, - libxl__ev_xswatch *, const char *watch_path, const char *); static void dm_resume_qmp_done(libxl__egc *egc, libxl__ev_qmp *qmp, const libxl__json_object *, int rc); static void dm_resume_timeout(libxl__egc *egc, @@ -521,27 +498,6 @@ void libxl__dm_resume(libxl__egc *egc, if (rc) goto out; switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - const char *path, *state; - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - rc = libxl__xs_read_checked(gc, XBT_NULL, path, &state); - if (rc) goto out; - if (!state || strcmp(state, "paused")) { - /* already running */ - rc = 0; - goto out; - } - - rc = libxl__qemu_traditional_cmd(gc, domid, "continue"); - if (rc) goto out; - rc = libxl__ev_xswatch_register(gc, &dmrs->watch, - dm_resume_xswatch_cb, - path); - if (rc) goto out; - break; - } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: qmp->ao = dmrs->ao; qmp->domid = domid; @@ -561,27 +517,6 @@ out: dm_resume_done(egc, dmrs, rc); } -static void dm_resume_xswatch_cb(libxl__egc *egc, - libxl__ev_xswatch *xsw, - const char *watch_path, - const char *event_path) -{ - EGC_GC; - libxl__dm_resume_state *dmrs = CONTAINER_OF(xsw, *dmrs, watch); - int rc; - const char *value; - - rc = libxl__xs_read_checked(gc, XBT_NULL, watch_path, &value); - if (rc) goto out; - - if (!value || strcmp(value, "running")) - return; - - rc = 0; -out: - dm_resume_done(egc, dmrs, rc); -} - static void dm_resume_qmp_done(libxl__egc *egc, libxl__ev_qmp *qmp, const libxl__json_object *response, diff --git a/tools/libs/light/libxl_domain.c b/tools/libs/light/libxl_domain.c index 6751fc785f..dd2e5e9a19 100644 --- a/tools/libs/light/libxl_domain.c +++ b/tools/libs/light/libxl_domain.c @@ -1877,8 +1877,6 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__ev_time_register_rel(ao, &svos->timeout, set_vcpuonline_timeout, @@ -2116,7 +2114,6 @@ static void domain_s3_resume(libxl__ao *ao, libxl__egc *egc, int domid) AO_GC; libxl__ev_qmp *qmp; int rc = 0; - int r; GCNEW(qmp); libxl__ev_qmp_init(qmp); @@ -2128,14 +2125,6 @@ static void domain_s3_resume(libxl__ao *ao, libxl__egc *egc, int domid) switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - r = xc_hvm_param_set(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); - if (r) { - LOGED(ERROR, domid, "Send trigger '%s' failed", - libxl_trigger_to_string(LIBXL_TRIGGER_S3RESUME)); - rc = ERROR_FAIL; - } - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__ev_qmp_send(egc, qmp, "system_wakeup", NULL); if (rc) goto out; @@ -2481,10 +2470,6 @@ static void retrieve_domain_configuration_end(libxl__egc *egc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: libxl_bitmap_copy(CTX, map, &rdcs->qemuu_cpus); break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__update_avail_vcpus_xenstore(gc, domid, - max_vcpus, map); - break; default: abort(); } diff --git a/tools/libs/light/libxl_exec.c b/tools/libs/light/libxl_exec.c index a8b949b193..7a59c050b2 100644 --- a/tools/libs/light/libxl_exec.c +++ b/tools/libs/light/libxl_exec.c @@ -157,81 +157,6 @@ out: return rc ? SIGTERM : 0; } -int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, - uint32_t domid, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawn_starting *spawning, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata) -{ - char *p; - unsigned int len; - int rc = 0; - struct xs_handle *xsh; - int nfds; - fd_set rfds; - struct timeval tv; - unsigned int num; - char **l = NULL; - - xsh = xs_open(0); - if (xsh == NULL) { - LOG(ERROR, "Unable to open xenstore connection"); - goto err; - } - - xs_watch(xsh, path, path); - tv.tv_sec = timeout; - tv.tv_usec = 0; - nfds = xs_fileno(xsh) + 1; - assert(!spawning); - - while (rc > 0 || (!rc && tv.tv_sec > 0)) { - p = xs_read(xsh, XBT_NULL, path, &len); - if ( NULL == p ) - goto again; - - if ( NULL != state && strcmp(p, state) ) - goto again; - - if ( NULL != check_callback ) { - rc = (*check_callback)(gc, domid, p, check_callback_userdata); - if ( rc > 0 ) - goto again; - } - - free(p); - xs_unwatch(xsh, path, path); - xs_close(xsh); - return rc; -again: - free(p); - FD_ZERO(&rfds); - FD_SET(xs_fileno(xsh), &rfds); - rc = select(nfds, &rfds, NULL, NULL, &tv); - if (rc > 0) { - if (FD_ISSET(xs_fileno(xsh), &rfds)) { - l = xs_read_watch(xsh, &num); - if (l != NULL) - free(l); - else - goto again; - } - } - } - LOG(ERROR, "%s not ready", what); - - xs_unwatch(xsh, path, path); - xs_close(xsh); -err: - return -1; -} - - /*----- spawn implementation -----*/ /* diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index c95624933f..2941ca0bbd 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -387,11 +387,9 @@ int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) path = libxl__xs_libxl_path(gc, domid); path = GCSPRINTF("%s/dm-version", path); dm_version = libxl__xs_read(gc, XBT_NULL, path); - if (!dm_version) { - return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } - if (libxl_device_model_version_from_string(dm_version, &value) < 0) { + if (!dm_version || + libxl_device_model_version_from_string(dm_version, &value) < 0) { LOGD(ERROR, domid, "fatal: %s contain a wrong value (%s)", path, dm_version); return -1; } diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 408a771310..75bb0b94cf 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -1423,8 +1423,6 @@ _hidden int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config, libxl__domain_build_state *state); -_hidden int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, - const char *cmd); _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid, const char *old_name, const char *new_name, xs_transaction_t trans); @@ -1914,50 +1912,6 @@ static inline int libxl__spawn_inuse(const libxl__spawn_state *ss) _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, pid_t innerchild); -/* - * libxl__xenstore_child_wait_deprecated - Wait for daemonic child IPC - * - * This is a NOT function for waiting for ordinary child processes. - * If you want to run (fork/exec/wait) subprocesses from libxl: - * - Make your libxl entrypoint use the ao machinery - * - Use libxl__ev_child_fork, and use the callback programming style - * - * This function is intended for interprocess communication with a - * service process. If the service process does not respond quickly, - * the whole caller may be blocked. Therefore this function is - * deprecated. This function is currently used only by - * libxl__wait_for_device_model_deprecated. - * - * gc: allocation pool - * domid: guest to work with - * timeout: how many seconds to wait for the state to appear - * what: string describing the spawned process - * path: path to the state file in xenstore - * state: expected string to wait for in path (optional) - * spawning: malloc'd pointer to libxl__spawn_starting (optional) - * check_callback: (optional) - * check_callback_userdata: data to pass to the callback function - * - * Returns 0 on success, and < 0 on error. - * - * This function waits the given timeout for the given path to appear - * in xenstore, and optionally for state in path. - * If path appears and state matches, check_callback is called. - * If check_callback returns > 0, waiting for path or state continues. - * Otherwise libxl__xenstore_child_wait_deprecated returns. - */ -_hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, - uint32_t domid, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawn_starting *spawning, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata); - - /* low-level stuff, for synchronous subprocesses etc. */ /* @@ -2022,25 +1976,6 @@ _hidden int libxl__domain_device_construct_rdm(libxl__gc *gc, uint64_t rdm_mem_guard, struct xc_dom_image *dom); -/* - * This function will cause the whole libxl process to hang - * if the device model does not respond. It is deprecated. - * - * Instead of calling this function: - * - Make your libxl entrypoint use the ao machinery - * - Use libxl__ev_xswatch_register, and use the callback programming - * style - */ -_hidden int libxl__wait_for_device_model_deprecated(libxl__gc *gc, - uint32_t domid, char *state, - libxl__spawn_starting *spawning - /* NULL allowed */, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata); - _hidden const libxl_vnc_info *libxl__dm_vnc(const libxl_domain_config *g_cfg); _hidden char *libxl__abs_path(libxl__gc *gc, const char *s, const char *path); @@ -2315,8 +2250,7 @@ _hidden char *libxl__json_object_to_json(libxl__gc *gc, #define JSON(o) \ (libxl__json_object_to_json(gc, (o)) ? : "") - /* Based on /local/domain/$domid/dm-version xenstore key - * default is qemu xen traditional */ + /* Based on /local/domain/$domid/dm-version xenstore key */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); static inline diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index a8460fb3ec..2ea2caeb66 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1023,82 +1023,6 @@ static int pci_multifunction_check(libxl__gc *gc, libxl_device_pci *pci, unsigne return 0; } -static int pci_ins_check(libxl__gc *gc, uint32_t domid, const char *state, void *priv) -{ - char *orig_state = priv; - - if ( !strcmp(state, "pci-insert-failed") ) - return -1; - if ( !strcmp(state, "pci-inserted") ) - return 0; - if ( !strcmp(state, orig_state) ) - return 1; - - return 1; -} - -static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, - libxl_device_pci *pci) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - int rc = 0; - char *path; - char *state, *vdevfn; - uint32_t dm_domid; - - dm_domid = libxl_get_stubdom_id(CTX, domid); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter"); - if (pci->vdevfn) { - libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, - pci->domain, pci->bus, pci->dev, - pci->func, pci->vdevfn, pci->msitranslate, - pci->power_mgmt); - } else { - libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, - pci->domain, pci->bus, pci->dev, - pci->func, pci->msitranslate, pci->power_mgmt); - } - - libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); - rc = libxl__wait_for_device_model_deprecated(gc, domid, NULL, NULL, - pci_ins_check, state); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter"); - vdevfn = libxl__xs_read(gc, XBT_NULL, path); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - if ( rc < 0 ) - LOGD(ERROR, domid, "qemu refused to add device: %s", vdevfn); - else if ( sscanf(vdevfn, "0x%x", &pci->vdevfn) != 1 ) { - LOGD(ERROR, domid, "wrong format for the vdevfn: '%s'", vdevfn); - rc = -1; - } - xs_write(ctx->xsh, XBT_NULL, path, state, strlen(state)); - - return rc; -} - -static int check_qemu_running(libxl__gc *gc, - libxl_domid domid, - libxl__xswait_state *xswa, - int rc, - const char *state) -{ - if (rc) { - if (rc == ERROR_TIMEDOUT) { - LOGD(ERROR, domid, "%s not ready", xswa->what); - } - goto out; - } - - if (!state || strcmp(state, "running")) - return ERROR_NOT_READY; - -out: - libxl__xswait_stop(gc, xswa); - return rc; -} - typedef struct pci_add_state { /* filled by user of do_pci_add */ libxl__ao_device *aodev; @@ -1119,8 +1043,6 @@ typedef struct pci_add_state { int retries; } pci_add_state; -static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, int rc, const char *state); static void pci_add_qmp_device_add(libxl__egc *, pci_add_state *); static void pci_add_qmp_device_add_cb(libxl__egc *, libxl__ev_qmp *, const libxl__json_object *, int rc); @@ -1156,16 +1078,6 @@ static void do_pci_add(libxl__egc *egc, if (type == LIBXL_DOMAIN_TYPE_HVM) { switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - pas->xswait.ao = ao; - pas->xswait.what = "Device Model"; - pas->xswait.path = DEVICE_MODEL_XS_PATH(gc, - libxl_get_stubdom_id(CTX, domid), domid, "/state"); - pas->xswait.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; - pas->xswait.callback = pci_add_qemu_trad_watch_state_cb; - rc = libxl__xswait_start(gc, &pas->xswait); - if (rc) goto out; - return; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__ev_time_register_rel(ao, &pas->timeout, pci_add_timeout, @@ -1186,29 +1098,6 @@ out: pci_add_dm_done(egc, pas, rc); /* must be last */ } -static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, - int rc, - const char *state) -{ - pci_add_state *pas = CONTAINER_OF(xswa, *pas, xswait); - STATE_AO_GC(pas->aodev->ao); - - /* Convenience aliases */ - libxl_domid domid = pas->domid; - libxl_device_pci *pci = &pas->pci; - - rc = check_qemu_running(gc, domid, xswa, rc, state); - if (rc == ERROR_NOT_READY) - return; - if (rc) - goto out; - - rc = qemu_pci_add_xenstore(gc, domid, pci); -out: - pci_add_dm_done(egc, pas, rc); /* must be last */ -} - static void pci_add_qmp_device_add(libxl__egc *egc, pci_add_state *pas) { STATE_AO_GC(pas->aodev->ao); @@ -1882,42 +1771,6 @@ static void add_pcis_done(libxl__egc *egc, libxl__multidev *multidev, aodev->callback(egc, aodev); } -static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, - libxl_device_pci *pci, int force) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - char *state; - char *path; - uint32_t dm_domid; - - dm_domid = libxl_get_stubdom_id(CTX, domid); - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter"); - libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pci->domain, - pci->bus, pci->dev, pci->func); - - /* Remove all functions at once atomically by only signalling - * device-model for function 0 */ - if ( !force && (pci->vdevfn & 0x7) == 0 ) { - libxl__qemu_traditional_cmd(gc, domid, "pci-rem"); - if (libxl__wait_for_device_model_deprecated(gc, domid, "pci-removed", - NULL, NULL, NULL) < 0) { - LOGD(ERROR, domid, "Device Model didn't respond in time"); - /* This depends on guest operating system acknowledging the - * SCI, if it doesn't respond in time then we may wish to - * force the removal. - */ - return ERROR_FAIL; - } - } - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - xs_write(ctx->xsh, XBT_NULL, path, state, strlen(state)); - - return 0; -} - typedef struct pci_remove_state { libxl__ao_device *aodev; libxl_domid domid; @@ -1940,8 +1793,6 @@ static void libxl__device_pci_remove_common(libxl__egc *egc, static void device_pci_remove_common_next(libxl__egc *egc, pci_remove_state *prs, int rc); -static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, int rc, const char *state); static void pci_remove_qmp_device_del(libxl__egc *egc, pci_remove_state *prs); static void pci_remove_qmp_device_del_cb(libxl__egc *egc, @@ -1987,16 +1838,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) if (type == LIBXL_DOMAIN_TYPE_HVM) { prs->hvm = true; switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - prs->xswait.ao = ao; - prs->xswait.what = "Device Model"; - prs->xswait.path = DEVICE_MODEL_XS_PATH(gc, - libxl_get_stubdom_id(CTX, domid), domid, "/state"); - prs->xswait.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; - prs->xswait.callback = pci_remove_qemu_trad_watch_state_cb; - rc = libxl__xswait_start(gc, &prs->xswait); - if (rc) goto out_fail; - return; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: pci_remove_qmp_device_del(egc, prs); /* must be last */ return; @@ -2010,30 +1851,6 @@ out_fail: pci_remove_detached(egc, prs, rc); /* must be last */ } -static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, - int rc, - const char *state) -{ - pci_remove_state *prs = CONTAINER_OF(xswa, *prs, xswait); - STATE_AO_GC(prs->aodev->ao); - - /* Convenience aliases */ - libxl_domid domid = prs->domid; - libxl_device_pci *const pci = &prs->pci; - - rc = check_qemu_running(gc, domid, xswa, rc, state); - if (rc == ERROR_NOT_READY) - return; - if (rc) - goto out; - - rc = qemu_pci_remove_xenstore(gc, domid, pci, prs->force); - -out: - pci_remove_detached(egc, prs, rc); -} - static void pci_remove_qmp_device_del(libxl__egc *egc, pci_remove_state *prs) { diff --git a/tools/libs/light/libxl_sr_stream_format.h b/tools/libs/light/libxl_sr_stream_format.h index 75f5190886..f8f4723c2e 100644 --- a/tools/libs/light/libxl_sr_stream_format.h +++ b/tools/libs/light/libxl_sr_stream_format.h @@ -45,7 +45,7 @@ typedef struct libxl__sr_emulator_hdr } libxl__sr_emulator_hdr; #define EMULATOR_UNKNOWN 0x00000000U -#define EMULATOR_QEMU_TRADITIONAL 0x00000001U +#define EMULATOR_QEMU_TRADITIONAL 0x00000001U /* Dropped in Xen 4.21 */ #define EMULATOR_QEMU_UPSTREAM 0x00000002U typedef struct libxl_sr_checkpoint_state diff --git a/tools/libs/light/libxl_stream_write.c b/tools/libs/light/libxl_stream_write.c index 634f3240d1..98d44597a7 100644 --- a/tools/libs/light/libxl_stream_write.c +++ b/tools/libs/light/libxl_stream_write.c @@ -252,10 +252,6 @@ void libxl__stream_write_start(libxl__egc *egc, stream->device_model_version = libxl__device_model_version_running(gc, dss->domid); switch (stream->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - stream->emu_sub_hdr.id = EMULATOR_QEMU_TRADITIONAL; - break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: stream->emu_sub_hdr.id = EMULATOR_QEMU_UPSTREAM; break; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 9bb2969931..1985153830 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -104,7 +104,7 @@ libxl_channel_connection = Enumeration("channel_connection", [ libxl_device_model_version = Enumeration("device_model_version", [ (0, "UNKNOWN"), - (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) + (1, "QEMU_XEN_TRADITIONAL"), # Historical dm (qemu-dm, no longer supported) (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index 5dcb50fe02..dc5c7ac355 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -51,12 +51,10 @@ rec_type_to_str = { EMULATOR_HEADER_FORMAT = "II" EMULATOR_ID_unknown = 0x00000000 -EMULATOR_ID_qemu_trad = 0x00000001 EMULATOR_ID_qemu_upstream = 0x00000002 emulator_id_to_str = { EMULATOR_ID_unknown : "Unknown", - EMULATOR_ID_qemu_trad : "Qemu Traditional", EMULATOR_ID_qemu_upstream : "Qemu Upstream", } diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 089a88935a..219e924779 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2733,10 +2733,7 @@ skip_usbdev: xlu_cfg_replace_string (config, "device_model_override", &b_info->device_model, 0); if (!xlu_cfg_get_string (config, "device_model_version", &buf, 0)) { - if (!strcmp(buf, "qemu-xen-traditional")) { - b_info->device_model_version - = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else if (!strcmp(buf, "qemu-xen")) { + if (!strcmp(buf, "qemu-xen")) { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } else { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 08:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 08:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1002914.1382320 (Exim 4.92) (envelope-from ) id 1uM0bt-0002W2-BQ; Mon, 02 Jun 2025 08:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1002914.1382320; Mon, 02 Jun 2025 08: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 1uM0bt-0002Vv-8n; Mon, 02 Jun 2025 08:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1002914; Mon, 02 Jun 2025 08:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM0bs-0002Vn-RG for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM0bs-00G3tG-2Z for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM0bs-00Cw3Z-2S for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08: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=rIl0WrXXMJq467EBi28CGlN2J/w4JOPygmfHdD54Cic=; b=E+sdarmwL5iS7duF7e2v+waqbk JErcltEXrjPRuN42xBNOoO5tgHBly97QYCqJTjGnxy8j2TDekYGIDchr4E2NxV1JcanIn++uX4KO1 JERSZPD2n/0cXx4IXZ++9TzUYqLOqF1wX7CPAiGBkkBtwLc3FuGI1PcNWpmmlFU9hqtU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: remove qemu-traditional Message-Id: Date: Mon, 02 Jun 2025 08:33:32 +0000 commit 1eb944f65055115e5c07cde420ead2f0beba1a5e Author: Juergen Gross AuthorDate: Tue May 27 15:20:32 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 tools: remove qemu-traditional Remove qemu traditional from the tree. Signed-off-by: Juergen Gross Acked-by: Oleksii Kurochko # CHANGELOG.md Reviewed-by: Anthony PERARD --- .gitignore | 3 - CHANGELOG.md | 2 + Config.mk | 38 ----------- INSTALL | 13 ---- MAINTAINERS | 4 -- README | 2 +- SUPPORT.md | 16 ----- config/Paths.mk.in | 3 +- config/Tools.mk.in | 1 - docs/process/branching-checklist.txt | 1 - docs/process/release-technician-checklist.txt | 1 - stubdom/.gitignore | 3 - stubdom/Makefile | 97 ++------------------------- stubdom/configure | 89 ------------------------ stubdom/configure.ac | 15 ----- stubdom/ioemu-minios.cfg | 6 -- tools/Makefile | 58 ---------------- tools/Rules.mk | 3 - tools/config.h.in | 3 - tools/configure | 42 ++---------- tools/configure.ac | 21 +----- 21 files changed, 16 insertions(+), 405 deletions(-) diff --git a/.gitignore b/.gitignore index 4a4e206804..7b7f5e7a4a 100644 --- a/.gitignore +++ b/.gitignore @@ -254,9 +254,6 @@ LibVNCServer* tools/qemu-xen-dir-remote tools/qemu-xen-dir -tools/qemu-xen-traditional-dir-remote -tools/qemu-xen-traditional-dir - tools/firmware/seabios-dir-remote tools/firmware/seabios-dir diff --git a/CHANGELOG.md b/CHANGELOG.md index ec452027f5..1ee2f42e74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - GNTTABOP_cache_flush: it's unused on x86 and the implementation is broken. + - Support of qemu-traditional has been removed. + ## [4.20.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.0) - 2025-03-05 ### Changed diff --git a/Config.mk b/Config.mk index 8be7733d9e..3ebc9ac125 100644 --- a/Config.mk +++ b/Config.mk @@ -165,20 +165,6 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \ - XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ - XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR \ - XEN_LIB_DIR XEN_RUN_STORED - -buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1))) -define buildmakevars2file-closure - $(1): .phony - rm -f $(1).tmp; \ - $(foreach var, $(BUILD_MAKE_VARS), \ - echo "$(var)=\"$($(var))\"" >>$(1).tmp;) \ - $(call move-if-changed,$(1).tmp,$(1)) -endef - CFLAGS += -fno-strict-aliasing CFLAGS += -std=gnu99 @@ -208,22 +194,12 @@ XEN_EXTFILES_URL ?= https://xenbits.xen.org/xen-extfiles # Where to look for inlined subtrees (for example, from a tarball) QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen -QEMU_TRADITIONAL_INTREE ?= $(XEN_ROOT)/tools/qemu-xen-traditional # Handle legacy options ifneq (,$(SEABIOS_UPSTREAM_TAG)) SEABIOS_UPSTREAM_REVISION ?= $(SEABIOS_UPSTREAM_TAG) endif -ifneq (,$(QEMU_REMOTE)) -QEMU_TRADITIONAL_URL ?= $(QEMU_REMOTE) -endif -ifneq (,$(CONFIG_QEMU)) -QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) -endif -ifneq (,$(QEMU_TAG)) -QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) -endif OVMF_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/ovmf.git OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16 @@ -239,20 +215,6 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.16.3 ETHERBOOT_NICS ?= rtl8139 8086100e - -QEMU_TRADITIONAL_URL ?= https://xenbits.xen.org/git-http/qemu-xen-traditional.git -QEMU_TRADITIONAL_REVISION ?= 3d273dd05e51e5a1ffba3d98c7437ee84e8f8764 -# Wed Jul 15 10:01:40 2020 +0100 -# qemu-trad: remove Xen path dependencies - -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git - -# Defaults for subtree locations -QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\ - $(QEMU_TRADITIONAL_URL)) - QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\ $(QEMU_UPSTREAM_URL)) diff --git a/INSTALL b/INSTALL index 88c1464816..eadf108aa5 100644 --- a/INSTALL +++ b/INSTALL @@ -113,15 +113,6 @@ Build a private copy of SeaBIOS. Use the given SeaBIOS binary instead of compiling a private copy. --with-system-seabios=PATH -Build the old qemu used by xm/xend. This is required if existing domUs -should be migrated to this host, or if existing domU snapshots should be -started with this version of the tools. Only if all domUs used the new -upstream qemu during initial start it is safe to disable this option. -The old qemu requires rombios, which can be disable along with -qemu-traditional. - --enable-qemu-traditional - --enable-rombios - The libxl toolstack uses the upstream qemu per default. A private copy will be built. If desired this private copy can be configured with additional options passed to its configure script. @@ -161,7 +152,6 @@ this detection and the sysv runlevel scripts have to be used. Build various stubom components, some are only example code. Its usually enough to specify just --enable-stubdom and leave these options alone. - --enable-ioemu-stubdom --enable-c-stubdom --disable-pv-grub --disable-xenstore-stubdom @@ -245,7 +235,6 @@ locations. XEN_EXTFILES_URL= OVMF_UPSTREAM_URL= QEMU_UPSTREAM_URL= -QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= MINIOS_UPSTREAM_URL= @@ -253,7 +242,6 @@ Using additional CFLAGS to build tools which will run in dom0 is required when building distro packages. These variables can be used to pass RPM_OPT_FLAGS. EXTRA_CFLAGS_XEN_TOOLS= -EXTRA_CFLAGS_QEMU_TRADITIONAL= EXTRA_CFLAGS_QEMU_XEN= Additional CFLAGS may be supplied to the build of the hypervisor by @@ -340,7 +328,6 @@ sudo make install BOOT_DIR=/ood/path/boot EFI_DIR=/odd/path/efi export WGET=$(type -P false) export GIT=$(type -P false) export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS" -export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS" export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS" %configure \ --with-initddir=%{_initddir} diff --git a/MAINTAINERS b/MAINTAINERS index c11b82eca9..7d1b3b8641 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -466,10 +466,6 @@ M: Marek Marczykowski-Górecki S: Supported F: tools/python -QEMU-DM -S: Supported -T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git - QEMU UPSTREAM M: Stefano Stabellini M: Anthony Perard diff --git a/README b/README index be90be3910..6ee58f7b35 100644 --- a/README +++ b/README @@ -80,7 +80,7 @@ disabled at compile time: libnl-3-dev, etc). Required if network buffering is desired when using Remus with libxl. See docs/README.remus for detailed information. - * 16-bit x86 assembler, loader and compiler for qemu-traditional / rombios + * 16-bit x86 assembler, loader and compiler for rombios (dev86 rpm or bin86 & bcc debs) * Development install of liblzma for rombios * Development install of libbz2, liblzma, liblzo2, and libzstd for DomU diff --git a/SUPPORT.md b/SUPPORT.md index e8fd0c251e..5eecf1dcbc 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -998,21 +998,6 @@ See the section **Blkback** for image formats supported by QEMU. Status: Supported, not security supported -### qemu-xen-traditional ### - -The Xen Project provides an old version of qemu with modifications -which enable use as a device model stub domain. The old version is -normally selected by default only in a stub dm configuration, but it -can be requested explicitly in other configurations, for example in -`xl` with `device_model_version="QEMU_XEN_TRADITIONAL"`. - - Status, Device Model Stub Domains: Supported, with caveats - Status, as host process device model: No security support, not recommended - -qemu-xen-traditional is security supported only for those available -devices which are supported for mainstream QEMU (see above), with -trusted driver domains (see Device Model Stub Domains). - ## Virtual Firmware ### x86/HVM iPXE @@ -1031,7 +1016,6 @@ as the guest itself. Booting a guest via guest BIOS firmware Status, SeaBIOS (qemu-xen): Supported - Status, ROMBIOS (qemu-xen-traditional): Supported ### x86/HVM OVMF diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 38b1bb6b1f..bc42748b7a 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -5,8 +5,7 @@ # because of this these variables are defined on one master input source file # and is generated after running ./configure. The master source is located # on the xen source tree at under config/Paths.mk.in and it is used to -# generate shell or header files by the build system upon demand through the -# use of the helper makefile helper buildmakevars2file(). +# generate shell or header files by the build system upon demand. # # For more documentation you can refer to the wiki: # diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 37c071961e..463ab75965 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -43,7 +43,6 @@ CONFIG_OVMF := @ovmf@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ CONFIG_IPXE := @ipxe@ -CONFIG_QEMU_TRAD := @qemu_traditional@ CONFIG_QEMU_XEN := @qemu_xen@ CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@ CONFIG_LIBNL := @libnl@ diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index aa7a27eed5..9632888a56 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -71,7 +71,6 @@ ov=4.0 Ensure references to qemu trees and Mini-OS in xen.git's Config.mk are updated. The variables and there content should be: * QEMU_UPSTREAM_REVISION: qemu-xen-X.Y.0 - * QEMU_TRADITIONAL_REVISION: xen-X.Y.0 * MINIOS_UPSTREAM_REVISION: xen-RELEASE-X.Y.0 Where X.Y is the release version (e.g. 4.17). diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt index 829e8ec47b..64ed9fd5b2 100644 --- a/docs/process/release-technician-checklist.txt +++ b/docs/process/release-technician-checklist.txt @@ -56,7 +56,6 @@ t=RELEASE-$r * change xen-unstable Config.mk # QEMU_UPSTREAM_REVISION, -# QEMU_TRADITIONAL_REVISION # MINIOS_UPSTREAM_REVISION # (drop any references to the specific commits, e.g. date or title) * change SUPPORT.md heading version number; -unstable or -rc tag diff --git a/stubdom/.gitignore b/stubdom/.gitignore index 23350446b9..1b69656d45 100644 --- a/stubdom/.gitignore +++ b/stubdom/.gitignore @@ -11,8 +11,6 @@ /gmp-* /grub-* /include -/ioemu -/ioemu/ /libs-* /libxencall-* /libxenevtchn-* @@ -29,7 +27,6 @@ /pciutils-* /pkg-config/* /polarssl-* -/stubdompath.sh /tpm_emulator-* /vtpm/vtpm_manager.h /xenstore diff --git a/stubdom/Makefile b/stubdom/Makefile index 724ce40365..666c3221dc 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -7,7 +7,6 @@ export PKG_CONFIG_DIR = $(CURDIR)/pkg-config # Remove flags which are meant for tools, e.g. "-m64" export EXTRA_CFLAGS_XEN_TOOLS= -export EXTRA_CFLAGS_QEMU_TRADITIONAL= export stubdom=y export debug=y @@ -71,16 +70,12 @@ TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib TARGETS=$(STUBDOM_TARGETS) -STUBDOMPATH="stubdompath.sh" -genpath-target = $(call buildmakevars2file,$(STUBDOMPATH)) -$(eval $(genpath-target)) - .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: $(STUBDOMPATH) $(STUBDOM_BUILD) +build: $(STUBDOM_BUILD) else -build: $(STUBDOMPATH) +build: endif ############## @@ -267,43 +262,6 @@ cross-tpmemu: $(TPMEMU_STAMPFILE) .PHONY: $(CROSS_ROOT) $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci -QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) - -ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),) -IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp -endif - -ifeq ($(QEMU_ROOT),.) -$(XEN_ROOT)/tools/qemu-xen-traditional-dir: - $(MAKE) DESTDIR= -C $(XEN_ROOT)/tools qemu-xen-traditional-dir-find - -ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/qemu-xen-traditional-dir - mkdir -p ioemu - set -e; \ - $(buildmakevars2shellvars); \ - cd ioemu; \ - src="$$XEN_ROOT/tools/qemu-xen-traditional-dir"; export src; \ - (cd $$src && find * -type d \ - $(addprefix ! -path , '*-softmmu*' '*-linux-user*') -print) \ - | xargs mkdir -p; \ - (cd $$src && find * ! -type l -type f $(addprefix ! -path , \ - '*.[oda1]' 'config-*' config.mak qemu-dm qemu-img-xen \ - '*.html' '*.pod' '*-softmmu*' '*-linux-user*' \ - )) >linkfarm.stamp.tmp; \ - cmp -s linkfarm.stamp.tmp linkfarm.stamp && \ - rm linkfarm.stamp.tmp || { \ - mv linkfarm.stamp.tmp linkfarm.stamp; \ - cat linkfarm.stamp | while read f; \ - do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done; \ - } -else -export QEMU_ROOT - -ioemu/linkfarm.stamp: - mkdir -p ioemu - touch ioemu/linkfarm.stamp -endif - ####### # libraries under tools/libs ####### @@ -380,29 +338,6 @@ $(TARGETS_MINIOS): mini-os-%: mkdir -p $@/$$i ; \ done -####### -# ioemu -####### - -ioemu-minios.gen.cfg: APP_LIBS = evtchn gnttab ctrl guest -ioemu-minios.gen.cfg: ioemu-minios.cfg Makefile - $(GEN_config) >$@ - -ioemu-minios-config.mk: ioemu-minios.gen.cfg - MINIOS_CONFIG="$(CURDIR)/$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config - -.PHONY: ioemu -ioemu: cross-zlib cross-libpci libxenguest ioemu-minios-config.mk - [ -f ioemu/config-host.mak ] || \ - ( $(buildmakevars2shellvars); \ - cd ioemu ; \ - LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat ioemu-minios-config.mk)" \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - $(QEMU_ROOT)/xen-setup-stubdom ) - $(MAKE) DESTDIR= -C ioemu -f $(QEMU_ROOT)/Makefile - ### # C ### @@ -496,11 +431,6 @@ xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk # minios ######## -.PHONY: ioemu-stubdom -ioemu-stubdom: APP_OBJS=$(CURDIR)/ioemu/i386-stubdom/qemu.a $(CURDIR)/ioemu/i386-stubdom/libqemu.a $(CURDIR)/ioemu/libqemu_common.a -ioemu-stubdom: mini-os-$(XEN_TARGET_ARCH)-ioemu lwip-$(XEN_TARGET_ARCH) libxenguest ioemu - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/ioemu-minios.gen.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)" - .PHONY: c-stubdom c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxenguest c DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/c/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=$(CURDIR)/c/main.a @@ -539,18 +469,11 @@ xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh $(XENSTORE_DEPS) xen ######### ifeq ($(STUBDOM_SUPPORTED),1) -install: $(STUBDOMPATH) $(STUBDOM_INSTALL) +install: $(STUBDOM_INSTALL) else -install: $(STUBDOMPATH) +install: endif -install-ioemu: ioemu-stubdom - $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" - $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" - install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" @@ -593,11 +516,6 @@ else uninstall: endif -uninstall-ioemu: - rm -f $(DESTDIR)$(LIBEXEC_BIN)/stubdom-dm - rm -f $(DESTDIR)$(LIBEXEC_BIN)/stubdompath.sh - rm -f $(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz - uninstall-grub: rm -f $(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz @@ -617,11 +535,10 @@ uninstall-vtpmmgr: # clean ####### -# Only clean the libxc/ioemu/mini-os part +# Only clean the libxc/mini-os part .PHONY: clean clean: $(foreach lib,$(STUB_LIBS),clean-libxen$(lib)) clean: - rm -fr mini-os-$(XEN_TARGET_ARCH)-ioemu rm -fr mini-os-$(XEN_TARGET_ARCH)-c rm -fr mini-os-$(XEN_TARGET_ARCH)-grub rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore @@ -632,11 +549,9 @@ clean: $(MAKE) -C vtpm clean $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) - rm -f $(STUBDOMPATH) rm -f *-minios-config.mk rm -f *.gen.cfg rm -fr pkg-config - -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstore clean -[ ! -d xenstorepvh ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstorepvh clean @@ -647,7 +562,7 @@ crossclean: clean rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) rm -fr libs-$(XEN_TARGET_ARCH) - rm -fr ioemu xenstore xenstorepvh + rm -fr xenstore xenstorepvh rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) rm -fr tpm_emulator-$(XEN_TARGET_ARCH) diff --git a/stubdom/configure b/stubdom/configure index 08cacf764c..9dd0e7c796 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -622,7 +622,6 @@ STUBDOM_UNINSTALL STUBDOM_INSTALL STUBDOM_BUILD STUBDOM_TARGETS -ioemu vtpmmgr vtpm TPMEMU_VERSION @@ -713,14 +712,12 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_ioemu_stubdom enable_c_stubdom enable_pv_grub enable_xenstore_stubdom enable_xenstorepvh_stubdom enable_vtpm_stubdom enable_vtpmmgr_stubdom -enable_qemu_traditional enable_debug enable_extfiles ' @@ -1363,7 +1360,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-ioemu-stubdom Build and install ioemu-stubdom --enable-c-stubdom Build and install c-stubdom (default is DISABLED) --enable-pv-grub Build and install pv-grub (default is DISABLED) --disable-xenstore-stubdom @@ -1375,7 +1371,6 @@ Optional Features: --enable-vtpm-stubdom Build and install vtpm-stubdom --enable-vtpmmgr-stubdom Build and install vtpmmgr-stubdom - --disable-debug Disable debug build of stubdom (default is ENABLED) --disable-extfiles Use xen extfiles repository for libraries (default is ENABLED) @@ -2411,40 +2406,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # Enable/disable stub domains -# Check whether --enable-ioemu-stubdom was given. -if test ${enable_ioemu_stubdom+y} -then : - enableval=$enable_ioemu_stubdom; - -if test "x$enableval" = "xyes" -then : - - -ioemu=y -STUBDOM_TARGETS="$STUBDOM_TARGETS ioemu" -STUBDOM_BUILD="$STUBDOM_BUILD ioemu-stubdom" -STUBDOM_INSTALL="$STUBDOM_INSTALL install-ioemu" -STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-ioemu" - - -else $as_nop - -if test "x$enableval" = "xno" -then : - - -ioemu=n - - -fi - -fi - - -fi - - - # Check whether --enable-c-stubdom was given. if test ${enable_c_stubdom+y} then : @@ -2685,35 +2646,6 @@ fi -# Check whether --enable-qemu-traditional was given. -if test ${enable_qemu_traditional+y} -then : - enableval=$enable_qemu_traditional; -fi - -if test "x$enable_qemu_traditional" = "xyes" -then : - - qemu_traditional=y -else $as_nop - - qemu_traditional=n - -fi -if test "x$ioemu" = "x" -then : - - ioemu=$qemu_traditional - -fi -echo "x$ioemu$qemu_traditional" -if test "x$ioemu$qemu_traditional" = "xyn" -then : - - as_fn_error $? "IOEMU stubdomain requires qemu-traditional" "$LINENO" 5 - -fi - # Check whether --enable-debug was given. if test ${enable_debug+y} @@ -4358,27 +4290,6 @@ fi -if test "x$ioemu" = "xy" || test "x$ioemu" = "x" -then : - - -ioemu=y -STUBDOM_TARGETS="$STUBDOM_TARGETS ioemu" -STUBDOM_BUILD="$STUBDOM_BUILD ioemu-stubdom" -STUBDOM_INSTALL="$STUBDOM_INSTALL install-ioemu" -STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-ioemu" - - -else $as_nop - - -ioemu=n - - -fi - - - diff --git a/stubdom/configure.ac b/stubdom/configure.ac index fc736c0387..f07b08c5b3 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -18,7 +18,6 @@ m4_include([../m4/depends.m4]) m4_include([../m4/fetcher.m4]) # Enable/disable stub domains -AX_STUBDOM_CONDITIONAL([ioemu-stubdom], [ioemu]) AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c]) AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub]) AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore]) @@ -26,19 +25,6 @@ AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) AX_STUBDOM_CONDITIONAL([vtpmmgr-stubdom], [vtpmmgr]) -AC_ARG_ENABLE([qemu-traditional]) -AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ - qemu_traditional=y],[ - qemu_traditional=n -]) -AS_IF([test "x$ioemu" = "x"], [ - ioemu=$qemu_traditional -]) -echo "x$ioemu$qemu_traditional" -AS_IF([test "x$ioemu$qemu_traditional" = "xyn"], [ - AC_MSG_ERROR(IOEMU stubdomain requires qemu-traditional) -]) - AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of stubdom]) AX_ARG_DEFAULT_ENABLE([extfiles], [Use xen extfiles repository for libraries]) @@ -69,7 +55,6 @@ AX_STUBDOM_AUTO_DEPENDS([vtpmmgr], [vtpm]) #Conditionally enable these stubdoms based on the presense of dependencies AX_STUBDOM_CONDITIONAL_FINISH([vtpm-stubdom], [vtpm]) AX_STUBDOM_CONDITIONAL_FINISH([vtpmmgr-stubdom], [vtpmmgr]) -AX_STUBDOM_CONDITIONAL_FINISH([ioemu-stubdom], [ioemu]) AX_STUBDOM_FINISH AC_OUTPUT() diff --git a/stubdom/ioemu-minios.cfg b/stubdom/ioemu-minios.cfg deleted file mode 100644 index 6153ae05f8..0000000000 --- a/stubdom/ioemu-minios.cfg +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_LIBC=y -CONFIG_LWIP=y -CONFIG_START_NETWORK=n -CONFIG_QEMU_XS_ARGS=y -CONFIG_PCIFRONT=y -XEN_INTERFACE_VERSION=__XEN_LATEST_INTERFACE_VERSION__ diff --git a/tools/Makefile b/tools/Makefile index e9e1cda305..6ecf7c0da8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -24,7 +24,6 @@ SUBDIRS-$(CONFIG_Linux) += vchan # do not recurse in to a dir we are about to delete ifneq "$(MAKECMDGOALS)" "distclean" -SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir endif @@ -79,7 +78,6 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean clean - rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote rm -rf qemu-xen-dir qemu-xen-dir-remote qemu-xen-build rm -rf ../config/Tools.mk config.h config.log config.status \ config.cache autom4te.cache @@ -97,11 +95,6 @@ QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB) IOEMU_EXTRA_LDFLAGS := endif -QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) -ifneq ($(QEMU_ROOT),.) -export QEMU_ROOT -endif - # Targets for external trees: # ${target}-dir-find # See if the directory exists and check it out if not. @@ -136,54 +129,6 @@ endif # ${TARGET}_LOC # The ultimate location of the source (either a local dir or remote URL) -# External target: qemu-xen-traditional -qemu-xen-traditional-dir-find: - set -ex; \ - if test -d $(QEMU_TRADITIONAL_LOC); then \ - mkdir -p qemu-xen-traditional-dir; \ - else \ - export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \ - fi - -.PHONY: qemu-xen-traditional-dir-force-update -qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find - set -ex; \ - if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \ - cd qemu-xen-traditional-dir-remote; \ - $(GIT) fetch origin; \ - $(GIT) reset --hard $(QEMU_TRADITIONAL_REVISION); \ - fi - -qemu-traditional-recurse = \ - set -e; \ - $(buildmakevars2shellvars); \ - export CONFIG_BLKTAP1=n; \ - export BUILDING_QEMU_TRAD=y; \ - cd qemu-xen-traditional-dir; \ - $(1) - -subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find - $(call qemu-traditional-recurse,\ - $(QEMU_ROOT)/xen-setup \ - --extra-cflags="-D__XEN_TOOLS__ $(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ - $(IOEMU_EXTRA_LDFLAGS) \ - --cpu=$(IOEMU_CPU_ARCH) \ - $(IOEMU_CONFIGURE_CROSS); \ - $(MAKE) all \ - ) - -subdir-install-qemu-xen-traditional-dir: subdir-all-qemu-xen-traditional-dir - $(call qemu-traditional-recurse,$(MAKE) install) - -subdir-clean-qemu-xen-traditional-dir: - set -e; if test -d qemu-xen-traditional-dir/.; then \ - $(MAKE) -C qemu-xen-traditional-dir clean; \ - fi -subdir-uninstall-qemu-xen-traditional-dir: - rm -f $(D)$(bindir)/qemu-nbd* - rm -f $(D)$(bindir)/qemu-img* - # External target: qemu-xen qemu-xen-dir-find: if test -d $(QEMU_UPSTREAM_LOC) ; then \ @@ -276,9 +221,6 @@ subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update endif -ifeq ($(CONFIG_QEMU_TRAD),y) - $(MAKE) qemu-xen-traditional-dir-force-update -endif ifeq ($(CONFIG_X86),y) $(MAKE) -C firmware subtree-force-update endif diff --git a/tools/Rules.mk b/tools/Rules.mk index 6bd636709f..725c3c32e9 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -134,12 +134,9 @@ endif CFLAGS_libxenlight += $(CFLAGS_libxenctrl) -# Don't add -Werror if we are used by qemu-trad build system. -ifndef BUILDING_QEMU_TRAD ifeq ($(CONFIG_WERROR),y) CFLAGS += -Werror endif -endif ifeq ($(debug),y) # Use -Og if available, -O0 otherwise diff --git a/tools/config.h.in b/tools/config.h.in index 0bab3cb136..fe2a94cfc4 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -42,9 +42,6 @@ /* pygrub enabled */ #undef HAVE_PYGRUB -/* Qemu traditional enabled */ -#undef HAVE_QEMU_TRADITIONAL - /* ROMBIOS enabled */ #undef HAVE_ROMBIOS diff --git a/tools/configure b/tools/configure index e1f6ea6bf5..27ae7c52fb 100755 --- a/tools/configure +++ b/tools/configure @@ -726,7 +726,6 @@ BCC LD86 AS86 ipxe -qemu_traditional LINUX_BACKEND_MODULES pygrub golang @@ -835,7 +834,6 @@ enable_seabios enable_golang enable_pygrub with_linux_backend_modules -enable_qemu_traditional enable_ipxe with_system_ipxe enable_rombios @@ -1518,13 +1516,10 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-golang Disable Go tools (default is ENABLED) --disable-pygrub Disable pygrub (default is ENABLED) - --enable-qemu-traditional - Enable qemu traditional device model, (DEFAULT is - off) --enable-ipxe Enable in-tree IPXE, (DEFAULT is off, see also --with-system-ipxe) - --enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-traditional - or ipxe is enabled, otherwise off) + --enable-rombios Enable ROMBIOS, (DEFAULT is on if ipxe is enabled, + otherwise off) --enable-libfsimage Enable libfsimage, (DEFAULT is on if pygrub is enabled, otherwise off) --enable-systemd Enable systemd support (default is DISABLED) @@ -4838,45 +4833,16 @@ fi LINUX_BACKEND_MODULES="`eval echo $LINUX_BACKEND_MODULES`" -# Check whether --enable-qemu-traditional was given. -if test ${enable_qemu_traditional+y} -then : - enableval=$enable_qemu_traditional; -fi - -if test "x$enable_qemu_traditional" = "xyes" -then : - - -printf "%s\n" "#define HAVE_QEMU_TRADITIONAL 1" >>confdefs.h - - qemu_traditional=y -else $as_nop - - qemu_traditional=n - -fi - - # Check whether --enable-ipxe was given. if test ${enable_ipxe+y} then : enableval=$enable_ipxe; -else $as_nop - - if test "x$enable_qemu_traditional" = "xyes" -then : - - enable_ipxe="yes" - else $as_nop enable_ipxe="no" fi -fi - if test "x$enable_ipxe" = "xno" then : ipxe=n @@ -4912,7 +4878,7 @@ then : enableval=$enable_rombios; else $as_nop - if test "x$enable_qemu_traditional" = "xyes" -o "x$enable_ipxe" = "xyes" + if test "x$enable_ipxe" = "xyes" then : enable_rombios="yes" @@ -4928,7 +4894,7 @@ fi if test "x$enable_rombios" = "xyes" then : - # Extract the first word of "as86", so it can be a program name with args. + # Extract the first word of "as86", so it can be a program name with args. set dummy as86; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 0dd6d747ab..dada1c3b15 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -121,25 +121,11 @@ esac]) LINUX_BACKEND_MODULES="`eval echo $LINUX_BACKEND_MODULES`" AC_SUBST(LINUX_BACKEND_MODULES) -AC_ARG_ENABLE([qemu-traditional], - AS_HELP_STRING([--enable-qemu-traditional], - [Enable qemu traditional device model, (DEFAULT is off)])) -AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ -AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled]) - qemu_traditional=y],[ - qemu_traditional=n -]) -AC_SUBST(qemu_traditional) - AC_ARG_ENABLE([ipxe], AS_HELP_STRING([--enable-ipxe], [Enable in-tree IPXE, (DEFAULT is off, see also --with-system-ipxe)]),,[ - AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ - enable_ipxe="yes" - ], [ enable_ipxe="no" - ]) ]) AS_IF([test "x$enable_ipxe" = "xno"], [ipxe=n], [ipxe=y]) AC_ARG_WITH([system-ipxe], @@ -162,18 +148,15 @@ AC_SUBST(ipxe) AC_ARG_ENABLE([rombios], AS_HELP_STRING([--enable-rombios], - [Enable ROMBIOS, (DEFAULT is on if qemu-traditional or ipxe is enabled, + [Enable ROMBIOS, (DEFAULT is on if ipxe is enabled, otherwise off)]),,[ - AS_IF([test "x$enable_qemu_traditional" = "xyes" -o "x$enable_ipxe" = "xyes"], [ + AS_IF([test "x$enable_ipxe" = "xyes"], [ enable_rombios="yes" ], [ enable_rombios="no" ]) ]) AS_IF([test "x$enable_rombios" = "xyes"], [ - dnl as86, ld86, and bcc are only required when building rombios. They - dnl are only needed when the host system is x86 but that check is done - dnl for us above when checking if we should build with qemu-traditional. AX_PATH_PROG_OR_FAIL([AS86], [as86]) AX_PATH_PROG_OR_FAIL([LD86], [ld86]) AX_PATH_PROG_OR_FAIL([BCC], [bcc]) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 08:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 08:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1002915.1382325 (Exim 4.92) (envelope-from ) id 1uM0c4-0002Yo-FC; Mon, 02 Jun 2025 08:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1002915.1382325; Mon, 02 Jun 2025 08: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 1uM0c4-0002Yf-Bv; Mon, 02 Jun 2025 08:33:44 +0000 Received: by outflank-mailman (input) for mailman id 1002915; Mon, 02 Jun 2025 08:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM0c2-0002YU-TC for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM0c2-00G3ta-2p for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM0c2-00CwIU-2k for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 08: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=UjqDi7L3PC98DDk/muQNR/RtYTFZ9gMM1awRWCE3+sU=; b=Em43gN3hky4jXbHnONKMNHL9XU xjAiS3KaGDvHgra9ojJFN/o9GJNUmiGiwM7sARqFqYatZ8OxEG2TYYRzBpwsPMHD/xyyfJg2MM5Tz XQ8TKRMXHCoQu2tfoCFtaFq8idAlLmjUhl7+LpI6FY+KTsad7lrsrl5/F0537QF0Qyso=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: don't require full tools build for building stubdoms Message-Id: Date: Mon, 02 Jun 2025 08:33:42 +0000 commit 286c4cc267005f73aba831d22d65abe6874ceaea Author: Juergen Gross AuthorDate: Tue May 27 15:20:33 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 build: don't require full tools build for building stubdoms With the drop of qemu-traditional "make stubdom" no longer requires "make tools" to have finished. It is enough to add "install-tools-public-headers" as a prereq of "install-stubdom". Signed-off-by: Juergen Gross Acked-by: Anthony PERARD --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c9d80a6dc6..67b71ac3d4 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ install-tools: install-tools-public-headers $(MAKE) -C tools install .PHONY: install-stubdom -install-stubdom: mini-os-dir install-tools +install-stubdom: mini-os-dir install-tools-public-headers $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 09:44:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 09:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003087.1382528 (Exim 4.92) (envelope-from ) id 1uM1i7-0007gl-Iu; Mon, 02 Jun 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 1003087.1382528; Mon, 02 Jun 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 1uM1i7-0007gc-GB; Mon, 02 Jun 2025 09:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1003087; Mon, 02 Jun 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 1uM1i6-0007gW-5W for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM1i6-00G5Ft-00 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM1i5-00EbWm-34 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=AeC4PgNQz14GP7S1W9A8TbTzhL93t1TugVKxLMWYGns=; b=7HjXNCOISZeW1a1tveo55w5Z4y mhWlT16acy5hcQXZnEdhZeyeTtlKyK9zoSXyQNhCd0OEhT3l2uhn24QQxd9mXUgQK1vWwC07d/ir+ PxHb3eqBLGU/XPivkmb1jk5cbkQiZgvsAMUVjGYk0StOQR3Ee2uv6ARPpUc+nCKCYIBE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxl: Only access legacy altp2m on HVM Message-Id: Date: Mon, 02 Jun 2025 09:44:01 +0000 commit 01dfd25509cc44011e83677e989dc7f55e2657d5 Author: Jason Andryuk AuthorDate: Tue May 13 11:44:19 2025 -0400 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 tools/libxl: Only access legacy altp2m on HVM Only access the HVM union b_info->u.hvm on HVM guests. The union access is not guarded, so this reads and sets the default even on non-HVM guests. Usually this doesn't matter as PV and PVH unions are smaller and zero-initialized, but the zero default will be re-written as a -1 boolean. Generally, it could incorrectly set b_info->altp2m through aliased data. Fixes: 0291089f6ea8 ("xen: enable altp2m at create domain domctl") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/libs/light/libxl_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 0b1c2d3a96..867addfcab 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -814,17 +814,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); - /* - * The config parameter "altp2m" replaces the parameter "altp2mhvm". - * For legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. - */ - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); - if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(b_info->u.hvm.altp2m)) - b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 09:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 09:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003088.1382531 (Exim 4.92) (envelope-from ) id 1uM1iH-0007iO-KH; Mon, 02 Jun 2025 09:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003088.1382531; Mon, 02 Jun 2025 09: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 1uM1iH-0007iG-HZ; Mon, 02 Jun 2025 09:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1003088; Mon, 02 Jun 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 1uM1iG-0007i6-4V for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM1iG-00G5G1-0J for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM1iG-00Ec3b-0C for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09: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=grYurMQ7VbKB14EHKvZjQLG3xJy4hzbXv7t6UhLRelo=; b=D1Owi71w1PiSj+pwyGYihzwPgC SmIk0ML9y7AhMJm1wVv+syOLzf7jPvbe02lrhB6gJigjBHtJwROHjR7ETs4f8Sc3rwL1SHTLLelDn ZLo9hFY4aPE+9em5LnOuQ3rGIV2szzq/qIMVl92njQIPPqJ9bK+Uolv3IxZ2u8bpkpzI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: remove qemu-traditional support from documentation Message-Id: Date: Mon, 02 Jun 2025 09:44:12 +0000 commit b1763edcead7fae81a3733d1f08d1c164a29b91d Author: Juergen Gross AuthorDate: Tue May 27 15:20:30 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 docs: remove qemu-traditional support from documentation In preparation to no longer support qemu-traditional (including qemu-stubdom), remove it from documentation. Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- docs/man/xl-pci-configuration.5.pod | 4 +-- docs/man/xl.cfg.5.pod.in | 49 +++++-------------------- docs/misc/stubdom.txt | 52 --------------------------- docs/misc/xenstore-paths.pandoc | 3 +- docs/process/branching-checklist.txt | 3 -- docs/process/release-technician-checklist.txt | 2 -- docs/process/xen-release-management.pandoc | 2 +- 7 files changed, 13 insertions(+), 102 deletions(-) diff --git a/docs/man/xl-pci-configuration.5.pod b/docs/man/xl-pci-configuration.5.pod index ec76f590b7..0691f06ad3 100644 --- a/docs/man/xl-pci-configuration.5.pod +++ b/docs/man/xl-pci-configuration.5.pod @@ -111,8 +111,8 @@ if this parameter is not specified. =item Description By default pciback only allows PV guests to write "known safe" values -into PCI configuration space, likewise QEMU (both qemu-xen and -qemu-xen-traditional) imposes the same constraint on HVM guests. +into PCI configuration space, likewise QEMU imposes the same constraint +on HVM guests. However, many devices require writes to other areas of the configuration space in order to operate properly. This option tells the backend (pciback or QEMU) to allow all writes to the PCI configuration space of this device by this diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 7339c44efd..c388899306 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -841,7 +841,7 @@ This option does not control the emulated graphics card presented to an HVM guest. See B below for how to configure the emulated device. If B options are used in a PV guest configuration, B will pick up B, B, -B, B, B, B, B and +B, B, B, B and B to construct the paravirtual framebuffer device for the guest. Each B is a comma-separated list of C @@ -895,12 +895,6 @@ is used. Specifies the path to the X authority file that should be used to connect to the X server when the B option is used. -=item B - -Enable OpenGL acceleration of the SDL display. Only effects machines -using B and only if the -device-model was compiled with OpenGL support. The default is 0 (disabled). - =item B Configure the keymap to use for the keyboard associated with this @@ -1215,17 +1209,11 @@ working graphics passthrough. See the XenVGAPassthroughTestedAdapters L wiki page for graphics cards currently supported by B. -B is currently supported both with the qemu-xen-traditional -device-model and upstream qemu-xen device-model. - When given as a boolean the B option either disables graphics card passthrough or enables autodetection. When given as a string the B option describes the type -of device to enable. Note that this behavior is only supported with the -upstream qemu-xen device-model. With qemu-xen-traditional IGD (Intel Graphics -Device) is always assumed and options other than autodetect or explicit IGD -will result in an error. +of device to enable. Currently, valid values for the option are: @@ -1903,10 +1891,7 @@ it may be useful to request a different one, like UEFI. =item B -Loads ROMBIOS, a 16-bit x86 compatible BIOS. This is used by default -when B. This is the only BIOS -option supported when B. This is -the BIOS used by all previous Xen versions. +Loads ROMBIOS, a 16-bit x86 compatible BIOS. =item B @@ -1926,8 +1911,7 @@ Override the path to the blob to be used as BIOS. The blob provided here MUST be consistent with the B which you have specified. You should not normally need to specify this option. -This option does not have any effect if using B or -B. +Requires B. =item B @@ -2516,15 +2500,10 @@ Sets the amount of RAM which the emulated video card will contain, which in turn limits the resolutions and bit depths which will be available. -When using the qemu-xen-traditional device-model, the default as well as -minimum amount of video RAM for stdvga is 8 MB, which is sufficient for e.g. -1600x1200 at 32bpp. For the upstream qemu-xen device-model, the default and -minimum is 16 MB. +When using stdvga, the default and minimum is 16 MB. -When using the emulated Cirrus graphics card (B) and the -qemu-xen-traditional device-model, the amount of video RAM is fixed at 4 MB, -which is sufficient for 1024x768 at 32 bpp. For the upstream qemu-xen -device-model, the default and minimum is 8 MB. +When using the emulated Cirrus graphics card (B), the +default and minimum is 8 MB. For QXL vga, both the default and minimal are 128MB. If B is set less than 128MB, an error will be triggered. @@ -2590,12 +2569,6 @@ B manpage. The default is B. Specifies that the display should be presented via an X window (using Simple DirectMedia Layer). The default is (0) not enabled. -=item B - -Enable OpenGL acceleration of the SDL display. Only effects machines -using B and only if the -device-model was compiled with OpenGL support. Default is (0) false. - =item B Enable or disable the virtual graphics device. The default is to @@ -2925,11 +2898,6 @@ Valid values are: Use the device-model merged into the upstream QEMU project. This device-model is the default for Linux dom0. -=item B - -Use the device-model based upon the historical Xen fork of QEMU. -This device-model is still the default for NetBSD dom0. - =back It is recommended to accept the default value for new guests. If @@ -2949,8 +2917,7 @@ to specify this option. Override the path to the kernel image used as device-model stubdomain. The binary provided here MUST be consistent with the B which you have specified. -In case of B it is expected to be MiniOS-based stubdomain -image, in case of B it is expected to be Linux-based stubdomain +In case of B it is expected to be Linux-based stubdomain kernel. =item B diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt index 64c220db20..cfcba4ba96 100644 --- a/docs/misc/stubdom.txt +++ b/docs/misc/stubdom.txt @@ -23,58 +23,6 @@ and https://wiki.xen.org/wiki/Device_Model_Stub_Domains for more information on device model stub domains -Toolstack to MiniOS ioemu stubdomain protocol ---------------------------------------------- - -This section describe communication protocol between toolstack and -qemu-traditional running in MiniOS stubdomain. The protocol include -expectations of both qemu and stubdomain itself. - -Setup (done by toolstack, expected by stubdomain): - - Block devices for target domain are connected as PV disks to stubdomain, - according to configuration order, starting with xvda - - Network devices for target domain are connected as PV nics to stubdomain, - according to configuration order, starting with 0 - - if graphics output is expected, VFB and VKB devices are set for stubdomain - (its backend is responsible for exposing them using appropriate protocol - like VNC or Spice) - - other target domain's devices are not connected at this point to stubdomain - (may be hot-plugged later) - - QEMU command line (space separated arguments) is stored in - /vm//image/dmargs xenstore path - - target domain id is stored in /local/domain//target xenstore path -?? - bios type is stored in /local/domain//hvmloader/bios - - stubdomain's console 0 is connected to qemu log file - - stubdomain's console 1 is connected to qemu save file (for saving state) - - stubdomain's console 2 is connected to qemu save file (for restoring state) - - next consoles are connected according to target guest's serial console configuration - -Startup: -1. PV stubdomain is started with ioemu-stubdom.gz kernel and no initrd -2. stubdomain initialize relevant devices -3. stubdomain signal readiness by writing "running" to /local/domain//device-model//state xenstore path -4. now stubdomain is considered running - -Runtime control (hotplug etc): -Toolstack can issue command through xenstore. The sequence is (from toolstack POV): -1. Write parameter to /local/domain//device-model//parameter. -2. Write command to /local/domain//device-model//command. -3. Wait for command result in /local/domain//device-model//state (command specific value). -4. Write "running" back to /local/domain//device-model//state. - -Defined commands: - - "pci-ins" - PCI hot plug, results: - - "pci-inserted" - success - - "pci-insert-failed" - failure - - "pci-rem" - PCI hot remove, results: - - "pci-removed" - success - - ?? - - "save" - save domain state to console 1, results: - - "paused" - success - - "continue" - resume domain execution, after loading state from console 2 (require -loadvm command argument), results: - - "running" - success - - Toolstack to Linux ioemu stubdomain protocol -------------------------------------------- diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index a604f6b1c6..01a340fafc 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -636,7 +636,8 @@ Trustworthy copy of /local/domain/$DOMID/backend/$KIND/$DEVID/$NODE. #### /libxl/$DOMID/dm-version ("qemu_xen"|"qemu_xen_traditional") = [n,INTERNAL] -The device model version for a domain. +The device model version for a domain. Note that "qemu_xen_traditional" is +a device model variant which has been removed from Xen. #### /libxl/$DOMID/remus/netbuf/$DEVID/ifb = STRING [n,INTERNAL] diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index 3dfa8ec257..aa7a27eed5 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -14,8 +14,6 @@ ov=4.0 cd ~/git/qemu-xen.git git branch staging-$v staging git branch stable-$v master - cd ~/git/qemu-xen-traditional.git - git branch stable-$v master # make branch in libvirt ssh xen@xenbits.xen.org @@ -63,7 +61,6 @@ ov=4.0 cp xen--staging.patchbot-reported-heads xen--staging-$v.patchbot-reported-heads cp qemu-xen--master.patchbot-reported-heads qemu-xen--stable-$v.patchbot-reported-heads cp qemu-xen--staging.patchbot-reported-heads qemu-xen--staging-$v.patchbot-reported-heads - cp qemu-xen-traditional--master.patchbot-reported-heads qemu-xen-traditional--stable-$v.patchbot-reported-heads #emacs versions perl -i~ -pe 'next unless m/\b\Q'$ov'\E\b/; $x=$_; $x=~ s/\b\Q'$ov'\E\b/'$v'/g; print $x;' versions diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt index 7bbe7c1489..829e8ec47b 100644 --- a/docs/process/release-technician-checklist.txt +++ b/docs/process/release-technician-checklist.txt @@ -32,8 +32,6 @@ t=RELEASE-$r git show # should show appropriate intended commit git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v - git-push xenbits.xen.org:/home/xen/git/qemu-xen-traditional.git $s:stable-$x xen-$v - # consider making tag in minios, and updating xen.git Config.mk git checkout SOMETHING git show # should show appropriate intended commit diff --git a/docs/process/xen-release-management.pandoc b/docs/process/xen-release-management.pandoc index 7826419dad..5da18f6da1 100644 --- a/docs/process/xen-release-management.pandoc +++ b/docs/process/xen-release-management.pandoc @@ -193,7 +193,7 @@ from the last RC: 1. Send out commit moratorium emails to committers@. -2. Check all the trees (mini-os, qemu-trad, qemu-xen, seabios, ovmf etc). +2. Check all the trees (mini-os, qemu-xen, seabios, ovmf etc). They have the correct commits and all security patches applied. There will be tools provided. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 09:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 09:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003089.1382535 (Exim 4.92) (envelope-from ) id 1uM1iR-0007l5-M6; Mon, 02 Jun 2025 09:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003089.1382535; Mon, 02 Jun 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 1uM1iR-0007ky-J7; Mon, 02 Jun 2025 09:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1003089; Mon, 02 Jun 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 1uM1iQ-0007k5-8e for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM1iQ-00G5G9-0k for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM1iQ-00EcJ9-0d for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=RcvUpJ2CqyvkULaRgHXlPSh8HrEDnGi5j1MCx51JXT4=; b=a5qFIIEdg8CjXz9PMXeb8paK/0 g3HIfmFltvqIYJX1XkwIyBZiZ76+8AQh/EakT4+Gy5pW3uHavj1LQwxJPsl9htndgXxWYo4XTIEbM GYi2q1NgPDwFfUJRVUshKG+/Vh5ABXPpdd2PHKbCgnwuwDHDFCtqAgLXi/uRqV1W2xsg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: remove support for running a guest with qemu-traditional Message-Id: Date: Mon, 02 Jun 2025 09:44:22 +0000 commit 19ab8356abe4acc0f203daad915b559f4b33019d Author: Juergen Gross AuthorDate: Tue May 27 15:20:31 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 tools: remove support for running a guest with qemu-traditional Remove the code in tools for running a guest with qemu-traditional. This covers xl, libxl, libacpi, hvmloader and the related python and go bindings. Signed-off-by: Juergen Gross Acked-by: Jan Beulich # hvmloader Reviewed-by: Anthony PERARD --- tools/firmware/hvmloader/Makefile | 4 +- tools/firmware/hvmloader/pci.c | 17 +- tools/firmware/hvmloader/util.c | 9 +- tools/libacpi/mk_dsdt.c | 185 ++++------------- tools/libs/light/libxl_create.c | 78 +------ tools/libs/light/libxl_device.c | 19 -- tools/libs/light/libxl_disk.c | 7 - tools/libs/light/libxl_dm.c | 327 +----------------------------- tools/libs/light/libxl_dom.c | 10 - tools/libs/light/libxl_dom_save.c | 140 ------------- tools/libs/light/libxl_dom_suspend.c | 65 ------ tools/libs/light/libxl_domain.c | 15 -- tools/libs/light/libxl_exec.c | 75 ------- tools/libs/light/libxl_internal.c | 6 +- tools/libs/light/libxl_internal.h | 68 +------ tools/libs/light/libxl_pci.c | 183 ----------------- tools/libs/light/libxl_sr_stream_format.h | 2 +- tools/libs/light/libxl_stream_write.c | 4 - tools/libs/light/libxl_types.idl | 2 +- tools/python/xen/migration/libxl.py | 2 - tools/xl/xl_parse.c | 5 +- 21 files changed, 77 insertions(+), 1146 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index cc5dc00498..21de72187d 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -53,12 +53,14 @@ endif endif ROMS := +DSDT_FILES := ifeq ($(CONFIG_ROMBIOS),y) OBJS += optionroms.o 32bitbios_support.o rombios.o CFLAGS += -DENABLE_ROMBIOS ROMBIOS_ROM := $(ROMBIOS_DIR)/BIOS-bochs-latest ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) +DSDT_FILES += dsdt_anycpu.c dsdt_15cpu.c endif # Suppress the warning about LOAD segments with RWX permissions, as what we @@ -76,7 +78,7 @@ rombios.o: roms.inc smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" ACPI_PATH = ../../libacpi -DSDT_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c +DSDT_FILES += dsdt_anycpu_qemu_xen.c ACPI_OBJS = $(patsubst %.c,%.o,$(DSDT_FILES)) build.o static_tables.o $(ACPI_OBJS): CFLAGS += -iquote . -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\" CFLAGS += -I$(ACPI_PATH) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index c3c61ca060..cc67b18c03 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -113,17 +113,7 @@ void pci_setup(void) * increase the size of the lowmem MMIO hole? Defaulting to 1 * here will mean that non-libxl toolstacks (including xend and * home-grown ones) means that those using qemu-xen will still - * experience the memory relocation bug described below; but it - * also means that those using qemu-traditional will *not* - * experience any change; and it also means that there is a - * work-around for those using qemu-xen, namely switching to - * qemu-traditional. - * - * If we defaulted to 0, and failing to resize the hole caused any - * problems with qemu-traditional, then there is no work-around. - * - * Since xend can only use qemu-traditional, I think this is the - * option that will have the least impact. + * experience the memory relocation bug described below. */ bool allow_memory_relocate = 1; @@ -347,9 +337,8 @@ void pci_setup(void) { /* * At the moment qemu-xen can't deal with relocated memory regions. - * It's too close to the release to make a proper fix; for now, - * only allow the MMIO hole to grow large enough to move guest memory - * if we're running qemu-traditional. Items that don't fit will be + * Only allow the MMIO hole to grow large enough to move guest memory + * if allow_memory_relocate is true. Items that don't fit will be * relocated into the 64-bit address space. * * This loop now does the following: diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 2d07ce1290..79c0e6bd4a 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -843,14 +843,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, /* If the device model is specified switch to the corresponding tables */ s = xenstore_read("platform/device-model", ""); - if ( !strncmp(s, "qemu_xen_traditional", 21) ) - { - config->dsdt_anycpu = dsdt_anycpu; - config->dsdt_anycpu_len = dsdt_anycpu_len; - config->dsdt_15cpu = dsdt_15cpu; - config->dsdt_15cpu_len = dsdt_15cpu_len; - } - else if ( !strncmp(s, "qemu_xen", 9) ) + if ( !strncmp(s, "qemu_xen", 9) ) { config->dsdt_anycpu = dsdt_anycpu_qemu_xen; config->dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len; diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index 34f6753f61..8ac4f9d0b4 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -19,8 +19,8 @@ static bool debug = false; typedef enum dm_version { QEMU_NONE, - QEMU_XEN_TRADITIONAL, QEMU_XEN, + QEMU_INVALID } dm_version; static void indent(void) @@ -68,30 +68,6 @@ static void pop_block(void) printf("}\n"); } -#ifdef CONFIG_X86 -static void pci_hotplug_notify(unsigned int slt) -{ - stmt("Notify", "\\_SB.PCI0.S%02X, EVT", slt); -} - -static void decision_tree( - unsigned int s, unsigned int e, char *var, void (*leaf)(unsigned int)) -{ - if ( s == (e-1) ) - { - (*leaf)(s); - return; - } - - push_block("If", "And(%s, 0x%02x)", var, (e-s)/2); - decision_tree((s+e)/2, e, var, leaf); - pop_block(); - push_block("Else", NULL); - decision_tree(s, (s+e)/2, var, leaf); - pop_block(); -} -#endif - static struct option options[] = { { "maxcpu", 1, 0, 'c' }, #ifdef CONFIG_X86 @@ -105,7 +81,7 @@ int main(int argc, char **argv) { unsigned int cpu, max_cpus; #if defined(CONFIG_X86) - dm_version dm_version = QEMU_XEN_TRADITIONAL; + dm_version dm_version = QEMU_INVALID; unsigned int slot, dev, intx, link; max_cpus = HVM_MAX_VCPUS; @@ -141,8 +117,6 @@ int main(int argc, char **argv) case 'q': if (strcmp(optarg, "qemu-xen") == 0) { dm_version = QEMU_XEN; - } else if (strcmp(optarg, "qemu-xen-traditional") == 0) { - dm_version = QEMU_XEN_TRADITIONAL; } else if (strcmp(optarg, "none") == 0) { dm_version = QEMU_NONE; } else { @@ -160,6 +134,13 @@ int main(int argc, char **argv) } } +#ifdef CONFIG_X86 + if (dm_version == QEMU_INVALID) { + fprintf(stderr, "--dm_version is a mandatory parameter.\n"); + return -1; + } +#endif + /**** DSDT DefinitionBlock start ****/ /* (we append to existing DSDT definition block) */ indent_level++; @@ -278,9 +259,7 @@ int main(int argc, char **argv) /* Define GPE control method. */ push_block("Scope", "\\_GPE"); - push_block("Method", - dm_version == QEMU_XEN_TRADITIONAL ? "_L%02d" : "_E%02d", - XEN_ACPI_GPE0_CPUHP_BIT); + push_block("Method", "_E%02d", XEN_ACPI_GPE0_CPUHP_BIT); stmt("\\_SB.PRSC ()", NULL); pop_block(); pop_block(); @@ -302,17 +281,10 @@ int main(int argc, char **argv) */ push_block("Device", "HP0"); { stmt("Name", "_HID, EISAID(\"PNP0C02\")"); - if (dm_version == QEMU_XEN_TRADITIONAL) { - stmt("Name", "_CRS, ResourceTemplate() {" - " IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x82)" - " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)" - "}"); - } else { - stmt("Name", "_CRS, ResourceTemplate() {" - " IO (Decode16, 0xae00, 0xae00, 0x00, 0x10)" - " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)" - "}"); - } + stmt("Name", "_CRS, ResourceTemplate() {" + " IO (Decode16, 0xae00, 0xae00, 0x00, 0x10)" + " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)" + "}"); } pop_block(); /*** PCI-ISA link definitions ***/ @@ -397,60 +369,27 @@ int main(int argc, char **argv) * QEMU provides a simple hotplug controller with some I/O to handle * the hotplug action and status, which is beyond the ACPI scope. */ - if (dm_version == QEMU_XEN_TRADITIONAL) { - for ( slot = 0; slot < 0x100; slot++ ) - { - push_block("Device", "S%02X", slot); - /* _ADR == dev:fn (16:16) */ - stmt("Name", "_ADR, 0x%08x", ((slot & ~7) << 13) | (slot & 7)); - /* _SUN == dev */ - stmt("Name", "_SUN, 0x%08x", slot >> 3); - push_block("Method", "_EJ0, 1"); - if (debug) - { - stmt("Store", "0x%02x, \\_GPE.DPT1", slot); - stmt("Store", "0x88, \\_GPE.DPT2"); - } - stmt("Store", "0x%02x, \\_GPE.PH%02X", /* eject */ - (slot & 1) ? 0x10 : 0x01, slot & ~1); - pop_block(); - push_block("Method", "_STA, 0"); - if (debug) - { - stmt("Store", "0x%02x, \\_GPE.DPT1", slot); - stmt("Store", "0x89, \\_GPE.DPT2"); - } - if ( slot & 1 ) - stmt("ShiftRight", "\\_GPE.PH%02X, 0x04, Local1", slot & ~1); - else - stmt("And", "\\_GPE.PH%02X, 0x0f, Local1", slot & ~1); - stmt("Return", "Local1"); /* IN status as the _STA */ - pop_block(); - pop_block(); - } - } else { - stmt("OperationRegion", "SEJ, SystemIO, 0xae08, 0x08"); - push_block("Field", "SEJ, DWordAcc, NoLock, WriteAsZeros"); - indent(); printf("B0EJ, 32,\n"); - indent(); printf("B0RM, 32,\n"); - pop_block(); + stmt("OperationRegion", "SEJ, SystemIO, 0xae08, 0x08"); + push_block("Field", "SEJ, DWordAcc, NoLock, WriteAsZeros"); + indent(); printf("B0EJ, 32,\n"); + indent(); printf("B0RM, 32,\n"); + pop_block(); - /* hotplug_slot */ - for (slot = 1; slot <= 31; slot++) { - push_block("Device", "S%i", slot); { - stmt("Name", "_ADR, %#06x0000", slot); - push_block("Method", "_EJ0,1"); { - stmt("Store", "%#010x, B0EJ", 1 << slot); - } pop_block(); - stmt("Name", "_SUN, %i", slot); - push_block("Method", "_STA, 0"); { - push_block("If", "And(B0RM, ShiftLeft(1, %i))", slot); - stmt("Return", "0xF"); - pop_block(); - stmt("Return", "0x0"); - } pop_block(); + /* hotplug_slot */ + for (slot = 1; slot <= 31; slot++) { + push_block("Device", "S%i", slot); { + stmt("Name", "_ADR, %#06x0000", slot); + push_block("Method", "_EJ0,1"); { + stmt("Store", "%#010x, B0EJ", 1 << slot); } pop_block(); - } + stmt("Name", "_SUN, %i", slot); + push_block("Method", "_STA, 0"); { + push_block("If", "And(B0RM, ShiftLeft(1, %i))", slot); + stmt("Return", "0xF"); + pop_block(); + stmt("Return", "0x0"); + } pop_block(); + } pop_block(); } pop_block(); @@ -460,26 +399,11 @@ int main(int argc, char **argv) /**** GPE start ****/ push_block("Scope", "\\_GPE"); - if (dm_version == QEMU_XEN_TRADITIONAL) { - stmt("OperationRegion", "PHP, SystemIO, 0x10c0, 0x82"); - - push_block("Field", "PHP, ByteAcc, NoLock, Preserve"); - indent(); printf("PSTA, 8,\n"); /* hotplug controller event reg */ - indent(); printf("PSTB, 8,\n"); /* hotplug controller slot reg */ - for ( slot = 0; slot < 0x100; slot += 2 ) - { - indent(); - /* Each hotplug control register manages a pair of pci functions. */ - printf("PH%02X, 8,\n", slot); - } - pop_block(); - } else { - stmt("OperationRegion", "PCST, SystemIO, 0xae00, 0x08"); - push_block("Field", "PCST, DWordAcc, NoLock, WriteAsZeros"); - indent(); printf("PCIU, 32,\n"); - indent(); printf("PCID, 32,\n"); - pop_block(); - } + stmt("OperationRegion", "PCST, SystemIO, 0xae00, 0x08"); + push_block("Field", "PCST, DWordAcc, NoLock, WriteAsZeros"); + indent(); printf("PCIU, 32,\n"); + indent(); printf("PCID, 32,\n"); + pop_block(); stmt("OperationRegion", "DG1, SystemIO, 0xb044, 0x04"); @@ -487,35 +411,16 @@ int main(int argc, char **argv) indent(); printf("DPT1, 8, DPT2, 8\n"); pop_block(); - if (dm_version == QEMU_XEN_TRADITIONAL) { - push_block("Method", "_L03, 0, Serialized"); - /* Detect slot and event (remove/add). */ - stmt("Name", "SLT, 0x0"); - stmt("Name", "EVT, 0x0"); - stmt("Store", "PSTA, Local1"); - stmt("And", "Local1, 0xf, EVT"); - stmt("Store", "PSTB, Local1"); /* XXX: Store (PSTB, SLT) ? */ - stmt("And", "Local1, 0xff, SLT"); - if (debug) - { - stmt("Store", "SLT, DPT1"); - stmt("Store", "EVT, DPT2"); - } - /* Decision tree */ - decision_tree(0x00, 0x100, "SLT", pci_hotplug_notify); + push_block("Method", "_E01"); + for (slot = 1; slot <= 31; slot++) { + push_block("If", "And(PCIU, ShiftLeft(1, %i))", slot); + stmt("Notify", "\\_SB.PCI0.S%i, 1", slot); pop_block(); - } else { - push_block("Method", "_E01"); - for (slot = 1; slot <= 31; slot++) { - push_block("If", "And(PCIU, ShiftLeft(1, %i))", slot); - stmt("Notify", "\\_SB.PCI0.S%i, 1", slot); - pop_block(); - push_block("If", "And(PCID, ShiftLeft(1, %i))", slot); - stmt("Notify", "\\_SB.PCI0.S%i, 3", slot); - pop_block(); - } + push_block("If", "And(PCID, ShiftLeft(1, %i))", slot); + stmt("Notify", "\\_SB.PCI0.S%i, 3", slot); pop_block(); } + pop_block(); pop_block(); /**** GPE end ****/ diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index e03599ea99..8bc768b515 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -99,35 +99,14 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->device_model_ssidref = SECINITSID_DOMDM; if (!b_info->device_model_version) { - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - if (libxl_defbool_val(b_info->device_model_stubdomain)) { - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else { - b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - } - } else { - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; - } - if (b_info->device_model_version - == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - const char *dm; - - dm = libxl__domain_device_model(gc, b_info); - rc = access(dm, X_OK); - if (rc < 0) { - /* qemu-xen unavailable, use qemu-xen-traditional */ - if (errno == ENOENT) { - LOGE(INFO, "qemu-xen is unavailable" - ", using qemu-xen-traditional instead"); - b_info->device_model_version = - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else { - LOGE(ERROR, "qemu-xen access error"); - return ERROR_FAIL; - } - } + const char *dm; + + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + 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; } } @@ -137,8 +116,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - b_info->u.hvm.bios = LIBXL_BIOS_TYPE_ROMBIOS; break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->u.hvm.bios = LIBXL_BIOS_TYPE_SEABIOS; break; default: @@ -148,12 +125,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, /* Enforce BIOS<->Device Model version relationship */ switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - if (b_info->u.hvm.bios != LIBXL_BIOS_TYPE_ROMBIOS) { - LOG(ERROR, "qemu-xen-traditional requires bios=rombios."); - return ERROR_INVAL; - } - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: if (b_info->u.hvm.bios == LIBXL_BIOS_TYPE_ROMBIOS) { LOG(ERROR, "qemu-xen does not support bios=rombios."); @@ -176,10 +147,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_val(b_info->device_model_stubdomain)) { if (!b_info->stubdomain_kernel) { switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - b_info->stubdomain_kernel = - libxl__abs_path(NOGC, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->stubdomain_kernel = libxl__abs_path(NOGC, @@ -192,8 +159,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } if (!b_info->stubdomain_ramdisk) { switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->stubdomain_ramdisk = libxl__abs_path(NOGC, @@ -299,33 +264,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->u.hvm.hdtype = LIBXL_HDTYPE_IDE; switch (b_info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - switch (b_info->u.hvm.vga.kind) { - case LIBXL_VGA_INTERFACE_TYPE_NONE: - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 0; - break; - case LIBXL_VGA_INTERFACE_TYPE_QXL: - LOG(ERROR,"qemu upstream required for qxl vga"); - return ERROR_INVAL; - break; - case LIBXL_VGA_INTERFACE_TYPE_STD: - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 8 * 1024; - if (b_info->video_memkb < 8 * 1024) { - LOG(ERROR, "videoram must be at least 8 MB for STDVGA on QEMU_XEN_TRADITIONAL"); - return ERROR_INVAL; - } - break; - case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: - default: - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) - b_info->video_memkb = 4 * 1024; - if (b_info->video_memkb != 4 * 1024) - LOG(WARN, "ignoring videoram other than 4 MB for CIRRUS on QEMU_XEN_TRADITIONAL"); - break; - } - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: default: switch (b_info->u.hvm.vga.kind) { diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index 4faa5fa3bd..42d71c17bc 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -1440,25 +1440,6 @@ static void devices_remove_callback(libxl__egc *egc, return; } -int libxl__wait_for_device_model_deprecated(libxl__gc *gc, - uint32_t domid, char *state, - libxl__spawn_starting *spawning, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata) -{ - char *path; - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - return libxl__xenstore_child_wait_deprecated(gc, domid, - LIBXL_DEVICE_MODEL_START_TIMEOUT, - "Device Model", path, state, spawning, - check_callback, check_callback_userdata); -} - int libxl__wait_for_backend(libxl__gc *gc, const char *be_path, const char *state) { diff --git a/tools/libs/light/libxl_disk.c b/tools/libs/light/libxl_disk.c index 6a0b6e06fe..456b5450ca 100644 --- a/tools/libs/light/libxl_disk.c +++ b/tools/libs/light/libxl_disk.c @@ -1007,13 +1007,6 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, disk->backend = LIBXL_DISK_BACKEND_PHY; } - if (cis->dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - stubdomid) { - LOGD(ERROR, domid, "cdrom-insert doesn't work for Mini-OS stubdoms"); - rc = ERROR_INVAL; - goto out; - } - disks = libxl__device_list(gc, &libxl__disk_devtype, cis->disk_domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index 4627564c0d..511ec76a65 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.c @@ -328,9 +328,6 @@ const char *libxl__domain_device_model(libxl__gc *gc, dm = libxl__strdup(gc, info->device_model); } else { switch (info->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - dm = libxl__abs_path(gc, "qemu-dm", libxl__private_bindir_path()); - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: { const char *configured_dm = qemu_xen_path(gc); if (configured_dm[0] == '/') @@ -704,272 +701,6 @@ static const char *dm_keymap(const libxl_domain_config *guest_config) return NULL; } -static int libxl__build_device_model_args_old(libxl__gc *gc, - const char *dm, int domid, - const libxl_domain_config *guest_config, - char ***args, char ***envs, - const libxl__domain_build_state *state) -{ - const libxl_domain_create_info *c_info = &guest_config->c_info; - const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_device_nic *nics = guest_config->nics; - const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); - const libxl_sdl_info *sdl = dm_sdl(guest_config); - const int num_nics = guest_config->num_nics; - const char *keymap = dm_keymap(guest_config); - int i; - flexarray_t *dm_args, *dm_envs; - dm_args = flexarray_make(gc, 16, 1); - dm_envs = flexarray_make(gc, 16, 1); - - assert(state->dm_monitor_fd == -1); - - flexarray_vappend(dm_args, dm, - "-d", GCSPRINTF("%d", domid), NULL); - - if (c_info->name) - flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); - - if (vnc) { - char *vncarg = NULL; - - flexarray_append(dm_args, "-vnc"); - - /* - * If vnc->listen is present and contains a :, and - * - vnc->display is 0, use vnc->listen - * - vnc->display is non-zero, be confused - * If vnc->listen is present but doesn't, use vnc->listen:vnc->display. - * If vnc->listen is not present, use 127.0.0.1:vnc->display - * (Remembering that vnc->display already defaults to 0.) - */ - if (vnc->listen) { - if (strchr(vnc->listen, ':') != NULL) { - if (vnc->display) { - LOGD(ERROR, domid, "vncdisplay set, vnclisten contains display"); - return ERROR_INVAL; - } - vncarg = vnc->listen; - } else { - vncarg = GCSPRINTF("%s:%d", vnc->listen, vnc->display); - } - } else - vncarg = GCSPRINTF("127.0.0.1:%d", vnc->display); - - if (vnc->passwd && vnc->passwd[0]) { - vncarg = GCSPRINTF("%s,password", vncarg); - } - - flexarray_append(dm_args, vncarg); - - if (libxl_defbool_val(vnc->findunused)) { - flexarray_append(dm_args, "-vncunused"); - } - } else if (!sdl) { - /* - * VNC is not enabled by default by qemu-xen-traditional, - * however skipping -vnc causes SDL to be - * (unexpectedly) enabled by default. If undesired, disable graphics at - * all. - */ - flexarray_append(dm_args, "-nographic"); - } - - if (sdl) { - flexarray_append(dm_args, "-sdl"); - if (!libxl_defbool_val(sdl->opengl)) { - flexarray_append(dm_args, "-disable-opengl"); - } - if (sdl->display) - flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); - if (sdl->xauthority) - flexarray_append_pair(dm_envs, "XAUTHORITY", sdl->xauthority); - } - if (keymap) { - flexarray_vappend(dm_args, "-k", keymap, NULL); - } - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { - int ioemu_nics = 0; - int nr_set_cpus = 0; - char *s; - - flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID", GCSPRINTF("%d", domid)); - - if (b_info->kernel) { - LOGD(ERROR, domid, "HVM direct kernel boot is not supported by " - "qemu-xen-traditional"); - return ERROR_INVAL; - } - - if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { - if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) - { - LOGD(ERROR, domid, "Both serial and serial_list set"); - return ERROR_INVAL; - } - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, - "-serial", b_info->u.hvm.serial, NULL); - } else if (b_info->u.hvm.serial_list) { - char **p; - for (p = b_info->u.hvm.serial_list; - *p; - p++) { - flexarray_vappend(dm_args, - "-serial", - *p, NULL); - } - } - } - - if (libxl_defbool_val(b_info->u.hvm.nographic) && (!sdl && !vnc)) { - flexarray_append(dm_args, "-nographic"); - } - - if (b_info->video_memkb) { - flexarray_vappend(dm_args, "-videoram", - GCSPRINTF("%d", libxl__sizekb_to_mb(b_info->video_memkb)), - NULL); - } - - switch (b_info->u.hvm.vga.kind) { - case LIBXL_VGA_INTERFACE_TYPE_STD: - flexarray_append(dm_args, "-std-vga"); - break; - case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: - break; - case LIBXL_VGA_INTERFACE_TYPE_NONE: - flexarray_append_pair(dm_args, "-vga", "none"); - break; - case LIBXL_VGA_INTERFACE_TYPE_QXL: - break; - default: - LOGD(ERROR, domid, "Invalid emulated video card specified"); - return ERROR_INVAL; - } - - if (b_info->u.hvm.boot) { - flexarray_vappend(dm_args, "-boot", b_info->u.hvm.boot, NULL); - } - if (libxl_defbool_val(b_info->u.hvm.usb) - || b_info->u.hvm.usbdevice - || libxl_string_list_length(&b_info->u.hvm.usbdevice_list)) { - if (b_info->u.hvm.usbdevice - && libxl_string_list_length(&b_info->u.hvm.usbdevice_list)) { - LOGD(ERROR, domid, "Both usbdevice and usbdevice_list set"); - return ERROR_INVAL; - } - flexarray_append(dm_args, "-usb"); - if (b_info->u.hvm.usbdevice) { - flexarray_vappend(dm_args, - "-usbdevice", b_info->u.hvm.usbdevice, NULL); - } else if (b_info->u.hvm.usbdevice_list) { - char **p; - for (p = b_info->u.hvm.usbdevice_list; - *p; - p++) { - flexarray_vappend(dm_args, - "-usbdevice", - *p, NULL); - } - } - } - if (b_info->u.hvm.soundhw) { - flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); - } - if (libxl__acpi_defbool_val(b_info)) { - flexarray_append(dm_args, "-acpi"); - } - if (b_info->max_vcpus > 1) { - flexarray_vappend(dm_args, "-vcpus", - GCSPRINTF("%d", b_info->max_vcpus), - NULL); - } - - nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus); - s = libxl_bitmap_to_hex_string(CTX, &b_info->avail_vcpus); - flexarray_vappend(dm_args, "-vcpu_avail", - GCSPRINTF("%s", s), NULL); - free(s); - - for (i = 0; i < num_nics; i++) { - if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { - char *smac = GCSPRINTF( - LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nics[i].mac)); - const char *ifname = libxl__device_nic_devname(gc, - domid, nics[i].devid, - LIBXL_NIC_TYPE_VIF_IOEMU); - flexarray_vappend(dm_args, - "-net", - GCSPRINTF( - "nic,vlan=%d,macaddr=%s,model=%s", - nics[i].devid, smac, nics[i].model), - "-net", - GCSPRINTF( - "tap,vlan=%d,ifname=%s,bridge=%s," - "script=%s,downscript=%s", - nics[i].devid, ifname, nics[i].bridge, - libxl_tapif_script(gc), - libxl_tapif_script(gc)), - NULL); - ioemu_nics++; - } - } - /* If we have no emulated nics, tell qemu not to create any */ - if ( ioemu_nics == 0 ) { - flexarray_vappend(dm_args, "-net", "none", NULL); - } - if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { - switch (b_info->u.hvm.gfx_passthru_kind) { - case LIBXL_GFX_PASSTHRU_KIND_DEFAULT: - case LIBXL_GFX_PASSTHRU_KIND_IGD: - flexarray_append(dm_args, "-gfx_passthru"); - break; - default: - LOGD(ERROR, domid, "unsupported gfx_passthru_kind."); - return ERROR_INVAL; - } - } - } else { - if (!sdl && !vnc) - flexarray_append(dm_args, "-nographic"); - } - - if (libxl_defbool_val(b_info->dm_restrict)) { - LOGD(ERROR, domid, - "dm_restrict not supported by qemu-xen-traditional"); - return ERROR_INVAL; - } - - if (state->saved_state) { - flexarray_vappend(dm_args, "-loadvm", state->saved_state, NULL); - } - for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) - flexarray_append(dm_args, b_info->extra[i]); - flexarray_append(dm_args, "-M"); - switch (b_info->type) { - case LIBXL_DOMAIN_TYPE_PVH: - case LIBXL_DOMAIN_TYPE_PV: - flexarray_append(dm_args, "xenpv"); - for (i = 0; b_info->extra_pv && b_info->extra_pv[i] != NULL; i++) - flexarray_append(dm_args, b_info->extra_pv[i]); - break; - case LIBXL_DOMAIN_TYPE_HVM: - flexarray_append(dm_args, "xenfv"); - for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) - flexarray_append(dm_args, b_info->extra_hvm[i]); - break; - default: - abort(); - } - flexarray_append(dm_args, NULL); - *args = (char **) flexarray_contents(dm_args); - flexarray_append(dm_envs, NULL); - if (envs) - *envs = (char **) flexarray_contents(dm_envs); - return 0; -} - static char *dm_spice_options(libxl__gc *gc, const libxl_spice_info *spice) { @@ -2096,11 +1827,6 @@ static int libxl__build_device_model_args(libxl__gc *gc, * and therefore will be passing a filename rather than a fd. */ { switch (guest_config->b_info.device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - return libxl__build_device_model_args_old(gc, dm, - guest_domid, guest_config, - args, envs, - state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: if (!libxl_defbool_val(guest_config->b_info.device_model_stubdomain)) { assert(dm_state_fd != NULL); @@ -2463,16 +2189,15 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) "%s", libxl_bios_type_to_string(guest_config->b_info.u.hvm.bios)); } - /* Disable relocating memory to make the MMIO hole larger - * unless we're running qemu-traditional and vNUMA is not - * configured. */ + + /* + * Disable relocating memory, having a larger MMIO hole isn't + * implemented with qemu-xen. + */ libxl__xs_printf(gc, XBT_NULL, libxl__sprintf(gc, "%s/hvmloader/allow-memory-relocate", libxl__xs_get_dompath(gc, guest_domid)), - "%d", - guest_config->b_info.device_model_version - == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - !libxl__vnuma_configured(&guest_config->b_info)); + "0"); ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { LOGED(ERROR, guest_domid, "setting target domain %d -> %d", @@ -3156,13 +2881,9 @@ static void device_model_launch(libxl__egc *egc, libxl_domain_config *guest_config = dmss->guest_config; const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); char *path; int logfile_w, null; char **args, **arg, **envs; - xs_transaction_t t; - char *vm_path; - char **pass_stuff; int dm_state_fd = -1; /* convenience aliases */ @@ -3196,26 +2917,19 @@ static void device_model_launch(libxl__egc *egc, libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/hvmloader/bios", path), "%s", libxl_bios_type_to_string(b_info->u.hvm.bios)); - /* Disable relocating memory to make the MMIO hole larger - * unless we're running qemu-traditional and vNUMA is not - * configured. */ + /* + * Disable relocating memory, having a larger MMIO hole isn't + * implemented with qemu-xen. + */ libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/hvmloader/allow-memory-relocate", path), - "%d", - b_info->device_model_version==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - !libxl__vnuma_configured(b_info)); + "0"); free(path); } path = DEVICE_MODEL_XS_PATH(gc, LIBXL_TOOLSTACK_DOMID, domid, ""); xs_mkdir(ctx->xsh, XBT_NULL, path); - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && - b_info->device_model_version - == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) - libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/disable_pf", path), - "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); - logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qemu-dm-%s", c_info->name)); if (logfile_w < 0) { @@ -3240,25 +2954,6 @@ static void device_model_launch(libxl__egc *egc, GCSPRINTF("%s/image/device-model-kill-uid", dom_path), "%s", state->dm_kill_uid); - if (vnc && vnc->passwd) { - /* This xenstore key will only be used by qemu-xen-traditionnal. - * The code to supply vncpasswd to qemu-xen is later. */ -retry_transaction: - /* Find uuid and the write the vnc password to xenstore for qemu. */ - t = xs_transaction_start(ctx->xsh); - vm_path = libxl__xs_read(gc,t,GCSPRINTF("%s/vm", dom_path)); - if (vm_path) { - /* Now write the vncpassword into it. */ - pass_stuff = libxl__calloc(gc, 3, sizeof(char *)); - pass_stuff[0] = "vncpasswd"; - pass_stuff[1] = vnc->passwd; - libxl__xs_writev(gc,t,vm_path,pass_stuff); - if (!xs_transaction_end(ctx->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; - } - } - LOGD(DEBUG, domid, "Spawning device-model %s with arguments:", dm); for (arg = args; *arg; arg++) LOGD(DEBUG, domid, " %s", *arg); diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 94fef37401..4d67b0d282 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -881,7 +881,6 @@ static int libxl__domain_firmware(libxl__gc *gc, switch (info->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: firmware = "hvmloader"; break; default: @@ -1212,15 +1211,6 @@ out: return rc; } -int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, - const char *cmd) -{ - char *path = NULL; - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/command"); - return libxl__xs_printf(gc, XBT_NULL, path, "%s", cmd); -} - /*==================== Miscellaneous ====================*/ char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) diff --git a/tools/libs/light/libxl_dom_save.c b/tools/libs/light/libxl_dom_save.c index 32e3cb5a13..d64fd64f2e 100644 --- a/tools/libs/light/libxl_dom_save.c +++ b/tools/libs/light/libxl_dom_save.c @@ -28,19 +28,6 @@ static void domain_save_done(libxl__egc *egc, /*----- complicated callback, called by xc_domain_save -----*/ -/* - * We implement the other end of protocol for controlling qemu-dm's - * logdirty. There is no documentation for this protocol, but our - * counterparty's implementation is in - * qemu-xen-traditional.git:xenstore.c in the function - * xenstore_process_logdirty_event - */ - -static void domain_suspend_switch_qemu_xen_traditional_logdirty - (libxl__egc *egc, int domid, unsigned enable, - libxl__logdirty_switch *lds); -static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch*, - const char *watch_path, const char *event_path); static void domain_suspend_switch_qemu_xen_logdirty (libxl__egc *egc, int domid, unsigned enable, libxl__logdirty_switch *lds); @@ -69,10 +56,6 @@ void libxl__domain_common_switch_qemu_logdirty(libxl__egc *egc, STATE_AO_GC(lds->ao); switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - domain_suspend_switch_qemu_xen_traditional_logdirty(egc, domid, enable, - lds); - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: domain_suspend_switch_qemu_xen_logdirty(egc, domid, enable, lds); break; @@ -83,129 +66,6 @@ void libxl__domain_common_switch_qemu_logdirty(libxl__egc *egc, } } -static void domain_suspend_switch_qemu_xen_traditional_logdirty - (libxl__egc *egc, int domid, unsigned enable, - libxl__logdirty_switch *lds) -{ - STATE_AO_GC(lds->ao); - int rc; - xs_transaction_t t = 0; - const char *got; - - if (!lds->cmd_path) { - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - lds->cmd_path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, - "/logdirty/cmd"); - lds->ret_path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, - "/logdirty/ret"); - } - lds->cmd = enable ? "enable" : "disable"; - - rc = libxl__ev_xswatch_register(gc, &lds->watch, - switch_logdirty_xswatch, lds->ret_path); - if (rc) goto out; - - rc = libxl__ev_time_register_rel(ao, &lds->timeout, - switch_logdirty_timeout, 10*1000); - if (rc) goto out; - - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - rc = libxl__xs_read_checked(gc, t, lds->cmd_path, &got); - if (rc) goto out; - - if (got) { - const char *got_ret; - rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got_ret); - if (rc) goto out; - - if (!got_ret || strcmp(got, got_ret)) { - LOGD(ERROR, domid, "controlling logdirty: qemu was already sent" - " command `%s' (xenstore path `%s') but result is `%s'", - got, lds->cmd_path, got_ret ? got_ret : ""); - rc = ERROR_FAIL; - goto out; - } - rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); - if (rc) goto out; - } - - rc = libxl__xs_rm_checked(gc, t, lds->ret_path); - if (rc) goto out; - - rc = libxl__xs_write_checked(gc, t, lds->cmd_path, lds->cmd); - if (rc) goto out; - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc<0) goto out; - } - - /* OK, wait for some callback */ - return; - - out: - LOGD(ERROR, domid, "logdirty switch failed (rc=%d), abandoning suspend",rc); - libxl__xs_transaction_abort(gc, &t); - switch_logdirty_done(egc,lds,rc); -} - -static void switch_logdirty_xswatch(libxl__egc *egc, libxl__ev_xswatch *watch, - const char *watch_path, const char *event_path) -{ - libxl__logdirty_switch *lds = CONTAINER_OF(watch, *lds, watch); - STATE_AO_GC(lds->ao); - const char *got; - xs_transaction_t t = 0; - int rc; - - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - rc = libxl__xs_read_checked(gc, t, lds->ret_path, &got); - if (rc) goto out; - - if (!got) { - rc = +1; - goto out; - } - - if (strcmp(got, lds->cmd)) { - LOG(ERROR,"logdirty switch: sent command `%s' but got reply `%s'" - " (xenstore paths `%s' / `%s')", lds->cmd, got, - lds->cmd_path, lds->ret_path); - rc = ERROR_FAIL; - goto out; - } - - rc = libxl__xs_rm_checked(gc, t, lds->cmd_path); - if (rc) goto out; - - rc = libxl__xs_rm_checked(gc, t, lds->ret_path); - if (rc) goto out; - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc<0) goto out; - } - - out: - /* rc < 0: error - * rc == 0: ok, we are done - * rc == +1: need to keep waiting - */ - libxl__xs_transaction_abort(gc, &t); - - if (rc <= 0) { - if (rc < 0) - LOG(ERROR,"logdirty switch: failed (rc=%d)",rc); - switch_logdirty_done(egc,lds,rc); - } -} - static void domain_suspend_switch_qemu_xen_logdirty (libxl__egc *egc, int domid, unsigned enable, libxl__logdirty_switch *lds) diff --git a/tools/libs/light/libxl_dom_suspend.c b/tools/libs/light/libxl_dom_suspend.c index 6091a5f3f6..f0a74fc82c 100644 --- a/tools/libs/light/libxl_dom_suspend.c +++ b/tools/libs/light/libxl_dom_suspend.c @@ -85,15 +85,8 @@ void libxl__domain_suspend_device_model(libxl__egc *egc, STATE_AO_GC(dsps->ao); int rc = 0; uint32_t const domid = dsps->domid; - const char *const filename = dsps->dm_savefile; switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { - LOGD(DEBUG, domid, "Saving device model state to %s", filename); - libxl__qemu_traditional_cmd(gc, domid, "save"); - libxl__wait_for_device_model_deprecated(gc, domid, "paused", NULL, NULL, NULL); - break; - } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: /* calls dsps->callback_device_model_done when done */ libxl__qmp_suspend_save(egc, dsps); /* must be last */ @@ -420,21 +413,7 @@ static void domain_suspend_callback_common_done(libxl__egc *egc, int libxl__domain_resume_device_model_deprecated(libxl__gc *gc, uint32_t domid) { - const char *path, *state; - switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - if (state != NULL && !strcmp(state, "paused")) { - libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model_deprecated(gc, domid, "running", - NULL, NULL, NULL); - } - break; - } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: if (libxl__qmp_resume(gc, domid)) return ERROR_FAIL; @@ -493,8 +472,6 @@ static void dm_resume_dispose(libxl__gc *gc, libxl__ev_xswatch_deregister(gc, &dmrs->watch); } -static void dm_resume_xswatch_cb(libxl__egc *egc, - libxl__ev_xswatch *, const char *watch_path, const char *); static void dm_resume_qmp_done(libxl__egc *egc, libxl__ev_qmp *qmp, const libxl__json_object *, int rc); static void dm_resume_timeout(libxl__egc *egc, @@ -521,27 +498,6 @@ void libxl__dm_resume(libxl__egc *egc, if (rc) goto out; switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: { - uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); - const char *path, *state; - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - rc = libxl__xs_read_checked(gc, XBT_NULL, path, &state); - if (rc) goto out; - if (!state || strcmp(state, "paused")) { - /* already running */ - rc = 0; - goto out; - } - - rc = libxl__qemu_traditional_cmd(gc, domid, "continue"); - if (rc) goto out; - rc = libxl__ev_xswatch_register(gc, &dmrs->watch, - dm_resume_xswatch_cb, - path); - if (rc) goto out; - break; - } case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: qmp->ao = dmrs->ao; qmp->domid = domid; @@ -561,27 +517,6 @@ out: dm_resume_done(egc, dmrs, rc); } -static void dm_resume_xswatch_cb(libxl__egc *egc, - libxl__ev_xswatch *xsw, - const char *watch_path, - const char *event_path) -{ - EGC_GC; - libxl__dm_resume_state *dmrs = CONTAINER_OF(xsw, *dmrs, watch); - int rc; - const char *value; - - rc = libxl__xs_read_checked(gc, XBT_NULL, watch_path, &value); - if (rc) goto out; - - if (!value || strcmp(value, "running")) - return; - - rc = 0; -out: - dm_resume_done(egc, dmrs, rc); -} - static void dm_resume_qmp_done(libxl__egc *egc, libxl__ev_qmp *qmp, const libxl__json_object *response, diff --git a/tools/libs/light/libxl_domain.c b/tools/libs/light/libxl_domain.c index 6751fc785f..dd2e5e9a19 100644 --- a/tools/libs/light/libxl_domain.c +++ b/tools/libs/light/libxl_domain.c @@ -1877,8 +1877,6 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__ev_time_register_rel(ao, &svos->timeout, set_vcpuonline_timeout, @@ -2116,7 +2114,6 @@ static void domain_s3_resume(libxl__ao *ao, libxl__egc *egc, int domid) AO_GC; libxl__ev_qmp *qmp; int rc = 0; - int r; GCNEW(qmp); libxl__ev_qmp_init(qmp); @@ -2128,14 +2125,6 @@ static void domain_s3_resume(libxl__ao *ao, libxl__egc *egc, int domid) switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - r = xc_hvm_param_set(CTX->xch, domid, HVM_PARAM_ACPI_S_STATE, 0); - if (r) { - LOGED(ERROR, domid, "Send trigger '%s' failed", - libxl_trigger_to_string(LIBXL_TRIGGER_S3RESUME)); - rc = ERROR_FAIL; - } - break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__ev_qmp_send(egc, qmp, "system_wakeup", NULL); if (rc) goto out; @@ -2481,10 +2470,6 @@ static void retrieve_domain_configuration_end(libxl__egc *egc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: libxl_bitmap_copy(CTX, map, &rdcs->qemuu_cpus); break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__update_avail_vcpus_xenstore(gc, domid, - max_vcpus, map); - break; default: abort(); } diff --git a/tools/libs/light/libxl_exec.c b/tools/libs/light/libxl_exec.c index a8b949b193..7a59c050b2 100644 --- a/tools/libs/light/libxl_exec.c +++ b/tools/libs/light/libxl_exec.c @@ -157,81 +157,6 @@ out: return rc ? SIGTERM : 0; } -int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, - uint32_t domid, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawn_starting *spawning, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata) -{ - char *p; - unsigned int len; - int rc = 0; - struct xs_handle *xsh; - int nfds; - fd_set rfds; - struct timeval tv; - unsigned int num; - char **l = NULL; - - xsh = xs_open(0); - if (xsh == NULL) { - LOG(ERROR, "Unable to open xenstore connection"); - goto err; - } - - xs_watch(xsh, path, path); - tv.tv_sec = timeout; - tv.tv_usec = 0; - nfds = xs_fileno(xsh) + 1; - assert(!spawning); - - while (rc > 0 || (!rc && tv.tv_sec > 0)) { - p = xs_read(xsh, XBT_NULL, path, &len); - if ( NULL == p ) - goto again; - - if ( NULL != state && strcmp(p, state) ) - goto again; - - if ( NULL != check_callback ) { - rc = (*check_callback)(gc, domid, p, check_callback_userdata); - if ( rc > 0 ) - goto again; - } - - free(p); - xs_unwatch(xsh, path, path); - xs_close(xsh); - return rc; -again: - free(p); - FD_ZERO(&rfds); - FD_SET(xs_fileno(xsh), &rfds); - rc = select(nfds, &rfds, NULL, NULL, &tv); - if (rc > 0) { - if (FD_ISSET(xs_fileno(xsh), &rfds)) { - l = xs_read_watch(xsh, &num); - if (l != NULL) - free(l); - else - goto again; - } - } - } - LOG(ERROR, "%s not ready", what); - - xs_unwatch(xsh, path, path); - xs_close(xsh); -err: - return -1; -} - - /*----- spawn implementation -----*/ /* diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index c95624933f..2941ca0bbd 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -387,11 +387,9 @@ int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) path = libxl__xs_libxl_path(gc, domid); path = GCSPRINTF("%s/dm-version", path); dm_version = libxl__xs_read(gc, XBT_NULL, path); - if (!dm_version) { - return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } - if (libxl_device_model_version_from_string(dm_version, &value) < 0) { + if (!dm_version || + libxl_device_model_version_from_string(dm_version, &value) < 0) { LOGD(ERROR, domid, "fatal: %s contain a wrong value (%s)", path, dm_version); return -1; } diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 408a771310..75bb0b94cf 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -1423,8 +1423,6 @@ _hidden int libxl__build_hvm(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config, libxl__domain_build_state *state); -_hidden int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, - const char *cmd); _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid, const char *old_name, const char *new_name, xs_transaction_t trans); @@ -1914,50 +1912,6 @@ static inline int libxl__spawn_inuse(const libxl__spawn_state *ss) _hidden int libxl__spawn_record_pid(libxl__gc*, libxl__spawn_state*, pid_t innerchild); -/* - * libxl__xenstore_child_wait_deprecated - Wait for daemonic child IPC - * - * This is a NOT function for waiting for ordinary child processes. - * If you want to run (fork/exec/wait) subprocesses from libxl: - * - Make your libxl entrypoint use the ao machinery - * - Use libxl__ev_child_fork, and use the callback programming style - * - * This function is intended for interprocess communication with a - * service process. If the service process does not respond quickly, - * the whole caller may be blocked. Therefore this function is - * deprecated. This function is currently used only by - * libxl__wait_for_device_model_deprecated. - * - * gc: allocation pool - * domid: guest to work with - * timeout: how many seconds to wait for the state to appear - * what: string describing the spawned process - * path: path to the state file in xenstore - * state: expected string to wait for in path (optional) - * spawning: malloc'd pointer to libxl__spawn_starting (optional) - * check_callback: (optional) - * check_callback_userdata: data to pass to the callback function - * - * Returns 0 on success, and < 0 on error. - * - * This function waits the given timeout for the given path to appear - * in xenstore, and optionally for state in path. - * If path appears and state matches, check_callback is called. - * If check_callback returns > 0, waiting for path or state continues. - * Otherwise libxl__xenstore_child_wait_deprecated returns. - */ -_hidden int libxl__xenstore_child_wait_deprecated(libxl__gc *gc, - uint32_t domid, - uint32_t timeout, char *what, - char *path, char *state, - libxl__spawn_starting *spawning, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata); - - /* low-level stuff, for synchronous subprocesses etc. */ /* @@ -2022,25 +1976,6 @@ _hidden int libxl__domain_device_construct_rdm(libxl__gc *gc, uint64_t rdm_mem_guard, struct xc_dom_image *dom); -/* - * This function will cause the whole libxl process to hang - * if the device model does not respond. It is deprecated. - * - * Instead of calling this function: - * - Make your libxl entrypoint use the ao machinery - * - Use libxl__ev_xswatch_register, and use the callback programming - * style - */ -_hidden int libxl__wait_for_device_model_deprecated(libxl__gc *gc, - uint32_t domid, char *state, - libxl__spawn_starting *spawning - /* NULL allowed */, - int (*check_callback)(libxl__gc *gc, - uint32_t domid, - const char *state, - void *userdata), - void *check_callback_userdata); - _hidden const libxl_vnc_info *libxl__dm_vnc(const libxl_domain_config *g_cfg); _hidden char *libxl__abs_path(libxl__gc *gc, const char *s, const char *path); @@ -2315,8 +2250,7 @@ _hidden char *libxl__json_object_to_json(libxl__gc *gc, #define JSON(o) \ (libxl__json_object_to_json(gc, (o)) ? : "") - /* Based on /local/domain/$domid/dm-version xenstore key - * default is qemu xen traditional */ + /* Based on /local/domain/$domid/dm-version xenstore key */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); static inline diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index a8460fb3ec..2ea2caeb66 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1023,82 +1023,6 @@ static int pci_multifunction_check(libxl__gc *gc, libxl_device_pci *pci, unsigne return 0; } -static int pci_ins_check(libxl__gc *gc, uint32_t domid, const char *state, void *priv) -{ - char *orig_state = priv; - - if ( !strcmp(state, "pci-insert-failed") ) - return -1; - if ( !strcmp(state, "pci-inserted") ) - return 0; - if ( !strcmp(state, orig_state) ) - return 1; - - return 1; -} - -static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, - libxl_device_pci *pci) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - int rc = 0; - char *path; - char *state, *vdevfn; - uint32_t dm_domid; - - dm_domid = libxl_get_stubdom_id(CTX, domid); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter"); - if (pci->vdevfn) { - libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, - pci->domain, pci->bus, pci->dev, - pci->func, pci->vdevfn, pci->msitranslate, - pci->power_mgmt); - } else { - libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, - pci->domain, pci->bus, pci->dev, - pci->func, pci->msitranslate, pci->power_mgmt); - } - - libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); - rc = libxl__wait_for_device_model_deprecated(gc, domid, NULL, NULL, - pci_ins_check, state); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter"); - vdevfn = libxl__xs_read(gc, XBT_NULL, path); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - if ( rc < 0 ) - LOGD(ERROR, domid, "qemu refused to add device: %s", vdevfn); - else if ( sscanf(vdevfn, "0x%x", &pci->vdevfn) != 1 ) { - LOGD(ERROR, domid, "wrong format for the vdevfn: '%s'", vdevfn); - rc = -1; - } - xs_write(ctx->xsh, XBT_NULL, path, state, strlen(state)); - - return rc; -} - -static int check_qemu_running(libxl__gc *gc, - libxl_domid domid, - libxl__xswait_state *xswa, - int rc, - const char *state) -{ - if (rc) { - if (rc == ERROR_TIMEDOUT) { - LOGD(ERROR, domid, "%s not ready", xswa->what); - } - goto out; - } - - if (!state || strcmp(state, "running")) - return ERROR_NOT_READY; - -out: - libxl__xswait_stop(gc, xswa); - return rc; -} - typedef struct pci_add_state { /* filled by user of do_pci_add */ libxl__ao_device *aodev; @@ -1119,8 +1043,6 @@ typedef struct pci_add_state { int retries; } pci_add_state; -static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, int rc, const char *state); static void pci_add_qmp_device_add(libxl__egc *, pci_add_state *); static void pci_add_qmp_device_add_cb(libxl__egc *, libxl__ev_qmp *, const libxl__json_object *, int rc); @@ -1156,16 +1078,6 @@ static void do_pci_add(libxl__egc *egc, if (type == LIBXL_DOMAIN_TYPE_HVM) { switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - pas->xswait.ao = ao; - pas->xswait.what = "Device Model"; - pas->xswait.path = DEVICE_MODEL_XS_PATH(gc, - libxl_get_stubdom_id(CTX, domid), domid, "/state"); - pas->xswait.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; - pas->xswait.callback = pci_add_qemu_trad_watch_state_cb; - rc = libxl__xswait_start(gc, &pas->xswait); - if (rc) goto out; - return; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__ev_time_register_rel(ao, &pas->timeout, pci_add_timeout, @@ -1186,29 +1098,6 @@ out: pci_add_dm_done(egc, pas, rc); /* must be last */ } -static void pci_add_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, - int rc, - const char *state) -{ - pci_add_state *pas = CONTAINER_OF(xswa, *pas, xswait); - STATE_AO_GC(pas->aodev->ao); - - /* Convenience aliases */ - libxl_domid domid = pas->domid; - libxl_device_pci *pci = &pas->pci; - - rc = check_qemu_running(gc, domid, xswa, rc, state); - if (rc == ERROR_NOT_READY) - return; - if (rc) - goto out; - - rc = qemu_pci_add_xenstore(gc, domid, pci); -out: - pci_add_dm_done(egc, pas, rc); /* must be last */ -} - static void pci_add_qmp_device_add(libxl__egc *egc, pci_add_state *pas) { STATE_AO_GC(pas->aodev->ao); @@ -1882,42 +1771,6 @@ static void add_pcis_done(libxl__egc *egc, libxl__multidev *multidev, aodev->callback(egc, aodev); } -static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, - libxl_device_pci *pci, int force) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - char *state; - char *path; - uint32_t dm_domid; - - dm_domid = libxl_get_stubdom_id(CTX, domid); - - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/parameter"); - libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pci->domain, - pci->bus, pci->dev, pci->func); - - /* Remove all functions at once atomically by only signalling - * device-model for function 0 */ - if ( !force && (pci->vdevfn & 0x7) == 0 ) { - libxl__qemu_traditional_cmd(gc, domid, "pci-rem"); - if (libxl__wait_for_device_model_deprecated(gc, domid, "pci-removed", - NULL, NULL, NULL) < 0) { - LOGD(ERROR, domid, "Device Model didn't respond in time"); - /* This depends on guest operating system acknowledging the - * SCI, if it doesn't respond in time then we may wish to - * force the removal. - */ - return ERROR_FAIL; - } - } - path = DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, "/state"); - xs_write(ctx->xsh, XBT_NULL, path, state, strlen(state)); - - return 0; -} - typedef struct pci_remove_state { libxl__ao_device *aodev; libxl_domid domid; @@ -1940,8 +1793,6 @@ static void libxl__device_pci_remove_common(libxl__egc *egc, static void device_pci_remove_common_next(libxl__egc *egc, pci_remove_state *prs, int rc); -static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, int rc, const char *state); static void pci_remove_qmp_device_del(libxl__egc *egc, pci_remove_state *prs); static void pci_remove_qmp_device_del_cb(libxl__egc *egc, @@ -1987,16 +1838,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) if (type == LIBXL_DOMAIN_TYPE_HVM) { prs->hvm = true; switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - prs->xswait.ao = ao; - prs->xswait.what = "Device Model"; - prs->xswait.path = DEVICE_MODEL_XS_PATH(gc, - libxl_get_stubdom_id(CTX, domid), domid, "/state"); - prs->xswait.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; - prs->xswait.callback = pci_remove_qemu_trad_watch_state_cb; - rc = libxl__xswait_start(gc, &prs->xswait); - if (rc) goto out_fail; - return; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: pci_remove_qmp_device_del(egc, prs); /* must be last */ return; @@ -2010,30 +1851,6 @@ out_fail: pci_remove_detached(egc, prs, rc); /* must be last */ } -static void pci_remove_qemu_trad_watch_state_cb(libxl__egc *egc, - libxl__xswait_state *xswa, - int rc, - const char *state) -{ - pci_remove_state *prs = CONTAINER_OF(xswa, *prs, xswait); - STATE_AO_GC(prs->aodev->ao); - - /* Convenience aliases */ - libxl_domid domid = prs->domid; - libxl_device_pci *const pci = &prs->pci; - - rc = check_qemu_running(gc, domid, xswa, rc, state); - if (rc == ERROR_NOT_READY) - return; - if (rc) - goto out; - - rc = qemu_pci_remove_xenstore(gc, domid, pci, prs->force); - -out: - pci_remove_detached(egc, prs, rc); -} - static void pci_remove_qmp_device_del(libxl__egc *egc, pci_remove_state *prs) { diff --git a/tools/libs/light/libxl_sr_stream_format.h b/tools/libs/light/libxl_sr_stream_format.h index 75f5190886..f8f4723c2e 100644 --- a/tools/libs/light/libxl_sr_stream_format.h +++ b/tools/libs/light/libxl_sr_stream_format.h @@ -45,7 +45,7 @@ typedef struct libxl__sr_emulator_hdr } libxl__sr_emulator_hdr; #define EMULATOR_UNKNOWN 0x00000000U -#define EMULATOR_QEMU_TRADITIONAL 0x00000001U +#define EMULATOR_QEMU_TRADITIONAL 0x00000001U /* Dropped in Xen 4.21 */ #define EMULATOR_QEMU_UPSTREAM 0x00000002U typedef struct libxl_sr_checkpoint_state diff --git a/tools/libs/light/libxl_stream_write.c b/tools/libs/light/libxl_stream_write.c index 634f3240d1..98d44597a7 100644 --- a/tools/libs/light/libxl_stream_write.c +++ b/tools/libs/light/libxl_stream_write.c @@ -252,10 +252,6 @@ void libxl__stream_write_start(libxl__egc *egc, stream->device_model_version = libxl__device_model_version_running(gc, dss->domid); switch (stream->device_model_version) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - stream->emu_sub_hdr.id = EMULATOR_QEMU_TRADITIONAL; - break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: stream->emu_sub_hdr.id = EMULATOR_QEMU_UPSTREAM; break; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 9bb2969931..1985153830 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -104,7 +104,7 @@ libxl_channel_connection = Enumeration("channel_connection", [ libxl_device_model_version = Enumeration("device_model_version", [ (0, "UNKNOWN"), - (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) + (1, "QEMU_XEN_TRADITIONAL"), # Historical dm (qemu-dm, no longer supported) (2, "QEMU_XEN"), # Upstream based qemu-xen device model ]) diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index 5dcb50fe02..dc5c7ac355 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -51,12 +51,10 @@ rec_type_to_str = { EMULATOR_HEADER_FORMAT = "II" EMULATOR_ID_unknown = 0x00000000 -EMULATOR_ID_qemu_trad = 0x00000001 EMULATOR_ID_qemu_upstream = 0x00000002 emulator_id_to_str = { EMULATOR_ID_unknown : "Unknown", - EMULATOR_ID_qemu_trad : "Qemu Traditional", EMULATOR_ID_qemu_upstream : "Qemu Upstream", } diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 089a88935a..219e924779 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2733,10 +2733,7 @@ skip_usbdev: xlu_cfg_replace_string (config, "device_model_override", &b_info->device_model, 0); if (!xlu_cfg_get_string (config, "device_model_version", &buf, 0)) { - if (!strcmp(buf, "qemu-xen-traditional")) { - b_info->device_model_version - = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; - } else if (!strcmp(buf, "qemu-xen")) { + if (!strcmp(buf, "qemu-xen")) { b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 09:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 09:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003090.1382540 (Exim 4.92) (envelope-from ) id 1uM1ib-0007oq-QI; Mon, 02 Jun 2025 09:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003090.1382540; Mon, 02 Jun 2025 09: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 1uM1ib-0007og-Mp; Mon, 02 Jun 2025 09:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1003090; Mon, 02 Jun 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 1uM1ia-0007oZ-CG for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM1ia-00G5GD-18 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM1ia-00EcWd-11 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=+tRz6GVHpirIp74DjjWw4daChI3/9MSwu4Gq2HoYpOE=; b=nJ5K5u45LpHhLofhf2kBVLSxok m/jfRf9DdaecATDGHXddCBlwECe+ozlOz1bgDoTcDiGXuVV0/l1qQ1TdD11sdEcDg6DwoWfcyuXcW T5n1zHDKn5Lf+zLC0XxQ9W629cjXZrvpGJc7CsldWh711Iz7sJUUcO+rBoZvWr6GW8PM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: remove qemu-traditional Message-Id: Date: Mon, 02 Jun 2025 09:44:32 +0000 commit 1eb944f65055115e5c07cde420ead2f0beba1a5e Author: Juergen Gross AuthorDate: Tue May 27 15:20:32 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 tools: remove qemu-traditional Remove qemu traditional from the tree. Signed-off-by: Juergen Gross Acked-by: Oleksii Kurochko # CHANGELOG.md Reviewed-by: Anthony PERARD --- .gitignore | 3 - CHANGELOG.md | 2 + Config.mk | 38 ----------- INSTALL | 13 ---- MAINTAINERS | 4 -- README | 2 +- SUPPORT.md | 16 ----- config/Paths.mk.in | 3 +- config/Tools.mk.in | 1 - docs/process/branching-checklist.txt | 1 - docs/process/release-technician-checklist.txt | 1 - stubdom/.gitignore | 3 - stubdom/Makefile | 97 ++------------------------- stubdom/configure | 89 ------------------------ stubdom/configure.ac | 15 ----- stubdom/ioemu-minios.cfg | 6 -- tools/Makefile | 58 ---------------- tools/Rules.mk | 3 - tools/config.h.in | 3 - tools/configure | 42 ++---------- tools/configure.ac | 21 +----- 21 files changed, 16 insertions(+), 405 deletions(-) diff --git a/.gitignore b/.gitignore index 4a4e206804..7b7f5e7a4a 100644 --- a/.gitignore +++ b/.gitignore @@ -254,9 +254,6 @@ LibVNCServer* tools/qemu-xen-dir-remote tools/qemu-xen-dir -tools/qemu-xen-traditional-dir-remote -tools/qemu-xen-traditional-dir - tools/firmware/seabios-dir-remote tools/firmware/seabios-dir diff --git a/CHANGELOG.md b/CHANGELOG.md index ec452027f5..1ee2f42e74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - GNTTABOP_cache_flush: it's unused on x86 and the implementation is broken. + - Support of qemu-traditional has been removed. + ## [4.20.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.0) - 2025-03-05 ### Changed diff --git a/Config.mk b/Config.mk index 8be7733d9e..3ebc9ac125 100644 --- a/Config.mk +++ b/Config.mk @@ -165,20 +165,6 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \ - XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ - XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR \ - XEN_LIB_DIR XEN_RUN_STORED - -buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1))) -define buildmakevars2file-closure - $(1): .phony - rm -f $(1).tmp; \ - $(foreach var, $(BUILD_MAKE_VARS), \ - echo "$(var)=\"$($(var))\"" >>$(1).tmp;) \ - $(call move-if-changed,$(1).tmp,$(1)) -endef - CFLAGS += -fno-strict-aliasing CFLAGS += -std=gnu99 @@ -208,22 +194,12 @@ XEN_EXTFILES_URL ?= https://xenbits.xen.org/xen-extfiles # Where to look for inlined subtrees (for example, from a tarball) QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen -QEMU_TRADITIONAL_INTREE ?= $(XEN_ROOT)/tools/qemu-xen-traditional # Handle legacy options ifneq (,$(SEABIOS_UPSTREAM_TAG)) SEABIOS_UPSTREAM_REVISION ?= $(SEABIOS_UPSTREAM_TAG) endif -ifneq (,$(QEMU_REMOTE)) -QEMU_TRADITIONAL_URL ?= $(QEMU_REMOTE) -endif -ifneq (,$(CONFIG_QEMU)) -QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) -endif -ifneq (,$(QEMU_TAG)) -QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) -endif OVMF_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/ovmf.git OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16 @@ -239,20 +215,6 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.16.3 ETHERBOOT_NICS ?= rtl8139 8086100e - -QEMU_TRADITIONAL_URL ?= https://xenbits.xen.org/git-http/qemu-xen-traditional.git -QEMU_TRADITIONAL_REVISION ?= 3d273dd05e51e5a1ffba3d98c7437ee84e8f8764 -# Wed Jul 15 10:01:40 2020 +0100 -# qemu-trad: remove Xen path dependencies - -# Specify which qemu-dm to use. This may be `ioemu' to use the old -# Mercurial in-tree version, or a local directory, or a git URL. -# QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git - -# Defaults for subtree locations -QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\ - $(QEMU_TRADITIONAL_URL)) - QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\ $(QEMU_UPSTREAM_URL)) diff --git a/INSTALL b/INSTALL index 88c1464816..eadf108aa5 100644 --- a/INSTALL +++ b/INSTALL @@ -113,15 +113,6 @@ Build a private copy of SeaBIOS. Use the given SeaBIOS binary instead of compiling a private copy. --with-system-seabios=PATH -Build the old qemu used by xm/xend. This is required if existing domUs -should be migrated to this host, or if existing domU snapshots should be -started with this version of the tools. Only if all domUs used the new -upstream qemu during initial start it is safe to disable this option. -The old qemu requires rombios, which can be disable along with -qemu-traditional. - --enable-qemu-traditional - --enable-rombios - The libxl toolstack uses the upstream qemu per default. A private copy will be built. If desired this private copy can be configured with additional options passed to its configure script. @@ -161,7 +152,6 @@ this detection and the sysv runlevel scripts have to be used. Build various stubom components, some are only example code. Its usually enough to specify just --enable-stubdom and leave these options alone. - --enable-ioemu-stubdom --enable-c-stubdom --disable-pv-grub --disable-xenstore-stubdom @@ -245,7 +235,6 @@ locations. XEN_EXTFILES_URL= OVMF_UPSTREAM_URL= QEMU_UPSTREAM_URL= -QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= MINIOS_UPSTREAM_URL= @@ -253,7 +242,6 @@ Using additional CFLAGS to build tools which will run in dom0 is required when building distro packages. These variables can be used to pass RPM_OPT_FLAGS. EXTRA_CFLAGS_XEN_TOOLS= -EXTRA_CFLAGS_QEMU_TRADITIONAL= EXTRA_CFLAGS_QEMU_XEN= Additional CFLAGS may be supplied to the build of the hypervisor by @@ -340,7 +328,6 @@ sudo make install BOOT_DIR=/ood/path/boot EFI_DIR=/odd/path/efi export WGET=$(type -P false) export GIT=$(type -P false) export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS" -export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS" export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS" %configure \ --with-initddir=%{_initddir} diff --git a/MAINTAINERS b/MAINTAINERS index c11b82eca9..7d1b3b8641 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -466,10 +466,6 @@ M: Marek Marczykowski-Górecki S: Supported F: tools/python -QEMU-DM -S: Supported -T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git - QEMU UPSTREAM M: Stefano Stabellini M: Anthony Perard diff --git a/README b/README index be90be3910..6ee58f7b35 100644 --- a/README +++ b/README @@ -80,7 +80,7 @@ disabled at compile time: libnl-3-dev, etc). Required if network buffering is desired when using Remus with libxl. See docs/README.remus for detailed information. - * 16-bit x86 assembler, loader and compiler for qemu-traditional / rombios + * 16-bit x86 assembler, loader and compiler for rombios (dev86 rpm or bin86 & bcc debs) * Development install of liblzma for rombios * Development install of libbz2, liblzma, liblzo2, and libzstd for DomU diff --git a/SUPPORT.md b/SUPPORT.md index e8fd0c251e..5eecf1dcbc 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -998,21 +998,6 @@ See the section **Blkback** for image formats supported by QEMU. Status: Supported, not security supported -### qemu-xen-traditional ### - -The Xen Project provides an old version of qemu with modifications -which enable use as a device model stub domain. The old version is -normally selected by default only in a stub dm configuration, but it -can be requested explicitly in other configurations, for example in -`xl` with `device_model_version="QEMU_XEN_TRADITIONAL"`. - - Status, Device Model Stub Domains: Supported, with caveats - Status, as host process device model: No security support, not recommended - -qemu-xen-traditional is security supported only for those available -devices which are supported for mainstream QEMU (see above), with -trusted driver domains (see Device Model Stub Domains). - ## Virtual Firmware ### x86/HVM iPXE @@ -1031,7 +1016,6 @@ as the guest itself. Booting a guest via guest BIOS firmware Status, SeaBIOS (qemu-xen): Supported - Status, ROMBIOS (qemu-xen-traditional): Supported ### x86/HVM OVMF diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 38b1bb6b1f..bc42748b7a 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -5,8 +5,7 @@ # because of this these variables are defined on one master input source file # and is generated after running ./configure. The master source is located # on the xen source tree at under config/Paths.mk.in and it is used to -# generate shell or header files by the build system upon demand through the -# use of the helper makefile helper buildmakevars2file(). +# generate shell or header files by the build system upon demand. # # For more documentation you can refer to the wiki: # diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 37c071961e..463ab75965 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -43,7 +43,6 @@ CONFIG_OVMF := @ovmf@ CONFIG_ROMBIOS := @rombios@ CONFIG_SEABIOS := @seabios@ CONFIG_IPXE := @ipxe@ -CONFIG_QEMU_TRAD := @qemu_traditional@ CONFIG_QEMU_XEN := @qemu_xen@ CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@ CONFIG_LIBNL := @libnl@ diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index aa7a27eed5..9632888a56 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -71,7 +71,6 @@ ov=4.0 Ensure references to qemu trees and Mini-OS in xen.git's Config.mk are updated. The variables and there content should be: * QEMU_UPSTREAM_REVISION: qemu-xen-X.Y.0 - * QEMU_TRADITIONAL_REVISION: xen-X.Y.0 * MINIOS_UPSTREAM_REVISION: xen-RELEASE-X.Y.0 Where X.Y is the release version (e.g. 4.17). diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt index 829e8ec47b..64ed9fd5b2 100644 --- a/docs/process/release-technician-checklist.txt +++ b/docs/process/release-technician-checklist.txt @@ -56,7 +56,6 @@ t=RELEASE-$r * change xen-unstable Config.mk # QEMU_UPSTREAM_REVISION, -# QEMU_TRADITIONAL_REVISION # MINIOS_UPSTREAM_REVISION # (drop any references to the specific commits, e.g. date or title) * change SUPPORT.md heading version number; -unstable or -rc tag diff --git a/stubdom/.gitignore b/stubdom/.gitignore index 23350446b9..1b69656d45 100644 --- a/stubdom/.gitignore +++ b/stubdom/.gitignore @@ -11,8 +11,6 @@ /gmp-* /grub-* /include -/ioemu -/ioemu/ /libs-* /libxencall-* /libxenevtchn-* @@ -29,7 +27,6 @@ /pciutils-* /pkg-config/* /polarssl-* -/stubdompath.sh /tpm_emulator-* /vtpm/vtpm_manager.h /xenstore diff --git a/stubdom/Makefile b/stubdom/Makefile index 724ce40365..666c3221dc 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -7,7 +7,6 @@ export PKG_CONFIG_DIR = $(CURDIR)/pkg-config # Remove flags which are meant for tools, e.g. "-m64" export EXTRA_CFLAGS_XEN_TOOLS= -export EXTRA_CFLAGS_QEMU_TRADITIONAL= export stubdom=y export debug=y @@ -71,16 +70,12 @@ TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib TARGETS=$(STUBDOM_TARGETS) -STUBDOMPATH="stubdompath.sh" -genpath-target = $(call buildmakevars2file,$(STUBDOMPATH)) -$(eval $(genpath-target)) - .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: $(STUBDOMPATH) $(STUBDOM_BUILD) +build: $(STUBDOM_BUILD) else -build: $(STUBDOMPATH) +build: endif ############## @@ -267,43 +262,6 @@ cross-tpmemu: $(TPMEMU_STAMPFILE) .PHONY: $(CROSS_ROOT) $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci -QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) - -ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),) -IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp -endif - -ifeq ($(QEMU_ROOT),.) -$(XEN_ROOT)/tools/qemu-xen-traditional-dir: - $(MAKE) DESTDIR= -C $(XEN_ROOT)/tools qemu-xen-traditional-dir-find - -ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/qemu-xen-traditional-dir - mkdir -p ioemu - set -e; \ - $(buildmakevars2shellvars); \ - cd ioemu; \ - src="$$XEN_ROOT/tools/qemu-xen-traditional-dir"; export src; \ - (cd $$src && find * -type d \ - $(addprefix ! -path , '*-softmmu*' '*-linux-user*') -print) \ - | xargs mkdir -p; \ - (cd $$src && find * ! -type l -type f $(addprefix ! -path , \ - '*.[oda1]' 'config-*' config.mak qemu-dm qemu-img-xen \ - '*.html' '*.pod' '*-softmmu*' '*-linux-user*' \ - )) >linkfarm.stamp.tmp; \ - cmp -s linkfarm.stamp.tmp linkfarm.stamp && \ - rm linkfarm.stamp.tmp || { \ - mv linkfarm.stamp.tmp linkfarm.stamp; \ - cat linkfarm.stamp | while read f; \ - do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done; \ - } -else -export QEMU_ROOT - -ioemu/linkfarm.stamp: - mkdir -p ioemu - touch ioemu/linkfarm.stamp -endif - ####### # libraries under tools/libs ####### @@ -380,29 +338,6 @@ $(TARGETS_MINIOS): mini-os-%: mkdir -p $@/$$i ; \ done -####### -# ioemu -####### - -ioemu-minios.gen.cfg: APP_LIBS = evtchn gnttab ctrl guest -ioemu-minios.gen.cfg: ioemu-minios.cfg Makefile - $(GEN_config) >$@ - -ioemu-minios-config.mk: ioemu-minios.gen.cfg - MINIOS_CONFIG="$(CURDIR)/$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config - -.PHONY: ioemu -ioemu: cross-zlib cross-libpci libxenguest ioemu-minios-config.mk - [ -f ioemu/config-host.mak ] || \ - ( $(buildmakevars2shellvars); \ - cd ioemu ; \ - LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat ioemu-minios-config.mk)" \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - $(QEMU_ROOT)/xen-setup-stubdom ) - $(MAKE) DESTDIR= -C ioemu -f $(QEMU_ROOT)/Makefile - ### # C ### @@ -496,11 +431,6 @@ xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk # minios ######## -.PHONY: ioemu-stubdom -ioemu-stubdom: APP_OBJS=$(CURDIR)/ioemu/i386-stubdom/qemu.a $(CURDIR)/ioemu/i386-stubdom/libqemu.a $(CURDIR)/ioemu/libqemu_common.a -ioemu-stubdom: mini-os-$(XEN_TARGET_ARCH)-ioemu lwip-$(XEN_TARGET_ARCH) libxenguest ioemu - DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/ioemu-minios.gen.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS="$(APP_OBJS)" - .PHONY: c-stubdom c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxenguest c DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/c/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=$(CURDIR)/c/main.a @@ -539,18 +469,11 @@ xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh $(XENSTORE_DEPS) xen ######### ifeq ($(STUBDOM_SUPPORTED),1) -install: $(STUBDOMPATH) $(STUBDOM_INSTALL) +install: $(STUBDOM_INSTALL) else -install: $(STUBDOMPATH) +install: endif -install-ioemu: ioemu-stubdom - $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" - $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" - install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" @@ -593,11 +516,6 @@ else uninstall: endif -uninstall-ioemu: - rm -f $(DESTDIR)$(LIBEXEC_BIN)/stubdom-dm - rm -f $(DESTDIR)$(LIBEXEC_BIN)/stubdompath.sh - rm -f $(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz - uninstall-grub: rm -f $(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz @@ -617,11 +535,10 @@ uninstall-vtpmmgr: # clean ####### -# Only clean the libxc/ioemu/mini-os part +# Only clean the libxc/mini-os part .PHONY: clean clean: $(foreach lib,$(STUB_LIBS),clean-libxen$(lib)) clean: - rm -fr mini-os-$(XEN_TARGET_ARCH)-ioemu rm -fr mini-os-$(XEN_TARGET_ARCH)-c rm -fr mini-os-$(XEN_TARGET_ARCH)-grub rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore @@ -632,11 +549,9 @@ clean: $(MAKE) -C vtpm clean $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) - rm -f $(STUBDOMPATH) rm -f *-minios-config.mk rm -f *.gen.cfg rm -fr pkg-config - -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstore clean -[ ! -d xenstorepvh ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstorepvh clean @@ -647,7 +562,7 @@ crossclean: clean rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) rm -fr libs-$(XEN_TARGET_ARCH) - rm -fr ioemu xenstore xenstorepvh + rm -fr xenstore xenstorepvh rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) rm -fr tpm_emulator-$(XEN_TARGET_ARCH) diff --git a/stubdom/configure b/stubdom/configure index 08cacf764c..9dd0e7c796 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -622,7 +622,6 @@ STUBDOM_UNINSTALL STUBDOM_INSTALL STUBDOM_BUILD STUBDOM_TARGETS -ioemu vtpmmgr vtpm TPMEMU_VERSION @@ -713,14 +712,12 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_ioemu_stubdom enable_c_stubdom enable_pv_grub enable_xenstore_stubdom enable_xenstorepvh_stubdom enable_vtpm_stubdom enable_vtpmmgr_stubdom -enable_qemu_traditional enable_debug enable_extfiles ' @@ -1363,7 +1360,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-ioemu-stubdom Build and install ioemu-stubdom --enable-c-stubdom Build and install c-stubdom (default is DISABLED) --enable-pv-grub Build and install pv-grub (default is DISABLED) --disable-xenstore-stubdom @@ -1375,7 +1371,6 @@ Optional Features: --enable-vtpm-stubdom Build and install vtpm-stubdom --enable-vtpmmgr-stubdom Build and install vtpmmgr-stubdom - --disable-debug Disable debug build of stubdom (default is ENABLED) --disable-extfiles Use xen extfiles repository for libraries (default is ENABLED) @@ -2411,40 +2406,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # Enable/disable stub domains -# Check whether --enable-ioemu-stubdom was given. -if test ${enable_ioemu_stubdom+y} -then : - enableval=$enable_ioemu_stubdom; - -if test "x$enableval" = "xyes" -then : - - -ioemu=y -STUBDOM_TARGETS="$STUBDOM_TARGETS ioemu" -STUBDOM_BUILD="$STUBDOM_BUILD ioemu-stubdom" -STUBDOM_INSTALL="$STUBDOM_INSTALL install-ioemu" -STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-ioemu" - - -else $as_nop - -if test "x$enableval" = "xno" -then : - - -ioemu=n - - -fi - -fi - - -fi - - - # Check whether --enable-c-stubdom was given. if test ${enable_c_stubdom+y} then : @@ -2685,35 +2646,6 @@ fi -# Check whether --enable-qemu-traditional was given. -if test ${enable_qemu_traditional+y} -then : - enableval=$enable_qemu_traditional; -fi - -if test "x$enable_qemu_traditional" = "xyes" -then : - - qemu_traditional=y -else $as_nop - - qemu_traditional=n - -fi -if test "x$ioemu" = "x" -then : - - ioemu=$qemu_traditional - -fi -echo "x$ioemu$qemu_traditional" -if test "x$ioemu$qemu_traditional" = "xyn" -then : - - as_fn_error $? "IOEMU stubdomain requires qemu-traditional" "$LINENO" 5 - -fi - # Check whether --enable-debug was given. if test ${enable_debug+y} @@ -4358,27 +4290,6 @@ fi -if test "x$ioemu" = "xy" || test "x$ioemu" = "x" -then : - - -ioemu=y -STUBDOM_TARGETS="$STUBDOM_TARGETS ioemu" -STUBDOM_BUILD="$STUBDOM_BUILD ioemu-stubdom" -STUBDOM_INSTALL="$STUBDOM_INSTALL install-ioemu" -STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-ioemu" - - -else $as_nop - - -ioemu=n - - -fi - - - diff --git a/stubdom/configure.ac b/stubdom/configure.ac index fc736c0387..f07b08c5b3 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -18,7 +18,6 @@ m4_include([../m4/depends.m4]) m4_include([../m4/fetcher.m4]) # Enable/disable stub domains -AX_STUBDOM_CONDITIONAL([ioemu-stubdom], [ioemu]) AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c]) AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub]) AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore]) @@ -26,19 +25,6 @@ AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) AX_STUBDOM_CONDITIONAL([vtpmmgr-stubdom], [vtpmmgr]) -AC_ARG_ENABLE([qemu-traditional]) -AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ - qemu_traditional=y],[ - qemu_traditional=n -]) -AS_IF([test "x$ioemu" = "x"], [ - ioemu=$qemu_traditional -]) -echo "x$ioemu$qemu_traditional" -AS_IF([test "x$ioemu$qemu_traditional" = "xyn"], [ - AC_MSG_ERROR(IOEMU stubdomain requires qemu-traditional) -]) - AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of stubdom]) AX_ARG_DEFAULT_ENABLE([extfiles], [Use xen extfiles repository for libraries]) @@ -69,7 +55,6 @@ AX_STUBDOM_AUTO_DEPENDS([vtpmmgr], [vtpm]) #Conditionally enable these stubdoms based on the presense of dependencies AX_STUBDOM_CONDITIONAL_FINISH([vtpm-stubdom], [vtpm]) AX_STUBDOM_CONDITIONAL_FINISH([vtpmmgr-stubdom], [vtpmmgr]) -AX_STUBDOM_CONDITIONAL_FINISH([ioemu-stubdom], [ioemu]) AX_STUBDOM_FINISH AC_OUTPUT() diff --git a/stubdom/ioemu-minios.cfg b/stubdom/ioemu-minios.cfg deleted file mode 100644 index 6153ae05f8..0000000000 --- a/stubdom/ioemu-minios.cfg +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_LIBC=y -CONFIG_LWIP=y -CONFIG_START_NETWORK=n -CONFIG_QEMU_XS_ARGS=y -CONFIG_PCIFRONT=y -XEN_INTERFACE_VERSION=__XEN_LATEST_INTERFACE_VERSION__ diff --git a/tools/Makefile b/tools/Makefile index e9e1cda305..6ecf7c0da8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -24,7 +24,6 @@ SUBDIRS-$(CONFIG_Linux) += vchan # do not recurse in to a dir we are about to delete ifneq "$(MAKECMDGOALS)" "distclean" -SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir endif @@ -79,7 +78,6 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean clean - rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote rm -rf qemu-xen-dir qemu-xen-dir-remote qemu-xen-build rm -rf ../config/Tools.mk config.h config.log config.status \ config.cache autom4te.cache @@ -97,11 +95,6 @@ QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB) IOEMU_EXTRA_LDFLAGS := endif -QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi) -ifneq ($(QEMU_ROOT),.) -export QEMU_ROOT -endif - # Targets for external trees: # ${target}-dir-find # See if the directory exists and check it out if not. @@ -136,54 +129,6 @@ endif # ${TARGET}_LOC # The ultimate location of the source (either a local dir or remote URL) -# External target: qemu-xen-traditional -qemu-xen-traditional-dir-find: - set -ex; \ - if test -d $(QEMU_TRADITIONAL_LOC); then \ - mkdir -p qemu-xen-traditional-dir; \ - else \ - export GIT=$(GIT); \ - $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \ - fi - -.PHONY: qemu-xen-traditional-dir-force-update -qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find - set -ex; \ - if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \ - cd qemu-xen-traditional-dir-remote; \ - $(GIT) fetch origin; \ - $(GIT) reset --hard $(QEMU_TRADITIONAL_REVISION); \ - fi - -qemu-traditional-recurse = \ - set -e; \ - $(buildmakevars2shellvars); \ - export CONFIG_BLKTAP1=n; \ - export BUILDING_QEMU_TRAD=y; \ - cd qemu-xen-traditional-dir; \ - $(1) - -subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find - $(call qemu-traditional-recurse,\ - $(QEMU_ROOT)/xen-setup \ - --extra-cflags="-D__XEN_TOOLS__ $(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ - $(IOEMU_EXTRA_LDFLAGS) \ - --cpu=$(IOEMU_CPU_ARCH) \ - $(IOEMU_CONFIGURE_CROSS); \ - $(MAKE) all \ - ) - -subdir-install-qemu-xen-traditional-dir: subdir-all-qemu-xen-traditional-dir - $(call qemu-traditional-recurse,$(MAKE) install) - -subdir-clean-qemu-xen-traditional-dir: - set -e; if test -d qemu-xen-traditional-dir/.; then \ - $(MAKE) -C qemu-xen-traditional-dir clean; \ - fi -subdir-uninstall-qemu-xen-traditional-dir: - rm -f $(D)$(bindir)/qemu-nbd* - rm -f $(D)$(bindir)/qemu-img* - # External target: qemu-xen qemu-xen-dir-find: if test -d $(QEMU_UPSTREAM_LOC) ; then \ @@ -276,9 +221,6 @@ subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update endif -ifeq ($(CONFIG_QEMU_TRAD),y) - $(MAKE) qemu-xen-traditional-dir-force-update -endif ifeq ($(CONFIG_X86),y) $(MAKE) -C firmware subtree-force-update endif diff --git a/tools/Rules.mk b/tools/Rules.mk index 6bd636709f..725c3c32e9 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -134,12 +134,9 @@ endif CFLAGS_libxenlight += $(CFLAGS_libxenctrl) -# Don't add -Werror if we are used by qemu-trad build system. -ifndef BUILDING_QEMU_TRAD ifeq ($(CONFIG_WERROR),y) CFLAGS += -Werror endif -endif ifeq ($(debug),y) # Use -Og if available, -O0 otherwise diff --git a/tools/config.h.in b/tools/config.h.in index 0bab3cb136..fe2a94cfc4 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -42,9 +42,6 @@ /* pygrub enabled */ #undef HAVE_PYGRUB -/* Qemu traditional enabled */ -#undef HAVE_QEMU_TRADITIONAL - /* ROMBIOS enabled */ #undef HAVE_ROMBIOS diff --git a/tools/configure b/tools/configure index e1f6ea6bf5..27ae7c52fb 100755 --- a/tools/configure +++ b/tools/configure @@ -726,7 +726,6 @@ BCC LD86 AS86 ipxe -qemu_traditional LINUX_BACKEND_MODULES pygrub golang @@ -835,7 +834,6 @@ enable_seabios enable_golang enable_pygrub with_linux_backend_modules -enable_qemu_traditional enable_ipxe with_system_ipxe enable_rombios @@ -1518,13 +1516,10 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-golang Disable Go tools (default is ENABLED) --disable-pygrub Disable pygrub (default is ENABLED) - --enable-qemu-traditional - Enable qemu traditional device model, (DEFAULT is - off) --enable-ipxe Enable in-tree IPXE, (DEFAULT is off, see also --with-system-ipxe) - --enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-traditional - or ipxe is enabled, otherwise off) + --enable-rombios Enable ROMBIOS, (DEFAULT is on if ipxe is enabled, + otherwise off) --enable-libfsimage Enable libfsimage, (DEFAULT is on if pygrub is enabled, otherwise off) --enable-systemd Enable systemd support (default is DISABLED) @@ -4838,45 +4833,16 @@ fi LINUX_BACKEND_MODULES="`eval echo $LINUX_BACKEND_MODULES`" -# Check whether --enable-qemu-traditional was given. -if test ${enable_qemu_traditional+y} -then : - enableval=$enable_qemu_traditional; -fi - -if test "x$enable_qemu_traditional" = "xyes" -then : - - -printf "%s\n" "#define HAVE_QEMU_TRADITIONAL 1" >>confdefs.h - - qemu_traditional=y -else $as_nop - - qemu_traditional=n - -fi - - # Check whether --enable-ipxe was given. if test ${enable_ipxe+y} then : enableval=$enable_ipxe; -else $as_nop - - if test "x$enable_qemu_traditional" = "xyes" -then : - - enable_ipxe="yes" - else $as_nop enable_ipxe="no" fi -fi - if test "x$enable_ipxe" = "xno" then : ipxe=n @@ -4912,7 +4878,7 @@ then : enableval=$enable_rombios; else $as_nop - if test "x$enable_qemu_traditional" = "xyes" -o "x$enable_ipxe" = "xyes" + if test "x$enable_ipxe" = "xyes" then : enable_rombios="yes" @@ -4928,7 +4894,7 @@ fi if test "x$enable_rombios" = "xyes" then : - # Extract the first word of "as86", so it can be a program name with args. + # Extract the first word of "as86", so it can be a program name with args. set dummy as86; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 0dd6d747ab..dada1c3b15 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -121,25 +121,11 @@ esac]) LINUX_BACKEND_MODULES="`eval echo $LINUX_BACKEND_MODULES`" AC_SUBST(LINUX_BACKEND_MODULES) -AC_ARG_ENABLE([qemu-traditional], - AS_HELP_STRING([--enable-qemu-traditional], - [Enable qemu traditional device model, (DEFAULT is off)])) -AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ -AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled]) - qemu_traditional=y],[ - qemu_traditional=n -]) -AC_SUBST(qemu_traditional) - AC_ARG_ENABLE([ipxe], AS_HELP_STRING([--enable-ipxe], [Enable in-tree IPXE, (DEFAULT is off, see also --with-system-ipxe)]),,[ - AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ - enable_ipxe="yes" - ], [ enable_ipxe="no" - ]) ]) AS_IF([test "x$enable_ipxe" = "xno"], [ipxe=n], [ipxe=y]) AC_ARG_WITH([system-ipxe], @@ -162,18 +148,15 @@ AC_SUBST(ipxe) AC_ARG_ENABLE([rombios], AS_HELP_STRING([--enable-rombios], - [Enable ROMBIOS, (DEFAULT is on if qemu-traditional or ipxe is enabled, + [Enable ROMBIOS, (DEFAULT is on if ipxe is enabled, otherwise off)]),,[ - AS_IF([test "x$enable_qemu_traditional" = "xyes" -o "x$enable_ipxe" = "xyes"], [ + AS_IF([test "x$enable_ipxe" = "xyes"], [ enable_rombios="yes" ], [ enable_rombios="no" ]) ]) AS_IF([test "x$enable_rombios" = "xyes"], [ - dnl as86, ld86, and bcc are only required when building rombios. They - dnl are only needed when the host system is x86 but that check is done - dnl for us above when checking if we should build with qemu-traditional. AX_PATH_PROG_OR_FAIL([AS86], [as86]) AX_PATH_PROG_OR_FAIL([LD86], [ld86]) AX_PATH_PROG_OR_FAIL([BCC], [bcc]) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 09:44:42 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 09:44:42 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003091.1382543 (Exim 4.92) (envelope-from ) id 1uM1ik-0007rj-SW; Mon, 02 Jun 2025 09:44:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003091.1382543; Mon, 02 Jun 2025 09:44: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 1uM1ik-0007rb-Py; Mon, 02 Jun 2025 09:44:42 +0000 Received: by outflank-mailman (input) for mailman id 1003091; Mon, 02 Jun 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 1uM1ik-0007rV-HN for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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 1uM1ik-00G5Ga-1e for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 09:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM1ik-00EcyB-1I for xen-changelog@lists.xenproject.org; Mon, 02 Jun 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=WPx9DoShswLIyb+tJL0xmzkGdN49iCHuXlLpd6FKo7I=; b=XuEVOHtqq9hH3LUGPo4G/92oh0 25AeAkftbbV7VbAcEon6GgKLcnl0cBhCC2ARS1qDyLu87ywfN47utOjHG3J0uvJ8HZGV5VfI3bSdR HBshMKCrwO6VKfFdfxmm6r9EJzfkcu53o7bd/1QmM1wHs944aU3atOpdsO8bauYrOeGY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: don't require full tools build for building stubdoms Message-Id: Date: Mon, 02 Jun 2025 09:44:42 +0000 commit 286c4cc267005f73aba831d22d65abe6874ceaea Author: Juergen Gross AuthorDate: Tue May 27 15:20:33 2025 +0200 Commit: Anthony PERARD CommitDate: Mon Jun 2 10:31:21 2025 +0200 build: don't require full tools build for building stubdoms With the drop of qemu-traditional "make stubdom" no longer requires "make tools" to have finished. It is enough to add "install-tools-public-headers" as a prereq of "install-stubdom". Signed-off-by: Juergen Gross Acked-by: Anthony PERARD --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c9d80a6dc6..67b71ac3d4 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ install-tools: install-tools-public-headers $(MAKE) -C tools install .PHONY: install-stubdom -install-stubdom: mini-os-dir install-tools +install-stubdom: mini-os-dir install-tools-public-headers $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003172.1382627 (Exim 4.92) (envelope-from ) id 1uM2oq-0005Xd-FJ; Mon, 02 Jun 2025 10:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003172.1382627; Mon, 02 Jun 2025 10: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 1uM2oq-0005XV-Cg; Mon, 02 Jun 2025 10:55:04 +0000 Received: by outflank-mailman (input) for mailman id 1003172; Mon, 02 Jun 2025 10:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2oo-0005XP-QX for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2oo-00G6f5-1Y for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2oo-00GCpe-1Q for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=fSu0Q3Sdj2BqNkcoXa+cUKvf4e+KqheJ3Cl9ALSxxgU=; b=tEn5QbKadagjRLnbJi/T0M8XeZ N5ojQtrAcjhSJokFbNoDh2/V9bWcVwBE0vYlMIIB6sWxTQLsM4draN4NhFeTFW3NVhK37tmHExtNR IPGyvIRnyK1Hc6syi0pA8IrH4Q3FcE4jqG+oHU4T6wGdeEMv0VJKjqt7G10du6BjJYIU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] SUPPORT.md: add xenstore stubdom as supported Message-Id: Date: Mon, 02 Jun 2025 10:55:02 +0000 commit 6b1da8110b065f7da40672b0cf01818415b4ab8d Author: Juergen Gross AuthorDate: Mon Jun 2 12:40:54 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:40:54 2025 +0200 SUPPORT.md: add xenstore stubdom as supported SUPPORT.md is missing a support statement for Xenstore stubdom. As SUSE is using it in production since several years now, it should be added as "supported". This covers the PV and the PVH variant. Signed-off-by: Juergen Gross Acked-by: Jan Beulich --- SUPPORT.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 5eecf1dcbc..d75cf018fc 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -272,6 +272,16 @@ or itself will not be regarded a security issue. Status: Supported Status, Liveupdate: Tech Preview +### C xenstore stubdom PV + + Status: Supported + Status, Liveupdate: Not implemented + +### C xenstore stubdom PVH + + Status: Supported + Status, Liveupdate: Not implemented + ### OCaml xenstored daemon Status: Supported -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:55:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003173.1382632 (Exim 4.92) (envelope-from ) id 1uM2p0-0005ZC-Gn; Mon, 02 Jun 2025 10:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003173.1382632; Mon, 02 Jun 2025 10: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 1uM2p0-0005Z5-E6; Mon, 02 Jun 2025 10:55:14 +0000 Received: by outflank-mailman (input) for mailman id 1003173; Mon, 02 Jun 2025 10:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2oy-0005Yv-KH for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2oy-00G6fA-1u for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2oy-00GD4f-1k for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=eZ1t35IwU82zdlzjiriK/yogv0omCmz3GABDBNJFhlA=; b=psWv4C29nMtU7Jwo5dT1ley1/2 H7d3AZF50F/RyfaXau1PXymo7c97gMeW821MiVJOxMsDfEu6RbAijyymiUEZaB5MAiiVYJO89KEif /8o4oyQ3+WtdYf0XvGbipnMTDiIL5bTbAAow4hHQd/I+JQ6jqZN+LDS76zt9VY7Xb2wo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce smp_prepare_boot_cpu() Message-Id: Date: Mon, 02 Jun 2025 10:55:12 +0000 commit b54b825e6fa1dbcfa9ea9de5e285441dd6649989 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:41:36 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:41:36 2025 +0200 xen/riscv: introduce smp_prepare_boot_cpu() Initialize cpu_{possible, online}_map by using smp_prepare_boot_cpu(). Drop DEFINE_PER_CPU(unsigned int, cpu_id) from stubs.c as this variable isn't expected to be used in RISC-V at all. Move declaration of cpu_{possible,online}_map from stubs.c to smpboot.c as now smpboot.c is now introduced. Other defintions keep in stubs.c as they are not initialized and not needed, at the moment. Drop cpu_present_map as it is enough to have cpu_possible_map. Also, ask linker to provide symbol for cpu_present_map as common code references it. Move call of set_processor_id(0) to smp_prepare_boot_cpu(). Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/setup.c | 4 ++-- xen/arch/riscv/smpboot.c | 16 ++++++++++++++++ xen/arch/riscv/stubs.c | 6 ------ xen/arch/riscv/xen.lds.S | 2 ++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index d882c57528..f42cf3dfa6 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -10,6 +10,7 @@ obj-y += sbi.o obj-y += setup.o obj-y += shutdown.o obj-y += smp.o +obj-y += smpboot.o obj-y += stubs.o obj-y += time.o obj-y += traps.o diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 4e416f6e44..a9c0c61fb6 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include /* Xen stack for bringing up the first CPU. */ @@ -72,7 +72,7 @@ void __init noreturn start_xen(unsigned long bootcpu_id, remove_identity_mapping(); - set_processor_id(0); + smp_prepare_boot_cpu(); set_cpuid_to_hartid(0, bootcpu_id); diff --git a/xen/arch/riscv/smpboot.c b/xen/arch/riscv/smpboot.c new file mode 100644 index 0000000000..0f9c2cc54a --- /dev/null +++ b/xen/arch/riscv/smpboot.c @@ -0,0 +1,16 @@ +#include +#include +#include + +#include + +cpumask_t __read_mostly cpu_online_map; +cpumask_t __ro_after_init cpu_possible_map; + +void __init smp_prepare_boot_cpu(void) +{ + set_processor_id(0); + + cpumask_set_cpu(0, &cpu_possible_map); + cpumask_set_cpu(0, &cpu_online_map); +} diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 83416d3350..fdcf91054e 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -11,12 +11,6 @@ /* smpboot.c */ -cpumask_t cpu_online_map; -cpumask_t cpu_present_map; -cpumask_t cpu_possible_map; - -/* ID of the PCPU we're running on */ -DEFINE_PER_CPU(unsigned int, cpu_id); /* XXX these seem awfully x86ish... */ /* representing HT siblings of each logical CPU */ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_mask); diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S index 818aa43669..8c3c06de01 100644 --- a/xen/arch/riscv/xen.lds.S +++ b/xen/arch/riscv/xen.lds.S @@ -165,6 +165,8 @@ SECTIONS ELF_DETAILS_SECTIONS } +PROVIDE(cpu_present_map = cpu_possible_map); + ASSERT(IS_ALIGNED(__bss_start, POINTER_ALIGN), "__bss_start is misaligned") ASSERT(IS_ALIGNED(__bss_end, POINTER_ALIGN), "__bss_end is misaligned") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:55:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003174.1382636 (Exim 4.92) (envelope-from ) id 1uM2pA-0005bj-IU; Mon, 02 Jun 2025 10:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003174.1382636; Mon, 02 Jun 2025 10: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 1uM2pA-0005bb-Fe; Mon, 02 Jun 2025 10:55:24 +0000 Received: by outflank-mailman (input) for mailman id 1003174; Mon, 02 Jun 2025 10:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2p8-0005bM-NB for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2p8-00G6fG-2B for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2p8-00GDEW-25 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=ICKjZBEz1L9edy6hvUv6YrYxkOedHvCkQy7ebs+W1RY=; b=Prd9nlWHeYj7Kq1qe1HfECWMst QupT1tQXwbq5VMbxKVd2ehyhhvG9BU5Wd+h49etdoIlToJ8p8wRNV23p8Nl6CDI6i1BMI1c775593 vKJvd+Vum3tu4JYrKyoO3ujZicLQkJ13QtlVrzxEelEi2fIu4IDVjl1R/hsnqgZ2qfvI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce support of Svpbmt extension and make it mandatory Message-Id: Date: Mon, 02 Jun 2025 10:55:22 +0000 commit b3d5fad63a48e2aa5ccd56d5d93a3b1ef47bf397 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:42:23 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:42:23 2025 +0200 xen/riscv: introduce support of Svpbmt extension and make it mandatory Svpbmt extension is necessary for chaning the memory type for a page contains a combination of attributes that indicate the cacheability, idempotency, and ordering properties for access to that page. As a part of the patch the following is introduced: - Svpbmt memory type defintions: PTE_PBMT_{NOCACHE,IO}. - PAGE_HYPERVISOR_{NOCACHE,WC}. - RISCV_ISA_EXT_svpbmt and add a check in runtime that Svpbmt is supported by platform. - Update riscv/booting.txt with information about Svpbmt. - Update logic of pt_update_entry() to take into account PBMT bits. Use 'unsigned long' for pte_attr_t as PBMT bits are 61 and 62 and it doesn't fit into 'unsigned int'. Also, update function prototypes which uses 'unsigned int' for flags/attibutes. Enable Svpbmt for testing in QEMU as it is now mandatory for Xen work. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- automation/scripts/qemu-smoke-riscv64.sh | 1 + docs/misc/riscv/booting.txt | 4 ++++ xen/arch/riscv/Kconfig | 4 ++++ xen/arch/riscv/cpufeature.c | 2 ++ xen/arch/riscv/include/asm/cpufeature.h | 1 + xen/arch/riscv/include/asm/fixmap.h | 2 +- xen/arch/riscv/include/asm/mm-types.h | 8 ++++++++ xen/arch/riscv/include/asm/page.h | 23 ++++++++++++++++++++++- xen/arch/riscv/pt.c | 20 +++++++++++--------- 9 files changed, 54 insertions(+), 11 deletions(-) diff --git a/automation/scripts/qemu-smoke-riscv64.sh b/automation/scripts/qemu-smoke-riscv64.sh index b2e112c942..25f9e4190e 100755 --- a/automation/scripts/qemu-smoke-riscv64.sh +++ b/automation/scripts/qemu-smoke-riscv64.sh @@ -7,6 +7,7 @@ rm -f smoke.serial export TEST_CMD="qemu-system-riscv64 \ -M virt,aia=aplic-imsic \ + -cpu rv64,svpbmt=on \ -smp 1 \ -nographic \ -m 2g \ diff --git a/docs/misc/riscv/booting.txt b/docs/misc/riscv/booting.txt index 3a8474a27d..e100bde575 100644 --- a/docs/misc/riscv/booting.txt +++ b/docs/misc/riscv/booting.txt @@ -18,3 +18,7 @@ Xen is run: - Zihintpause: On a system that doesn't have this extension, cpu_relax() should be implemented properly. +- SVPBMT is mandatory to enable changing the memory attributes of a page. + For platforms that do not support SVPBMT, it is necessary to introduce a + similar mechanism as described in: + https://lore.kernel.org/all/20241102000843.1301099-1-samuel.holland@sifive.com/ diff --git a/xen/arch/riscv/Kconfig b/xen/arch/riscv/Kconfig index d882e0a059..62c5b7ba34 100644 --- a/xen/arch/riscv/Kconfig +++ b/xen/arch/riscv/Kconfig @@ -10,11 +10,15 @@ config RISCV config RISCV_64 def_bool y select 64BIT + select HAS_SVPBMT config ARCH_DEFCONFIG string default "arch/riscv/configs/tiny64_defconfig" +config HAS_SVPBMT + bool + menu "Architecture Features" source "arch/Kconfig" diff --git a/xen/arch/riscv/cpufeature.c b/xen/arch/riscv/cpufeature.c index 3246a03624..b7d5ec6580 100644 --- a/xen/arch/riscv/cpufeature.c +++ b/xen/arch/riscv/cpufeature.c @@ -137,6 +137,7 @@ const struct riscv_isa_ext_data __initconst riscv_isa_ext[] = { RISCV_ISA_EXT_DATA(zbs), RISCV_ISA_EXT_DATA(smaia), RISCV_ISA_EXT_DATA(ssaia), + RISCV_ISA_EXT_DATA(svpbmt), }; static const struct riscv_isa_ext_data __initconst required_extensions[] = { @@ -151,6 +152,7 @@ static const struct riscv_isa_ext_data __initconst required_extensions[] = { RISCV_ISA_EXT_DATA(zifencei), RISCV_ISA_EXT_DATA(zihintpause), RISCV_ISA_EXT_DATA(zbb), + RISCV_ISA_EXT_DATA(svpbmt), }; static bool __init is_lowercase_extension_name(const char *str) diff --git a/xen/arch/riscv/include/asm/cpufeature.h b/xen/arch/riscv/include/asm/cpufeature.h index 1015b6ee44..768b84b769 100644 --- a/xen/arch/riscv/include/asm/cpufeature.h +++ b/xen/arch/riscv/include/asm/cpufeature.h @@ -37,6 +37,7 @@ enum riscv_isa_ext_id { RISCV_ISA_EXT_zbs, RISCV_ISA_EXT_smaia, RISCV_ISA_EXT_ssaia, + RISCV_ISA_EXT_svpbmt, RISCV_ISA_EXT_MAX }; diff --git a/xen/arch/riscv/include/asm/fixmap.h b/xen/arch/riscv/include/asm/fixmap.h index e399a15f53..5990c964aa 100644 --- a/xen/arch/riscv/include/asm/fixmap.h +++ b/xen/arch/riscv/include/asm/fixmap.h @@ -33,7 +33,7 @@ extern pte_t xen_fixmap[]; /* Map a page in a fixmap entry */ -void set_fixmap(unsigned int map, mfn_t mfn, unsigned int flags); +void set_fixmap(unsigned int map, mfn_t mfn, pte_attr_t flags); /* Remove a mapping from a fixmap entry */ void clear_fixmap(unsigned int map); diff --git a/xen/arch/riscv/include/asm/mm-types.h b/xen/arch/riscv/include/asm/mm-types.h new file mode 100644 index 0000000000..fa512064b8 --- /dev/null +++ b/xen/arch/riscv/include/asm/mm-types.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ASM_RISCV_MM_TYPES_H +#define ASM_RISCV_MM_TYPES_H + +typedef unsigned long pte_attr_t; + +#endif /* ASM_RISCV_MM_TYPES_H */ diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h index bf8988f657..4cb0179648 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -37,6 +37,16 @@ #define PTE_ACCESSED BIT(6, UL) #define PTE_DIRTY BIT(7, UL) #define PTE_RSW (BIT(8, UL) | BIT(9, UL)) +/* + * [62:61] Svpbmt Memory Type definitions: + * + * 00 - PMA Normal Cacheable, No change to implied PMA memory type + * 01 - NC Non-cacheable, idempotent, weakly-ordered Main Memory + * 10 - IO Non-cacheable, non-idempotent, strongly-ordered I/O memory + * 11 - Rsvd Reserved for future standard use + */ +#define PTE_PBMT_NOCACHE BIT(61, UL) +#define PTE_PBMT_IO BIT(62, UL) #define PTE_LEAF_DEFAULT (PTE_VALID | PTE_READABLE | PTE_WRITABLE) #define PTE_TABLE (PTE_VALID) @@ -46,6 +56,15 @@ #define PAGE_HYPERVISOR_RX (PTE_VALID | PTE_READABLE | PTE_EXECUTABLE) #define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW +/* + * PAGE_HYPERVISOR_NOCACHE is used for ioremap(). + * + * Both PTE_PBMT_IO and PTE_PBMT_NOCACHE are non-cacheable, but the difference + * is that IO is non-idempotent and strongly ordered, which makes it a good + * candidate for mapping IOMEM. + */ +#define PAGE_HYPERVISOR_NOCACHE (PAGE_HYPERVISOR_RW | PTE_PBMT_IO) +#define PAGE_HYPERVISOR_WC (PAGE_HYPERVISOR_RW | PTE_PBMT_NOCACHE) /* * The PTE format does not contain the following bits within itself; @@ -58,6 +77,8 @@ #define PTE_ACCESS_MASK (PTE_READABLE | PTE_WRITABLE | PTE_EXECUTABLE) +#define PTE_PBMT_MASK (PTE_PBMT_NOCACHE | PTE_PBMT_IO) + /* Calculate the offsets into the pagetables for a given VA */ #define pt_linear_offset(lvl, va) ((va) >> XEN_PT_LEVEL_SHIFT(lvl)) @@ -202,7 +223,7 @@ static inline pte_t read_pte(const pte_t *p) return read_atomic(p); } -static inline pte_t pte_from_mfn(mfn_t mfn, unsigned int flags) +static inline pte_t pte_from_mfn(mfn_t mfn, pte_attr_t flags) { unsigned long pte = (mfn_x(mfn) << PTE_PPN_SHIFT) | flags; return (pte_t){ .pte = pte }; diff --git a/xen/arch/riscv/pt.c b/xen/arch/riscv/pt.c index 918b1b91ab..82c8c73c3e 100644 --- a/xen/arch/riscv/pt.c +++ b/xen/arch/riscv/pt.c @@ -25,7 +25,7 @@ static inline mfn_t get_root_page(void) * See the comment about the possible combination of (mfn, flags) in * the comment above pt_update(). */ -static bool pt_check_entry(pte_t entry, mfn_t mfn, unsigned int flags) +static bool pt_check_entry(pte_t entry, mfn_t mfn, pte_attr_t flags) { /* Sanity check when modifying an entry. */ if ( (flags & PTE_VALID) && mfn_eq(mfn, INVALID_MFN) ) @@ -260,7 +260,7 @@ pte_t pt_walk(vaddr_t va, unsigned int *pte_level) */ static int pt_update_entry(mfn_t root, vaddr_t virt, mfn_t mfn, unsigned int *target, - unsigned int flags) + pte_attr_t flags) { int rc; /* @@ -328,17 +328,19 @@ static int pt_update_entry(mfn_t root, vaddr_t virt, pte.pte = 0; else { + const pte_attr_t attrs = PTE_ACCESS_MASK | PTE_PBMT_MASK; + /* We are inserting a mapping => Create new pte. */ if ( !mfn_eq(mfn, INVALID_MFN) ) pte = pte_from_mfn(mfn, PTE_VALID); - else /* We are updating the permission => Copy the current pte. */ + else /* We are updating the attributes => Copy the current pte. */ { pte = *ptep; - pte.pte &= ~PTE_ACCESS_MASK; + pte.pte &= ~attrs; } - /* update permission according to the flags */ - pte.pte |= (flags & PTE_ACCESS_MASK) | PTE_ACCESSED | PTE_DIRTY; + /* Update attributes of PTE according to the flags. */ + pte.pte |= (flags & attrs) | PTE_ACCESSED | PTE_DIRTY; } write_pte(ptep, pte); @@ -353,7 +355,7 @@ static int pt_update_entry(mfn_t root, vaddr_t virt, /* Return the level where mapping should be done */ static int pt_mapping_level(unsigned long vfn, mfn_t mfn, unsigned long nr, - unsigned int flags) + pte_attr_t flags) { unsigned int level = 0; unsigned long mask; @@ -407,7 +409,7 @@ static DEFINE_SPINLOCK(pt_lock); * inserting will be done. */ static int pt_update(vaddr_t virt, mfn_t mfn, - unsigned long nr_mfns, unsigned int flags) + unsigned long nr_mfns, pte_attr_t flags) { int rc = 0; unsigned long vfn = PFN_DOWN(virt); @@ -535,7 +537,7 @@ int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) } /* Map a 4k page in a fixmap entry */ -void set_fixmap(unsigned int map, mfn_t mfn, unsigned int flags) +void set_fixmap(unsigned int map, mfn_t mfn, pte_attr_t flags) { if ( map_pages_to_xen(FIXMAP_ADDR(map), mfn, 1, flags | PTE_SMALL) != 0 ) BUG(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:55:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003175.1382640 (Exim 4.92) (envelope-from ) id 1uM2pK-0005eW-JW; Mon, 02 Jun 2025 10:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003175.1382640; Mon, 02 Jun 2025 10: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 1uM2pK-0005eO-H3; Mon, 02 Jun 2025 10:55:34 +0000 Received: by outflank-mailman (input) for mailman id 1003175; Mon, 02 Jun 2025 10:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2pI-0005e9-Q7 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2pI-00G6fN-2U for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2pI-00GDRf-2M for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=jQc4nyhhKW22jQWIc0YZfNZnD0GnQL0xTiJSw6w+HWU=; b=sBbLIEe68vCCJ1EIlTVDNvQAD3 AoSkykH840UR7+KekfPwuGg+iG6OrF8VUBqONsxN/qhuVeKxtjKrUrxAw0Mj7CR5vm9AOgqXT/rn+ kL/NSrOciqN8yXtEkSrIPDVxnlQa6MfBUybbmniXGGDhvxfeJHT9KtpIi0Y7tx9SSHSE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: add ioremap_*() variants using ioremap_attr() Message-Id: Date: Mon, 02 Jun 2025 10:55:32 +0000 commit c8ff4d60a696292038e01a51a60085e5906123bb Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:42:49 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:42:49 2025 +0200 xen/riscv: add ioremap_*() variants using ioremap_attr() Introduce ioremap_attr() as a shared helper to implement architecture-specific ioremap variants: - ioremap_cache() - ioremap_wc() These functions use __vmap() internally and apply appropriate memory attributes for RISC-V. These functions are implemned not as static inline function or macros as it will require to include asm/page.h into asm/io.h what will lead to compilation issue. Also, remove the unused ioremap_wt() macro from asm/io.h, as write-through mappings are not expected to be used on RISC-V. Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/include/asm/io.h | 10 ++-------- xen/arch/riscv/mm.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/xen/arch/riscv/include/asm/io.h b/xen/arch/riscv/include/asm/io.h index 8bab4ffa03..9aeafd6b3b 100644 --- a/xen/arch/riscv/include/asm/io.h +++ b/xen/arch/riscv/include/asm/io.h @@ -41,14 +41,8 @@ #include #include -/* - * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't - * change the properties of memory regions. This should be fixed by the - * upcoming platform spec. - */ -#define ioremap_nocache(addr, size) ioremap(addr, size) -#define ioremap_wc(addr, size) ioremap(addr, size) -#define ioremap_wt(addr, size) ioremap(addr, size) +void __iomem *ioremap_cache(paddr_t pa, size_t len); +void __iomem *ioremap_wc(paddr_t pa, size_t len); /* Generic IO read/write. These perform native-endian accesses. */ static inline void __raw_writeb(uint8_t val, volatile void __iomem *addr) diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index d3ece9f132..4047d67c0e 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -583,3 +584,32 @@ void *__init arch_vmap_virt_end(void) { return (void *)(VMAP_VIRT_START + VMAP_VIRT_SIZE); } + +static void __iomem *ioremap_attr(paddr_t pa, size_t len, + pte_attr_t attributes) +{ + mfn_t mfn = _mfn(PFN_DOWN(pa)); + unsigned int offs = pa & (PAGE_SIZE - 1); + unsigned int nr = PFN_UP(offs + len); + void *ptr = __vmap(&mfn, nr, 1, 1, attributes, VMAP_DEFAULT); + + if ( ptr == NULL ) + return NULL; + + return ptr + offs; +} + +void __iomem *ioremap_cache(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR); +} + +void __iomem *ioremap_wc(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR_WC); +} + +void __iomem *ioremap(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR_NOCACHE); +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:55:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003176.1382644 (Exim 4.92) (envelope-from ) id 1uM2pU-0005go-LK; Mon, 02 Jun 2025 10:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003176.1382644; Mon, 02 Jun 2025 10:55: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 1uM2pU-0005gg-IZ; Mon, 02 Jun 2025 10:55:44 +0000 Received: by outflank-mailman (input) for mailman id 1003176; Mon, 02 Jun 2025 10:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2pS-0005gT-TF for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2pS-00G6i6-2p for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2pS-00GDeF-2f for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=l9+lEP2fjbzUC7PXQRQUeg1Fzh+u5seS9/HoS7Qzp0k=; b=C9dnmjAe12ItCEjAR7QZomtghx j7ZmVfPG+ZkvKt/E+G2+RYb4CTFA5gRy62HwGct/eH49QyMVn0kReAaymwyccPgWBzVpNI20n9AJy ewtgmEPpU57GKvxlNxvt+bdUyNqWACMB3r5Z8klIprtsb3b9xRJBCF12gBLVF+5RB1n4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce init_IRQ() Message-Id: Date: Mon, 02 Jun 2025 10:55:42 +0000 commit 62bdc26881083d2ae829b56db03103f2ee72f2c9 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:43:51 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:43:51 2025 +0200 xen/riscv: introduce init_IRQ() Implement init_IRQ() to initalize various IRQs. Currently, this function initializes the irq_desc[] array, which stores IRQ descriptors containing various information about each IRQ, such as the type of hardware handling, whether the IRQ is disabled, etc. The initialization is basic at this point and includes setting IRQ_TYPE_INVALID as the IRQ type, assigning the IRQ number ( which is just a consequent index of irq_desc[] array ) to desc->irq. Additionally, the function init_irq_data() is introduced to initialize the IRQ descriptors for all IRQs in the system. Reuse defines of IRQ_TYPE_* from asm-generic/irq-dt.h. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/Makefile | 1 + xen/arch/riscv/include/asm/irq.h | 15 +++++++++++++ xen/arch/riscv/irq.c | 45 +++++++++++++++++++++++++++++++++++++ xen/arch/riscv/setup.c | 3 +++ xen/arch/riscv/stubs.c | 5 ----- 6 files changed, 65 insertions(+), 5 deletions(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index f42cf3dfa6..a1c145c506 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -3,6 +3,7 @@ obj-y += cpufeature.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += entry.o obj-y += intc.o +obj-y += irq.o obj-y += mm.o obj-y += pt.o obj-$(CONFIG_RISCV_64) += riscv64/ diff --git a/xen/arch/riscv/include/asm/Makefile b/xen/arch/riscv/include/asm/Makefile index c989a7f89b..bfdf186c68 100644 --- a/xen/arch/riscv/include/asm/Makefile +++ b/xen/arch/riscv/include/asm/Makefile @@ -5,6 +5,7 @@ generic-y += div64.h generic-y += hardirq.h generic-y += hypercall.h generic-y += iocap.h +generic-y += irq-dt.h generic-y += paging.h generic-y += percpu.h generic-y += perfc_defn.h diff --git a/xen/arch/riscv/include/asm/irq.h b/xen/arch/riscv/include/asm/irq.h index 2a48da2651..ea555afd1a 100644 --- a/xen/arch/riscv/include/asm/irq.h +++ b/xen/arch/riscv/include/asm/irq.h @@ -3,6 +3,19 @@ #define ASM__RISCV__IRQ_H #include +#include + +#include + +/* + * According to the AIA spec: + * The maximum number of interrupt sources an APLIC may support is 1023. + * + * The same is true for PLIC. + * + * Interrupt Source 0 is reserved and shall never generate an interrupt. + */ +#define NR_IRQS 1024 /* TODO */ #define nr_irqs 0U @@ -25,6 +38,8 @@ static inline void arch_move_irqs(struct vcpu *v) BUG_ON("unimplemented"); } +void init_IRQ(void); + #endif /* ASM__RISCV__IRQ_H */ /* diff --git a/xen/arch/riscv/irq.c b/xen/arch/riscv/irq.c new file mode 100644 index 0000000000..b5ae7a114b --- /dev/null +++ b/xen/arch/riscv/irq.c @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * RISC-V Interrupt support + * + * Copyright (c) Vates + */ + +#include +#include +#include + +static irq_desc_t irq_desc[NR_IRQS]; + +int arch_init_one_irq_desc(struct irq_desc *desc) +{ + desc->arch.type = IRQ_TYPE_INVALID; + + return 0; +} + +static int __init init_irq_data(void) +{ + unsigned int irq; + + for ( irq = 0; irq < NR_IRQS; irq++ ) + { + struct irq_desc *desc = irq_to_desc(irq); + int rc; + + desc->irq = irq; + + rc = init_one_irq_desc(desc); + if ( rc ) + return rc; + } + + return 0; +} + +void __init init_IRQ(void) +{ + if ( init_irq_data() < 0 ) + panic("initialization of IRQ data failed\n"); +} diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index a9c0c61fb6..8bcd19218d 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -125,6 +126,8 @@ void __init noreturn start_xen(unsigned long bootcpu_id, panic("Booting using ACPI isn't supported\n"); } + init_IRQ(); + riscv_fill_hwcap(); preinit_xen_time(); diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index fdcf91054e..e396b67cd3 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -107,11 +107,6 @@ void irq_ack_none(struct irq_desc *desc) BUG_ON("unimplemented"); } -int arch_init_one_irq_desc(struct irq_desc *desc) -{ - BUG_ON("unimplemented"); -} - void smp_send_state_dump(unsigned int cpu) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:55:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003177.1382648 (Exim 4.92) (envelope-from ) id 1uM2pe-0005jb-O0; Mon, 02 Jun 2025 10:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003177.1382648; Mon, 02 Jun 2025 10: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 1uM2pe-0005jT-LQ; Mon, 02 Jun 2025 10:55:54 +0000 Received: by outflank-mailman (input) for mailman id 1003177; Mon, 02 Jun 2025 10:55:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2pc-0005jH-Vg for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2pc-00G6iA-34 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2pc-00GDpX-2z for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=WTSmWUNmyPWIlepw+AuYk7KyBC0XxuJ2YwXiLnqLKiU=; b=eSd9XaH74qAqmEEexpHdmuirs4 AnqgRUxthgx5XSw18FhuEcCOhQli9tV9LT0DbL7fl/DoD6vYUQ0c6OcwmzBfD+tjoAFe6sldtqSL4 /vTzIjrw8F6eGPJ31tV4WU2iFFj7+2H4AQLMsYjGnpPk6vS9hXJfcEaXWFnoFAXuKwJc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce platform_get_irq() Message-Id: Date: Mon, 02 Jun 2025 10:55:52 +0000 commit 8e8ffba487866fffd6e0fb4b52be316d61194089 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:44:13 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:44:13 2025 +0200 xen/riscv: introduce platform_get_irq() platform_get_irq() recieves information about device's irq ( type and irq number ) from device tree node and using this information update irq descriptor in irq_desc[] array. Introduce dt_irq_xlate and initialize with aplic_irq_xlate() as it is used by dt_device_get_irq() which is called by platform_get_irq(). Co-developed-by: Romain Caritey Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/aplic.c | 20 +++++++++++++++++ xen/arch/riscv/include/asm/irq.h | 3 +++ xen/arch/riscv/irq.c | 47 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/xen/arch/riscv/aplic.c b/xen/arch/riscv/aplic.c index caba8f8993..10ae81f7ac 100644 --- a/xen/arch/riscv/aplic.c +++ b/xen/arch/riscv/aplic.c @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -21,6 +22,23 @@ static struct intc_info __ro_after_init aplic_info = { .hw_version = INTC_APLIC, }; +static int cf_check aplic_irq_xlate(const uint32_t *intspec, + unsigned int intsize, + unsigned int *out_hwirq, + unsigned int *out_type) +{ + if ( intsize < 2 ) + return -EINVAL; + + /* Mapping 1:1 */ + *out_hwirq = intspec[0]; + + if ( out_type ) + *out_type = intspec[1] & IRQ_TYPE_SENSE_MASK; + + return 0; +} + static int __init aplic_preinit(struct dt_device_node *node, const void *dat) { if ( aplic_info.node ) @@ -35,6 +53,8 @@ static int __init aplic_preinit(struct dt_device_node *node, const void *dat) aplic_info.node = node; + dt_irq_xlate = aplic_irq_xlate; + return 0; } diff --git a/xen/arch/riscv/include/asm/irq.h b/xen/arch/riscv/include/asm/irq.h index ea555afd1a..84c3c2904d 100644 --- a/xen/arch/riscv/include/asm/irq.h +++ b/xen/arch/riscv/include/asm/irq.h @@ -38,6 +38,9 @@ static inline void arch_move_irqs(struct vcpu *v) BUG_ON("unimplemented"); } +struct dt_device_node; +int platform_get_irq(const struct dt_device_node *device, int index); + void init_IRQ(void); #endif /* ASM__RISCV__IRQ_H */ diff --git a/xen/arch/riscv/irq.c b/xen/arch/riscv/irq.c index b5ae7a114b..669ef3ae9e 100644 --- a/xen/arch/riscv/irq.c +++ b/xen/arch/riscv/irq.c @@ -7,11 +7,58 @@ */ #include +#include +#include #include #include static irq_desc_t irq_desc[NR_IRQS]; +static bool irq_validate_new_type(unsigned int curr, unsigned int new) +{ + return curr == IRQ_TYPE_INVALID || curr == new; +} + +static int irq_set_type(unsigned int irq, unsigned int type) +{ + unsigned long flags; + struct irq_desc *desc = irq_to_desc(irq); + int ret = -EBUSY; + + spin_lock_irqsave(&desc->lock, flags); + + if ( !irq_validate_new_type(desc->arch.type, type) ) + goto err; + + desc->arch.type = type; + + ret = 0; + + err: + spin_unlock_irqrestore(&desc->lock, flags); + + return ret; +} + +int platform_get_irq(const struct dt_device_node *device, int index) +{ + struct dt_irq dt_irq; + int ret; + + if ( (ret = dt_device_get_irq(device, index, &dt_irq)) != 0 ) + return ret; + + BUILD_BUG_ON(NR_IRQS > INT_MAX); + + if ( dt_irq.irq >= NR_IRQS ) + panic("irq%d is bigger then NR_IRQS(%d)\n", dt_irq.irq, NR_IRQS); + + if ( (ret = irq_set_type(dt_irq.irq, dt_irq.type)) != 0 ) + return ret; + + return dt_irq.irq; +} + int arch_init_one_irq_desc(struct irq_desc *desc) { desc->arch.type = IRQ_TYPE_INVALID; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:56:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003178.1382651 (Exim 4.92) (envelope-from ) id 1uM2po-0005lq-PC; Mon, 02 Jun 2025 10:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003178.1382651; Mon, 02 Jun 2025 10: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 1uM2po-0005lj-Mm; Mon, 02 Jun 2025 10:56:04 +0000 Received: by outflank-mailman (input) for mailman id 1003178; Mon, 02 Jun 2025 10:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2pn-0005lZ-2K for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2pn-00G6iS-08 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2pn-00GE2F-00 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56: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=k6QA1wmhp1kfKwxrCkJzV5MHInmGp8n6awjN1O0C9+U=; b=6ou92Qt10KNLND8F9wJ+7b4EtO 2G3HqpQjfxI8CfOYkBy4QjAgGHoZYDZv4owc+rc+cCna21qX7hm5Okhkb8uqcPAtZ/tf0WeeXT+HJ NepFPWYfwoqSy8rOJS962ZNHnhbPge95zkgOAOESwdfMpdrYJBNHlFz4G0/dSYGzrI0w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci/header: Move emulating cap list logic into new function Message-Id: Date: Mon, 02 Jun 2025 10:56:03 +0000 commit b64f9ee6958198ac9cbef8f55a2a2e15e2d56d3f Author: Jiqian Chen AuthorDate: Mon Jun 2 12:44:33 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:44:33 2025 +0200 vpci/header: Move emulating cap list logic into new function No functional changes. Follow-on changes will benifit from this. Signed-off-by: Jiqian Chen Acked-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 138 ++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 65 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 1f48f2aac6..0fb3cfa6a3 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -754,6 +754,75 @@ static int bar_add_rangeset(const struct pci_dev *pdev, struct vpci_bar *bar, return !bar->mem ? -ENOMEM : 0; } +static int vpci_init_capability_list(struct pci_dev *pdev) +{ + int rc; + bool mask_cap_list = false; + + if ( !is_hardware_domain(pdev->domain) && + pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) + { + /* Only expose capabilities to the guest that vPCI can handle. */ + unsigned int next, ttl = 48; + static const unsigned int supported_caps[] = { + PCI_CAP_ID_MSI, + PCI_CAP_ID_MSIX, + }; + + next = pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, + supported_caps, + ARRAY_SIZE(supported_caps), &ttl); + + rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + PCI_CAPABILITY_LIST, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &= ~3; + + if ( !next ) + /* + * If we don't have any supported capabilities to expose to the + * guest, mask the PCI_STATUS_CAP_LIST bit in the status + * register. + */ + mask_cap_list = true; + + while ( next && ttl ) + { + unsigned int pos = next; + + next = pci_find_next_cap_ttl(pdev->sbdf, + pos + PCI_CAP_LIST_NEXT, + supported_caps, + ARRAY_SIZE(supported_caps), &ttl); + + rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, + pos + PCI_CAP_LIST_ID, 1, NULL); + if ( rc ) + return rc; + + rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos + PCI_CAP_LIST_NEXT, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &= ~3; + } + } + + /* Utilize rsvdp_mask to hide PCI_STATUS_CAP_LIST from the guest. */ + return vpci_add_register_mask(pdev->vpci, vpci_hw_read16, vpci_hw_write16, + PCI_STATUS, 2, NULL, + PCI_STATUS_RO_MASK & + ~(mask_cap_list ? PCI_STATUS_CAP_LIST : 0), + PCI_STATUS_RW1C_MASK, + mask_cap_list ? PCI_STATUS_CAP_LIST : 0, + PCI_STATUS_RSVDZ_MASK); +} + static int cf_check init_header(struct pci_dev *pdev) { uint16_t cmd; @@ -762,7 +831,6 @@ static int cf_check init_header(struct pci_dev *pdev) struct vpci_header *header = &pdev->vpci->header; struct vpci_bar *bars = header->bars; int rc; - bool mask_cap_list = false; bool is_hwdom = is_hardware_domain(pdev->domain); ASSERT(rw_is_write_locked(&pdev->domain->pci_lock)); @@ -803,61 +871,12 @@ static int cf_check init_header(struct pci_dev *pdev) if ( rc ) return rc; + rc = vpci_init_capability_list(pdev); + if ( rc ) + return rc; + if ( !is_hwdom ) { - if ( pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) - { - /* Only expose capabilities to the guest that vPCI can handle. */ - unsigned int next, ttl = 48; - static const unsigned int supported_caps[] = { - PCI_CAP_ID_MSI, - PCI_CAP_ID_MSIX, - }; - - next = pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); - - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, - PCI_CAPABILITY_LIST, 1, - (void *)(uintptr_t)next); - if ( rc ) - return rc; - - next &= ~3; - - if ( !next ) - /* - * If we don't have any supported capabilities to expose to the - * guest, mask the PCI_STATUS_CAP_LIST bit in the status - * register. - */ - mask_cap_list = true; - - while ( next && ttl ) - { - unsigned int pos = next; - - next = pci_find_next_cap_ttl(pdev->sbdf, - pos + PCI_CAP_LIST_NEXT, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); - - rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, - pos + PCI_CAP_LIST_ID, 1, NULL); - if ( rc ) - return rc; - - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, - pos + PCI_CAP_LIST_NEXT, 1, - (void *)(uintptr_t)next); - if ( rc ) - return rc; - - next &= ~3; - } - } - /* Extended capabilities read as zero, write ignore */ rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, 0x100, 4, (void *)0); @@ -865,17 +884,6 @@ static int cf_check init_header(struct pci_dev *pdev) return rc; } - /* Utilize rsvdp_mask to hide PCI_STATUS_CAP_LIST from the guest. */ - rc = vpci_add_register_mask(pdev->vpci, vpci_hw_read16, vpci_hw_write16, - PCI_STATUS, 2, NULL, - PCI_STATUS_RO_MASK & - ~(mask_cap_list ? PCI_STATUS_CAP_LIST : 0), - PCI_STATUS_RW1C_MASK, - mask_cap_list ? PCI_STATUS_CAP_LIST : 0, - PCI_STATUS_RSVDZ_MASK); - if ( rc ) - return rc; - if ( pdev->ignore_bars ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:56:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003179.1382656 (Exim 4.92) (envelope-from ) id 1uM2py-0005o4-R3; Mon, 02 Jun 2025 10:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003179.1382656; Mon, 02 Jun 2025 10: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 1uM2py-0005nw-OF; Mon, 02 Jun 2025 10:56:14 +0000 Received: by outflank-mailman (input) for mailman id 1003179; Mon, 02 Jun 2025 10:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2px-0005nl-56 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2px-00G6iW-0Q for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2px-00GEJl-0J for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=Y5G/le2Wx0yYDcq0e+83cuhsP6uui+552/e3YONoIx4=; b=zGSqj9CPEfI2yCWxSnzg+ECFhp xZzYf+VjMX5gsKsyXvES6mdYbN4gaCnJFp4KBD3n2iMi/WE8Sdfuq1Mj+l3cutcR/TW4YZuRdHgVH Oae5JgVE0el5e7XWvt8tZhhwSAE00J/dt3TYBfG7nVEq5HK1ikyWYPiXByxGP1uP8mx4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: add a reviewer for Argo Message-Id: Date: Mon, 02 Jun 2025 10:56:13 +0000 commit 6359068422feba2760bc8c57e8d15bf8088437e7 Author: Christopher Clark AuthorDate: Mon Jun 2 12:45:03 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:45:03 2025 +0200 MAINTAINERS: add a reviewer for Argo Adding Daniel P. Smith as reviewer for the Argo subsystem. Signed-off-by: Christopher Clark Acked-by: Stefano Stabellini --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7d1b3b8641..13f31b0c1b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -222,6 +222,7 @@ F: tools/libacpi/ ARGO M: Christopher Clark +R: Daniel P. Smith S: Maintained F: xen/include/public/argo.h F: xen/include/xen/argo.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:56:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003180.1382661 (Exim 4.92) (envelope-from ) id 1uM2q8-0005qK-SU; Mon, 02 Jun 2025 10:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003180.1382661; Mon, 02 Jun 2025 10: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 1uM2q8-0005qC-Pe; Mon, 02 Jun 2025 10:56:24 +0000 Received: by outflank-mailman (input) for mailman id 1003180; Mon, 02 Jun 2025 10:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2q7-0005py-7a for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2q7-00G6ia-0f for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2q7-00GEXc-0a for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=BzknL4myENcgE/Y4tAUcT4Nt+WOE7aNBimFsvNfMld8=; b=LBAcyFta74lrbfmjYtNb2WoCSg kUxGa82xGQkSW7Zm+42+XFZuykXElwPJE9OmVVpLxPreyQl89iArUkUDnRsuIIVATqTrHvXLXsm3y 3oC4FCJKHM4zyJKyNKxDpi9q/nZnoSxSJPAVAWD4RE77KAF90lEzgCffgqrtucVZZUVg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] licence: Add missing SPDX line to bootfdt.h Message-Id: Date: Mon, 02 Jun 2025 10:56:23 +0000 commit 1083fb5a72430160e1a273842b6d0a887ed1650d Author: Alejandro Vallejo AuthorDate: Mon Jun 2 12:45:21 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:45:21 2025 +0200 licence: Add missing SPDX line to bootfdt.h Signed-off-by: Alejandro Vallejo Acked-by: Michal Orzel --- xen/include/xen/bootfdt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index 80a90e53c0..847f019559 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef XEN_BOOTFDT_H #define XEN_BOOTFDT_H -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:56:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003181.1382666 (Exim 4.92) (envelope-from ) id 1uM2qI-0005sv-Ut; Mon, 02 Jun 2025 10:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003181.1382666; Mon, 02 Jun 2025 10: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 1uM2qI-0005sj-R0; Mon, 02 Jun 2025 10:56:34 +0000 Received: by outflank-mailman (input) for mailman id 1003181; Mon, 02 Jun 2025 10:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2qH-0005sX-Am for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2qH-00G6ie-0z for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2qH-00GEop-0p for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=0JckSLJL3s2YETnAe4W4xqtR5NUHa341063KfZE5ZOo=; b=T46Mwuhd2qPlEoTg47NkSBi6Yj R4JGXhJGmpEd2MwsZGyrAL1MASNy47VM0OiBdYBFq0iBs5SVznviKxGSrSSoBtRa7avVUgTssNksX H+Ot2Y5kpZGckIQ8IwZVLI6M4mO/4o7hMM7orCXf9r8blrwvAU89wlYS3Cla/lb/aw6o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] riscv: Add missing forward declaration to intc.h Message-Id: Date: Mon, 02 Jun 2025 10:56:33 +0000 commit 546281a115a674f49cbca177b3403fa3186568e9 Author: Alejandro Vallejo AuthorDate: Mon Jun 2 12:45:57 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:45:57 2025 +0200 riscv: Add missing forward declaration to intc.h Very much not a functional change Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/arch/riscv/include/asm/intc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/riscv/include/asm/intc.h b/xen/arch/riscv/include/asm/intc.h index 52ba196d87..81f74736ba 100644 --- a/xen/arch/riscv/include/asm/intc.h +++ b/xen/arch/riscv/include/asm/intc.h @@ -8,6 +8,8 @@ #ifndef ASM__RISCV__INTERRUPT_CONTOLLER_H #define ASM__RISCV__INTERRUPT_CONTOLLER_H +struct dt_device_node; + enum intc_version { INTC_APLIC, }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:56:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003182.1382667 (Exim 4.92) (envelope-from ) id 1uM2qS-0005vK-Uy; Mon, 02 Jun 2025 10:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003182.1382667; Mon, 02 Jun 2025 10: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 1uM2qS-0005vC-SN; Mon, 02 Jun 2025 10:56:44 +0000 Received: by outflank-mailman (input) for mailman id 1003182; Mon, 02 Jun 2025 10:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2qR-0005uw-Da for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2qR-00G6j2-1H for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2qR-00GEzK-19 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10: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=+OcP/3hw8RlBEhhoFJwa7rIddKhg7tg2N+ZswJr1OeA=; b=rNisnRkbPCyn+6aDuNDiTkLXvp ZbIbmkXy4tn0ubzVx0MUw9IYuUC0/7yPaBvNVtdvKzYAEWMvfm8r2Jg84WuhVKmw3dpY2LMIh/Z5d 2jxPPE6TxJqZob9imPeWn6BLpB97BAkQZJqac0LwfElU9c2Y3Zp1ODa5SfF6tkqYOfjc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Add missing forward declaration to btcpupools_get_domain_pool_id Message-Id: Date: Mon, 02 Jun 2025 10:56:43 +0000 commit 1cadd2a011cb24f6d5da1c92f48eb8a8ee05e41f Author: Alejandro Vallejo AuthorDate: Mon Jun 2 12:46:19 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:46:19 2025 +0200 xen: Add missing forward declaration to btcpupools_get_domain_pool_id And remove the ifdef guard, as it's inconsequential. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/include/xen/sched.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 559d201e0c..b17aada5f5 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1291,15 +1291,15 @@ static inline unsigned int btcpupools_get_cpupool_id(unsigned int cpu) { return 0; } -#ifdef CONFIG_HAS_DEVICE_TREE + +struct dt_device_node; + static inline int btcpupools_get_domain_pool_id(const struct dt_device_node *node) { return 0; } -#endif - -#endif +#endif /* CONFIG_BOOT_TIME_CPUPOOLS */ #endif /* __SCHED_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 10:56:55 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 10:56:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003183.1382671 (Exim 4.92) (envelope-from ) id 1uM2qd-0005xT-06; Mon, 02 Jun 2025 10:56:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003183.1382671; Mon, 02 Jun 2025 10:56: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 1uM2qc-0005xM-Tk; Mon, 02 Jun 2025 10:56:54 +0000 Received: by outflank-mailman (input) for mailman id 1003183; Mon, 02 Jun 2025 10:56:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM2qb-0005x9-G3 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM2qb-00G6j6-1W for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM2qb-00GFPy-1R for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 10:56: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=Myjy1Ma0gFjI47RAX/Xe8C84CUGd1HOzni1t/7quiXQ=; b=HhIR+h6wY7R1m83ttaSw8bOrvl lSuV6kAVbFHIGD+S+ewy5fOwzc+GylumnJOerJt0O3x7q5ZYUwbMcimhgSKAE8/VSHKig+FkleBXC 01sF1C2dq2khUAca/LarxpUJ2VQXrWQwaPXkVKEkTZu1S+IZ7NrhWtEGVt2ioYswhuRg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/console: rename switch_serial_input() to console_switch_input() Message-Id: Date: Mon, 02 Jun 2025 10:56:53 +0000 commit c3933dbf77f9d176df0b76ae1aea46422e2793df Author: Denis Mukhin AuthorDate: Mon Jun 2 12:46:50 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:46:50 2025 +0200 xen/console: rename switch_serial_input() to console_switch_input() Update the function name as per naming notation in the console driver. No functional change. Signed-off-by: Denis Mukhin Acked-by: Jan Beulich --- xen/drivers/char/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index c15987f5bb..30701ae0b0 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -523,7 +523,7 @@ void console_put_domain(struct domain *d) rcu_unlock_domain(d); } -static void switch_serial_input(void) +static void console_switch_input(void) { unsigned int next_rx = console_rx; @@ -617,7 +617,7 @@ static void cf_check serial_rx(char c) /* We eat CTRL- in groups of 3 to switch console input. */ if ( ++switch_code_count == 3 ) { - switch_serial_input(); + console_switch_input(); switch_code_count = 0; } return; @@ -1171,7 +1171,7 @@ void __init console_endboot(void) "toggle host/guest log level adjustment", 0); /* Serial input is directed to DOM0 by default. */ - switch_serial_input(); + console_switch_input(); } int __init console_has(const char *device) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003265.1382776 (Exim 4.92) (envelope-from ) id 1uM3aF-0001El-JN; Mon, 02 Jun 2025 11:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003265.1382776; Mon, 02 Jun 2025 11: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 1uM3aF-0001Ed-GY; Mon, 02 Jun 2025 11:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1003265; Mon, 02 Jun 2025 11:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3aE-0001EX-9n for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3aE-00G7dJ-0O for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3aE-00HM3c-0D for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=oI8SAtRxdxK08hIbC9Sk4hlZivDCVISi76eqh7N37DE=; b=ctnRXjrulSgEoXs6uktxprqBJt wdidjhJUpqfIJoKXnIwvTXnKaTheue1njGVXIKc7zZ4frg8boxJibux7gTBYnVBcC+NbV8Tc9U+f/ tIrjvyfoSGA4VihavTqyJ6uJqMP+rZnftmfL9t5XDw1CgYYRTG46OqXme30TBSmDp4/g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] SUPPORT.md: add xenstore stubdom as supported Message-Id: Date: Mon, 02 Jun 2025 11:44:02 +0000 commit 6b1da8110b065f7da40672b0cf01818415b4ab8d Author: Juergen Gross AuthorDate: Mon Jun 2 12:40:54 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:40:54 2025 +0200 SUPPORT.md: add xenstore stubdom as supported SUPPORT.md is missing a support statement for Xenstore stubdom. As SUSE is using it in production since several years now, it should be added as "supported". This covers the PV and the PVH variant. Signed-off-by: Juergen Gross Acked-by: Jan Beulich --- SUPPORT.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 5eecf1dcbc..d75cf018fc 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -272,6 +272,16 @@ or itself will not be regarded a security issue. Status: Supported Status, Liveupdate: Tech Preview +### C xenstore stubdom PV + + Status: Supported + Status, Liveupdate: Not implemented + +### C xenstore stubdom PVH + + Status: Supported + Status, Liveupdate: Not implemented + ### OCaml xenstored daemon Status: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003266.1382780 (Exim 4.92) (envelope-from ) id 1uM3aP-0001GP-KW; Mon, 02 Jun 2025 11:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003266.1382780; Mon, 02 Jun 2025 11: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 1uM3aP-0001GH-Hv; Mon, 02 Jun 2025 11:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1003266; Mon, 02 Jun 2025 11:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3aO-0001G7-9p for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3aO-00G7dR-0t for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3aO-00HMCx-0Y for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=gH+zd55ZkKP2gnht1XzwfOaNCNl6DFdG1XnVq4l361w=; b=DWdyGxIq7b3RoGxfcSHArrC9W9 k6Le9lr83O6UV9TbBKMvZAOJYZXTKI8JAPfYgffy2LQayg1p8IiPwng2XfbOdd9PHoCqFUhoMmGsx Am/HRWe8Ao8uKEL3nSEUqazCVKG0CjLmY10sHg7OZFpPeUrYMaYQcGOZqdQCXpsAa8hY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce smp_prepare_boot_cpu() Message-Id: Date: Mon, 02 Jun 2025 11:44:12 +0000 commit b54b825e6fa1dbcfa9ea9de5e285441dd6649989 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:41:36 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:41:36 2025 +0200 xen/riscv: introduce smp_prepare_boot_cpu() Initialize cpu_{possible, online}_map by using smp_prepare_boot_cpu(). Drop DEFINE_PER_CPU(unsigned int, cpu_id) from stubs.c as this variable isn't expected to be used in RISC-V at all. Move declaration of cpu_{possible,online}_map from stubs.c to smpboot.c as now smpboot.c is now introduced. Other defintions keep in stubs.c as they are not initialized and not needed, at the moment. Drop cpu_present_map as it is enough to have cpu_possible_map. Also, ask linker to provide symbol for cpu_present_map as common code references it. Move call of set_processor_id(0) to smp_prepare_boot_cpu(). Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/setup.c | 4 ++-- xen/arch/riscv/smpboot.c | 16 ++++++++++++++++ xen/arch/riscv/stubs.c | 6 ------ xen/arch/riscv/xen.lds.S | 2 ++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index d882c57528..f42cf3dfa6 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -10,6 +10,7 @@ obj-y += sbi.o obj-y += setup.o obj-y += shutdown.o obj-y += smp.o +obj-y += smpboot.o obj-y += stubs.o obj-y += time.o obj-y += traps.o diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 4e416f6e44..a9c0c61fb6 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include /* Xen stack for bringing up the first CPU. */ @@ -72,7 +72,7 @@ void __init noreturn start_xen(unsigned long bootcpu_id, remove_identity_mapping(); - set_processor_id(0); + smp_prepare_boot_cpu(); set_cpuid_to_hartid(0, bootcpu_id); diff --git a/xen/arch/riscv/smpboot.c b/xen/arch/riscv/smpboot.c new file mode 100644 index 0000000000..0f9c2cc54a --- /dev/null +++ b/xen/arch/riscv/smpboot.c @@ -0,0 +1,16 @@ +#include +#include +#include + +#include + +cpumask_t __read_mostly cpu_online_map; +cpumask_t __ro_after_init cpu_possible_map; + +void __init smp_prepare_boot_cpu(void) +{ + set_processor_id(0); + + cpumask_set_cpu(0, &cpu_possible_map); + cpumask_set_cpu(0, &cpu_online_map); +} diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 83416d3350..fdcf91054e 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -11,12 +11,6 @@ /* smpboot.c */ -cpumask_t cpu_online_map; -cpumask_t cpu_present_map; -cpumask_t cpu_possible_map; - -/* ID of the PCPU we're running on */ -DEFINE_PER_CPU(unsigned int, cpu_id); /* XXX these seem awfully x86ish... */ /* representing HT siblings of each logical CPU */ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_mask); diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S index 818aa43669..8c3c06de01 100644 --- a/xen/arch/riscv/xen.lds.S +++ b/xen/arch/riscv/xen.lds.S @@ -165,6 +165,8 @@ SECTIONS ELF_DETAILS_SECTIONS } +PROVIDE(cpu_present_map = cpu_possible_map); + ASSERT(IS_ALIGNED(__bss_start, POINTER_ALIGN), "__bss_start is misaligned") ASSERT(IS_ALIGNED(__bss_end, POINTER_ALIGN), "__bss_end is misaligned") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003267.1382785 (Exim 4.92) (envelope-from ) id 1uM3aZ-0001JX-Mu; Mon, 02 Jun 2025 11:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003267.1382785; Mon, 02 Jun 2025 11: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 1uM3aZ-0001JP-JM; Mon, 02 Jun 2025 11:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1003267; Mon, 02 Jun 2025 11:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3aY-0001IR-DI for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3aY-00G7dc-1B for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3aY-00HMLi-14 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=70W5+cvXYqmLaQNFc4U4mJeXclRMETGmjRSgtcyym0s=; b=zAuy6SmwFz0dKqg6yL5REeZaUr IgzjjY99KITKjForKqj0g5gaB5Fj7ljL8IpmCfPRa80vWJyADtfHUBAwjoiVDi/kUSl/EqGHxA8tB OF14xQb2mqqu/7UWWJbBC8IzN8OUgmCvVSX900dP0vYmtAEYOd7b8+Ca8vNyWnLpFc1M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce support of Svpbmt extension and make it mandatory Message-Id: Date: Mon, 02 Jun 2025 11:44:22 +0000 commit b3d5fad63a48e2aa5ccd56d5d93a3b1ef47bf397 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:42:23 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:42:23 2025 +0200 xen/riscv: introduce support of Svpbmt extension and make it mandatory Svpbmt extension is necessary for chaning the memory type for a page contains a combination of attributes that indicate the cacheability, idempotency, and ordering properties for access to that page. As a part of the patch the following is introduced: - Svpbmt memory type defintions: PTE_PBMT_{NOCACHE,IO}. - PAGE_HYPERVISOR_{NOCACHE,WC}. - RISCV_ISA_EXT_svpbmt and add a check in runtime that Svpbmt is supported by platform. - Update riscv/booting.txt with information about Svpbmt. - Update logic of pt_update_entry() to take into account PBMT bits. Use 'unsigned long' for pte_attr_t as PBMT bits are 61 and 62 and it doesn't fit into 'unsigned int'. Also, update function prototypes which uses 'unsigned int' for flags/attibutes. Enable Svpbmt for testing in QEMU as it is now mandatory for Xen work. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- automation/scripts/qemu-smoke-riscv64.sh | 1 + docs/misc/riscv/booting.txt | 4 ++++ xen/arch/riscv/Kconfig | 4 ++++ xen/arch/riscv/cpufeature.c | 2 ++ xen/arch/riscv/include/asm/cpufeature.h | 1 + xen/arch/riscv/include/asm/fixmap.h | 2 +- xen/arch/riscv/include/asm/mm-types.h | 8 ++++++++ xen/arch/riscv/include/asm/page.h | 23 ++++++++++++++++++++++- xen/arch/riscv/pt.c | 20 +++++++++++--------- 9 files changed, 54 insertions(+), 11 deletions(-) diff --git a/automation/scripts/qemu-smoke-riscv64.sh b/automation/scripts/qemu-smoke-riscv64.sh index b2e112c942..25f9e4190e 100755 --- a/automation/scripts/qemu-smoke-riscv64.sh +++ b/automation/scripts/qemu-smoke-riscv64.sh @@ -7,6 +7,7 @@ rm -f smoke.serial export TEST_CMD="qemu-system-riscv64 \ -M virt,aia=aplic-imsic \ + -cpu rv64,svpbmt=on \ -smp 1 \ -nographic \ -m 2g \ diff --git a/docs/misc/riscv/booting.txt b/docs/misc/riscv/booting.txt index 3a8474a27d..e100bde575 100644 --- a/docs/misc/riscv/booting.txt +++ b/docs/misc/riscv/booting.txt @@ -18,3 +18,7 @@ Xen is run: - Zihintpause: On a system that doesn't have this extension, cpu_relax() should be implemented properly. +- SVPBMT is mandatory to enable changing the memory attributes of a page. + For platforms that do not support SVPBMT, it is necessary to introduce a + similar mechanism as described in: + https://lore.kernel.org/all/20241102000843.1301099-1-samuel.holland@sifive.com/ diff --git a/xen/arch/riscv/Kconfig b/xen/arch/riscv/Kconfig index d882e0a059..62c5b7ba34 100644 --- a/xen/arch/riscv/Kconfig +++ b/xen/arch/riscv/Kconfig @@ -10,11 +10,15 @@ config RISCV config RISCV_64 def_bool y select 64BIT + select HAS_SVPBMT config ARCH_DEFCONFIG string default "arch/riscv/configs/tiny64_defconfig" +config HAS_SVPBMT + bool + menu "Architecture Features" source "arch/Kconfig" diff --git a/xen/arch/riscv/cpufeature.c b/xen/arch/riscv/cpufeature.c index 3246a03624..b7d5ec6580 100644 --- a/xen/arch/riscv/cpufeature.c +++ b/xen/arch/riscv/cpufeature.c @@ -137,6 +137,7 @@ const struct riscv_isa_ext_data __initconst riscv_isa_ext[] = { RISCV_ISA_EXT_DATA(zbs), RISCV_ISA_EXT_DATA(smaia), RISCV_ISA_EXT_DATA(ssaia), + RISCV_ISA_EXT_DATA(svpbmt), }; static const struct riscv_isa_ext_data __initconst required_extensions[] = { @@ -151,6 +152,7 @@ static const struct riscv_isa_ext_data __initconst required_extensions[] = { RISCV_ISA_EXT_DATA(zifencei), RISCV_ISA_EXT_DATA(zihintpause), RISCV_ISA_EXT_DATA(zbb), + RISCV_ISA_EXT_DATA(svpbmt), }; static bool __init is_lowercase_extension_name(const char *str) diff --git a/xen/arch/riscv/include/asm/cpufeature.h b/xen/arch/riscv/include/asm/cpufeature.h index 1015b6ee44..768b84b769 100644 --- a/xen/arch/riscv/include/asm/cpufeature.h +++ b/xen/arch/riscv/include/asm/cpufeature.h @@ -37,6 +37,7 @@ enum riscv_isa_ext_id { RISCV_ISA_EXT_zbs, RISCV_ISA_EXT_smaia, RISCV_ISA_EXT_ssaia, + RISCV_ISA_EXT_svpbmt, RISCV_ISA_EXT_MAX }; diff --git a/xen/arch/riscv/include/asm/fixmap.h b/xen/arch/riscv/include/asm/fixmap.h index e399a15f53..5990c964aa 100644 --- a/xen/arch/riscv/include/asm/fixmap.h +++ b/xen/arch/riscv/include/asm/fixmap.h @@ -33,7 +33,7 @@ extern pte_t xen_fixmap[]; /* Map a page in a fixmap entry */ -void set_fixmap(unsigned int map, mfn_t mfn, unsigned int flags); +void set_fixmap(unsigned int map, mfn_t mfn, pte_attr_t flags); /* Remove a mapping from a fixmap entry */ void clear_fixmap(unsigned int map); diff --git a/xen/arch/riscv/include/asm/mm-types.h b/xen/arch/riscv/include/asm/mm-types.h new file mode 100644 index 0000000000..fa512064b8 --- /dev/null +++ b/xen/arch/riscv/include/asm/mm-types.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ASM_RISCV_MM_TYPES_H +#define ASM_RISCV_MM_TYPES_H + +typedef unsigned long pte_attr_t; + +#endif /* ASM_RISCV_MM_TYPES_H */ diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h index bf8988f657..4cb0179648 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -37,6 +37,16 @@ #define PTE_ACCESSED BIT(6, UL) #define PTE_DIRTY BIT(7, UL) #define PTE_RSW (BIT(8, UL) | BIT(9, UL)) +/* + * [62:61] Svpbmt Memory Type definitions: + * + * 00 - PMA Normal Cacheable, No change to implied PMA memory type + * 01 - NC Non-cacheable, idempotent, weakly-ordered Main Memory + * 10 - IO Non-cacheable, non-idempotent, strongly-ordered I/O memory + * 11 - Rsvd Reserved for future standard use + */ +#define PTE_PBMT_NOCACHE BIT(61, UL) +#define PTE_PBMT_IO BIT(62, UL) #define PTE_LEAF_DEFAULT (PTE_VALID | PTE_READABLE | PTE_WRITABLE) #define PTE_TABLE (PTE_VALID) @@ -46,6 +56,15 @@ #define PAGE_HYPERVISOR_RX (PTE_VALID | PTE_READABLE | PTE_EXECUTABLE) #define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW +/* + * PAGE_HYPERVISOR_NOCACHE is used for ioremap(). + * + * Both PTE_PBMT_IO and PTE_PBMT_NOCACHE are non-cacheable, but the difference + * is that IO is non-idempotent and strongly ordered, which makes it a good + * candidate for mapping IOMEM. + */ +#define PAGE_HYPERVISOR_NOCACHE (PAGE_HYPERVISOR_RW | PTE_PBMT_IO) +#define PAGE_HYPERVISOR_WC (PAGE_HYPERVISOR_RW | PTE_PBMT_NOCACHE) /* * The PTE format does not contain the following bits within itself; @@ -58,6 +77,8 @@ #define PTE_ACCESS_MASK (PTE_READABLE | PTE_WRITABLE | PTE_EXECUTABLE) +#define PTE_PBMT_MASK (PTE_PBMT_NOCACHE | PTE_PBMT_IO) + /* Calculate the offsets into the pagetables for a given VA */ #define pt_linear_offset(lvl, va) ((va) >> XEN_PT_LEVEL_SHIFT(lvl)) @@ -202,7 +223,7 @@ static inline pte_t read_pte(const pte_t *p) return read_atomic(p); } -static inline pte_t pte_from_mfn(mfn_t mfn, unsigned int flags) +static inline pte_t pte_from_mfn(mfn_t mfn, pte_attr_t flags) { unsigned long pte = (mfn_x(mfn) << PTE_PPN_SHIFT) | flags; return (pte_t){ .pte = pte }; diff --git a/xen/arch/riscv/pt.c b/xen/arch/riscv/pt.c index 918b1b91ab..82c8c73c3e 100644 --- a/xen/arch/riscv/pt.c +++ b/xen/arch/riscv/pt.c @@ -25,7 +25,7 @@ static inline mfn_t get_root_page(void) * See the comment about the possible combination of (mfn, flags) in * the comment above pt_update(). */ -static bool pt_check_entry(pte_t entry, mfn_t mfn, unsigned int flags) +static bool pt_check_entry(pte_t entry, mfn_t mfn, pte_attr_t flags) { /* Sanity check when modifying an entry. */ if ( (flags & PTE_VALID) && mfn_eq(mfn, INVALID_MFN) ) @@ -260,7 +260,7 @@ pte_t pt_walk(vaddr_t va, unsigned int *pte_level) */ static int pt_update_entry(mfn_t root, vaddr_t virt, mfn_t mfn, unsigned int *target, - unsigned int flags) + pte_attr_t flags) { int rc; /* @@ -328,17 +328,19 @@ static int pt_update_entry(mfn_t root, vaddr_t virt, pte.pte = 0; else { + const pte_attr_t attrs = PTE_ACCESS_MASK | PTE_PBMT_MASK; + /* We are inserting a mapping => Create new pte. */ if ( !mfn_eq(mfn, INVALID_MFN) ) pte = pte_from_mfn(mfn, PTE_VALID); - else /* We are updating the permission => Copy the current pte. */ + else /* We are updating the attributes => Copy the current pte. */ { pte = *ptep; - pte.pte &= ~PTE_ACCESS_MASK; + pte.pte &= ~attrs; } - /* update permission according to the flags */ - pte.pte |= (flags & PTE_ACCESS_MASK) | PTE_ACCESSED | PTE_DIRTY; + /* Update attributes of PTE according to the flags. */ + pte.pte |= (flags & attrs) | PTE_ACCESSED | PTE_DIRTY; } write_pte(ptep, pte); @@ -353,7 +355,7 @@ static int pt_update_entry(mfn_t root, vaddr_t virt, /* Return the level where mapping should be done */ static int pt_mapping_level(unsigned long vfn, mfn_t mfn, unsigned long nr, - unsigned int flags) + pte_attr_t flags) { unsigned int level = 0; unsigned long mask; @@ -407,7 +409,7 @@ static DEFINE_SPINLOCK(pt_lock); * inserting will be done. */ static int pt_update(vaddr_t virt, mfn_t mfn, - unsigned long nr_mfns, unsigned int flags) + unsigned long nr_mfns, pte_attr_t flags) { int rc = 0; unsigned long vfn = PFN_DOWN(virt); @@ -535,7 +537,7 @@ int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) } /* Map a 4k page in a fixmap entry */ -void set_fixmap(unsigned int map, mfn_t mfn, unsigned int flags) +void set_fixmap(unsigned int map, mfn_t mfn, pte_attr_t flags) { if ( map_pages_to_xen(FIXMAP_ADDR(map), mfn, 1, flags | PTE_SMALL) != 0 ) BUG(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003268.1382788 (Exim 4.92) (envelope-from ) id 1uM3aj-0001N1-NV; Mon, 02 Jun 2025 11:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003268.1382788; Mon, 02 Jun 2025 11: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 1uM3aj-0001Mt-Kt; Mon, 02 Jun 2025 11:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1003268; Mon, 02 Jun 2025 11:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3ai-0001Mh-GE for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3ai-00G7dj-1W for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3ai-00HMSb-1M for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=9JrSlrECTGHzh1atmFv8GiNdS2FTGjuBYDJ0PoZbKo8=; b=1Ngf5KPdvIYaxHCG5nDOEURz4p NLRy9qoW5ZkAh62z5g30NbivZfwotnMwuZfcdHrZExRKDMyYXLAhByiuobaF7Mz/HzjHxonyE5BW7 4T00Vowsno5OO0ZuuZHMRulAaxFhkK7tFjo/riXvmMHCOHq+GfU+R+Dxpzs/UXogw1vI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add ioremap_*() variants using ioremap_attr() Message-Id: Date: Mon, 02 Jun 2025 11:44:32 +0000 commit c8ff4d60a696292038e01a51a60085e5906123bb Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:42:49 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:42:49 2025 +0200 xen/riscv: add ioremap_*() variants using ioremap_attr() Introduce ioremap_attr() as a shared helper to implement architecture-specific ioremap variants: - ioremap_cache() - ioremap_wc() These functions use __vmap() internally and apply appropriate memory attributes for RISC-V. These functions are implemned not as static inline function or macros as it will require to include asm/page.h into asm/io.h what will lead to compilation issue. Also, remove the unused ioremap_wt() macro from asm/io.h, as write-through mappings are not expected to be used on RISC-V. Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/include/asm/io.h | 10 ++-------- xen/arch/riscv/mm.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/xen/arch/riscv/include/asm/io.h b/xen/arch/riscv/include/asm/io.h index 8bab4ffa03..9aeafd6b3b 100644 --- a/xen/arch/riscv/include/asm/io.h +++ b/xen/arch/riscv/include/asm/io.h @@ -41,14 +41,8 @@ #include #include -/* - * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't - * change the properties of memory regions. This should be fixed by the - * upcoming platform spec. - */ -#define ioremap_nocache(addr, size) ioremap(addr, size) -#define ioremap_wc(addr, size) ioremap(addr, size) -#define ioremap_wt(addr, size) ioremap(addr, size) +void __iomem *ioremap_cache(paddr_t pa, size_t len); +void __iomem *ioremap_wc(paddr_t pa, size_t len); /* Generic IO read/write. These perform native-endian accesses. */ static inline void __raw_writeb(uint8_t val, volatile void __iomem *addr) diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index d3ece9f132..4047d67c0e 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -583,3 +584,32 @@ void *__init arch_vmap_virt_end(void) { return (void *)(VMAP_VIRT_START + VMAP_VIRT_SIZE); } + +static void __iomem *ioremap_attr(paddr_t pa, size_t len, + pte_attr_t attributes) +{ + mfn_t mfn = _mfn(PFN_DOWN(pa)); + unsigned int offs = pa & (PAGE_SIZE - 1); + unsigned int nr = PFN_UP(offs + len); + void *ptr = __vmap(&mfn, nr, 1, 1, attributes, VMAP_DEFAULT); + + if ( ptr == NULL ) + return NULL; + + return ptr + offs; +} + +void __iomem *ioremap_cache(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR); +} + +void __iomem *ioremap_wc(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR_WC); +} + +void __iomem *ioremap(paddr_t pa, size_t len) +{ + return ioremap_attr(pa, len, PAGE_HYPERVISOR_NOCACHE); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003269.1382792 (Exim 4.92) (envelope-from ) id 1uM3at-0001PK-P8; Mon, 02 Jun 2025 11:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003269.1382792; Mon, 02 Jun 2025 11:44: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 1uM3at-0001PC-MK; Mon, 02 Jun 2025 11:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1003269; Mon, 02 Jun 2025 11:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3as-0001Oz-J5 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3as-00G7e6-1n for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3as-00HMZl-1h for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=A+EWwQhWPfTnEULHSYOhfuhUWT86ZngRRS0g3ctTqfM=; b=HtCSAwMdoQZnwCQb1X3NZ7kaRK 6x7KSkGn2y94wzvm2sjlwyDIpX6E4o0qzhk4AreRvvzZVmUk0bwOo/SDmKITHG6hoCOID6lyjGUha dpgwidkZ+hYiCIwTZZGohEaZUIPt3qO/gAuO0v0b2t5D7C4+dBJSHCEb6dnc7LtHfsbw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce init_IRQ() Message-Id: Date: Mon, 02 Jun 2025 11:44:42 +0000 commit 62bdc26881083d2ae829b56db03103f2ee72f2c9 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:43:51 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:43:51 2025 +0200 xen/riscv: introduce init_IRQ() Implement init_IRQ() to initalize various IRQs. Currently, this function initializes the irq_desc[] array, which stores IRQ descriptors containing various information about each IRQ, such as the type of hardware handling, whether the IRQ is disabled, etc. The initialization is basic at this point and includes setting IRQ_TYPE_INVALID as the IRQ type, assigning the IRQ number ( which is just a consequent index of irq_desc[] array ) to desc->irq. Additionally, the function init_irq_data() is introduced to initialize the IRQ descriptors for all IRQs in the system. Reuse defines of IRQ_TYPE_* from asm-generic/irq-dt.h. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/Makefile | 1 + xen/arch/riscv/include/asm/irq.h | 15 +++++++++++++ xen/arch/riscv/irq.c | 45 +++++++++++++++++++++++++++++++++++++ xen/arch/riscv/setup.c | 3 +++ xen/arch/riscv/stubs.c | 5 ----- 6 files changed, 65 insertions(+), 5 deletions(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index f42cf3dfa6..a1c145c506 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -3,6 +3,7 @@ obj-y += cpufeature.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += entry.o obj-y += intc.o +obj-y += irq.o obj-y += mm.o obj-y += pt.o obj-$(CONFIG_RISCV_64) += riscv64/ diff --git a/xen/arch/riscv/include/asm/Makefile b/xen/arch/riscv/include/asm/Makefile index c989a7f89b..bfdf186c68 100644 --- a/xen/arch/riscv/include/asm/Makefile +++ b/xen/arch/riscv/include/asm/Makefile @@ -5,6 +5,7 @@ generic-y += div64.h generic-y += hardirq.h generic-y += hypercall.h generic-y += iocap.h +generic-y += irq-dt.h generic-y += paging.h generic-y += percpu.h generic-y += perfc_defn.h diff --git a/xen/arch/riscv/include/asm/irq.h b/xen/arch/riscv/include/asm/irq.h index 2a48da2651..ea555afd1a 100644 --- a/xen/arch/riscv/include/asm/irq.h +++ b/xen/arch/riscv/include/asm/irq.h @@ -3,6 +3,19 @@ #define ASM__RISCV__IRQ_H #include +#include + +#include + +/* + * According to the AIA spec: + * The maximum number of interrupt sources an APLIC may support is 1023. + * + * The same is true for PLIC. + * + * Interrupt Source 0 is reserved and shall never generate an interrupt. + */ +#define NR_IRQS 1024 /* TODO */ #define nr_irqs 0U @@ -25,6 +38,8 @@ static inline void arch_move_irqs(struct vcpu *v) BUG_ON("unimplemented"); } +void init_IRQ(void); + #endif /* ASM__RISCV__IRQ_H */ /* diff --git a/xen/arch/riscv/irq.c b/xen/arch/riscv/irq.c new file mode 100644 index 0000000000..b5ae7a114b --- /dev/null +++ b/xen/arch/riscv/irq.c @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * RISC-V Interrupt support + * + * Copyright (c) Vates + */ + +#include +#include +#include + +static irq_desc_t irq_desc[NR_IRQS]; + +int arch_init_one_irq_desc(struct irq_desc *desc) +{ + desc->arch.type = IRQ_TYPE_INVALID; + + return 0; +} + +static int __init init_irq_data(void) +{ + unsigned int irq; + + for ( irq = 0; irq < NR_IRQS; irq++ ) + { + struct irq_desc *desc = irq_to_desc(irq); + int rc; + + desc->irq = irq; + + rc = init_one_irq_desc(desc); + if ( rc ) + return rc; + } + + return 0; +} + +void __init init_IRQ(void) +{ + if ( init_irq_data() < 0 ) + panic("initialization of IRQ data failed\n"); +} diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index a9c0c61fb6..8bcd19218d 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -125,6 +126,8 @@ void __init noreturn start_xen(unsigned long bootcpu_id, panic("Booting using ACPI isn't supported\n"); } + init_IRQ(); + riscv_fill_hwcap(); preinit_xen_time(); diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index fdcf91054e..e396b67cd3 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -107,11 +107,6 @@ void irq_ack_none(struct irq_desc *desc) BUG_ON("unimplemented"); } -int arch_init_one_irq_desc(struct irq_desc *desc) -{ - BUG_ON("unimplemented"); -} - void smp_send_state_dump(unsigned int cpu) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:44:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003270.1382795 (Exim 4.92) (envelope-from ) id 1uM3b3-0001SJ-S2; Mon, 02 Jun 2025 11:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003270.1382795; Mon, 02 Jun 2025 11:44: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 1uM3b3-0001SB-PK; Mon, 02 Jun 2025 11:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1003270; Mon, 02 Jun 2025 11:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3b2-0001Rw-M7 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3b2-00G7eA-27 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3b2-00HMxv-1y for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=xUUtDLQheHCOkgDzpfzbXLaYzsIsw9c9FoKSTElWxyI=; b=eCvo7GAVzDYYF3l33HPsH/mfPW 9QcnRhPtgInIwNokPNdC2QbowN0tLK4tMCDplhkiQp8csVzTURvwt5JdrxP6gQob5sV4DasmD1dfR FZskg7F0KEjYmAqGSLSQi5l4yDErBndvoNTvxsV83l7jYKdfG5AcLQQ2YD+c8qW8IswE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce platform_get_irq() Message-Id: Date: Mon, 02 Jun 2025 11:44:52 +0000 commit 8e8ffba487866fffd6e0fb4b52be316d61194089 Author: Oleksii Kurochko AuthorDate: Mon Jun 2 12:44:13 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:44:13 2025 +0200 xen/riscv: introduce platform_get_irq() platform_get_irq() recieves information about device's irq ( type and irq number ) from device tree node and using this information update irq descriptor in irq_desc[] array. Introduce dt_irq_xlate and initialize with aplic_irq_xlate() as it is used by dt_device_get_irq() which is called by platform_get_irq(). Co-developed-by: Romain Caritey Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/aplic.c | 20 +++++++++++++++++ xen/arch/riscv/include/asm/irq.h | 3 +++ xen/arch/riscv/irq.c | 47 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/xen/arch/riscv/aplic.c b/xen/arch/riscv/aplic.c index caba8f8993..10ae81f7ac 100644 --- a/xen/arch/riscv/aplic.c +++ b/xen/arch/riscv/aplic.c @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -21,6 +22,23 @@ static struct intc_info __ro_after_init aplic_info = { .hw_version = INTC_APLIC, }; +static int cf_check aplic_irq_xlate(const uint32_t *intspec, + unsigned int intsize, + unsigned int *out_hwirq, + unsigned int *out_type) +{ + if ( intsize < 2 ) + return -EINVAL; + + /* Mapping 1:1 */ + *out_hwirq = intspec[0]; + + if ( out_type ) + *out_type = intspec[1] & IRQ_TYPE_SENSE_MASK; + + return 0; +} + static int __init aplic_preinit(struct dt_device_node *node, const void *dat) { if ( aplic_info.node ) @@ -35,6 +53,8 @@ static int __init aplic_preinit(struct dt_device_node *node, const void *dat) aplic_info.node = node; + dt_irq_xlate = aplic_irq_xlate; + return 0; } diff --git a/xen/arch/riscv/include/asm/irq.h b/xen/arch/riscv/include/asm/irq.h index ea555afd1a..84c3c2904d 100644 --- a/xen/arch/riscv/include/asm/irq.h +++ b/xen/arch/riscv/include/asm/irq.h @@ -38,6 +38,9 @@ static inline void arch_move_irqs(struct vcpu *v) BUG_ON("unimplemented"); } +struct dt_device_node; +int platform_get_irq(const struct dt_device_node *device, int index); + void init_IRQ(void); #endif /* ASM__RISCV__IRQ_H */ diff --git a/xen/arch/riscv/irq.c b/xen/arch/riscv/irq.c index b5ae7a114b..669ef3ae9e 100644 --- a/xen/arch/riscv/irq.c +++ b/xen/arch/riscv/irq.c @@ -7,11 +7,58 @@ */ #include +#include +#include #include #include static irq_desc_t irq_desc[NR_IRQS]; +static bool irq_validate_new_type(unsigned int curr, unsigned int new) +{ + return curr == IRQ_TYPE_INVALID || curr == new; +} + +static int irq_set_type(unsigned int irq, unsigned int type) +{ + unsigned long flags; + struct irq_desc *desc = irq_to_desc(irq); + int ret = -EBUSY; + + spin_lock_irqsave(&desc->lock, flags); + + if ( !irq_validate_new_type(desc->arch.type, type) ) + goto err; + + desc->arch.type = type; + + ret = 0; + + err: + spin_unlock_irqrestore(&desc->lock, flags); + + return ret; +} + +int platform_get_irq(const struct dt_device_node *device, int index) +{ + struct dt_irq dt_irq; + int ret; + + if ( (ret = dt_device_get_irq(device, index, &dt_irq)) != 0 ) + return ret; + + BUILD_BUG_ON(NR_IRQS > INT_MAX); + + if ( dt_irq.irq >= NR_IRQS ) + panic("irq%d is bigger then NR_IRQS(%d)\n", dt_irq.irq, NR_IRQS); + + if ( (ret = irq_set_type(dt_irq.irq, dt_irq.type)) != 0 ) + return ret; + + return dt_irq.irq; +} + int arch_init_one_irq_desc(struct irq_desc *desc) { desc->arch.type = IRQ_TYPE_INVALID; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:45:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003271.1382799 (Exim 4.92) (envelope-from ) id 1uM3bD-0001Uf-Tc; Mon, 02 Jun 2025 11:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003271.1382799; Mon, 02 Jun 2025 11: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 1uM3bD-0001UX-Ql; Mon, 02 Jun 2025 11:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1003271; Mon, 02 Jun 2025 11:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3bC-0001UL-Og for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3bC-00G7ec-2N for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3bC-00HN5q-2H for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11: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=xumK5QZrMKVsTSx85/DTNvYwmyE9uD1iOuzL7ASFK4o=; b=OPvuOs/YrQqgnxSjAfRy2ETcm/ WO/F3OPpIW+4ldhLJyIF3LGVXC7w9zvmH6SY2zED1sNeyikj+J6U+yzDxnv6eVeO4RtYkHtgJQGlD 9yj5o4OjZSSXNpkZMIdF7T9ly47+MWWC9//2VLzEgwFvpiayQ6900FFQx6MbkMPavCUI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci/header: Move emulating cap list logic into new function Message-Id: Date: Mon, 02 Jun 2025 11:45:02 +0000 commit b64f9ee6958198ac9cbef8f55a2a2e15e2d56d3f Author: Jiqian Chen AuthorDate: Mon Jun 2 12:44:33 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:44:33 2025 +0200 vpci/header: Move emulating cap list logic into new function No functional changes. Follow-on changes will benifit from this. Signed-off-by: Jiqian Chen Acked-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 138 ++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 65 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 1f48f2aac6..0fb3cfa6a3 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -754,6 +754,75 @@ static int bar_add_rangeset(const struct pci_dev *pdev, struct vpci_bar *bar, return !bar->mem ? -ENOMEM : 0; } +static int vpci_init_capability_list(struct pci_dev *pdev) +{ + int rc; + bool mask_cap_list = false; + + if ( !is_hardware_domain(pdev->domain) && + pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) + { + /* Only expose capabilities to the guest that vPCI can handle. */ + unsigned int next, ttl = 48; + static const unsigned int supported_caps[] = { + PCI_CAP_ID_MSI, + PCI_CAP_ID_MSIX, + }; + + next = pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, + supported_caps, + ARRAY_SIZE(supported_caps), &ttl); + + rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + PCI_CAPABILITY_LIST, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &= ~3; + + if ( !next ) + /* + * If we don't have any supported capabilities to expose to the + * guest, mask the PCI_STATUS_CAP_LIST bit in the status + * register. + */ + mask_cap_list = true; + + while ( next && ttl ) + { + unsigned int pos = next; + + next = pci_find_next_cap_ttl(pdev->sbdf, + pos + PCI_CAP_LIST_NEXT, + supported_caps, + ARRAY_SIZE(supported_caps), &ttl); + + rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, + pos + PCI_CAP_LIST_ID, 1, NULL); + if ( rc ) + return rc; + + rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos + PCI_CAP_LIST_NEXT, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &= ~3; + } + } + + /* Utilize rsvdp_mask to hide PCI_STATUS_CAP_LIST from the guest. */ + return vpci_add_register_mask(pdev->vpci, vpci_hw_read16, vpci_hw_write16, + PCI_STATUS, 2, NULL, + PCI_STATUS_RO_MASK & + ~(mask_cap_list ? PCI_STATUS_CAP_LIST : 0), + PCI_STATUS_RW1C_MASK, + mask_cap_list ? PCI_STATUS_CAP_LIST : 0, + PCI_STATUS_RSVDZ_MASK); +} + static int cf_check init_header(struct pci_dev *pdev) { uint16_t cmd; @@ -762,7 +831,6 @@ static int cf_check init_header(struct pci_dev *pdev) struct vpci_header *header = &pdev->vpci->header; struct vpci_bar *bars = header->bars; int rc; - bool mask_cap_list = false; bool is_hwdom = is_hardware_domain(pdev->domain); ASSERT(rw_is_write_locked(&pdev->domain->pci_lock)); @@ -803,61 +871,12 @@ static int cf_check init_header(struct pci_dev *pdev) if ( rc ) return rc; + rc = vpci_init_capability_list(pdev); + if ( rc ) + return rc; + if ( !is_hwdom ) { - if ( pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) - { - /* Only expose capabilities to the guest that vPCI can handle. */ - unsigned int next, ttl = 48; - static const unsigned int supported_caps[] = { - PCI_CAP_ID_MSI, - PCI_CAP_ID_MSIX, - }; - - next = pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); - - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, - PCI_CAPABILITY_LIST, 1, - (void *)(uintptr_t)next); - if ( rc ) - return rc; - - next &= ~3; - - if ( !next ) - /* - * If we don't have any supported capabilities to expose to the - * guest, mask the PCI_STATUS_CAP_LIST bit in the status - * register. - */ - mask_cap_list = true; - - while ( next && ttl ) - { - unsigned int pos = next; - - next = pci_find_next_cap_ttl(pdev->sbdf, - pos + PCI_CAP_LIST_NEXT, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); - - rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, - pos + PCI_CAP_LIST_ID, 1, NULL); - if ( rc ) - return rc; - - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, - pos + PCI_CAP_LIST_NEXT, 1, - (void *)(uintptr_t)next); - if ( rc ) - return rc; - - next &= ~3; - } - } - /* Extended capabilities read as zero, write ignore */ rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, 0x100, 4, (void *)0); @@ -865,17 +884,6 @@ static int cf_check init_header(struct pci_dev *pdev) return rc; } - /* Utilize rsvdp_mask to hide PCI_STATUS_CAP_LIST from the guest. */ - rc = vpci_add_register_mask(pdev->vpci, vpci_hw_read16, vpci_hw_write16, - PCI_STATUS, 2, NULL, - PCI_STATUS_RO_MASK & - ~(mask_cap_list ? PCI_STATUS_CAP_LIST : 0), - PCI_STATUS_RW1C_MASK, - mask_cap_list ? PCI_STATUS_CAP_LIST : 0, - PCI_STATUS_RSVDZ_MASK); - if ( rc ) - return rc; - if ( pdev->ignore_bars ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:45:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003272.1382804 (Exim 4.92) (envelope-from ) id 1uM3bN-0001Wx-VF; Mon, 02 Jun 2025 11:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003272.1382804; Mon, 02 Jun 2025 11:45: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 1uM3bN-0001Wp-SO; Mon, 02 Jun 2025 11:45:13 +0000 Received: by outflank-mailman (input) for mailman id 1003272; Mon, 02 Jun 2025 11:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3bM-0001Wa-R9 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3bM-00G7eh-2c for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3bM-00HNU0-2X for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45: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=pVEXexswxbJ9II58Q+jJR3V2csX/EL3FqEpmpGbLdpQ=; b=XYM8T9XxqQQmT3ppejQK1CMLkY gGc01iyUbbEL6/48qsmete0RK11OQQREd42jIxxTWZ04xK4wO7ppQJs2/iyZnCGElR0yC/5qK35Q6 OXSx21NeumBs4xkUR5Gfg3f4qLyLeZgAYTlPVyj6f/lniQP1q08yijHdYHwl5huS5mgI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: add a reviewer for Argo Message-Id: Date: Mon, 02 Jun 2025 11:45:12 +0000 commit 6359068422feba2760bc8c57e8d15bf8088437e7 Author: Christopher Clark AuthorDate: Mon Jun 2 12:45:03 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:45:03 2025 +0200 MAINTAINERS: add a reviewer for Argo Adding Daniel P. Smith as reviewer for the Argo subsystem. Signed-off-by: Christopher Clark Acked-by: Stefano Stabellini --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7d1b3b8641..13f31b0c1b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -222,6 +222,7 @@ F: tools/libacpi/ ARGO M: Christopher Clark +R: Daniel P. Smith S: Maintained F: xen/include/public/argo.h F: xen/include/xen/argo.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:45:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003273.1382807 (Exim 4.92) (envelope-from ) id 1uM3bX-0001ZE-WD; Mon, 02 Jun 2025 11:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003273.1382807; Mon, 02 Jun 2025 11:45: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 1uM3bX-0001Z7-Th; Mon, 02 Jun 2025 11:45:23 +0000 Received: by outflank-mailman (input) for mailman id 1003273; Mon, 02 Jun 2025 11:45:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3bW-0001Z0-Tv for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3bW-00G7en-2u for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3bW-00HNcK-2n for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45: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=UWVL4MUV6c9rmzwUIUt29Us39po4xyr4jvltMJvgv+Q=; b=Cyz5GSuI5p6toXm4qsty9trSEU qImc/ct9/EFdMbhZxyt5Ixmc7RWZpfruOVhXO9ulLMkEcmYDMJ3DN+nXJ3ILbmQDWmZZBAG0ba/gx Ywc5Yy3s13UQOC9PF/uQqWVVfOVj8jE16pJH94QFOlN2GSiXbkiZ+T7Mjua0n48H0+KM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] licence: Add missing SPDX line to bootfdt.h Message-Id: Date: Mon, 02 Jun 2025 11:45:22 +0000 commit 1083fb5a72430160e1a273842b6d0a887ed1650d Author: Alejandro Vallejo AuthorDate: Mon Jun 2 12:45:21 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:45:21 2025 +0200 licence: Add missing SPDX line to bootfdt.h Signed-off-by: Alejandro Vallejo Acked-by: Michal Orzel --- xen/include/xen/bootfdt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index 80a90e53c0..847f019559 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef XEN_BOOTFDT_H #define XEN_BOOTFDT_H -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:45:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003274.1382812 (Exim 4.92) (envelope-from ) id 1uM3bi-0001bm-1R; Mon, 02 Jun 2025 11:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003274.1382812; Mon, 02 Jun 2025 11: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 1uM3bh-0001be-V8; Mon, 02 Jun 2025 11:45:33 +0000 Received: by outflank-mailman (input) for mailman id 1003274; Mon, 02 Jun 2025 11:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3bh-0001bP-0L for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3bg-00G7eu-3B for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3bg-00HNkT-34 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45: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=365CiIpgsx+VcGVtebgu215JDm3KJGac4ubIJPrWjDE=; b=TfUrgHU4onzaHmOSbYk/xG3Dz5 8c3AmVFzC4E3HQt6jVBMhBsnFFg/H8M0qldNVsaLVDA29gQyCgGTwlHFTkmWlD1mfM5/SB51vcT7J mpegsjpZ8r1u2XSPRQkhA3P6EBww4AUktKYCyQK7gFIh8YEO/dF2WRixFJbAhga3wWcA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] riscv: Add missing forward declaration to intc.h Message-Id: Date: Mon, 02 Jun 2025 11:45:32 +0000 commit 546281a115a674f49cbca177b3403fa3186568e9 Author: Alejandro Vallejo AuthorDate: Mon Jun 2 12:45:57 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:45:57 2025 +0200 riscv: Add missing forward declaration to intc.h Very much not a functional change Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/arch/riscv/include/asm/intc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/riscv/include/asm/intc.h b/xen/arch/riscv/include/asm/intc.h index 52ba196d87..81f74736ba 100644 --- a/xen/arch/riscv/include/asm/intc.h +++ b/xen/arch/riscv/include/asm/intc.h @@ -8,6 +8,8 @@ #ifndef ASM__RISCV__INTERRUPT_CONTOLLER_H #define ASM__RISCV__INTERRUPT_CONTOLLER_H +struct dt_device_node; + enum intc_version { INTC_APLIC, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:45:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003275.1382816 (Exim 4.92) (envelope-from ) id 1uM3bs-0001eJ-2m; Mon, 02 Jun 2025 11:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003275.1382816; Mon, 02 Jun 2025 11:45: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 1uM3bs-0001eB-0I; Mon, 02 Jun 2025 11:45:44 +0000 Received: by outflank-mailman (input) for mailman id 1003275; Mon, 02 Jun 2025 11:45:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3br-0001dw-34 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3br-00G7hb-0D for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3br-00HO6Z-07 for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45: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=IcVqWgAEvS9Pi6WJ9NXzKOBZdof+dzxqx0KutUKyUso=; b=0ns7AS4JyHvUe8t6Y4s8tUoFf7 lrXPWheYgpL0OFAFPAO2S5Gh6usrXJ10sMqZsnC8B8EOjixRwbzPbbP3wsJCoGf3l9jX8FfG3qu1h +fUzy/MB/MtT2wzY84lxdxVy0JN3OTC7qd2Zuw+Do5Pn3Eo8FInFdoig7xhMOBgz7zrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Add missing forward declaration to btcpupools_get_domain_pool_id Message-Id: Date: Mon, 02 Jun 2025 11:45:43 +0000 commit 1cadd2a011cb24f6d5da1c92f48eb8a8ee05e41f Author: Alejandro Vallejo AuthorDate: Mon Jun 2 12:46:19 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:46:19 2025 +0200 xen: Add missing forward declaration to btcpupools_get_domain_pool_id And remove the ifdef guard, as it's inconsequential. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/include/xen/sched.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 559d201e0c..b17aada5f5 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1291,15 +1291,15 @@ static inline unsigned int btcpupools_get_cpupool_id(unsigned int cpu) { return 0; } -#ifdef CONFIG_HAS_DEVICE_TREE + +struct dt_device_node; + static inline int btcpupools_get_domain_pool_id(const struct dt_device_node *node) { return 0; } -#endif - -#endif +#endif /* CONFIG_BOOT_TIME_CPUPOOLS */ #endif /* __SCHED_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 02 11:45:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Jun 2025 11:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1003276.1382819 (Exim 4.92) (envelope-from ) id 1uM3c2-0001gO-4I; Mon, 02 Jun 2025 11:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003276.1382819; Mon, 02 Jun 2025 11:45: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 1uM3c2-0001gH-1c; Mon, 02 Jun 2025 11:45:54 +0000 Received: by outflank-mailman (input) for mailman id 1003276; Mon, 02 Jun 2025 11:45:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM3c1-0001g4-5s for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uM3c1-00G7hf-0T for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uM3c1-00HOIy-0O for xen-changelog@lists.xenproject.org; Mon, 02 Jun 2025 11:45: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=bx9MAgepQX6IFP5h+/JrF+GJ777V2Q/HNJWuvFmF6JA=; b=ektWRzJKp5Hss7tN9OuEyBdI6l mfFRh++WoFR1EE49m3Rpdf3kC8ikDt+j7gSFEjiIPPvJkBaRAAUwdvBhquh9NKLPWabOh+vF3Vwsc bZSlZysJ5slEOHNe80/hXv7ljP42vr6qLYiZQntrl1O5oSimIk6IdDWJ2hcxsFfQ0s5A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/console: rename switch_serial_input() to console_switch_input() Message-Id: Date: Mon, 02 Jun 2025 11:45:53 +0000 commit c3933dbf77f9d176df0b76ae1aea46422e2793df Author: Denis Mukhin AuthorDate: Mon Jun 2 12:46:50 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 2 12:46:50 2025 +0200 xen/console: rename switch_serial_input() to console_switch_input() Update the function name as per naming notation in the console driver. No functional change. Signed-off-by: Denis Mukhin Acked-by: Jan Beulich --- xen/drivers/char/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index c15987f5bb..30701ae0b0 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -523,7 +523,7 @@ void console_put_domain(struct domain *d) rcu_unlock_domain(d); } -static void switch_serial_input(void) +static void console_switch_input(void) { unsigned int next_rx = console_rx; @@ -617,7 +617,7 @@ static void cf_check serial_rx(char c) /* We eat CTRL- in groups of 3 to switch console input. */ if ( ++switch_code_count == 3 ) { - switch_serial_input(); + console_switch_input(); switch_code_count = 0; } return; @@ -1171,7 +1171,7 @@ void __init console_endboot(void) "toggle host/guest log level adjustment", 0); /* Serial input is directed to DOM0 by default. */ - switch_serial_input(); + console_switch_input(); } int __init console_has(const char *device) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 03 11:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jun 2025 11:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1004251.1383914 (Exim 4.92) (envelope-from ) id 1uMPiV-0003HG-H0; Tue, 03 Jun 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 1004251.1383914; Tue, 03 Jun 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 1uMPiV-0003H8-EM; Tue, 03 Jun 2025 11:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1004251; Tue, 03 Jun 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 1uMPiU-0003H2-G6 for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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 1uMPiU-000AmB-14 for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 11:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMPiU-005Lsd-0l for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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=98LKovAUuM54ykvtDza7uoqZ4QRU3wLkfWV/mTbZfFQ=; b=UTzLfxXeyY2Ru8D4gH3pgx+ovN t3zTP7HNgKLkWqXdolqpjQU9GMb8y/9drHN+HAgr3R/k8/fNtR3jNss7K5SLC+LgAf0euQfAgBoxS 3FQrVvQA7bgX6y0QNn4IcAOY4Yk1PVVBkirwcTipaIBi9KBvdCVIogWLELtVvTX+8RVI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert tools/python part of "tools: remove support for running a guest with qemu-traditional" Message-Id: Date: Tue, 03 Jun 2025 11:22:02 +0000 commit ffa511b9dac03d3fbf3c3fe85514e8ed135a955a Author: Andrew Cooper AuthorDate: Mon Jun 2 12:15:53 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 3 12:10:36 2025 +0100 Revert tools/python part of "tools: remove support for running a guest with qemu-traditional" The migration stream is a stable ABI. What this does is break the ability to inspection and operate on pre-Xen-4.21 streams. Signed-off-by: Andrew Cooper Acked-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD --- tools/python/xen/migration/libxl.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index dc5c7ac355..5dcb50fe02 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -51,10 +51,12 @@ rec_type_to_str = { EMULATOR_HEADER_FORMAT = "II" EMULATOR_ID_unknown = 0x00000000 +EMULATOR_ID_qemu_trad = 0x00000001 EMULATOR_ID_qemu_upstream = 0x00000002 emulator_id_to_str = { EMULATOR_ID_unknown : "Unknown", + EMULATOR_ID_qemu_trad : "Qemu Traditional", EMULATOR_ID_qemu_upstream : "Qemu Upstream", } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 03 11:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jun 2025 11:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1004252.1383918 (Exim 4.92) (envelope-from ) id 1uMPif-0003Iv-IT; Tue, 03 Jun 2025 11:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1004252.1383918; Tue, 03 Jun 2025 11: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 1uMPif-0003In-Fy; Tue, 03 Jun 2025 11:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1004252; Tue, 03 Jun 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 1uMPie-0003Id-G4 for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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 1uMPie-000AmH-1L for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 11:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMPie-005Lwr-1E for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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=gvAnP7hc1PWulmy5RTWO/iO+xr9mJXSpDwPxaD1JbzI=; b=Yq5HMOt0cb4o7PyJg2IZDtNsnd /2oNq5QReX9qGL3Gd2YuqT1Yj8YAOQMizbuWJhHkOep59hequPQmB2fLBOPHsHGVQBOajlWDbD5Ff DD2YweuhMhBJWolzRqBwv+tW5CIjeZrPh2lHc2mQtXUQE6LpQI185MM5sgmTZycyQn+Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Use bash arrays to simplify dom0 rootfs construction Message-Id: Date: Tue, 03 Jun 2025 11:22:12 +0000 commit 39056384375b791bd8b65afe6edb2edfdc500674 Author: Andrew Cooper AuthorDate: Thu May 22 17:37:58 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 3 12:10:36 2025 +0100 CI: Use bash arrays to simplify dom0 rootfs construction For Qubes, this requires switching from sh to bash. This reduces the number of times the target filename needs to be written to 1. Expand the comment to explain the concatenation constraints. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Reviewed-by: Marek Marczykowski-Górecki --- automation/scripts/qubes-x86-64.sh | 18 +++++++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 20 +++++++++++++------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e86940c6e..f338a67e05 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex -o pipefail @@ -22,6 +22,8 @@ domU_type="pvh" domU_vif="'bridge=xenbr0'," domU_extra_config= retrieve_xml= +dom0_rootfs_extra_comp=() +dom0_rootfs_extra_uncomp=() case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM @@ -187,10 +189,16 @@ Kernel \r on an \m (\l) rm -rf rootfs fi -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz +# Dom0 rootfs. The order of concatenation is important; ucode wants to come +# first, and all uncompressed must be ahead of compressed. +dom0_rootfs_parts=( + binaries/ucode.cpio + "${dom0_rootfs_extra_uncomp[@]}" + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz + "${dom0_rootfs_extra_comp[@]}" +) +cat "${dom0_rootfs_parts[@]}" > binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 8f02fa73bd..2d4fe43509 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,6 +28,8 @@ extra = "root=/dev/ram0 console=hvc0" memory = 512 ' DOMU_CFG_EXTRA="" +dom0_rootfs_extra_comp=() +dom0_rootfs_extra_uncomp=() # Select test variant. if [ "${TEST}" = "ping" ]; then @@ -71,6 +73,7 @@ do sleep 1 done | argo-exec -p 28333 -d 0 -- /bin/echo " + dom0_rootfs_extra_comp+=(binaries/argo.cpio.gz) DOM0_CMD=" insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg @@ -103,13 +106,16 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz -if [[ "${TEST}" == argo ]]; then - cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -fi +# Dom0 rootfs. The order of concatenation is important; ucode wants to come +# first, and all uncompressed must be ahead of compressed. +dom0_rootfs_parts=( + binaries/ucode.cpio + "${dom0_rootfs_extra_uncomp[@]}" + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz + "${dom0_rootfs_extra_comp[@]}" +) +cat "${dom0_rootfs_parts[@]}" > binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 03 11:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jun 2025 11:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1004253.1383922 (Exim 4.92) (envelope-from ) id 1uMPip-0003LY-KG; Tue, 03 Jun 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 1004253.1383922; Tue, 03 Jun 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 1uMPip-0003LP-HZ; Tue, 03 Jun 2025 11:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1004253; Tue, 03 Jun 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 1uMPio-0003LE-H5 for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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 1uMPio-000AmR-1c for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 11:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMPio-005M2K-1V for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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=kbTa9CurV0pRaCmco3TVWLCimvOR4bVwuK3CdygihFM=; b=MmK3sEf/g9GzVNbqtpgeN0H4cr 8VHwnNdIfnFvgFT5hOXvmVLDjIMNPJBYzV8j0rzoR8KlCOD0GZdr4387/3TpmH1Y7rrOaLXcSszbf M9vUzkMoMxiQ6365K/FlNN7sIZ4D0bSWuz3g0rt4xtVbtdWwENaWJedMD9QgH0zqqNtQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Adjust how domU is packaged in dom0 Message-Id: Date: Tue, 03 Jun 2025 11:22:22 +0000 commit 2c4a3d688943b2034756859844b8337a5a97ce07 Author: Andrew Cooper AuthorDate: Mon Apr 14 13:38:31 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 3 12:10:36 2025 +0100 CI: Adjust how domU is packaged in dom0 Package domU for dom0 and insert into the uncompressed part of dom0's rootfs, rather than recompressing it as part of the overlay. For Qubes, this avoids putting the domU kernel in dom0's rootfs for tests which aren't going to boot a guest. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Reviewed-by: Marek Marczykowski-Górecki --- automation/scripts/qubes-x86-64.sh | 17 ++++++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 14 +++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f338a67e05..2750d24eba 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -156,7 +156,7 @@ esac domU_config=" type = '${domU_type}' name = 'domU' -kernel = '/boot/vmlinuz' +kernel = '/boot/vmlinuz-domU' ramdisk = '/boot/initrd-domU' cmdline = 'root=/dev/ram0 console=hvc0' memory = 512 @@ -187,6 +187,17 @@ Kernel \r on an \m (\l) find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs + + # Package domU kernel+rootfs in /boot for dom0 (uncompressed) + mkdir -p rootfs/boot + cd rootfs + cp ../binaries/bzImage boot/vmlinuz-domU + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio + cd .. + rm -rf rootfs + + dom0_rootfs_extra_uncomp+=(binaries/domU-in-dom0.cpio) fi # Dom0 rootfs. The order of concatenation is important; ucode wants to come @@ -241,10 +252,6 @@ mkdir -p etc/default echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -fi find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 2d4fe43509..71cdb295b2 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -22,7 +22,7 @@ DOMU_CMD="" DOMU_CFG=' type = "pvh" name = "domU" -kernel = "/boot/vmlinuz" +kernel = "/boot/vmlinuz-domU" ramdisk = "/boot/initrd-domU" extra = "root=/dev/ram0 console=hvc0" memory = 512 @@ -106,10 +106,20 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs +# Package domU kernel+rootfs in /boot for dom0 (uncompressed) +mkdir -p rootfs/boot +cd rootfs +cp ../binaries/bzImage boot/vmlinuz-domU +cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio +cd .. +rm -rf rootfs + # Dom0 rootfs. The order of concatenation is important; ucode wants to come # first, and all uncompressed must be ahead of compressed. dom0_rootfs_parts=( binaries/ucode.cpio + binaries/domU-in-dom0.cpio "${dom0_rootfs_extra_uncomp[@]}" binaries/rootfs.cpio.gz binaries/xen-tools.cpio.gz @@ -131,8 +141,6 @@ echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 03 12:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jun 2025 12:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1004284.1383945 (Exim 4.92) (envelope-from ) id 1uMQpD-0004Lh-SD; Tue, 03 Jun 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 1004284.1383945; Tue, 03 Jun 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 1uMQpD-0004LZ-Pe; Tue, 03 Jun 2025 12:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1004284; Tue, 03 Jun 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 1uMQpC-0004LT-2B for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMQpB-000C5E-2q for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMQpB-005cRZ-2f for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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=6Kq+BjJz7D8wdSNYA8Ir5stjtwPO1i4OGd2IuMev8XM=; b=ATi982naW6R1ochci5I/eWPV2f p7KLM0HmPdAuCesUcOa6nI90g8USIyTizS+T0HW8g59fjEav7S+ne40EYmRuwfpBuva76hSrSw6vl kljP3dT6Zgmp39vKf71bcQq1JNMRgmekqDij7Ms+0nIG3SfccU39+ZHUWUe3+kpdkb0k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert tools/python part of "tools: remove support for running a guest with qemu-traditional" Message-Id: Date: Tue, 03 Jun 2025 12:33:01 +0000 commit ffa511b9dac03d3fbf3c3fe85514e8ed135a955a Author: Andrew Cooper AuthorDate: Mon Jun 2 12:15:53 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 3 12:10:36 2025 +0100 Revert tools/python part of "tools: remove support for running a guest with qemu-traditional" The migration stream is a stable ABI. What this does is break the ability to inspection and operate on pre-Xen-4.21 streams. Signed-off-by: Andrew Cooper Acked-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD --- tools/python/xen/migration/libxl.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index dc5c7ac355..5dcb50fe02 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -51,10 +51,12 @@ rec_type_to_str = { EMULATOR_HEADER_FORMAT = "II" EMULATOR_ID_unknown = 0x00000000 +EMULATOR_ID_qemu_trad = 0x00000001 EMULATOR_ID_qemu_upstream = 0x00000002 emulator_id_to_str = { EMULATOR_ID_unknown : "Unknown", + EMULATOR_ID_qemu_trad : "Qemu Traditional", EMULATOR_ID_qemu_upstream : "Qemu Upstream", } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 03 12:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jun 2025 12:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1004285.1383950 (Exim 4.92) (envelope-from ) id 1uMQpN-0004NM-Tm; Tue, 03 Jun 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 1004285.1383950; Tue, 03 Jun 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 1uMQpN-0004NE-R2; Tue, 03 Jun 2025 12:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1004285; Tue, 03 Jun 2025 12:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMQpM-0004N1-1o for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMQpM-000C5b-05 for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMQpL-005cTX-32 for xen-changelog@lists.xenproject.org; Tue, 03 Jun 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=Oif8eTD4NllQG1nkjxICHDmgUeZTzfbhx+FHSzuFJE0=; b=lhQJOhdM3OVdcvR6BZq3sZxeQk 42jgAIcKed5klWCC9/dW7BxbD+ncLyiC8IPWD+m5xMNDK452+jJVZIsxrYsn8UfTJ89XRLmHNS6g/ wYySnm+1Jf0DywT80+EMcZXrFIJyXHteySn8hdWb67kqF1xgUD3eE/vxT7+KeWoubOCQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Use bash arrays to simplify dom0 rootfs construction Message-Id: Date: Tue, 03 Jun 2025 12:33:11 +0000 commit 39056384375b791bd8b65afe6edb2edfdc500674 Author: Andrew Cooper AuthorDate: Thu May 22 17:37:58 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 3 12:10:36 2025 +0100 CI: Use bash arrays to simplify dom0 rootfs construction For Qubes, this requires switching from sh to bash. This reduces the number of times the target filename needs to be written to 1. Expand the comment to explain the concatenation constraints. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Reviewed-by: Marek Marczykowski-Górecki --- automation/scripts/qubes-x86-64.sh | 18 +++++++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 20 +++++++++++++------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e86940c6e..f338a67e05 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex -o pipefail @@ -22,6 +22,8 @@ domU_type="pvh" domU_vif="'bridge=xenbr0'," domU_extra_config= retrieve_xml= +dom0_rootfs_extra_comp=() +dom0_rootfs_extra_uncomp=() case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM @@ -187,10 +189,16 @@ Kernel \r on an \m (\l) rm -rf rootfs fi -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz +# Dom0 rootfs. The order of concatenation is important; ucode wants to come +# first, and all uncompressed must be ahead of compressed. +dom0_rootfs_parts=( + binaries/ucode.cpio + "${dom0_rootfs_extra_uncomp[@]}" + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz + "${dom0_rootfs_extra_comp[@]}" +) +cat "${dom0_rootfs_parts[@]}" > binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 8f02fa73bd..2d4fe43509 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,6 +28,8 @@ extra = "root=/dev/ram0 console=hvc0" memory = 512 ' DOMU_CFG_EXTRA="" +dom0_rootfs_extra_comp=() +dom0_rootfs_extra_uncomp=() # Select test variant. if [ "${TEST}" = "ping" ]; then @@ -71,6 +73,7 @@ do sleep 1 done | argo-exec -p 28333 -d 0 -- /bin/echo " + dom0_rootfs_extra_comp+=(binaries/argo.cpio.gz) DOM0_CMD=" insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg @@ -103,13 +106,16 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz -if [[ "${TEST}" == argo ]]; then - cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -fi +# Dom0 rootfs. The order of concatenation is important; ucode wants to come +# first, and all uncompressed must be ahead of compressed. +dom0_rootfs_parts=( + binaries/ucode.cpio + "${dom0_rootfs_extra_uncomp[@]}" + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz + "${dom0_rootfs_extra_comp[@]}" +) +cat "${dom0_rootfs_parts[@]}" > binaries/dom0-rootfs.cpio.gz # test-local configuration mkdir -p rootfs -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 03 12:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Jun 2025 12:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1004286.1383954 (Exim 4.92) (envelope-from ) id 1uMQpX-0004PJ-VH; Tue, 03 Jun 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 1004286.1383954; Tue, 03 Jun 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 1uMQpX-0004PB-SW; Tue, 03 Jun 2025 12:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1004286; Tue, 03 Jun 2025 12:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMQpW-0004P1-4g for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMQpW-000C5f-0N for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMQpW-005cUN-0F for xen-changelog@lists.xenproject.org; Tue, 03 Jun 2025 12: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=+RZt8xHccgQg2/gI1OjcWRVin5qSSVQhVZmik5fY3r8=; b=WZ+jTu8oTXoOrxVApld4wuN4m3 g34BCya1R2Yxdup5sF8BGvtIm1GKVMgm8syI+0fQa20LmuBZGPaXFsyzx/J0PK7/XZq/N4LTtXKP6 n3uG6roNxh+vwjyxQiOhCviAlkH3WQwjnZ+VFs5nqqNhe/4Ypr+boxl2N846tKScH+nk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Adjust how domU is packaged in dom0 Message-Id: Date: Tue, 03 Jun 2025 12:33:22 +0000 commit 2c4a3d688943b2034756859844b8337a5a97ce07 Author: Andrew Cooper AuthorDate: Mon Apr 14 13:38:31 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 3 12:10:36 2025 +0100 CI: Adjust how domU is packaged in dom0 Package domU for dom0 and insert into the uncompressed part of dom0's rootfs, rather than recompressing it as part of the overlay. For Qubes, this avoids putting the domU kernel in dom0's rootfs for tests which aren't going to boot a guest. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Reviewed-by: Marek Marczykowski-Górecki --- automation/scripts/qubes-x86-64.sh | 17 ++++++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 14 +++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f338a67e05..2750d24eba 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -156,7 +156,7 @@ esac domU_config=" type = '${domU_type}' name = 'domU' -kernel = '/boot/vmlinuz' +kernel = '/boot/vmlinuz-domU' ramdisk = '/boot/initrd-domU' cmdline = 'root=/dev/ram0 console=hvc0' memory = 512 @@ -187,6 +187,17 @@ Kernel \r on an \m (\l) find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs + + # Package domU kernel+rootfs in /boot for dom0 (uncompressed) + mkdir -p rootfs/boot + cd rootfs + cp ../binaries/bzImage boot/vmlinuz-domU + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio + cd .. + rm -rf rootfs + + dom0_rootfs_extra_uncomp+=(binaries/domU-in-dom0.cpio) fi # Dom0 rootfs. The order of concatenation is important; ucode wants to come @@ -241,10 +252,6 @@ mkdir -p etc/default echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -fi find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 2d4fe43509..71cdb295b2 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -22,7 +22,7 @@ DOMU_CMD="" DOMU_CFG=' type = "pvh" name = "domU" -kernel = "/boot/vmlinuz" +kernel = "/boot/vmlinuz-domU" ramdisk = "/boot/initrd-domU" extra = "root=/dev/ram0 console=hvc0" memory = 512 @@ -106,10 +106,20 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs +# Package domU kernel+rootfs in /boot for dom0 (uncompressed) +mkdir -p rootfs/boot +cd rootfs +cp ../binaries/bzImage boot/vmlinuz-domU +cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio +cd .. +rm -rf rootfs + # Dom0 rootfs. The order of concatenation is important; ucode wants to come # first, and all uncompressed must be ahead of compressed. dom0_rootfs_parts=( binaries/ucode.cpio + binaries/domU-in-dom0.cpio "${dom0_rootfs_extra_uncomp[@]}" binaries/rootfs.cpio.gz binaries/xen-tools.cpio.gz @@ -131,8 +141,6 @@ echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 07:11:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005137.1384644 (Exim 4.92) (envelope-from ) id 1uMiHA-0006nH-I0; Wed, 04 Jun 2025 07:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005137.1384644; Wed, 04 Jun 2025 07: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 1uMiHA-0006n9-FA; Wed, 04 Jun 2025 07:11:04 +0000 Received: by outflank-mailman (input) for mailman id 1005137; Wed, 04 Jun 2025 07:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMiH8-0006n3-Is for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMiH8-001msA-0Y for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMiH8-00EzZz-0R for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=EG0fR1VkTFJWLSBK12ITy+ufalBzmitx4FAsc1KLiHU=; b=SvcnfL4fgtRFmlR+yWpHnOSNBU 0Q72inCyTWlePyHgoyEynHfJAZQfkM9SMolzZ5T5w78K+QVUKg/3zHZFh0x7SYjfK6qMm/GchtPPr NfImAoZy5mADjnGextz+0ZBxJuc2svJ7yv+c1CNy/pozhI2INzUl4FMplMrFUIYKOpV0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] common: Drop unneeded Arm dependency for static-evtchn Message-Id: Date: Wed, 04 Jun 2025 07:11:02 +0000 commit 4d62fe057f6020aab810ba41f721d7be80657750 Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:26 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:02:21 2025 +0200 common: Drop unneeded Arm dependency for static-evtchn DOM0LESS_BOOT is sufficient (only Arm selects it today). If needed, proper arch dependency can be introduced while adding support for it for another architecture. Suggested-by: Jan Beulich Signed-off-by: Michal Orzel Acked-by: Jan Beulich --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0951d4c2f2..7ecf5a8031 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -164,7 +164,7 @@ config STATIC_MEMORY config STATIC_EVTCHN bool "Static event channel support on a dom0less system" - depends on DOM0LESS_BOOT && ARM + depends on DOM0LESS_BOOT default y help This option enables establishing static event channel communication -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 07:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005138.1384646 (Exim 4.92) (envelope-from ) id 1uMiHJ-0006ou-J6; Wed, 04 Jun 2025 07:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005138.1384646; Wed, 04 Jun 2025 07: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 1uMiHJ-0006on-GV; Wed, 04 Jun 2025 07:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1005138; Wed, 04 Jun 2025 07:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMiHI-0006ob-9z for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMiHI-001msG-0t for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMiHI-00Ezi3-0l for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=GfuCCs7ESeP6gusVdMk4C0YvZ/0pZ3xjk3npwduPWJI=; b=h4lUQr1zBELEsupY0u7oZa/Y6z XivhEjYOPs520JdToh3xSSWRRfrktThPnc5QT8kJPglXdqlZVG+CH3sWnxnDe3wyH1O6fbchylSyZ 5VygTWHeDYgCj5nl4JHCJpMQY8Pn1OLeaUi8FFG3LsUN6o1em24lYa2+VyFCGLhkytsE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] device-tree: Move domain_fdt_begin_node() to common Message-Id: Date: Wed, 04 Jun 2025 07:11:12 +0000 commit 9b29c4ad0bc845ca3612ca5d38161138619ab8f7 Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:27 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:02:21 2025 +0200 device-tree: Move domain_fdt_begin_node() to common This is just a wrapper around fdt_begin_node(). Move it to common and remove asm/domain_build.h inclusion from static-shmem.c. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 32 -------------------------------- xen/arch/arm/include/asm/domain_build.h | 1 - xen/arch/arm/static-shmem.c | 1 - xen/common/device-tree/bootfdt.c | 32 ++++++++++++++++++++++++++++++++ xen/include/xen/bootfdt.h | 1 + 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b189a7cfae..068af31a62 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -649,38 +649,6 @@ static int __init fdt_property_interrupts(const struct kernel_info *kinfo, return res; } -/* - * Wrapper to convert physical address from paddr_t to uint64_t and - * invoke fdt_begin_node(). This is required as the physical address - * provided as part of node name should not contain any leading - * zeroes. Thus, one should use PRIx64 (instead of PRIpaddr) to append - * unit (which contains the physical address) with name to generate a - * node name. - */ -int __init domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit) -{ - /* - * The size of the buffer to hold the longest possible string (i.e. - * interrupt-controller@ + a 64-bit number + \0). - */ - char buf[38]; - int ret; - - /* ePAPR 3.4 */ - ret = snprintf(buf, sizeof(buf), "%s@%"PRIx64, name, unit); - - if ( ret >= sizeof(buf) ) - { - printk(XENLOG_ERR - "Insufficient buffer. Minimum size required is %d\n", - (ret + 1)); - - return -FDT_ERR_TRUNCATED; - } - - return fdt_begin_node(fdt, buf); -} - int __init make_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells, const struct membanks *mem) { diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 9655e9d453..c6fec3168c 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -5,7 +5,6 @@ #include typedef __be32 gic_interrupt_t[3]; -int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); int make_psci_node(void *fdt); void evtchn_allocate(struct domain *d); diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 32ec6d4bc6..21fd2c3cd4 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index 529c91e603..aa44f5a67c 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -659,6 +659,38 @@ const __init char *boot_fdt_cmdline(const void *fdt) return prop->data; } +/* + * Wrapper to convert physical address from paddr_t to uint64_t and + * invoke fdt_begin_node(). This is required as the physical address + * provided as part of node name should not contain any leading + * zeroes. Thus, one should use PRIx64 (instead of PRIpaddr) to append + * unit (which contains the physical address) with name to generate a + * node name. + */ +int __init domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit) +{ + /* + * The size of the buffer to hold the longest possible string (i.e. + * interrupt-controller@ + a 64-bit number + \0). + */ + char buf[38]; + int ret; + + /* ePAPR 3.4 */ + ret = snprintf(buf, sizeof(buf), "%s@%"PRIx64, name, unit); + + if ( ret >= sizeof(buf) ) + { + printk(XENLOG_ERR + "Insufficient buffer. Minimum size required is %d\n", + (ret + 1)); + + return -FDT_ERR_TRUNCATED; + } + + return fdt_begin_node(fdt, buf); +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index 847f019559..64db48f4fe 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -191,6 +191,7 @@ void populate_boot_allocator(void); size_t boot_fdt_info(const void *fdt, paddr_t paddr); const char *boot_fdt_cmdline(const void *fdt); +int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); static inline struct membanks *bootinfo_get_reserved_mem(void) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 07:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005139.1384651 (Exim 4.92) (envelope-from ) id 1uMiHT-0006rQ-Kj; Wed, 04 Jun 2025 07:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005139.1384651; Wed, 04 Jun 2025 07: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 1uMiHT-0006rI-Hw; Wed, 04 Jun 2025 07:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1005139; Wed, 04 Jun 2025 07:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMiHS-0006r8-Cx for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMiHS-001msd-1B for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMiHS-00EzqI-16 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=3crXddQwOBmTpF843IfmklMRkSYjmVlsN3AQynnA8lw=; b=oF1DeJu5yg45vshTlcZofOiIWX L2UexbVvq27vkYp4VIUqZZJw6qNcknvHuytdndm0TMXjYeYgO0/Ugi2wanltWPbZksnH0ugxD1MWy IPiaTi66xaqWDusrBclD+ATPG8QXBTFBfJQkUNWWC5jk+YEJDNtqf5R4RCE1k6b7Z0CI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] device-tree: Move Arm's static-memory feature to common Message-Id: Date: Wed, 04 Jun 2025 07:11:22 +0000 commit 3e027c2732162e4c1b685a110f93e277b721edb6 Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:28 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:02:59 2025 +0200 device-tree: Move Arm's static-memory feature to common This feature is arch agnostic, thus move it to common. While at it, move xen/pfn.h inclusion in static-memory.h below #ifdef CONFIG_STATIC_MEMORY when it is only needed. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/Makefile | 1 - xen/arch/arm/arm32/mmu/mm.c | 2 +- xen/arch/arm/arm64/mmu/mm.c | 2 +- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/include/asm/static-memory.h | 58 ------- xen/arch/arm/static-memory.c | 281 ------------------------------- xen/arch/arm/static-shmem.c | 2 +- xen/common/device-tree/Makefile | 1 + xen/common/device-tree/dom0less-build.c | 6 +- xen/common/device-tree/static-memory.c | 281 +++++++++++++++++++++++++++++++ xen/include/xen/static-memory.h | 59 +++++++ 11 files changed, 346 insertions(+), 349 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index eeeac4e653..4f08014547 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y += setup.o obj-y += shutdown.o obj-y += smp.o obj-y += smpboot.o -obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o obj-y += sysctl.o obj-y += time.o diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 956693232a..f3305e28e9 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -6,9 +6,9 @@ #include #include #include +#include #include #include -#include #include static unsigned long opt_xenheap_megabytes __initdata; diff --git a/xen/arch/arm/arm64/mmu/mm.c b/xen/arch/arm/arm64/mmu/mm.c index c1efa1348a..cded8f2787 100644 --- a/xen/arch/arm/arm64/mmu/mm.c +++ b/xen/arch/arm/arm64/mmu/mm.c @@ -4,9 +4,9 @@ #include #include #include +#include #include -#include #include /* Override macros from asm/page.h to make them work with mfn_t */ diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a49764f0ad..bcfd686a8b 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include #include #ifdef CONFIG_VGICV2 diff --git a/xen/arch/arm/include/asm/static-memory.h b/xen/arch/arm/include/asm/static-memory.h deleted file mode 100644 index a32a3c6553..0000000000 --- a/xen/arch/arm/include/asm/static-memory.h +++ /dev/null @@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_STATIC_MEMORY_H_ -#define __ASM_STATIC_MEMORY_H_ - -#include -#include - -#ifdef CONFIG_STATIC_MEMORY - -static inline void init_staticmem_bank(const struct membank *bank) -{ - mfn_t bank_start = _mfn(PFN_UP(bank->start)); - unsigned long bank_pages = PFN_DOWN(bank->size); - mfn_t bank_end = mfn_add(bank_start, bank_pages); - - if ( mfn_x(bank_end) <= mfn_x(bank_start) ) - return; - - unprepare_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); -} - -void allocate_static_memory(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node); -void assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node); -void init_staticmem_pages(void); - -#else /* !CONFIG_STATIC_MEMORY */ - -static inline void allocate_static_memory(struct domain *d, - struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - ASSERT_UNREACHABLE(); -} - -static inline void assign_static_memory_11(struct domain *d, - struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - ASSERT_UNREACHABLE(); -} - -static inline void init_staticmem_pages(void) {}; - -#endif /* CONFIG_STATIC_MEMORY */ - -#endif /* __ASM_STATIC_MEMORY_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/static-memory.c b/xen/arch/arm/static-memory.c deleted file mode 100644 index e0f76afcd8..0000000000 --- a/xen/arch/arm/static-memory.c +++ /dev/null @@ -1,281 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include - -#include -#include - -static bool __init append_static_memory_to_bank(struct domain *d, - struct membank *bank, - mfn_t smfn, - paddr_t size) -{ - int res; - unsigned int nr_pages = PFN_DOWN(size); - gfn_t sgfn; - - /* - * For direct-mapped domain, the GFN match the MFN. - * Otherwise, this is inferred on what has already been allocated - * in the bank. - */ - if ( !is_domain_direct_mapped(d) ) - sgfn = gaddr_to_gfn(bank->start + bank->size); - else - sgfn = gaddr_to_gfn(mfn_to_maddr(smfn)); - - res = guest_physmap_add_pages(d, sgfn, smfn, nr_pages); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed to map pages to DOMU: %d", res); - return false; - } - - bank->size = bank->size + size; - - return true; -} - -static mfn_t __init acquire_static_memory_bank(struct domain *d, - const __be32 **cell, - u32 addr_cells, u32 size_cells, - paddr_t *pbase, paddr_t *psize) -{ - mfn_t smfn; - int res; - - device_tree_get_reg(cell, addr_cells, size_cells, pbase, psize); - ASSERT(IS_ALIGNED(*pbase, PAGE_SIZE) && IS_ALIGNED(*psize, PAGE_SIZE)); - if ( PFN_DOWN(*psize) > UINT_MAX ) - { - printk(XENLOG_ERR "%pd: static memory size too large: %#"PRIpaddr, - d, *psize); - return INVALID_MFN; - } - - smfn = maddr_to_mfn(*pbase); - res = acquire_domstatic_pages(d, smfn, PFN_DOWN(*psize), 0); - if ( res ) - { - printk(XENLOG_ERR - "%pd: failed to acquire static memory: %d.\n", d, res); - return INVALID_MFN; - } - - return smfn; -} - -static int __init parse_static_mem_prop(const struct dt_device_node *node, - u32 *addr_cells, u32 *size_cells, - int *length, const __be32 **cell) -{ - const struct dt_property *prop; - - prop = dt_find_property(node, "xen,static-mem", NULL); - - *addr_cells = dt_n_addr_cells(node); - *size_cells = dt_n_size_cells(node); - - *cell = (const __be32 *)prop->value; - *length = prop->length; - - return 0; -} - -/* Allocate memory from static memory as RAM for one specific domain d. */ -void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - u32 addr_cells, size_cells, reg_cells; - unsigned int nr_banks, gbank, bank = 0; - const uint64_t rambase[] = GUEST_RAM_BANK_BASES; - const uint64_t ramsize[] = GUEST_RAM_BANK_SIZES; - const __be32 *cell; - u64 tot_size = 0; - paddr_t pbase, psize, gsize; - mfn_t smfn; - int length; - - if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) - goto fail; - reg_cells = addr_cells + size_cells; - - /* - * The static memory will be mapped in the guest at the usual guest memory - * addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by - * xen/include/public/arch-arm.h. - */ - gbank = 0; - gsize = ramsize[gbank]; - mem->bank[gbank].start = rambase[gbank]; - nr_banks = length / (reg_cells * sizeof (u32)); - - for ( ; bank < nr_banks; bank++ ) - { - smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, - &pbase, &psize); - if ( mfn_eq(smfn, INVALID_MFN) ) - goto fail; - - printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", - d, bank, pbase, pbase + psize); - - while ( 1 ) - { - /* Map as much as possible the static range to the guest bank */ - if ( !append_static_memory_to_bank(d, &mem->bank[gbank], smfn, - min(psize, gsize)) ) - goto fail; - - /* - * The current physical bank is fully mapped. - * Handle the next physical bank. - */ - if ( gsize >= psize ) - { - gsize = gsize - psize; - break; - } - /* - * When current guest bank is not enough to map, exhaust - * the current one and seek to the next. - * Before seeking to the next, check if we still have available - * guest bank. - */ - else if ( (gbank + 1) >= GUEST_RAM_BANKS ) - { - printk(XENLOG_ERR "Exhausted all possible guest banks.\n"); - goto fail; - } - else - { - psize = psize - gsize; - smfn = mfn_add(smfn, gsize >> PAGE_SHIFT); - /* Update to the next guest bank. */ - gbank++; - gsize = ramsize[gbank]; - mem->bank[gbank].start = rambase[gbank]; - } - } - - tot_size += psize; - } - - mem->nr_banks = ++gbank; - - kinfo->unassigned_mem -= tot_size; - /* - * The property 'memory' should match the amount of memory given to the - * guest. - * Currently, it is only possible to either acquire static memory or let - * Xen allocate. *Mixing* is not supported. - */ - if ( kinfo->unassigned_mem ) - { - printk(XENLOG_ERR - "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\". Unsupported configuration.\n"); - goto fail; - } - - return; - - fail: - panic("Failed to allocate requested static memory for domain %pd.\n", d); -} - -/* - * Allocate static memory as RAM for one specific domain d. - * The static memory will be directly mapped in the guest(Guest Physical - * Address == Physical Address). - */ -void __init assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - u32 addr_cells, size_cells, reg_cells; - unsigned int nr_banks, bank = 0; - const __be32 *cell; - paddr_t pbase, psize; - mfn_t smfn; - int length; - - if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) - { - printk(XENLOG_ERR - "%pd: failed to parse \"xen,static-mem\" property.\n", d); - goto fail; - } - reg_cells = addr_cells + size_cells; - nr_banks = length / (reg_cells * sizeof(u32)); - - if ( nr_banks > mem->max_banks ) - { - printk(XENLOG_ERR - "%pd: exceed max number of supported guest memory banks.\n", d); - goto fail; - } - - for ( ; bank < nr_banks; bank++ ) - { - smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, - &pbase, &psize); - if ( mfn_eq(smfn, INVALID_MFN) ) - goto fail; - - printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", - d, bank, pbase, pbase + psize); - - /* One guest memory bank is matched with one physical memory bank. */ - mem->bank[bank].start = pbase; - if ( !append_static_memory_to_bank(d, &mem->bank[bank], - smfn, psize) ) - goto fail; - - kinfo->unassigned_mem -= psize; - } - - mem->nr_banks = nr_banks; - - /* - * The property 'memory' should match the amount of memory given to - * the guest. - * Currently, it is only possible to either acquire static memory or - * let Xen allocate. *Mixing* is not supported. - */ - if ( kinfo->unassigned_mem != 0 ) - { - printk(XENLOG_ERR - "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\".\n"); - goto fail; - } - - return; - - fail: - panic("Failed to assign requested static memory for direct-map domain %pd.\n", - d); -} - -/* Static memory initialization */ -void __init init_staticmem_pages(void) -{ - const struct membanks *reserved_mem = bootinfo_get_reserved_mem(); - unsigned int bank; - - for ( bank = 0 ; bank < reserved_mem->nr_banks; bank++ ) - { - if ( reserved_mem->bank[bank].type == MEMBANK_STATIC_DOMAIN ) - init_staticmem_bank(&reserved_mem->bank[bank]); - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 21fd2c3cd4..2055b7be0f 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -5,9 +5,9 @@ #include #include #include +#include #include -#include #include typedef struct { diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index 57b9e6ca00..ed11f2c3b4 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o +obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 39cb2cd5c7..c8c5a04f24 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -28,9 +28,7 @@ #include #include -#if __has_include() -# include -#endif +#include #if __has_include() # include @@ -799,12 +797,10 @@ static int __init construct_domU(struct domain *d, { if ( !dt_find_property(node, "xen,static-mem", NULL) ) allocate_memory(d, &kinfo); -#ifdef CONFIG_STATIC_MEMORY else if ( !is_domain_direct_mapped(d) ) allocate_static_memory(d, &kinfo, node); else assign_static_memory_11(d, &kinfo, node); -#endif #ifdef CONFIG_STATIC_SHM rc = process_shm(d, &kinfo, node); diff --git a/xen/common/device-tree/static-memory.c b/xen/common/device-tree/static-memory.c new file mode 100644 index 0000000000..0774d06806 --- /dev/null +++ b/xen/common/device-tree/static-memory.c @@ -0,0 +1,281 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#include + +static bool __init append_static_memory_to_bank(struct domain *d, + struct membank *bank, + mfn_t smfn, + paddr_t size) +{ + int res; + unsigned int nr_pages = PFN_DOWN(size); + gfn_t sgfn; + + /* + * For direct-mapped domain, the GFN match the MFN. + * Otherwise, this is inferred on what has already been allocated + * in the bank. + */ + if ( !is_domain_direct_mapped(d) ) + sgfn = gaddr_to_gfn(bank->start + bank->size); + else + sgfn = gaddr_to_gfn(mfn_to_maddr(smfn)); + + res = guest_physmap_add_pages(d, sgfn, smfn, nr_pages); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed to map pages to DOMU: %d", res); + return false; + } + + bank->size = bank->size + size; + + return true; +} + +static mfn_t __init acquire_static_memory_bank(struct domain *d, + const __be32 **cell, + u32 addr_cells, u32 size_cells, + paddr_t *pbase, paddr_t *psize) +{ + mfn_t smfn; + int res; + + device_tree_get_reg(cell, addr_cells, size_cells, pbase, psize); + ASSERT(IS_ALIGNED(*pbase, PAGE_SIZE) && IS_ALIGNED(*psize, PAGE_SIZE)); + if ( PFN_DOWN(*psize) > UINT_MAX ) + { + printk(XENLOG_ERR "%pd: static memory size too large: %#"PRIpaddr, + d, *psize); + return INVALID_MFN; + } + + smfn = maddr_to_mfn(*pbase); + res = acquire_domstatic_pages(d, smfn, PFN_DOWN(*psize), 0); + if ( res ) + { + printk(XENLOG_ERR + "%pd: failed to acquire static memory: %d.\n", d, res); + return INVALID_MFN; + } + + return smfn; +} + +static int __init parse_static_mem_prop(const struct dt_device_node *node, + u32 *addr_cells, u32 *size_cells, + int *length, const __be32 **cell) +{ + const struct dt_property *prop; + + prop = dt_find_property(node, "xen,static-mem", NULL); + + *addr_cells = dt_n_addr_cells(node); + *size_cells = dt_n_size_cells(node); + + *cell = (const __be32 *)prop->value; + *length = prop->length; + + return 0; +} + +/* Allocate memory from static memory as RAM for one specific domain d. */ +void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + u32 addr_cells, size_cells, reg_cells; + unsigned int nr_banks, gbank, bank = 0; + const uint64_t rambase[] = GUEST_RAM_BANK_BASES; + const uint64_t ramsize[] = GUEST_RAM_BANK_SIZES; + const __be32 *cell; + u64 tot_size = 0; + paddr_t pbase, psize, gsize; + mfn_t smfn; + int length; + + if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) + goto fail; + reg_cells = addr_cells + size_cells; + + /* + * The static memory will be mapped in the guest at the usual guest memory + * addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by + * xen/include/public/arch-arm.h. + */ + gbank = 0; + gsize = ramsize[gbank]; + mem->bank[gbank].start = rambase[gbank]; + nr_banks = length / (reg_cells * sizeof (u32)); + + for ( ; bank < nr_banks; bank++ ) + { + smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, + &pbase, &psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + goto fail; + + printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", + d, bank, pbase, pbase + psize); + + while ( 1 ) + { + /* Map as much as possible the static range to the guest bank */ + if ( !append_static_memory_to_bank(d, &mem->bank[gbank], smfn, + min(psize, gsize)) ) + goto fail; + + /* + * The current physical bank is fully mapped. + * Handle the next physical bank. + */ + if ( gsize >= psize ) + { + gsize = gsize - psize; + break; + } + /* + * When current guest bank is not enough to map, exhaust + * the current one and seek to the next. + * Before seeking to the next, check if we still have available + * guest bank. + */ + else if ( (gbank + 1) >= GUEST_RAM_BANKS ) + { + printk(XENLOG_ERR "Exhausted all possible guest banks.\n"); + goto fail; + } + else + { + psize = psize - gsize; + smfn = mfn_add(smfn, gsize >> PAGE_SHIFT); + /* Update to the next guest bank. */ + gbank++; + gsize = ramsize[gbank]; + mem->bank[gbank].start = rambase[gbank]; + } + } + + tot_size += psize; + } + + mem->nr_banks = ++gbank; + + kinfo->unassigned_mem -= tot_size; + /* + * The property 'memory' should match the amount of memory given to the + * guest. + * Currently, it is only possible to either acquire static memory or let + * Xen allocate. *Mixing* is not supported. + */ + if ( kinfo->unassigned_mem ) + { + printk(XENLOG_ERR + "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\". Unsupported configuration.\n"); + goto fail; + } + + return; + + fail: + panic("Failed to allocate requested static memory for domain %pd.\n", d); +} + +/* + * Allocate static memory as RAM for one specific domain d. + * The static memory will be directly mapped in the guest(Guest Physical + * Address == Physical Address). + */ +void __init assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + u32 addr_cells, size_cells, reg_cells; + unsigned int nr_banks, bank = 0; + const __be32 *cell; + paddr_t pbase, psize; + mfn_t smfn; + int length; + + if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) + { + printk(XENLOG_ERR + "%pd: failed to parse \"xen,static-mem\" property.\n", d); + goto fail; + } + reg_cells = addr_cells + size_cells; + nr_banks = length / (reg_cells * sizeof(u32)); + + if ( nr_banks > mem->max_banks ) + { + printk(XENLOG_ERR + "%pd: exceed max number of supported guest memory banks.\n", d); + goto fail; + } + + for ( ; bank < nr_banks; bank++ ) + { + smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, + &pbase, &psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + goto fail; + + printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", + d, bank, pbase, pbase + psize); + + /* One guest memory bank is matched with one physical memory bank. */ + mem->bank[bank].start = pbase; + if ( !append_static_memory_to_bank(d, &mem->bank[bank], + smfn, psize) ) + goto fail; + + kinfo->unassigned_mem -= psize; + } + + mem->nr_banks = nr_banks; + + /* + * The property 'memory' should match the amount of memory given to + * the guest. + * Currently, it is only possible to either acquire static memory or + * let Xen allocate. *Mixing* is not supported. + */ + if ( kinfo->unassigned_mem != 0 ) + { + printk(XENLOG_ERR + "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\".\n"); + goto fail; + } + + return; + + fail: + panic("Failed to assign requested static memory for direct-map domain %pd.\n", + d); +} + +/* Static memory initialization */ +void __init init_staticmem_pages(void) +{ + const struct membanks *reserved_mem = bootinfo_get_reserved_mem(); + unsigned int bank; + + for ( bank = 0 ; bank < reserved_mem->nr_banks; bank++ ) + { + if ( reserved_mem->bank[bank].type == MEMBANK_STATIC_DOMAIN ) + init_staticmem_bank(&reserved_mem->bank[bank]); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/static-memory.h b/xen/include/xen/static-memory.h new file mode 100644 index 0000000000..e445aa8057 --- /dev/null +++ b/xen/include/xen/static-memory.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef XEN_STATIC_MEMORY_H +#define XEN_STATIC_MEMORY_H + +#include + +#ifdef CONFIG_STATIC_MEMORY + +#include + +static inline void init_staticmem_bank(const struct membank *bank) +{ + mfn_t bank_start = _mfn(PFN_UP(bank->start)); + unsigned long bank_pages = PFN_DOWN(bank->size); + mfn_t bank_end = mfn_add(bank_start, bank_pages); + + if ( mfn_x(bank_end) <= mfn_x(bank_start) ) + return; + + unprepare_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); +} + +void allocate_static_memory(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); +void assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); +void init_staticmem_pages(void); + +#else /* !CONFIG_STATIC_MEMORY */ + +static inline void allocate_static_memory(struct domain *d, + struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + ASSERT_UNREACHABLE(); +} + +static inline void assign_static_memory_11(struct domain *d, + struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + ASSERT_UNREACHABLE(); +} + +static inline void init_staticmem_pages(void) {}; + +#endif /* CONFIG_STATIC_MEMORY */ + +#endif /* XEN_STATIC_MEMORY_H */ + +/* + * 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 Wed Jun 04 07:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005140.1384656 (Exim 4.92) (envelope-from ) id 1uMiHd-0006uJ-OR; Wed, 04 Jun 2025 07:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005140.1384656; Wed, 04 Jun 2025 07: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 1uMiHd-0006uA-L9; Wed, 04 Jun 2025 07:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1005140; Wed, 04 Jun 2025 07:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMiHc-0006ty-GX for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMiHc-001msh-1W for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMiHc-00Ezzv-1P for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=3yOCGWF6bsK2ICMYXkvacfyYeuEpSeaMVLhYQyI8TGc=; b=WGelIw3/a2KOMc7zrXPNdNooWj K4LMxpWvC30EjFDKChZFnOgMwJhc2q5NEoFfHtUcPUmSlVkFgGl+O/w1ly77d/RNZM8TfiqINLOZA N4OLYjMQ+Y8Bmah050j6itRtttZu9N0PhYgVuqBPySkLlA294/9tkg1kZ1oscYGP+xA4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] device-tree: Move Arm's static-shmem feature to common Message-Id: Date: Wed, 04 Jun 2025 07:11:32 +0000 commit 72c5fa220804520839fd431ed19cd2b6eb04015a Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:29 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:04:24 2025 +0200 device-tree: Move Arm's static-shmem feature to common This feature is arch agnostic, thus move it to common. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/Kconfig | 6 - xen/arch/arm/Makefile | 1 - xen/arch/arm/arm32/mmu/mm.c | 2 +- xen/arch/arm/arm64/mmu/mm.c | 2 +- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/include/asm/static-shmem.h | 94 ---- xen/arch/arm/static-shmem.c | 854 -------------------------------- xen/common/Kconfig | 6 + xen/common/device-tree/Makefile | 1 + xen/common/device-tree/bootfdt.c | 4 +- xen/common/device-tree/dom0less-build.c | 9 +- xen/common/device-tree/static-shmem.c | 854 ++++++++++++++++++++++++++++++++ xen/include/xen/static-shmem.h | 94 ++++ 14 files changed, 961 insertions(+), 970 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 57919d8b3a..3f25da3ca5 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -247,12 +247,6 @@ config ARM64_BTI source "arch/arm/tee/Kconfig" -config STATIC_SHM - bool "Statically shared memory on a dom0less system" if UNSUPPORTED - depends on STATIC_MEMORY - help - This option enables statically shared memory on a dom0less system. - config PARTIAL_EMULATION bool "Enable partial emulation of system/coprocessor registers" default y diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 4f08014547..ab0a0c2be6 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y += setup.o obj-y += shutdown.o obj-y += smp.o obj-y += smpboot.o -obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o obj-y += sysctl.o obj-y += time.o obj-y += traps.o diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index f3305e28e9..4d22f35618 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -7,9 +7,9 @@ #include #include #include +#include #include #include -#include static unsigned long opt_xenheap_megabytes __initdata; integer_param("xenheap_megabytes", opt_xenheap_megabytes); diff --git a/xen/arch/arm/arm64/mmu/mm.c b/xen/arch/arm/arm64/mmu/mm.c index cded8f2787..a0a2dd8cc7 100644 --- a/xen/arch/arm/arm64/mmu/mm.c +++ b/xen/arch/arm/arm64/mmu/mm.c @@ -5,9 +5,9 @@ #include #include #include +#include #include -#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index bcfd686a8b..20aabf6be5 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include #ifdef CONFIG_VGICV2 static int __init make_gicv2_domU_node(struct kernel_info *kinfo) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 068af31a62..590f38e520 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h deleted file mode 100644 index 6a4c33cca8..0000000000 --- a/xen/arch/arm/include/asm/static-shmem.h +++ /dev/null @@ -1,94 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_STATIC_SHMEM_H_ -#define __ASM_STATIC_SHMEM_H_ - -#include -#include - -#ifdef CONFIG_STATIC_SHM - -/* Worst case /memory node reg element: (addrcells + sizecells) */ -#define DT_MEM_NODE_REG_RANGE_SIZE ((NR_MEM_BANKS + NR_SHMEM_BANKS) * 4) - -int make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells); - -int process_shm(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node); - -int process_shm_node(const void *fdt, int node, uint32_t address_cells, - uint32_t size_cells); - -void early_print_info_shmem(void); - -void init_sharedmem_pages(void); - -int remove_shm_from_rangeset(const struct kernel_info *kinfo, - struct rangeset *rangeset); - -int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells); - -void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, - int *nr_cells, int addrcells, int sizecells); - -static inline struct membanks * -kernel_info_get_shm_mem(struct kernel_info *kinfo) -{ - return container_of(&kinfo->shm_mem.common, struct membanks, common); -} - -static inline const struct membanks * -kernel_info_get_shm_mem_const(const struct kernel_info *kinfo) -{ - return container_of(&kinfo->shm_mem.common, const struct membanks, common); -} - -#else /* !CONFIG_STATIC_SHM */ - -/* Worst case /memory node reg element: (addrcells + sizecells) */ -#define DT_MEM_NODE_REG_RANGE_SIZE (NR_MEM_BANKS * 4) - -static inline int make_resv_memory_node(const struct kernel_info *kinfo, - int addrcells, int sizecells) -{ - return 0; -} - -static inline int process_shm(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - return 0; -} - -static inline void init_sharedmem_pages(void) {}; - -static inline int remove_shm_from_rangeset(const struct kernel_info *kinfo, - struct rangeset *rangeset) -{ - return 0; -} - -static inline int make_shm_resv_memory_node(const struct kernel_info *kinfo, - int addrcells, int sizecells) -{ - return 0; -} - -static inline void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, - __be32 *reg, int *nr_cells, - int addrcells, int sizecells) {}; - -#endif /* CONFIG_STATIC_SHM */ - -#endif /* __ASM_STATIC_SHMEM_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c deleted file mode 100644 index 2055b7be0f..0000000000 --- a/xen/arch/arm/static-shmem.c +++ /dev/null @@ -1,854 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include - -#include -#include - -typedef struct { - struct domain *d; - const char *role_str; - paddr_t gbase; - struct shmem_membank_extra *bank_extra_info; -} alloc_heap_pages_cb_extra; - -static struct { - struct membanks_hdr common; - struct membank bank[NR_SHMEM_BANKS]; -} shm_heap_banks __initdata = { - .common.max_banks = NR_SHMEM_BANKS, - .common.type = STATIC_SHARED_MEMORY -}; - -static inline struct membanks *get_shmem_heap_banks(void) -{ - return container_of(&shm_heap_banks.common, struct membanks, common); -} - -static void __init __maybe_unused build_assertions(void) -{ - /* - * Check that no padding is between struct membanks "bank" flexible array - * member and struct shared_meminfo "bank" member - */ - BUILD_BUG_ON((offsetof(struct membanks, bank) != - offsetof(struct shared_meminfo, bank))); -} - -static const struct membank __init * -find_shm_bank_by_id(const struct membanks *shmem, const char *shm_id) -{ - unsigned int bank; - - for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) - { - if ( strcmp(shm_id, shmem->bank[bank].shmem_extra->shm_id) == 0 ) - break; - } - - if ( bank == shmem->nr_banks ) - return NULL; - - return &shmem->bank[bank]; -} - -/* - * This function checks whether the static shared memory region is - * already allocated to dom_io. - */ -static bool __init is_shm_allocated_to_domio(paddr_t pbase) -{ - struct page_info *page; - struct domain *d; - - page = maddr_to_page(pbase); - d = page_get_owner_and_reference(page); - if ( d == NULL ) - return false; - put_page(page); - - if ( d != dom_io ) - { - printk(XENLOG_ERR - "shm memory node has already been allocated to a specific owner %pd, Please check your configuration\n", - d); - return false; - } - - return true; -} - -static mfn_t __init acquire_shared_memory_bank(struct domain *d, - paddr_t pbase, paddr_t psize, - bool bank_from_heap) -{ - mfn_t smfn; - unsigned long nr_pfns; - int res; - - /* - * Pages of statically shared memory shall be included - * into domain_tot_pages(). - */ - nr_pfns = PFN_DOWN(psize); - if ( (UINT_MAX - d->max_pages) < nr_pfns ) - { - printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", - d, nr_pfns); - return INVALID_MFN; - } - d->max_pages += nr_pfns; - - smfn = maddr_to_mfn(pbase); - if ( bank_from_heap ) - /* - * When host address is not provided, static shared memory is - * allocated from heap and shall be assigned to owner domain. - */ - res = assign_pages(maddr_to_page(pbase), nr_pfns, d, 0); - else - res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); - - if ( res ) - { - printk(XENLOG_ERR "%pd: failed to %s static memory: %d.\n", d, - bank_from_heap ? "assign" : "acquire", res); - goto fail; - } - - return smfn; - - fail: - d->max_pages -= nr_pfns; - return INVALID_MFN; -} - -static int __init assign_shared_memory(struct domain *d, paddr_t gbase, - bool bank_from_heap, - const struct membank *shm_bank) -{ - mfn_t smfn; - int ret = 0; - unsigned long nr_pages, nr_borrowers, i; - struct page_info *page; - paddr_t pbase, psize; - - pbase = shm_bank->start; - psize = shm_bank->size; - nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; - - smfn = acquire_shared_memory_bank(d, pbase, psize, bank_from_heap); - if ( mfn_eq(smfn, INVALID_MFN) ) - return -EINVAL; - - /* - * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need - * to create mapping in the P2M. - */ - nr_pages = PFN_DOWN(psize); - if ( d != dom_io ) - { - ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, - PFN_DOWN(psize)); - if ( ret ) - { - printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); - return ret; - } - } - - /* - * Instead of letting borrower domain get a page ref, we add as many - * additional reference as the number of borrowers when the owner - * is allocated, since there is a chance that owner is created - * after borrower. - * So if the borrower is created first, it will cause adding pages - * in the P2M without reference. - */ - page = mfn_to_page(smfn); - for ( i = 0; i < nr_pages; i++ ) - { - if ( !get_page_nr(page + i, d, nr_borrowers) ) - { - printk(XENLOG_ERR - "Failed to add %lu references to page %"PRI_mfn".\n", - nr_borrowers, mfn_x(smfn) + i); - goto fail; - } - } - - return 0; - - fail: - while ( --i >= 0 ) - put_page_nr(page + i, nr_borrowers); - return ret; -} - -static int __init -append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, - paddr_t size, const char *shm_id) -{ - struct membanks *shm_mem = kernel_info_get_shm_mem(kinfo); - struct shmem_membank_extra *shm_mem_extra; - - if ( shm_mem->nr_banks >= shm_mem->max_banks ) - return -ENOMEM; - - shm_mem_extra = &kinfo->shm_mem.extra[shm_mem->nr_banks]; - - shm_mem->bank[shm_mem->nr_banks].start = start; - shm_mem->bank[shm_mem->nr_banks].size = size; - safe_strcpy(shm_mem_extra->shm_id, shm_id); - shm_mem->bank[shm_mem->nr_banks].shmem_extra = shm_mem_extra; - shm_mem->nr_banks++; - - return 0; -} - -static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, - const char *role_str, - bool bank_from_heap, - const struct membank *shm_bank) -{ - bool owner_dom_io = true; - paddr_t pbase, psize; - int ret; - - pbase = shm_bank->start; - psize = shm_bank->size; - - /* - * "role" property is optional and if it is defined explicitly, - * then the owner domain is not the default "dom_io" domain. - */ - if ( role_str != NULL ) - owner_dom_io = false; - - /* - * DOMID_IO is a fake domain and is not described in the Device-Tree. - * Therefore when the owner of the shared region is DOMID_IO, we will - * only find the borrowers. - */ - if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || - (!owner_dom_io && strcmp(role_str, "owner") == 0) ) - { - /* - * We found the first borrower of the region, the owner was not - * specified, so they should be assigned to dom_io. - */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, - bank_from_heap, shm_bank); - if ( ret ) - return ret; - } - - if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) - { - /* Set up P2M foreign mapping for borrower domain. */ - ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), - _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); - if ( ret ) - return ret; - } - - return 0; -} - -static bool __init save_map_heap_pages(struct domain *d, struct page_info *pg, - unsigned int order, void *extra) -{ - alloc_heap_pages_cb_extra *b_extra = (alloc_heap_pages_cb_extra *)extra; - int idx = shm_heap_banks.common.nr_banks; - int ret = -ENOSPC; - - BUG_ON(!b_extra); - - if ( idx < shm_heap_banks.common.max_banks ) - { - shm_heap_banks.bank[idx].start = page_to_maddr(pg); - shm_heap_banks.bank[idx].size = (1ULL << (PAGE_SHIFT + order)); - shm_heap_banks.bank[idx].shmem_extra = b_extra->bank_extra_info; - shm_heap_banks.common.nr_banks++; - - ret = handle_shared_mem_bank(b_extra->d, b_extra->gbase, - b_extra->role_str, true, - &shm_heap_banks.bank[idx]); - if ( !ret ) - { - /* Increment guest physical address for next mapping */ - b_extra->gbase += shm_heap_banks.bank[idx].size; - return true; - } - } - - printk("Failed to allocate static shared memory from Xen heap: (%d)\n", - ret); - - return false; -} - -int __init process_shm(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - struct dt_device_node *shm_node; - - /* Hwdom case - shm node under /chosen */ - if ( !node ) - { - node = dt_find_node_by_path("/chosen"); - BUG_ON(!node); - } - - dt_for_each_child_node(node, shm_node) - { - const struct membank *boot_shm_bank; - const struct dt_property *prop; - const __be32 *cells; - uint32_t addr_cells; - paddr_t gbase, pbase, psize; - int ret = 0; - unsigned int i; - const char *role_str; - const char *shm_id; - - if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) - continue; - - if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) - { - printk("%pd: invalid \"xen,shm-id\" property", d); - return -EINVAL; - } - BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); - - boot_shm_bank = find_shm_bank_by_id(bootinfo_get_shmem(), shm_id); - if ( !boot_shm_bank ) - { - printk("%pd: static shared memory bank not found: '%s'", d, shm_id); - return -ENOENT; - } - - pbase = boot_shm_bank->start; - psize = boot_shm_bank->size; - - /* "role" property is optional */ - if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) - role_str = NULL; - - /* - * xen,shared-mem = <[pbase,] gbase, size>; - * pbase is optional. - */ - addr_cells = dt_n_addr_cells(shm_node); - prop = dt_find_property(shm_node, "xen,shared-mem", NULL); - BUG_ON(!prop); - cells = (const __be32 *)prop->value; - - if ( pbase != INVALID_PADDR ) - { - /* guest phys address is after host phys address */ - gbase = dt_read_paddr(cells + addr_cells, addr_cells); - - if ( is_domain_direct_mapped(d) && (pbase != gbase) ) - { - printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", - d, pbase, gbase); - return -EINVAL; - } - - for ( i = 0; i < PFN_DOWN(psize); i++ ) - if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) - { - printk("%pd: invalid physical address 0x%"PRI_mfn"\n", - d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); - return -EINVAL; - } - - /* The host physical address is supplied by the user */ - ret = handle_shared_mem_bank(d, gbase, role_str, false, - boot_shm_bank); - if ( ret ) - return ret; - } - else - { - /* - * The host physical address is not supplied by the user, so it - * means that the banks needs to be allocated from the Xen heap, - * look into the already allocated banks from the heap. - */ - const struct membank *alloc_bank = - find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); - - if ( is_domain_direct_mapped(d) ) - { - printk("%pd: host and guest physical address must be supplied for direct-mapped domains\n", - d); - return -EINVAL; - } - - /* guest phys address is right at the beginning */ - gbase = dt_read_paddr(cells, addr_cells); - - if ( !alloc_bank ) - { - alloc_heap_pages_cb_extra cb_arg = { d, role_str, gbase, - boot_shm_bank->shmem_extra }; - - /* shm_id identified bank is not yet allocated */ - if ( !allocate_domheap_memory(NULL, psize, save_map_heap_pages, - &cb_arg) ) - { - printk(XENLOG_ERR - "Failed to allocate (%"PRIpaddr"KB) pages as static shared memory from heap\n", - psize >> 10); - return -EINVAL; - } - } - else - { - /* shm_id identified bank is already allocated */ - const struct membank *end_bank = - &shm_heap_banks.bank[shm_heap_banks.common.nr_banks]; - paddr_t gbase_bank = gbase; - - /* - * Static shared memory banks that are taken from the Xen heap - * are allocated sequentially in shm_heap_banks, so starting - * from the first bank found identified by shm_id, the code can - * just advance by one bank at the time until it reaches the end - * of the array or it finds another bank NOT identified by - * shm_id - */ - for ( ; alloc_bank < end_bank; alloc_bank++ ) - { - if ( strcmp(shm_id, alloc_bank->shmem_extra->shm_id) != 0 ) - break; - - ret = handle_shared_mem_bank(d, gbase_bank, role_str, true, - alloc_bank); - if ( ret ) - return ret; - - /* Increment guest physical address for next mapping */ - gbase_bank += alloc_bank->size; - } - } - } - - /* - * Record static shared memory region info for later setting - * up shm-node in guest device tree. - */ - ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); - if ( ret ) - return ret; - } - - return 0; -} - -int __init make_shm_resv_memory_node(const struct kernel_info *kinfo, - int addrcells, int sizecells) -{ - const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); - void *fdt = kinfo->fdt; - unsigned int i = 0; - int res = 0; - - if ( mem->nr_banks == 0 ) - return 0; - - /* - * For each shared memory region, a range is exposed under - * the /reserved-memory node as a child node. Each range sub-node is - * named xen-shmem@
. - */ - dt_dprintk("Create xen-shmem node\n"); - - for ( ; i < mem->nr_banks; i++ ) - { - uint64_t start = mem->bank[i].start; - uint64_t size = mem->bank[i].size; - const char compat[] = "xen,shared-memory-v1"; - /* Worst case addrcells + sizecells */ - __be32 reg[GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS]; - __be32 *cells; - unsigned int len = (addrcells + sizecells) * sizeof(__be32); - - res = domain_fdt_begin_node(fdt, "xen-shmem", mem->bank[i].start); - if ( res ) - return res; - - res = fdt_property(fdt, "compatible", compat, sizeof(compat)); - if ( res ) - return res; - - cells = reg; - dt_child_set_range(&cells, addrcells, sizecells, start, size); - - res = fdt_property(fdt, "reg", reg, len); - if ( res ) - return res; - - dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", - i, start, start + size); - - res = fdt_property_string(fdt, "xen,id", - mem->bank[i].shmem_extra->shm_id); - if ( res ) - return res; - - /* - * TODO: - * - xen,offset: (borrower VMs only) - * 64 bit integer offset within the owner virtual machine's shared - * memory region used for the mapping in the borrower VM - */ - res = fdt_property_u64(fdt, "xen,offset", 0); - if ( res ) - return res; - - res = fdt_end_node(fdt); - if ( res ) - return res; - } - - return res; -} - -int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, - uint32_t size_cells) -{ - const struct fdt_property *prop, *prop_id, *prop_role; - const __be32 *cell; - paddr_t paddr = INVALID_PADDR; - paddr_t gaddr, size, end; - struct membanks *mem = bootinfo_get_shmem(); - struct shmem_membank_extra *shmem_extra = bootinfo_get_shmem_extra(); - unsigned int i; - int len; - bool owner = false; - const char *shm_id; - - if ( address_cells < 1 || size_cells < 1 ) - { - printk("fdt: invalid #address-cells or #size-cells for static shared memory node.\n"); - return -EINVAL; - } - - /* - * "xen,shm-id" property holds an arbitrary string with a strict limit - * on the number of characters, MAX_SHM_ID_LENGTH - */ - prop_id = fdt_get_property(fdt, node, "xen,shm-id", NULL); - if ( !prop_id ) - return -ENOENT; - shm_id = (const char *)prop_id->data; - if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) == MAX_SHM_ID_LENGTH ) - { - printk("fdt: invalid xen,shm-id %s, it must be limited to %u characters\n", - shm_id, MAX_SHM_ID_LENGTH); - return -EINVAL; - } - - /* - * "role" property is optional and if it is defined explicitly, - * it must be either `owner` or `borrower`. - */ - prop_role = fdt_get_property(fdt, node, "role", NULL); - if ( prop_role ) - { - if ( !strcmp(prop_role->data, "owner") ) - owner = true; - else if ( strcmp(prop_role->data, "borrower") ) - { - printk("fdt: invalid `role` property for static shared memory node.\n"); - return -EINVAL; - } - } - - /* - * xen,shared-mem = ; - * Memory region starting from physical address #paddr of #size shall - * be mapped to guest physical address #gaddr as static shared memory - * region. - */ - prop = fdt_get_property(fdt, node, "xen,shared-mem", &len); - if ( !prop ) - return -ENOENT; - - cell = (const __be32 *)prop->data; - if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) - { - if ( len == dt_cells_to_size(address_cells + size_cells) ) - device_tree_get_reg(&cell, address_cells, size_cells, &gaddr, - &size); - else - { - printk("fdt: invalid `xen,shared-mem` property.\n"); - return -EINVAL; - } - } - else - { - device_tree_get_reg(&cell, address_cells, address_cells, &paddr, - &gaddr); - size = dt_next_cell(size_cells, &cell); - - if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) - { - printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", - paddr); - return -EINVAL; - } - - end = paddr + size; - if ( end <= paddr ) - { - printk("fdt: static shared memory region %s overflow\n", shm_id); - return -EINVAL; - } - } - - if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) - { - printk("fdt: guest address 0x%"PRIpaddr" is not suitably aligned.\n", - gaddr); - return -EINVAL; - } - - if ( !size ) - { - printk("fdt: the size for static shared memory region can not be zero\n"); - return -EINVAL; - } - - if ( !IS_ALIGNED(size, PAGE_SIZE) ) - { - printk("fdt: size 0x%"PRIpaddr" is not suitably aligned\n", size); - return -EINVAL; - } - - for ( i = 0; i < mem->nr_banks; i++ ) - { - /* - * Meet the following check: - * - when host address is provided: - * 1) The shm ID matches and the region exactly match - * 2) The shm ID doesn't match and the region doesn't overlap - * with an existing one - * - when host address is not provided: - * 1) The shm ID matches and the region size exactly match - */ - bool paddr_assigned = (INVALID_PADDR != paddr); - - if ( strncmp(shm_id, shmem_extra[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) - { - /* - * Regions have same shm_id (cases): - * 1) physical host address is supplied: - * - OK: paddr is equal and size is equal (same region) - * - Fail: paddr doesn't match or size doesn't match (there - * cannot exists two shmem regions with same shm_id) - * 2) physical host address is NOT supplied: - * - OK: size is equal (same region) - * - Fail: size is not equal (same shm_id must identify only one - * region, there can't be two different regions with same - * shm_id) - */ - bool start_match = paddr_assigned ? (paddr == mem->bank[i].start) : - true; - - if ( start_match && (size == mem->bank[i].size) ) - break; - else - { - printk("fdt: different shared memory region could not share the same shm ID %s\n", - shm_id); - return -EINVAL; - } - } - - /* - * Regions have different shm_id (cases): - * 1) physical host address is supplied: - * - OK: paddr different, or size different (case where paddr - * is equal but psize is different are wrong, but they - * are handled later when checking for overlapping) - * - Fail: paddr equal and size equal (the same region can't be - * identified with different shm_id) - * 2) physical host address is NOT supplied: - * - OK: Both have different shm_id so even with same size they - * can exists - */ - if ( !paddr_assigned || (paddr != mem->bank[i].start) || - (size != mem->bank[i].size) ) - continue; - else - { - printk("fdt: xen,shm-id %s does not match for all the nodes using the same region\n", - shm_id); - return -EINVAL; - } - } - - if ( i == mem->nr_banks ) - { - if (i < mem->max_banks) - { - if ( (paddr != INVALID_PADDR) && - check_reserved_regions_overlap(paddr, size, false) ) - return -EINVAL; - - /* Static shared memory shall be reserved from any other use. */ - safe_strcpy(shmem_extra[mem->nr_banks].shm_id, shm_id); - mem->bank[mem->nr_banks].start = paddr; - mem->bank[mem->nr_banks].size = size; - mem->bank[mem->nr_banks].shmem_extra = &shmem_extra[mem->nr_banks]; - mem->nr_banks++; - } - else - { - printk("Warning: Max number of supported memory regions reached.\n"); - return -ENOSPC; - } - } - /* - * keep a count of the number of borrowers, which later may be used - * to calculate the reference count. - */ - if ( !owner ) - shmem_extra[i].nr_shm_borrowers++; - - return 0; -} - -int __init make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells) -{ - const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); - void *fdt = kinfo->fdt; - int res = 0; - /* Placeholder for reserved-memory\0 */ - const char resvbuf[16] = "reserved-memory"; - - if ( mem->nr_banks == 0 ) - /* No shared memory provided. */ - return 0; - - dt_dprintk("Create reserved-memory node\n"); - - res = fdt_begin_node(fdt, resvbuf); - if ( res ) - return res; - - res = fdt_property(fdt, "ranges", NULL, 0); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#address-cells", addrcells); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#size-cells", sizecells); - if ( res ) - return res; - - res = make_shm_resv_memory_node(kinfo, addrcells, sizecells); - if ( res ) - return res; - - res = fdt_end_node(fdt); - - return res; -} - -void __init early_print_info_shmem(void) -{ - const struct membanks *shmem = bootinfo_get_shmem(); - unsigned int bank; - unsigned int printed = 0; - - for ( bank = 0; bank < shmem->nr_banks; bank++, printed++ ) - if ( shmem->bank[bank].start != INVALID_PADDR ) - printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", printed, - shmem->bank[bank].start, - shmem->bank[bank].start + shmem->bank[bank].size - 1); -} - -void __init init_sharedmem_pages(void) -{ - const struct membanks *shmem = bootinfo_get_shmem(); - unsigned int bank; - - for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) - if ( shmem->bank[bank].start != INVALID_PADDR ) - init_staticmem_bank(&shmem->bank[bank]); -} - -int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, - struct rangeset *rangeset) -{ - const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); - unsigned int i; - - /* Remove static shared memory regions */ - for ( i = 0; i < shm_mem->nr_banks; i++ ) - { - paddr_t start, end; - int res; - - start = shm_mem->bank[i].start; - end = shm_mem->bank[i].start + shm_mem->bank[i].size; - res = rangeset_remove_range(rangeset, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR - "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr", error: %d\n", - start, end, res); - return -EINVAL; - } - } - - return 0; -} - -void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, - __be32 *reg, int *nr_cells, - int addrcells, int sizecells) -{ - const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); - unsigned int i; - __be32 *cells; - - BUG_ON(!nr_cells || !reg); - - cells = ®[*nr_cells]; - for ( i = 0; i < mem->nr_banks; i++ ) - { - paddr_t start = mem->bank[i].start; - paddr_t size = mem->bank[i].size; - - *nr_cells += addrcells + sizecells; - BUG_ON(*nr_cells >= DT_MEM_NODE_REG_RANGE_SIZE); - dt_child_set_range(&cells, addrcells, sizecells, start, size); - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 7ecf5a8031..eece1370a3 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -162,6 +162,12 @@ config STATIC_MEMORY If unsure, say N. +config STATIC_SHM + bool "Statically shared memory on a dom0less system" if UNSUPPORTED + depends on STATIC_MEMORY + help + This option enables statically shared memory on a dom0less system. + config STATIC_EVTCHN bool "Static event channel support on a dom0less system" depends on DOM0LESS_BOOT diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index ed11f2c3b4..13127296cb 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -8,3 +8,4 @@ obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o +obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index aa44f5a67c..9df80291b1 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -13,11 +13,9 @@ #include #include #include +#include #include #include -#ifdef CONFIG_STATIC_SHM -#include -#endif static void __init __maybe_unused build_assertions(void) { diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index c8c5a04f24..3d503c6973 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -29,10 +29,7 @@ #include #include - -#if __has_include() -# include -#endif +#include #define XENSTORE_PFN_LATE_ALLOC UINT64_MAX @@ -505,11 +502,9 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) if ( ret ) goto err; -#ifdef CONFIG_STATIC_SHM ret = make_resv_memory_node(kinfo, addrcells, sizecells); if ( ret ) goto err; -#endif /* * domain_handle_dtb_bootmodule has to be called before the rest of @@ -802,11 +797,9 @@ static int __init construct_domU(struct domain *d, else assign_static_memory_11(d, &kinfo, node); -#ifdef CONFIG_STATIC_SHM rc = process_shm(d, &kinfo, node); if ( rc < 0 ) return rc; -#endif rc = init_vuart(d, &kinfo, node); if ( rc < 0 ) diff --git a/xen/common/device-tree/static-shmem.c b/xen/common/device-tree/static-shmem.c new file mode 100644 index 0000000000..8023c0a484 --- /dev/null +++ b/xen/common/device-tree/static-shmem.c @@ -0,0 +1,854 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +typedef struct { + struct domain *d; + const char *role_str; + paddr_t gbase; + struct shmem_membank_extra *bank_extra_info; +} alloc_heap_pages_cb_extra; + +static struct { + struct membanks_hdr common; + struct membank bank[NR_SHMEM_BANKS]; +} shm_heap_banks __initdata = { + .common.max_banks = NR_SHMEM_BANKS, + .common.type = STATIC_SHARED_MEMORY +}; + +static inline struct membanks *get_shmem_heap_banks(void) +{ + return container_of(&shm_heap_banks.common, struct membanks, common); +} + +static void __init __maybe_unused build_assertions(void) +{ + /* + * Check that no padding is between struct membanks "bank" flexible array + * member and struct shared_meminfo "bank" member + */ + BUILD_BUG_ON((offsetof(struct membanks, bank) != + offsetof(struct shared_meminfo, bank))); +} + +static const struct membank __init * +find_shm_bank_by_id(const struct membanks *shmem, const char *shm_id) +{ + unsigned int bank; + + for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) + { + if ( strcmp(shm_id, shmem->bank[bank].shmem_extra->shm_id) == 0 ) + break; + } + + if ( bank == shmem->nr_banks ) + return NULL; + + return &shmem->bank[bank]; +} + +/* + * This function checks whether the static shared memory region is + * already allocated to dom_io. + */ +static bool __init is_shm_allocated_to_domio(paddr_t pbase) +{ + struct page_info *page; + struct domain *d; + + page = maddr_to_page(pbase); + d = page_get_owner_and_reference(page); + if ( d == NULL ) + return false; + put_page(page); + + if ( d != dom_io ) + { + printk(XENLOG_ERR + "shm memory node has already been allocated to a specific owner %pd, Please check your configuration\n", + d); + return false; + } + + return true; +} + +static mfn_t __init acquire_shared_memory_bank(struct domain *d, + paddr_t pbase, paddr_t psize, + bool bank_from_heap) +{ + mfn_t smfn; + unsigned long nr_pfns; + int res; + + /* + * Pages of statically shared memory shall be included + * into domain_tot_pages(). + */ + nr_pfns = PFN_DOWN(psize); + if ( (UINT_MAX - d->max_pages) < nr_pfns ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", + d, nr_pfns); + return INVALID_MFN; + } + d->max_pages += nr_pfns; + + smfn = maddr_to_mfn(pbase); + if ( bank_from_heap ) + /* + * When host address is not provided, static shared memory is + * allocated from heap and shall be assigned to owner domain. + */ + res = assign_pages(maddr_to_page(pbase), nr_pfns, d, 0); + else + res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + + if ( res ) + { + printk(XENLOG_ERR "%pd: failed to %s static memory: %d.\n", d, + bank_from_heap ? "assign" : "acquire", res); + goto fail; + } + + return smfn; + + fail: + d->max_pages -= nr_pfns; + return INVALID_MFN; +} + +static int __init assign_shared_memory(struct domain *d, paddr_t gbase, + bool bank_from_heap, + const struct membank *shm_bank) +{ + mfn_t smfn; + int ret = 0; + unsigned long nr_pages, nr_borrowers, i; + struct page_info *page; + paddr_t pbase, psize; + + pbase = shm_bank->start; + psize = shm_bank->size; + nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; + + smfn = acquire_shared_memory_bank(d, pbase, psize, bank_from_heap); + if ( mfn_eq(smfn, INVALID_MFN) ) + return -EINVAL; + + /* + * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need + * to create mapping in the P2M. + */ + nr_pages = PFN_DOWN(psize); + if ( d != dom_io ) + { + ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, + PFN_DOWN(psize)); + if ( ret ) + { + printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); + return ret; + } + } + + /* + * Instead of letting borrower domain get a page ref, we add as many + * additional reference as the number of borrowers when the owner + * is allocated, since there is a chance that owner is created + * after borrower. + * So if the borrower is created first, it will cause adding pages + * in the P2M without reference. + */ + page = mfn_to_page(smfn); + for ( i = 0; i < nr_pages; i++ ) + { + if ( !get_page_nr(page + i, d, nr_borrowers) ) + { + printk(XENLOG_ERR + "Failed to add %lu references to page %"PRI_mfn".\n", + nr_borrowers, mfn_x(smfn) + i); + goto fail; + } + } + + return 0; + + fail: + while ( --i >= 0 ) + put_page_nr(page + i, nr_borrowers); + return ret; +} + +static int __init +append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, + paddr_t size, const char *shm_id) +{ + struct membanks *shm_mem = kernel_info_get_shm_mem(kinfo); + struct shmem_membank_extra *shm_mem_extra; + + if ( shm_mem->nr_banks >= shm_mem->max_banks ) + return -ENOMEM; + + shm_mem_extra = &kinfo->shm_mem.extra[shm_mem->nr_banks]; + + shm_mem->bank[shm_mem->nr_banks].start = start; + shm_mem->bank[shm_mem->nr_banks].size = size; + safe_strcpy(shm_mem_extra->shm_id, shm_id); + shm_mem->bank[shm_mem->nr_banks].shmem_extra = shm_mem_extra; + shm_mem->nr_banks++; + + return 0; +} + +static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, + const char *role_str, + bool bank_from_heap, + const struct membank *shm_bank) +{ + bool owner_dom_io = true; + paddr_t pbase, psize; + int ret; + + pbase = shm_bank->start; + psize = shm_bank->size; + + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( role_str != NULL ) + owner_dom_io = false; + + /* + * DOMID_IO is a fake domain and is not described in the Device-Tree. + * Therefore when the owner of the shared region is DOMID_IO, we will + * only find the borrowers. + */ + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") == 0) ) + { + /* + * We found the first borrower of the region, the owner was not + * specified, so they should be assigned to dom_io. + */ + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, + bank_from_heap, shm_bank); + if ( ret ) + return ret; + } + + if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); + if ( ret ) + return ret; + } + + return 0; +} + +static bool __init save_map_heap_pages(struct domain *d, struct page_info *pg, + unsigned int order, void *extra) +{ + alloc_heap_pages_cb_extra *b_extra = (alloc_heap_pages_cb_extra *)extra; + int idx = shm_heap_banks.common.nr_banks; + int ret = -ENOSPC; + + BUG_ON(!b_extra); + + if ( idx < shm_heap_banks.common.max_banks ) + { + shm_heap_banks.bank[idx].start = page_to_maddr(pg); + shm_heap_banks.bank[idx].size = (1ULL << (PAGE_SHIFT + order)); + shm_heap_banks.bank[idx].shmem_extra = b_extra->bank_extra_info; + shm_heap_banks.common.nr_banks++; + + ret = handle_shared_mem_bank(b_extra->d, b_extra->gbase, + b_extra->role_str, true, + &shm_heap_banks.bank[idx]); + if ( !ret ) + { + /* Increment guest physical address for next mapping */ + b_extra->gbase += shm_heap_banks.bank[idx].size; + return true; + } + } + + printk("Failed to allocate static shared memory from Xen heap: (%d)\n", + ret); + + return false; +} + +int __init process_shm(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + struct dt_device_node *shm_node; + + /* Hwdom case - shm node under /chosen */ + if ( !node ) + { + node = dt_find_node_by_path("/chosen"); + BUG_ON(!node); + } + + dt_for_each_child_node(node, shm_node) + { + const struct membank *boot_shm_bank; + const struct dt_property *prop; + const __be32 *cells; + uint32_t addr_cells; + paddr_t gbase, pbase, psize; + int ret = 0; + unsigned int i; + const char *role_str; + const char *shm_id; + + if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) + continue; + + if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) + { + printk("%pd: invalid \"xen,shm-id\" property", d); + return -EINVAL; + } + BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); + + boot_shm_bank = find_shm_bank_by_id(bootinfo_get_shmem(), shm_id); + if ( !boot_shm_bank ) + { + printk("%pd: static shared memory bank not found: '%s'", d, shm_id); + return -ENOENT; + } + + pbase = boot_shm_bank->start; + psize = boot_shm_bank->size; + + /* "role" property is optional */ + if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) + role_str = NULL; + + /* + * xen,shared-mem = <[pbase,] gbase, size>; + * pbase is optional. + */ + addr_cells = dt_n_addr_cells(shm_node); + prop = dt_find_property(shm_node, "xen,shared-mem", NULL); + BUG_ON(!prop); + cells = (const __be32 *)prop->value; + + if ( pbase != INVALID_PADDR ) + { + /* guest phys address is after host phys address */ + gbase = dt_read_paddr(cells + addr_cells, addr_cells); + + if ( is_domain_direct_mapped(d) && (pbase != gbase) ) + { + printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", + d, pbase, gbase); + return -EINVAL; + } + + for ( i = 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* The host physical address is supplied by the user */ + ret = handle_shared_mem_bank(d, gbase, role_str, false, + boot_shm_bank); + if ( ret ) + return ret; + } + else + { + /* + * The host physical address is not supplied by the user, so it + * means that the banks needs to be allocated from the Xen heap, + * look into the already allocated banks from the heap. + */ + const struct membank *alloc_bank = + find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); + + if ( is_domain_direct_mapped(d) ) + { + printk("%pd: host and guest physical address must be supplied for direct-mapped domains\n", + d); + return -EINVAL; + } + + /* guest phys address is right at the beginning */ + gbase = dt_read_paddr(cells, addr_cells); + + if ( !alloc_bank ) + { + alloc_heap_pages_cb_extra cb_arg = { d, role_str, gbase, + boot_shm_bank->shmem_extra }; + + /* shm_id identified bank is not yet allocated */ + if ( !allocate_domheap_memory(NULL, psize, save_map_heap_pages, + &cb_arg) ) + { + printk(XENLOG_ERR + "Failed to allocate (%"PRIpaddr"KB) pages as static shared memory from heap\n", + psize >> 10); + return -EINVAL; + } + } + else + { + /* shm_id identified bank is already allocated */ + const struct membank *end_bank = + &shm_heap_banks.bank[shm_heap_banks.common.nr_banks]; + paddr_t gbase_bank = gbase; + + /* + * Static shared memory banks that are taken from the Xen heap + * are allocated sequentially in shm_heap_banks, so starting + * from the first bank found identified by shm_id, the code can + * just advance by one bank at the time until it reaches the end + * of the array or it finds another bank NOT identified by + * shm_id + */ + for ( ; alloc_bank < end_bank; alloc_bank++ ) + { + if ( strcmp(shm_id, alloc_bank->shmem_extra->shm_id) != 0 ) + break; + + ret = handle_shared_mem_bank(d, gbase_bank, role_str, true, + alloc_bank); + if ( ret ) + return ret; + + /* Increment guest physical address for next mapping */ + gbase_bank += alloc_bank->size; + } + } + } + + /* + * Record static shared memory region info for later setting + * up shm-node in guest device tree. + */ + ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); + if ( ret ) + return ret; + } + + return 0; +} + +int __init make_shm_resv_memory_node(const struct kernel_info *kinfo, + int addrcells, int sizecells) +{ + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); + void *fdt = kinfo->fdt; + unsigned int i = 0; + int res = 0; + + if ( mem->nr_banks == 0 ) + return 0; + + /* + * For each shared memory region, a range is exposed under + * the /reserved-memory node as a child node. Each range sub-node is + * named xen-shmem@
. + */ + dt_dprintk("Create xen-shmem node\n"); + + for ( ; i < mem->nr_banks; i++ ) + { + uint64_t start = mem->bank[i].start; + uint64_t size = mem->bank[i].size; + const char compat[] = "xen,shared-memory-v1"; + /* Worst case addrcells + sizecells */ + __be32 reg[GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS]; + __be32 *cells; + unsigned int len = (addrcells + sizecells) * sizeof(__be32); + + res = domain_fdt_begin_node(fdt, "xen-shmem", mem->bank[i].start); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + + cells = reg; + dt_child_set_range(&cells, addrcells, sizecells, start, size); + + res = fdt_property(fdt, "reg", reg, len); + if ( res ) + return res; + + dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + res = fdt_property_string(fdt, "xen,id", + mem->bank[i].shmem_extra->shm_id); + if ( res ) + return res; + + /* + * TODO: + * - xen,offset: (borrower VMs only) + * 64 bit integer offset within the owner virtual machine's shared + * memory region used for the mapping in the borrower VM + */ + res = fdt_property_u64(fdt, "xen,offset", 0); + if ( res ) + return res; + + res = fdt_end_node(fdt); + if ( res ) + return res; + } + + return res; +} + +int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, + uint32_t size_cells) +{ + const struct fdt_property *prop, *prop_id, *prop_role; + const __be32 *cell; + paddr_t paddr = INVALID_PADDR; + paddr_t gaddr, size, end; + struct membanks *mem = bootinfo_get_shmem(); + struct shmem_membank_extra *shmem_extra = bootinfo_get_shmem_extra(); + unsigned int i; + int len; + bool owner = false; + const char *shm_id; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: invalid #address-cells or #size-cells for static shared memory node.\n"); + return -EINVAL; + } + + /* + * "xen,shm-id" property holds an arbitrary string with a strict limit + * on the number of characters, MAX_SHM_ID_LENGTH + */ + prop_id = fdt_get_property(fdt, node, "xen,shm-id", NULL); + if ( !prop_id ) + return -ENOENT; + shm_id = (const char *)prop_id->data; + if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) == MAX_SHM_ID_LENGTH ) + { + printk("fdt: invalid xen,shm-id %s, it must be limited to %u characters\n", + shm_id, MAX_SHM_ID_LENGTH); + return -EINVAL; + } + + /* + * "role" property is optional and if it is defined explicitly, + * it must be either `owner` or `borrower`. + */ + prop_role = fdt_get_property(fdt, node, "role", NULL); + if ( prop_role ) + { + if ( !strcmp(prop_role->data, "owner") ) + owner = true; + else if ( strcmp(prop_role->data, "borrower") ) + { + printk("fdt: invalid `role` property for static shared memory node.\n"); + return -EINVAL; + } + } + + /* + * xen,shared-mem = ; + * Memory region starting from physical address #paddr of #size shall + * be mapped to guest physical address #gaddr as static shared memory + * region. + */ + prop = fdt_get_property(fdt, node, "xen,shared-mem", &len); + if ( !prop ) + return -ENOENT; + + cell = (const __be32 *)prop->data; + if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) + { + if ( len == dt_cells_to_size(address_cells + size_cells) ) + device_tree_get_reg(&cell, address_cells, size_cells, &gaddr, + &size); + else + { + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } + } + else + { + device_tree_get_reg(&cell, address_cells, address_cells, &paddr, + &gaddr); + size = dt_next_cell(size_cells, &cell); + + if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) + { + printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", + paddr); + return -EINVAL; + } + + end = paddr + size; + if ( end <= paddr ) + { + printk("fdt: static shared memory region %s overflow\n", shm_id); + return -EINVAL; + } + } + + if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) + { + printk("fdt: guest address 0x%"PRIpaddr" is not suitably aligned.\n", + gaddr); + return -EINVAL; + } + + if ( !size ) + { + printk("fdt: the size for static shared memory region can not be zero\n"); + return -EINVAL; + } + + if ( !IS_ALIGNED(size, PAGE_SIZE) ) + { + printk("fdt: size 0x%"PRIpaddr" is not suitably aligned\n", size); + return -EINVAL; + } + + for ( i = 0; i < mem->nr_banks; i++ ) + { + /* + * Meet the following check: + * - when host address is provided: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + * - when host address is not provided: + * 1) The shm ID matches and the region size exactly match + */ + bool paddr_assigned = (INVALID_PADDR != paddr); + + if ( strncmp(shm_id, shmem_extra[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) + { + /* + * Regions have same shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr is equal and size is equal (same region) + * - Fail: paddr doesn't match or size doesn't match (there + * cannot exists two shmem regions with same shm_id) + * 2) physical host address is NOT supplied: + * - OK: size is equal (same region) + * - Fail: size is not equal (same shm_id must identify only one + * region, there can't be two different regions with same + * shm_id) + */ + bool start_match = paddr_assigned ? (paddr == mem->bank[i].start) : + true; + + if ( start_match && (size == mem->bank[i].size) ) + break; + else + { + printk("fdt: different shared memory region could not share the same shm ID %s\n", + shm_id); + return -EINVAL; + } + } + + /* + * Regions have different shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr different, or size different (case where paddr + * is equal but psize is different are wrong, but they + * are handled later when checking for overlapping) + * - Fail: paddr equal and size equal (the same region can't be + * identified with different shm_id) + * 2) physical host address is NOT supplied: + * - OK: Both have different shm_id so even with same size they + * can exists + */ + if ( !paddr_assigned || (paddr != mem->bank[i].start) || + (size != mem->bank[i].size) ) + continue; + else + { + printk("fdt: xen,shm-id %s does not match for all the nodes using the same region\n", + shm_id); + return -EINVAL; + } + } + + if ( i == mem->nr_banks ) + { + if (i < mem->max_banks) + { + if ( (paddr != INVALID_PADDR) && + check_reserved_regions_overlap(paddr, size, false) ) + return -EINVAL; + + /* Static shared memory shall be reserved from any other use. */ + safe_strcpy(shmem_extra[mem->nr_banks].shm_id, shm_id); + mem->bank[mem->nr_banks].start = paddr; + mem->bank[mem->nr_banks].size = size; + mem->bank[mem->nr_banks].shmem_extra = &shmem_extra[mem->nr_banks]; + mem->nr_banks++; + } + else + { + printk("Warning: Max number of supported memory regions reached.\n"); + return -ENOSPC; + } + } + /* + * keep a count of the number of borrowers, which later may be used + * to calculate the reference count. + */ + if ( !owner ) + shmem_extra[i].nr_shm_borrowers++; + + return 0; +} + +int __init make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells) +{ + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); + void *fdt = kinfo->fdt; + int res = 0; + /* Placeholder for reserved-memory\0 */ + const char resvbuf[16] = "reserved-memory"; + + if ( mem->nr_banks == 0 ) + /* No shared memory provided. */ + return 0; + + dt_dprintk("Create reserved-memory node\n"); + + res = fdt_begin_node(fdt, resvbuf); + if ( res ) + return res; + + res = fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", addrcells); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", sizecells); + if ( res ) + return res; + + res = make_shm_resv_memory_node(kinfo, addrcells, sizecells); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + +void __init early_print_info_shmem(void) +{ + const struct membanks *shmem = bootinfo_get_shmem(); + unsigned int bank; + unsigned int printed = 0; + + for ( bank = 0; bank < shmem->nr_banks; bank++, printed++ ) + if ( shmem->bank[bank].start != INVALID_PADDR ) + printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", printed, + shmem->bank[bank].start, + shmem->bank[bank].start + shmem->bank[bank].size - 1); +} + +void __init init_sharedmem_pages(void) +{ + const struct membanks *shmem = bootinfo_get_shmem(); + unsigned int bank; + + for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) + if ( shmem->bank[bank].start != INVALID_PADDR ) + init_staticmem_bank(&shmem->bank[bank]); +} + +int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, + struct rangeset *rangeset) +{ + const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); + unsigned int i; + + /* Remove static shared memory regions */ + for ( i = 0; i < shm_mem->nr_banks; i++ ) + { + paddr_t start, end; + int res; + + start = shm_mem->bank[i].start; + end = shm_mem->bank[i].start + shm_mem->bank[i].size; + res = rangeset_remove_range(rangeset, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR + "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr", error: %d\n", + start, end, res); + return -EINVAL; + } + } + + return 0; +} + +void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, + __be32 *reg, int *nr_cells, + int addrcells, int sizecells) +{ + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); + unsigned int i; + __be32 *cells; + + BUG_ON(!nr_cells || !reg); + + cells = ®[*nr_cells]; + for ( i = 0; i < mem->nr_banks; i++ ) + { + paddr_t start = mem->bank[i].start; + paddr_t size = mem->bank[i].size; + + *nr_cells += addrcells + sizecells; + BUG_ON(*nr_cells >= DT_MEM_NODE_REG_RANGE_SIZE); + dt_child_set_range(&cells, addrcells, sizecells, start, size); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/static-shmem.h b/xen/include/xen/static-shmem.h new file mode 100644 index 0000000000..76a4986912 --- /dev/null +++ b/xen/include/xen/static-shmem.h @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef XEN_STATIC_SHMEM_H +#define XEN_STATIC_SHMEM_H + +#include +#include + +#ifdef CONFIG_STATIC_SHM + +/* Worst case /memory node reg element: (addrcells + sizecells) */ +#define DT_MEM_NODE_REG_RANGE_SIZE ((NR_MEM_BANKS + NR_SHMEM_BANKS) * 4) + +int make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells); + +int process_shm(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); + +int process_shm_node(const void *fdt, int node, uint32_t address_cells, + uint32_t size_cells); + +void early_print_info_shmem(void); + +void init_sharedmem_pages(void); + +int remove_shm_from_rangeset(const struct kernel_info *kinfo, + struct rangeset *rangeset); + +int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells); + +void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, + int *nr_cells, int addrcells, int sizecells); + +static inline struct membanks * +kernel_info_get_shm_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_shm_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, const struct membanks, common); +} + +#else /* !CONFIG_STATIC_SHM */ + +/* Worst case /memory node reg element: (addrcells + sizecells) */ +#define DT_MEM_NODE_REG_RANGE_SIZE (NR_MEM_BANKS * 4) + +static inline int make_resv_memory_node(const struct kernel_info *kinfo, + int addrcells, int sizecells) +{ + return 0; +} + +static inline int process_shm(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + return 0; +} + +static inline void init_sharedmem_pages(void) {}; + +static inline int remove_shm_from_rangeset(const struct kernel_info *kinfo, + struct rangeset *rangeset) +{ + return 0; +} + +static inline int make_shm_resv_memory_node(const struct kernel_info *kinfo, + int addrcells, int sizecells) +{ + return 0; +} + +static inline void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, + __be32 *reg, int *nr_cells, + int addrcells, int sizecells) {}; + +#endif /* CONFIG_STATIC_SHM */ + +#endif /* XEN_STATIC_SHMEM_H */ + +/* + * 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 Wed Jun 04 07:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005162.1384679 (Exim 4.92) (envelope-from ) id 1uMixj-0004MV-9d; Wed, 04 Jun 2025 07:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005162.1384679; Wed, 04 Jun 2025 07: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 1uMixj-0004MN-6g; Wed, 04 Jun 2025 07:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1005162; Wed, 04 Jun 2025 07:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMixh-0004MH-UH for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMixh-001nkX-1t for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMixh-00FSFU-1f for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=+FWYt3WzES/6JsTEcAklYruaNBrxx76iDQAMJa2Zcj0=; b=h1xNyAJzb9Ak6Dons7FeiozgDU 8dKjVKnzgH9YU4eD4jxRbd6dgweYszIV4PPEExZBzYIJBSXrgfLwE35CcdRE3vdUW24pwA0pe9DPr u0cf+VrErxLJDwKEboCWhE5LjOT9ZugM7L7iYXhfal15Hb1TVGKPPgp7vdnwP0BJIRr8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common: Drop unneeded Arm dependency for static-evtchn Message-Id: Date: Wed, 04 Jun 2025 07:55:01 +0000 commit 4d62fe057f6020aab810ba41f721d7be80657750 Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:26 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:02:21 2025 +0200 common: Drop unneeded Arm dependency for static-evtchn DOM0LESS_BOOT is sufficient (only Arm selects it today). If needed, proper arch dependency can be introduced while adding support for it for another architecture. Suggested-by: Jan Beulich Signed-off-by: Michal Orzel Acked-by: Jan Beulich --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0951d4c2f2..7ecf5a8031 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -164,7 +164,7 @@ config STATIC_MEMORY config STATIC_EVTCHN bool "Static event channel support on a dom0less system" - depends on DOM0LESS_BOOT && ARM + depends on DOM0LESS_BOOT default y help This option enables establishing static event channel communication -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 07:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005163.1384683 (Exim 4.92) (envelope-from ) id 1uMixt-0004OM-B1; Wed, 04 Jun 2025 07:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005163.1384683; Wed, 04 Jun 2025 07: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 1uMixt-0004OD-87; Wed, 04 Jun 2025 07:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1005163; Wed, 04 Jun 2025 07:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMixr-0004Nz-Nd for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMixr-001nl7-2F for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMixr-00FSNO-25 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=NDyTg0eJx4TvSx/4tBlhthwN2knhitqqidrq2urVGSE=; b=ig6vdU88YfvIyZCOIXJcbTgxr+ LMrxfPrBbLq/QlzGaPJOoC4N0XEvTjNFg3s9hvV9hbvYDt3QdDfe9HYc2Bl7MUyRJnETPUtpHs3vI lZVuAB+C9n1fVTYbyzvapfWG1gIAdd416qPecy8F7qry/e5YQr1Vnh/cl5X3RLWL1QRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] device-tree: Move domain_fdt_begin_node() to common Message-Id: Date: Wed, 04 Jun 2025 07:55:11 +0000 commit 9b29c4ad0bc845ca3612ca5d38161138619ab8f7 Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:27 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:02:21 2025 +0200 device-tree: Move domain_fdt_begin_node() to common This is just a wrapper around fdt_begin_node(). Move it to common and remove asm/domain_build.h inclusion from static-shmem.c. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 32 -------------------------------- xen/arch/arm/include/asm/domain_build.h | 1 - xen/arch/arm/static-shmem.c | 1 - xen/common/device-tree/bootfdt.c | 32 ++++++++++++++++++++++++++++++++ xen/include/xen/bootfdt.h | 1 + 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b189a7cfae..068af31a62 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -649,38 +649,6 @@ static int __init fdt_property_interrupts(const struct kernel_info *kinfo, return res; } -/* - * Wrapper to convert physical address from paddr_t to uint64_t and - * invoke fdt_begin_node(). This is required as the physical address - * provided as part of node name should not contain any leading - * zeroes. Thus, one should use PRIx64 (instead of PRIpaddr) to append - * unit (which contains the physical address) with name to generate a - * node name. - */ -int __init domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit) -{ - /* - * The size of the buffer to hold the longest possible string (i.e. - * interrupt-controller@ + a 64-bit number + \0). - */ - char buf[38]; - int ret; - - /* ePAPR 3.4 */ - ret = snprintf(buf, sizeof(buf), "%s@%"PRIx64, name, unit); - - if ( ret >= sizeof(buf) ) - { - printk(XENLOG_ERR - "Insufficient buffer. Minimum size required is %d\n", - (ret + 1)); - - return -FDT_ERR_TRUNCATED; - } - - return fdt_begin_node(fdt, buf); -} - int __init make_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells, const struct membanks *mem) { diff --git a/xen/arch/arm/include/asm/domain_build.h b/xen/arch/arm/include/asm/domain_build.h index 9655e9d453..c6fec3168c 100644 --- a/xen/arch/arm/include/asm/domain_build.h +++ b/xen/arch/arm/include/asm/domain_build.h @@ -5,7 +5,6 @@ #include typedef __be32 gic_interrupt_t[3]; -int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); int make_psci_node(void *fdt); void evtchn_allocate(struct domain *d); diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 32ec6d4bc6..21fd2c3cd4 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index 529c91e603..aa44f5a67c 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -659,6 +659,38 @@ const __init char *boot_fdt_cmdline(const void *fdt) return prop->data; } +/* + * Wrapper to convert physical address from paddr_t to uint64_t and + * invoke fdt_begin_node(). This is required as the physical address + * provided as part of node name should not contain any leading + * zeroes. Thus, one should use PRIx64 (instead of PRIpaddr) to append + * unit (which contains the physical address) with name to generate a + * node name. + */ +int __init domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit) +{ + /* + * The size of the buffer to hold the longest possible string (i.e. + * interrupt-controller@ + a 64-bit number + \0). + */ + char buf[38]; + int ret; + + /* ePAPR 3.4 */ + ret = snprintf(buf, sizeof(buf), "%s@%"PRIx64, name, unit); + + if ( ret >= sizeof(buf) ) + { + printk(XENLOG_ERR + "Insufficient buffer. Minimum size required is %d\n", + (ret + 1)); + + return -FDT_ERR_TRUNCATED; + } + + return fdt_begin_node(fdt, buf); +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index 847f019559..64db48f4fe 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -191,6 +191,7 @@ void populate_boot_allocator(void); size_t boot_fdt_info(const void *fdt, paddr_t paddr); const char *boot_fdt_cmdline(const void *fdt); +int domain_fdt_begin_node(void *fdt, const char *name, uint64_t unit); static inline struct membanks *bootinfo_get_reserved_mem(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 07:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005164.1384688 (Exim 4.92) (envelope-from ) id 1uMiy3-0004Qx-Cx; Wed, 04 Jun 2025 07:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005164.1384688; Wed, 04 Jun 2025 07: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 1uMiy3-0004Qf-9Y; Wed, 04 Jun 2025 07:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1005164; Wed, 04 Jun 2025 07:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMiy1-0004QT-RA for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMiy1-001nlt-2b for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMiy1-00FSVG-2S for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=gtHCLaagiGFIKAOpLP4mQeFxmiE0mchdpnPE1DbxeNc=; b=oe0DbpsX15eynInGQoiU2cHt3w Htg0d3AoflGuIoSYWvHd7QJr/HzB0M57iOPpHbwtWRAPiX2tvKexMl1jgpJ7ipYmYOH1CnauQDG4x SqPutJ4PjurTCbFcc5sYh5SCbBArnge9DV2qqi/rBuSrVjMP12ry1ghGbwq945YrMx7w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] device-tree: Move Arm's static-memory feature to common Message-Id: Date: Wed, 04 Jun 2025 07:55:21 +0000 commit 3e027c2732162e4c1b685a110f93e277b721edb6 Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:28 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:02:59 2025 +0200 device-tree: Move Arm's static-memory feature to common This feature is arch agnostic, thus move it to common. While at it, move xen/pfn.h inclusion in static-memory.h below #ifdef CONFIG_STATIC_MEMORY when it is only needed. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/Makefile | 1 - xen/arch/arm/arm32/mmu/mm.c | 2 +- xen/arch/arm/arm64/mmu/mm.c | 2 +- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/include/asm/static-memory.h | 58 ------- xen/arch/arm/static-memory.c | 281 ------------------------------- xen/arch/arm/static-shmem.c | 2 +- xen/common/device-tree/Makefile | 1 + xen/common/device-tree/dom0less-build.c | 6 +- xen/common/device-tree/static-memory.c | 281 +++++++++++++++++++++++++++++++ xen/include/xen/static-memory.h | 59 +++++++ 11 files changed, 346 insertions(+), 349 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index eeeac4e653..4f08014547 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y += setup.o obj-y += shutdown.o obj-y += smp.o obj-y += smpboot.o -obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o obj-y += sysctl.o obj-y += time.o diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 956693232a..f3305e28e9 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -6,9 +6,9 @@ #include #include #include +#include #include #include -#include #include static unsigned long opt_xenheap_megabytes __initdata; diff --git a/xen/arch/arm/arm64/mmu/mm.c b/xen/arch/arm/arm64/mmu/mm.c index c1efa1348a..cded8f2787 100644 --- a/xen/arch/arm/arm64/mmu/mm.c +++ b/xen/arch/arm/arm64/mmu/mm.c @@ -4,9 +4,9 @@ #include #include #include +#include #include -#include #include /* Override macros from asm/page.h to make them work with mfn_t */ diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a49764f0ad..bcfd686a8b 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include #include #ifdef CONFIG_VGICV2 diff --git a/xen/arch/arm/include/asm/static-memory.h b/xen/arch/arm/include/asm/static-memory.h deleted file mode 100644 index a32a3c6553..0000000000 --- a/xen/arch/arm/include/asm/static-memory.h +++ /dev/null @@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_STATIC_MEMORY_H_ -#define __ASM_STATIC_MEMORY_H_ - -#include -#include - -#ifdef CONFIG_STATIC_MEMORY - -static inline void init_staticmem_bank(const struct membank *bank) -{ - mfn_t bank_start = _mfn(PFN_UP(bank->start)); - unsigned long bank_pages = PFN_DOWN(bank->size); - mfn_t bank_end = mfn_add(bank_start, bank_pages); - - if ( mfn_x(bank_end) <= mfn_x(bank_start) ) - return; - - unprepare_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); -} - -void allocate_static_memory(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node); -void assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node); -void init_staticmem_pages(void); - -#else /* !CONFIG_STATIC_MEMORY */ - -static inline void allocate_static_memory(struct domain *d, - struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - ASSERT_UNREACHABLE(); -} - -static inline void assign_static_memory_11(struct domain *d, - struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - ASSERT_UNREACHABLE(); -} - -static inline void init_staticmem_pages(void) {}; - -#endif /* CONFIG_STATIC_MEMORY */ - -#endif /* __ASM_STATIC_MEMORY_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/static-memory.c b/xen/arch/arm/static-memory.c deleted file mode 100644 index e0f76afcd8..0000000000 --- a/xen/arch/arm/static-memory.c +++ /dev/null @@ -1,281 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include - -#include -#include - -static bool __init append_static_memory_to_bank(struct domain *d, - struct membank *bank, - mfn_t smfn, - paddr_t size) -{ - int res; - unsigned int nr_pages = PFN_DOWN(size); - gfn_t sgfn; - - /* - * For direct-mapped domain, the GFN match the MFN. - * Otherwise, this is inferred on what has already been allocated - * in the bank. - */ - if ( !is_domain_direct_mapped(d) ) - sgfn = gaddr_to_gfn(bank->start + bank->size); - else - sgfn = gaddr_to_gfn(mfn_to_maddr(smfn)); - - res = guest_physmap_add_pages(d, sgfn, smfn, nr_pages); - if ( res ) - { - dprintk(XENLOG_ERR, "Failed to map pages to DOMU: %d", res); - return false; - } - - bank->size = bank->size + size; - - return true; -} - -static mfn_t __init acquire_static_memory_bank(struct domain *d, - const __be32 **cell, - u32 addr_cells, u32 size_cells, - paddr_t *pbase, paddr_t *psize) -{ - mfn_t smfn; - int res; - - device_tree_get_reg(cell, addr_cells, size_cells, pbase, psize); - ASSERT(IS_ALIGNED(*pbase, PAGE_SIZE) && IS_ALIGNED(*psize, PAGE_SIZE)); - if ( PFN_DOWN(*psize) > UINT_MAX ) - { - printk(XENLOG_ERR "%pd: static memory size too large: %#"PRIpaddr, - d, *psize); - return INVALID_MFN; - } - - smfn = maddr_to_mfn(*pbase); - res = acquire_domstatic_pages(d, smfn, PFN_DOWN(*psize), 0); - if ( res ) - { - printk(XENLOG_ERR - "%pd: failed to acquire static memory: %d.\n", d, res); - return INVALID_MFN; - } - - return smfn; -} - -static int __init parse_static_mem_prop(const struct dt_device_node *node, - u32 *addr_cells, u32 *size_cells, - int *length, const __be32 **cell) -{ - const struct dt_property *prop; - - prop = dt_find_property(node, "xen,static-mem", NULL); - - *addr_cells = dt_n_addr_cells(node); - *size_cells = dt_n_size_cells(node); - - *cell = (const __be32 *)prop->value; - *length = prop->length; - - return 0; -} - -/* Allocate memory from static memory as RAM for one specific domain d. */ -void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - u32 addr_cells, size_cells, reg_cells; - unsigned int nr_banks, gbank, bank = 0; - const uint64_t rambase[] = GUEST_RAM_BANK_BASES; - const uint64_t ramsize[] = GUEST_RAM_BANK_SIZES; - const __be32 *cell; - u64 tot_size = 0; - paddr_t pbase, psize, gsize; - mfn_t smfn; - int length; - - if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) - goto fail; - reg_cells = addr_cells + size_cells; - - /* - * The static memory will be mapped in the guest at the usual guest memory - * addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by - * xen/include/public/arch-arm.h. - */ - gbank = 0; - gsize = ramsize[gbank]; - mem->bank[gbank].start = rambase[gbank]; - nr_banks = length / (reg_cells * sizeof (u32)); - - for ( ; bank < nr_banks; bank++ ) - { - smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, - &pbase, &psize); - if ( mfn_eq(smfn, INVALID_MFN) ) - goto fail; - - printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", - d, bank, pbase, pbase + psize); - - while ( 1 ) - { - /* Map as much as possible the static range to the guest bank */ - if ( !append_static_memory_to_bank(d, &mem->bank[gbank], smfn, - min(psize, gsize)) ) - goto fail; - - /* - * The current physical bank is fully mapped. - * Handle the next physical bank. - */ - if ( gsize >= psize ) - { - gsize = gsize - psize; - break; - } - /* - * When current guest bank is not enough to map, exhaust - * the current one and seek to the next. - * Before seeking to the next, check if we still have available - * guest bank. - */ - else if ( (gbank + 1) >= GUEST_RAM_BANKS ) - { - printk(XENLOG_ERR "Exhausted all possible guest banks.\n"); - goto fail; - } - else - { - psize = psize - gsize; - smfn = mfn_add(smfn, gsize >> PAGE_SHIFT); - /* Update to the next guest bank. */ - gbank++; - gsize = ramsize[gbank]; - mem->bank[gbank].start = rambase[gbank]; - } - } - - tot_size += psize; - } - - mem->nr_banks = ++gbank; - - kinfo->unassigned_mem -= tot_size; - /* - * The property 'memory' should match the amount of memory given to the - * guest. - * Currently, it is only possible to either acquire static memory or let - * Xen allocate. *Mixing* is not supported. - */ - if ( kinfo->unassigned_mem ) - { - printk(XENLOG_ERR - "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\". Unsupported configuration.\n"); - goto fail; - } - - return; - - fail: - panic("Failed to allocate requested static memory for domain %pd.\n", d); -} - -/* - * Allocate static memory as RAM for one specific domain d. - * The static memory will be directly mapped in the guest(Guest Physical - * Address == Physical Address). - */ -void __init assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - struct membanks *mem = kernel_info_get_mem(kinfo); - u32 addr_cells, size_cells, reg_cells; - unsigned int nr_banks, bank = 0; - const __be32 *cell; - paddr_t pbase, psize; - mfn_t smfn; - int length; - - if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) - { - printk(XENLOG_ERR - "%pd: failed to parse \"xen,static-mem\" property.\n", d); - goto fail; - } - reg_cells = addr_cells + size_cells; - nr_banks = length / (reg_cells * sizeof(u32)); - - if ( nr_banks > mem->max_banks ) - { - printk(XENLOG_ERR - "%pd: exceed max number of supported guest memory banks.\n", d); - goto fail; - } - - for ( ; bank < nr_banks; bank++ ) - { - smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, - &pbase, &psize); - if ( mfn_eq(smfn, INVALID_MFN) ) - goto fail; - - printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", - d, bank, pbase, pbase + psize); - - /* One guest memory bank is matched with one physical memory bank. */ - mem->bank[bank].start = pbase; - if ( !append_static_memory_to_bank(d, &mem->bank[bank], - smfn, psize) ) - goto fail; - - kinfo->unassigned_mem -= psize; - } - - mem->nr_banks = nr_banks; - - /* - * The property 'memory' should match the amount of memory given to - * the guest. - * Currently, it is only possible to either acquire static memory or - * let Xen allocate. *Mixing* is not supported. - */ - if ( kinfo->unassigned_mem != 0 ) - { - printk(XENLOG_ERR - "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\".\n"); - goto fail; - } - - return; - - fail: - panic("Failed to assign requested static memory for direct-map domain %pd.\n", - d); -} - -/* Static memory initialization */ -void __init init_staticmem_pages(void) -{ - const struct membanks *reserved_mem = bootinfo_get_reserved_mem(); - unsigned int bank; - - for ( bank = 0 ; bank < reserved_mem->nr_banks; bank++ ) - { - if ( reserved_mem->bank[bank].type == MEMBANK_STATIC_DOMAIN ) - init_staticmem_bank(&reserved_mem->bank[bank]); - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 21fd2c3cd4..2055b7be0f 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -5,9 +5,9 @@ #include #include #include +#include #include -#include #include typedef struct { diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index 57b9e6ca00..ed11f2c3b4 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o +obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 39cb2cd5c7..c8c5a04f24 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -28,9 +28,7 @@ #include #include -#if __has_include() -# include -#endif +#include #if __has_include() # include @@ -799,12 +797,10 @@ static int __init construct_domU(struct domain *d, { if ( !dt_find_property(node, "xen,static-mem", NULL) ) allocate_memory(d, &kinfo); -#ifdef CONFIG_STATIC_MEMORY else if ( !is_domain_direct_mapped(d) ) allocate_static_memory(d, &kinfo, node); else assign_static_memory_11(d, &kinfo, node); -#endif #ifdef CONFIG_STATIC_SHM rc = process_shm(d, &kinfo, node); diff --git a/xen/common/device-tree/static-memory.c b/xen/common/device-tree/static-memory.c new file mode 100644 index 0000000000..0774d06806 --- /dev/null +++ b/xen/common/device-tree/static-memory.c @@ -0,0 +1,281 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#include + +static bool __init append_static_memory_to_bank(struct domain *d, + struct membank *bank, + mfn_t smfn, + paddr_t size) +{ + int res; + unsigned int nr_pages = PFN_DOWN(size); + gfn_t sgfn; + + /* + * For direct-mapped domain, the GFN match the MFN. + * Otherwise, this is inferred on what has already been allocated + * in the bank. + */ + if ( !is_domain_direct_mapped(d) ) + sgfn = gaddr_to_gfn(bank->start + bank->size); + else + sgfn = gaddr_to_gfn(mfn_to_maddr(smfn)); + + res = guest_physmap_add_pages(d, sgfn, smfn, nr_pages); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed to map pages to DOMU: %d", res); + return false; + } + + bank->size = bank->size + size; + + return true; +} + +static mfn_t __init acquire_static_memory_bank(struct domain *d, + const __be32 **cell, + u32 addr_cells, u32 size_cells, + paddr_t *pbase, paddr_t *psize) +{ + mfn_t smfn; + int res; + + device_tree_get_reg(cell, addr_cells, size_cells, pbase, psize); + ASSERT(IS_ALIGNED(*pbase, PAGE_SIZE) && IS_ALIGNED(*psize, PAGE_SIZE)); + if ( PFN_DOWN(*psize) > UINT_MAX ) + { + printk(XENLOG_ERR "%pd: static memory size too large: %#"PRIpaddr, + d, *psize); + return INVALID_MFN; + } + + smfn = maddr_to_mfn(*pbase); + res = acquire_domstatic_pages(d, smfn, PFN_DOWN(*psize), 0); + if ( res ) + { + printk(XENLOG_ERR + "%pd: failed to acquire static memory: %d.\n", d, res); + return INVALID_MFN; + } + + return smfn; +} + +static int __init parse_static_mem_prop(const struct dt_device_node *node, + u32 *addr_cells, u32 *size_cells, + int *length, const __be32 **cell) +{ + const struct dt_property *prop; + + prop = dt_find_property(node, "xen,static-mem", NULL); + + *addr_cells = dt_n_addr_cells(node); + *size_cells = dt_n_size_cells(node); + + *cell = (const __be32 *)prop->value; + *length = prop->length; + + return 0; +} + +/* Allocate memory from static memory as RAM for one specific domain d. */ +void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + u32 addr_cells, size_cells, reg_cells; + unsigned int nr_banks, gbank, bank = 0; + const uint64_t rambase[] = GUEST_RAM_BANK_BASES; + const uint64_t ramsize[] = GUEST_RAM_BANK_SIZES; + const __be32 *cell; + u64 tot_size = 0; + paddr_t pbase, psize, gsize; + mfn_t smfn; + int length; + + if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) + goto fail; + reg_cells = addr_cells + size_cells; + + /* + * The static memory will be mapped in the guest at the usual guest memory + * addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by + * xen/include/public/arch-arm.h. + */ + gbank = 0; + gsize = ramsize[gbank]; + mem->bank[gbank].start = rambase[gbank]; + nr_banks = length / (reg_cells * sizeof (u32)); + + for ( ; bank < nr_banks; bank++ ) + { + smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, + &pbase, &psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + goto fail; + + printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", + d, bank, pbase, pbase + psize); + + while ( 1 ) + { + /* Map as much as possible the static range to the guest bank */ + if ( !append_static_memory_to_bank(d, &mem->bank[gbank], smfn, + min(psize, gsize)) ) + goto fail; + + /* + * The current physical bank is fully mapped. + * Handle the next physical bank. + */ + if ( gsize >= psize ) + { + gsize = gsize - psize; + break; + } + /* + * When current guest bank is not enough to map, exhaust + * the current one and seek to the next. + * Before seeking to the next, check if we still have available + * guest bank. + */ + else if ( (gbank + 1) >= GUEST_RAM_BANKS ) + { + printk(XENLOG_ERR "Exhausted all possible guest banks.\n"); + goto fail; + } + else + { + psize = psize - gsize; + smfn = mfn_add(smfn, gsize >> PAGE_SHIFT); + /* Update to the next guest bank. */ + gbank++; + gsize = ramsize[gbank]; + mem->bank[gbank].start = rambase[gbank]; + } + } + + tot_size += psize; + } + + mem->nr_banks = ++gbank; + + kinfo->unassigned_mem -= tot_size; + /* + * The property 'memory' should match the amount of memory given to the + * guest. + * Currently, it is only possible to either acquire static memory or let + * Xen allocate. *Mixing* is not supported. + */ + if ( kinfo->unassigned_mem ) + { + printk(XENLOG_ERR + "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\". Unsupported configuration.\n"); + goto fail; + } + + return; + + fail: + panic("Failed to allocate requested static memory for domain %pd.\n", d); +} + +/* + * Allocate static memory as RAM for one specific domain d. + * The static memory will be directly mapped in the guest(Guest Physical + * Address == Physical Address). + */ +void __init assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + struct membanks *mem = kernel_info_get_mem(kinfo); + u32 addr_cells, size_cells, reg_cells; + unsigned int nr_banks, bank = 0; + const __be32 *cell; + paddr_t pbase, psize; + mfn_t smfn; + int length; + + if ( parse_static_mem_prop(node, &addr_cells, &size_cells, &length, &cell) ) + { + printk(XENLOG_ERR + "%pd: failed to parse \"xen,static-mem\" property.\n", d); + goto fail; + } + reg_cells = addr_cells + size_cells; + nr_banks = length / (reg_cells * sizeof(u32)); + + if ( nr_banks > mem->max_banks ) + { + printk(XENLOG_ERR + "%pd: exceed max number of supported guest memory banks.\n", d); + goto fail; + } + + for ( ; bank < nr_banks; bank++ ) + { + smfn = acquire_static_memory_bank(d, &cell, addr_cells, size_cells, + &pbase, &psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + goto fail; + + printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", + d, bank, pbase, pbase + psize); + + /* One guest memory bank is matched with one physical memory bank. */ + mem->bank[bank].start = pbase; + if ( !append_static_memory_to_bank(d, &mem->bank[bank], + smfn, psize) ) + goto fail; + + kinfo->unassigned_mem -= psize; + } + + mem->nr_banks = nr_banks; + + /* + * The property 'memory' should match the amount of memory given to + * the guest. + * Currently, it is only possible to either acquire static memory or + * let Xen allocate. *Mixing* is not supported. + */ + if ( kinfo->unassigned_mem != 0 ) + { + printk(XENLOG_ERR + "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\".\n"); + goto fail; + } + + return; + + fail: + panic("Failed to assign requested static memory for direct-map domain %pd.\n", + d); +} + +/* Static memory initialization */ +void __init init_staticmem_pages(void) +{ + const struct membanks *reserved_mem = bootinfo_get_reserved_mem(); + unsigned int bank; + + for ( bank = 0 ; bank < reserved_mem->nr_banks; bank++ ) + { + if ( reserved_mem->bank[bank].type == MEMBANK_STATIC_DOMAIN ) + init_staticmem_bank(&reserved_mem->bank[bank]); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/static-memory.h b/xen/include/xen/static-memory.h new file mode 100644 index 0000000000..e445aa8057 --- /dev/null +++ b/xen/include/xen/static-memory.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef XEN_STATIC_MEMORY_H +#define XEN_STATIC_MEMORY_H + +#include + +#ifdef CONFIG_STATIC_MEMORY + +#include + +static inline void init_staticmem_bank(const struct membank *bank) +{ + mfn_t bank_start = _mfn(PFN_UP(bank->start)); + unsigned long bank_pages = PFN_DOWN(bank->size); + mfn_t bank_end = mfn_add(bank_start, bank_pages); + + if ( mfn_x(bank_end) <= mfn_x(bank_start) ) + return; + + unprepare_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); +} + +void allocate_static_memory(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); +void assign_static_memory_11(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); +void init_staticmem_pages(void); + +#else /* !CONFIG_STATIC_MEMORY */ + +static inline void allocate_static_memory(struct domain *d, + struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + ASSERT_UNREACHABLE(); +} + +static inline void assign_static_memory_11(struct domain *d, + struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + ASSERT_UNREACHABLE(); +} + +static inline void init_staticmem_pages(void) {}; + +#endif /* CONFIG_STATIC_MEMORY */ + +#endif /* XEN_STATIC_MEMORY_H */ + +/* + * 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 Wed Jun 04 07:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 07:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005165.1384691 (Exim 4.92) (envelope-from ) id 1uMiyD-0004TW-Gf; Wed, 04 Jun 2025 07:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005165.1384691; Wed, 04 Jun 2025 07: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 1uMiyD-0004TP-DN; Wed, 04 Jun 2025 07:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1005165; Wed, 04 Jun 2025 07:55:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMiyB-0004TH-UK for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMiyB-001nmA-2u for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07:55:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMiyB-00FSck-2o for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 07: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=YYC6O7psioBYbEHEDXVUNAQG553Upok7lctOVGliwbc=; b=j8R48SIQOShD+6buqZzIUUxdcj cQUBEdWcVwD6L2rf09ZzYuyIZ9NdTczfYvePaE0QZyuOIyfsRqMcJKuTvWlJgaTl2AOap8+vKrQ4A mLgEkKmgJux+8mEZwgjzyqQk85XdA/NMLF+01SUGh//Dh2W1q14DG8U8NwINyEhn3Fa4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] device-tree: Move Arm's static-shmem feature to common Message-Id: Date: Wed, 04 Jun 2025 07:55:31 +0000 commit 72c5fa220804520839fd431ed19cd2b6eb04015a Author: Michal Orzel AuthorDate: Tue Jun 3 12:03:29 2025 +0200 Commit: Michal Orzel CommitDate: Wed Jun 4 09:04:24 2025 +0200 device-tree: Move Arm's static-shmem feature to common This feature is arch agnostic, thus move it to common. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/Kconfig | 6 - xen/arch/arm/Makefile | 1 - xen/arch/arm/arm32/mmu/mm.c | 2 +- xen/arch/arm/arm64/mmu/mm.c | 2 +- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/include/asm/static-shmem.h | 94 ---- xen/arch/arm/static-shmem.c | 854 -------------------------------- xen/common/Kconfig | 6 + xen/common/device-tree/Makefile | 1 + xen/common/device-tree/bootfdt.c | 4 +- xen/common/device-tree/dom0less-build.c | 9 +- xen/common/device-tree/static-shmem.c | 854 ++++++++++++++++++++++++++++++++ xen/include/xen/static-shmem.h | 94 ++++ 14 files changed, 961 insertions(+), 970 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 57919d8b3a..3f25da3ca5 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -247,12 +247,6 @@ config ARM64_BTI source "arch/arm/tee/Kconfig" -config STATIC_SHM - bool "Statically shared memory on a dom0less system" if UNSUPPORTED - depends on STATIC_MEMORY - help - This option enables statically shared memory on a dom0less system. - config PARTIAL_EMULATION bool "Enable partial emulation of system/coprocessor registers" default y diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 4f08014547..ab0a0c2be6 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y += setup.o obj-y += shutdown.o obj-y += smp.o obj-y += smpboot.o -obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o obj-y += sysctl.o obj-y += time.o obj-y += traps.o diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index f3305e28e9..4d22f35618 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -7,9 +7,9 @@ #include #include #include +#include #include #include -#include static unsigned long opt_xenheap_megabytes __initdata; integer_param("xenheap_megabytes", opt_xenheap_megabytes); diff --git a/xen/arch/arm/arm64/mmu/mm.c b/xen/arch/arm/arm64/mmu/mm.c index cded8f2787..a0a2dd8cc7 100644 --- a/xen/arch/arm/arm64/mmu/mm.c +++ b/xen/arch/arm/arm64/mmu/mm.c @@ -5,9 +5,9 @@ #include #include #include +#include #include -#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index bcfd686a8b..20aabf6be5 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include #ifdef CONFIG_VGICV2 static int __init make_gicv2_domU_node(struct kernel_info *kinfo) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 068af31a62..590f38e520 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h deleted file mode 100644 index 6a4c33cca8..0000000000 --- a/xen/arch/arm/include/asm/static-shmem.h +++ /dev/null @@ -1,94 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __ASM_STATIC_SHMEM_H_ -#define __ASM_STATIC_SHMEM_H_ - -#include -#include - -#ifdef CONFIG_STATIC_SHM - -/* Worst case /memory node reg element: (addrcells + sizecells) */ -#define DT_MEM_NODE_REG_RANGE_SIZE ((NR_MEM_BANKS + NR_SHMEM_BANKS) * 4) - -int make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells); - -int process_shm(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node); - -int process_shm_node(const void *fdt, int node, uint32_t address_cells, - uint32_t size_cells); - -void early_print_info_shmem(void); - -void init_sharedmem_pages(void); - -int remove_shm_from_rangeset(const struct kernel_info *kinfo, - struct rangeset *rangeset); - -int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells); - -void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, - int *nr_cells, int addrcells, int sizecells); - -static inline struct membanks * -kernel_info_get_shm_mem(struct kernel_info *kinfo) -{ - return container_of(&kinfo->shm_mem.common, struct membanks, common); -} - -static inline const struct membanks * -kernel_info_get_shm_mem_const(const struct kernel_info *kinfo) -{ - return container_of(&kinfo->shm_mem.common, const struct membanks, common); -} - -#else /* !CONFIG_STATIC_SHM */ - -/* Worst case /memory node reg element: (addrcells + sizecells) */ -#define DT_MEM_NODE_REG_RANGE_SIZE (NR_MEM_BANKS * 4) - -static inline int make_resv_memory_node(const struct kernel_info *kinfo, - int addrcells, int sizecells) -{ - return 0; -} - -static inline int process_shm(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - return 0; -} - -static inline void init_sharedmem_pages(void) {}; - -static inline int remove_shm_from_rangeset(const struct kernel_info *kinfo, - struct rangeset *rangeset) -{ - return 0; -} - -static inline int make_shm_resv_memory_node(const struct kernel_info *kinfo, - int addrcells, int sizecells) -{ - return 0; -} - -static inline void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, - __be32 *reg, int *nr_cells, - int addrcells, int sizecells) {}; - -#endif /* CONFIG_STATIC_SHM */ - -#endif /* __ASM_STATIC_SHMEM_H_ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c deleted file mode 100644 index 2055b7be0f..0000000000 --- a/xen/arch/arm/static-shmem.c +++ /dev/null @@ -1,854 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include - -#include -#include - -typedef struct { - struct domain *d; - const char *role_str; - paddr_t gbase; - struct shmem_membank_extra *bank_extra_info; -} alloc_heap_pages_cb_extra; - -static struct { - struct membanks_hdr common; - struct membank bank[NR_SHMEM_BANKS]; -} shm_heap_banks __initdata = { - .common.max_banks = NR_SHMEM_BANKS, - .common.type = STATIC_SHARED_MEMORY -}; - -static inline struct membanks *get_shmem_heap_banks(void) -{ - return container_of(&shm_heap_banks.common, struct membanks, common); -} - -static void __init __maybe_unused build_assertions(void) -{ - /* - * Check that no padding is between struct membanks "bank" flexible array - * member and struct shared_meminfo "bank" member - */ - BUILD_BUG_ON((offsetof(struct membanks, bank) != - offsetof(struct shared_meminfo, bank))); -} - -static const struct membank __init * -find_shm_bank_by_id(const struct membanks *shmem, const char *shm_id) -{ - unsigned int bank; - - for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) - { - if ( strcmp(shm_id, shmem->bank[bank].shmem_extra->shm_id) == 0 ) - break; - } - - if ( bank == shmem->nr_banks ) - return NULL; - - return &shmem->bank[bank]; -} - -/* - * This function checks whether the static shared memory region is - * already allocated to dom_io. - */ -static bool __init is_shm_allocated_to_domio(paddr_t pbase) -{ - struct page_info *page; - struct domain *d; - - page = maddr_to_page(pbase); - d = page_get_owner_and_reference(page); - if ( d == NULL ) - return false; - put_page(page); - - if ( d != dom_io ) - { - printk(XENLOG_ERR - "shm memory node has already been allocated to a specific owner %pd, Please check your configuration\n", - d); - return false; - } - - return true; -} - -static mfn_t __init acquire_shared_memory_bank(struct domain *d, - paddr_t pbase, paddr_t psize, - bool bank_from_heap) -{ - mfn_t smfn; - unsigned long nr_pfns; - int res; - - /* - * Pages of statically shared memory shall be included - * into domain_tot_pages(). - */ - nr_pfns = PFN_DOWN(psize); - if ( (UINT_MAX - d->max_pages) < nr_pfns ) - { - printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", - d, nr_pfns); - return INVALID_MFN; - } - d->max_pages += nr_pfns; - - smfn = maddr_to_mfn(pbase); - if ( bank_from_heap ) - /* - * When host address is not provided, static shared memory is - * allocated from heap and shall be assigned to owner domain. - */ - res = assign_pages(maddr_to_page(pbase), nr_pfns, d, 0); - else - res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); - - if ( res ) - { - printk(XENLOG_ERR "%pd: failed to %s static memory: %d.\n", d, - bank_from_heap ? "assign" : "acquire", res); - goto fail; - } - - return smfn; - - fail: - d->max_pages -= nr_pfns; - return INVALID_MFN; -} - -static int __init assign_shared_memory(struct domain *d, paddr_t gbase, - bool bank_from_heap, - const struct membank *shm_bank) -{ - mfn_t smfn; - int ret = 0; - unsigned long nr_pages, nr_borrowers, i; - struct page_info *page; - paddr_t pbase, psize; - - pbase = shm_bank->start; - psize = shm_bank->size; - nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; - - smfn = acquire_shared_memory_bank(d, pbase, psize, bank_from_heap); - if ( mfn_eq(smfn, INVALID_MFN) ) - return -EINVAL; - - /* - * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need - * to create mapping in the P2M. - */ - nr_pages = PFN_DOWN(psize); - if ( d != dom_io ) - { - ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, - PFN_DOWN(psize)); - if ( ret ) - { - printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); - return ret; - } - } - - /* - * Instead of letting borrower domain get a page ref, we add as many - * additional reference as the number of borrowers when the owner - * is allocated, since there is a chance that owner is created - * after borrower. - * So if the borrower is created first, it will cause adding pages - * in the P2M without reference. - */ - page = mfn_to_page(smfn); - for ( i = 0; i < nr_pages; i++ ) - { - if ( !get_page_nr(page + i, d, nr_borrowers) ) - { - printk(XENLOG_ERR - "Failed to add %lu references to page %"PRI_mfn".\n", - nr_borrowers, mfn_x(smfn) + i); - goto fail; - } - } - - return 0; - - fail: - while ( --i >= 0 ) - put_page_nr(page + i, nr_borrowers); - return ret; -} - -static int __init -append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, - paddr_t size, const char *shm_id) -{ - struct membanks *shm_mem = kernel_info_get_shm_mem(kinfo); - struct shmem_membank_extra *shm_mem_extra; - - if ( shm_mem->nr_banks >= shm_mem->max_banks ) - return -ENOMEM; - - shm_mem_extra = &kinfo->shm_mem.extra[shm_mem->nr_banks]; - - shm_mem->bank[shm_mem->nr_banks].start = start; - shm_mem->bank[shm_mem->nr_banks].size = size; - safe_strcpy(shm_mem_extra->shm_id, shm_id); - shm_mem->bank[shm_mem->nr_banks].shmem_extra = shm_mem_extra; - shm_mem->nr_banks++; - - return 0; -} - -static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, - const char *role_str, - bool bank_from_heap, - const struct membank *shm_bank) -{ - bool owner_dom_io = true; - paddr_t pbase, psize; - int ret; - - pbase = shm_bank->start; - psize = shm_bank->size; - - /* - * "role" property is optional and if it is defined explicitly, - * then the owner domain is not the default "dom_io" domain. - */ - if ( role_str != NULL ) - owner_dom_io = false; - - /* - * DOMID_IO is a fake domain and is not described in the Device-Tree. - * Therefore when the owner of the shared region is DOMID_IO, we will - * only find the borrowers. - */ - if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || - (!owner_dom_io && strcmp(role_str, "owner") == 0) ) - { - /* - * We found the first borrower of the region, the owner was not - * specified, so they should be assigned to dom_io. - */ - ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, - bank_from_heap, shm_bank); - if ( ret ) - return ret; - } - - if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) - { - /* Set up P2M foreign mapping for borrower domain. */ - ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), - _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); - if ( ret ) - return ret; - } - - return 0; -} - -static bool __init save_map_heap_pages(struct domain *d, struct page_info *pg, - unsigned int order, void *extra) -{ - alloc_heap_pages_cb_extra *b_extra = (alloc_heap_pages_cb_extra *)extra; - int idx = shm_heap_banks.common.nr_banks; - int ret = -ENOSPC; - - BUG_ON(!b_extra); - - if ( idx < shm_heap_banks.common.max_banks ) - { - shm_heap_banks.bank[idx].start = page_to_maddr(pg); - shm_heap_banks.bank[idx].size = (1ULL << (PAGE_SHIFT + order)); - shm_heap_banks.bank[idx].shmem_extra = b_extra->bank_extra_info; - shm_heap_banks.common.nr_banks++; - - ret = handle_shared_mem_bank(b_extra->d, b_extra->gbase, - b_extra->role_str, true, - &shm_heap_banks.bank[idx]); - if ( !ret ) - { - /* Increment guest physical address for next mapping */ - b_extra->gbase += shm_heap_banks.bank[idx].size; - return true; - } - } - - printk("Failed to allocate static shared memory from Xen heap: (%d)\n", - ret); - - return false; -} - -int __init process_shm(struct domain *d, struct kernel_info *kinfo, - const struct dt_device_node *node) -{ - struct dt_device_node *shm_node; - - /* Hwdom case - shm node under /chosen */ - if ( !node ) - { - node = dt_find_node_by_path("/chosen"); - BUG_ON(!node); - } - - dt_for_each_child_node(node, shm_node) - { - const struct membank *boot_shm_bank; - const struct dt_property *prop; - const __be32 *cells; - uint32_t addr_cells; - paddr_t gbase, pbase, psize; - int ret = 0; - unsigned int i; - const char *role_str; - const char *shm_id; - - if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) - continue; - - if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) - { - printk("%pd: invalid \"xen,shm-id\" property", d); - return -EINVAL; - } - BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); - - boot_shm_bank = find_shm_bank_by_id(bootinfo_get_shmem(), shm_id); - if ( !boot_shm_bank ) - { - printk("%pd: static shared memory bank not found: '%s'", d, shm_id); - return -ENOENT; - } - - pbase = boot_shm_bank->start; - psize = boot_shm_bank->size; - - /* "role" property is optional */ - if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) - role_str = NULL; - - /* - * xen,shared-mem = <[pbase,] gbase, size>; - * pbase is optional. - */ - addr_cells = dt_n_addr_cells(shm_node); - prop = dt_find_property(shm_node, "xen,shared-mem", NULL); - BUG_ON(!prop); - cells = (const __be32 *)prop->value; - - if ( pbase != INVALID_PADDR ) - { - /* guest phys address is after host phys address */ - gbase = dt_read_paddr(cells + addr_cells, addr_cells); - - if ( is_domain_direct_mapped(d) && (pbase != gbase) ) - { - printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", - d, pbase, gbase); - return -EINVAL; - } - - for ( i = 0; i < PFN_DOWN(psize); i++ ) - if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) - { - printk("%pd: invalid physical address 0x%"PRI_mfn"\n", - d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); - return -EINVAL; - } - - /* The host physical address is supplied by the user */ - ret = handle_shared_mem_bank(d, gbase, role_str, false, - boot_shm_bank); - if ( ret ) - return ret; - } - else - { - /* - * The host physical address is not supplied by the user, so it - * means that the banks needs to be allocated from the Xen heap, - * look into the already allocated banks from the heap. - */ - const struct membank *alloc_bank = - find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); - - if ( is_domain_direct_mapped(d) ) - { - printk("%pd: host and guest physical address must be supplied for direct-mapped domains\n", - d); - return -EINVAL; - } - - /* guest phys address is right at the beginning */ - gbase = dt_read_paddr(cells, addr_cells); - - if ( !alloc_bank ) - { - alloc_heap_pages_cb_extra cb_arg = { d, role_str, gbase, - boot_shm_bank->shmem_extra }; - - /* shm_id identified bank is not yet allocated */ - if ( !allocate_domheap_memory(NULL, psize, save_map_heap_pages, - &cb_arg) ) - { - printk(XENLOG_ERR - "Failed to allocate (%"PRIpaddr"KB) pages as static shared memory from heap\n", - psize >> 10); - return -EINVAL; - } - } - else - { - /* shm_id identified bank is already allocated */ - const struct membank *end_bank = - &shm_heap_banks.bank[shm_heap_banks.common.nr_banks]; - paddr_t gbase_bank = gbase; - - /* - * Static shared memory banks that are taken from the Xen heap - * are allocated sequentially in shm_heap_banks, so starting - * from the first bank found identified by shm_id, the code can - * just advance by one bank at the time until it reaches the end - * of the array or it finds another bank NOT identified by - * shm_id - */ - for ( ; alloc_bank < end_bank; alloc_bank++ ) - { - if ( strcmp(shm_id, alloc_bank->shmem_extra->shm_id) != 0 ) - break; - - ret = handle_shared_mem_bank(d, gbase_bank, role_str, true, - alloc_bank); - if ( ret ) - return ret; - - /* Increment guest physical address for next mapping */ - gbase_bank += alloc_bank->size; - } - } - } - - /* - * Record static shared memory region info for later setting - * up shm-node in guest device tree. - */ - ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); - if ( ret ) - return ret; - } - - return 0; -} - -int __init make_shm_resv_memory_node(const struct kernel_info *kinfo, - int addrcells, int sizecells) -{ - const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); - void *fdt = kinfo->fdt; - unsigned int i = 0; - int res = 0; - - if ( mem->nr_banks == 0 ) - return 0; - - /* - * For each shared memory region, a range is exposed under - * the /reserved-memory node as a child node. Each range sub-node is - * named xen-shmem@
. - */ - dt_dprintk("Create xen-shmem node\n"); - - for ( ; i < mem->nr_banks; i++ ) - { - uint64_t start = mem->bank[i].start; - uint64_t size = mem->bank[i].size; - const char compat[] = "xen,shared-memory-v1"; - /* Worst case addrcells + sizecells */ - __be32 reg[GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS]; - __be32 *cells; - unsigned int len = (addrcells + sizecells) * sizeof(__be32); - - res = domain_fdt_begin_node(fdt, "xen-shmem", mem->bank[i].start); - if ( res ) - return res; - - res = fdt_property(fdt, "compatible", compat, sizeof(compat)); - if ( res ) - return res; - - cells = reg; - dt_child_set_range(&cells, addrcells, sizecells, start, size); - - res = fdt_property(fdt, "reg", reg, len); - if ( res ) - return res; - - dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", - i, start, start + size); - - res = fdt_property_string(fdt, "xen,id", - mem->bank[i].shmem_extra->shm_id); - if ( res ) - return res; - - /* - * TODO: - * - xen,offset: (borrower VMs only) - * 64 bit integer offset within the owner virtual machine's shared - * memory region used for the mapping in the borrower VM - */ - res = fdt_property_u64(fdt, "xen,offset", 0); - if ( res ) - return res; - - res = fdt_end_node(fdt); - if ( res ) - return res; - } - - return res; -} - -int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, - uint32_t size_cells) -{ - const struct fdt_property *prop, *prop_id, *prop_role; - const __be32 *cell; - paddr_t paddr = INVALID_PADDR; - paddr_t gaddr, size, end; - struct membanks *mem = bootinfo_get_shmem(); - struct shmem_membank_extra *shmem_extra = bootinfo_get_shmem_extra(); - unsigned int i; - int len; - bool owner = false; - const char *shm_id; - - if ( address_cells < 1 || size_cells < 1 ) - { - printk("fdt: invalid #address-cells or #size-cells for static shared memory node.\n"); - return -EINVAL; - } - - /* - * "xen,shm-id" property holds an arbitrary string with a strict limit - * on the number of characters, MAX_SHM_ID_LENGTH - */ - prop_id = fdt_get_property(fdt, node, "xen,shm-id", NULL); - if ( !prop_id ) - return -ENOENT; - shm_id = (const char *)prop_id->data; - if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) == MAX_SHM_ID_LENGTH ) - { - printk("fdt: invalid xen,shm-id %s, it must be limited to %u characters\n", - shm_id, MAX_SHM_ID_LENGTH); - return -EINVAL; - } - - /* - * "role" property is optional and if it is defined explicitly, - * it must be either `owner` or `borrower`. - */ - prop_role = fdt_get_property(fdt, node, "role", NULL); - if ( prop_role ) - { - if ( !strcmp(prop_role->data, "owner") ) - owner = true; - else if ( strcmp(prop_role->data, "borrower") ) - { - printk("fdt: invalid `role` property for static shared memory node.\n"); - return -EINVAL; - } - } - - /* - * xen,shared-mem = ; - * Memory region starting from physical address #paddr of #size shall - * be mapped to guest physical address #gaddr as static shared memory - * region. - */ - prop = fdt_get_property(fdt, node, "xen,shared-mem", &len); - if ( !prop ) - return -ENOENT; - - cell = (const __be32 *)prop->data; - if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) - { - if ( len == dt_cells_to_size(address_cells + size_cells) ) - device_tree_get_reg(&cell, address_cells, size_cells, &gaddr, - &size); - else - { - printk("fdt: invalid `xen,shared-mem` property.\n"); - return -EINVAL; - } - } - else - { - device_tree_get_reg(&cell, address_cells, address_cells, &paddr, - &gaddr); - size = dt_next_cell(size_cells, &cell); - - if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) - { - printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", - paddr); - return -EINVAL; - } - - end = paddr + size; - if ( end <= paddr ) - { - printk("fdt: static shared memory region %s overflow\n", shm_id); - return -EINVAL; - } - } - - if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) - { - printk("fdt: guest address 0x%"PRIpaddr" is not suitably aligned.\n", - gaddr); - return -EINVAL; - } - - if ( !size ) - { - printk("fdt: the size for static shared memory region can not be zero\n"); - return -EINVAL; - } - - if ( !IS_ALIGNED(size, PAGE_SIZE) ) - { - printk("fdt: size 0x%"PRIpaddr" is not suitably aligned\n", size); - return -EINVAL; - } - - for ( i = 0; i < mem->nr_banks; i++ ) - { - /* - * Meet the following check: - * - when host address is provided: - * 1) The shm ID matches and the region exactly match - * 2) The shm ID doesn't match and the region doesn't overlap - * with an existing one - * - when host address is not provided: - * 1) The shm ID matches and the region size exactly match - */ - bool paddr_assigned = (INVALID_PADDR != paddr); - - if ( strncmp(shm_id, shmem_extra[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) - { - /* - * Regions have same shm_id (cases): - * 1) physical host address is supplied: - * - OK: paddr is equal and size is equal (same region) - * - Fail: paddr doesn't match or size doesn't match (there - * cannot exists two shmem regions with same shm_id) - * 2) physical host address is NOT supplied: - * - OK: size is equal (same region) - * - Fail: size is not equal (same shm_id must identify only one - * region, there can't be two different regions with same - * shm_id) - */ - bool start_match = paddr_assigned ? (paddr == mem->bank[i].start) : - true; - - if ( start_match && (size == mem->bank[i].size) ) - break; - else - { - printk("fdt: different shared memory region could not share the same shm ID %s\n", - shm_id); - return -EINVAL; - } - } - - /* - * Regions have different shm_id (cases): - * 1) physical host address is supplied: - * - OK: paddr different, or size different (case where paddr - * is equal but psize is different are wrong, but they - * are handled later when checking for overlapping) - * - Fail: paddr equal and size equal (the same region can't be - * identified with different shm_id) - * 2) physical host address is NOT supplied: - * - OK: Both have different shm_id so even with same size they - * can exists - */ - if ( !paddr_assigned || (paddr != mem->bank[i].start) || - (size != mem->bank[i].size) ) - continue; - else - { - printk("fdt: xen,shm-id %s does not match for all the nodes using the same region\n", - shm_id); - return -EINVAL; - } - } - - if ( i == mem->nr_banks ) - { - if (i < mem->max_banks) - { - if ( (paddr != INVALID_PADDR) && - check_reserved_regions_overlap(paddr, size, false) ) - return -EINVAL; - - /* Static shared memory shall be reserved from any other use. */ - safe_strcpy(shmem_extra[mem->nr_banks].shm_id, shm_id); - mem->bank[mem->nr_banks].start = paddr; - mem->bank[mem->nr_banks].size = size; - mem->bank[mem->nr_banks].shmem_extra = &shmem_extra[mem->nr_banks]; - mem->nr_banks++; - } - else - { - printk("Warning: Max number of supported memory regions reached.\n"); - return -ENOSPC; - } - } - /* - * keep a count of the number of borrowers, which later may be used - * to calculate the reference count. - */ - if ( !owner ) - shmem_extra[i].nr_shm_borrowers++; - - return 0; -} - -int __init make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, - int sizecells) -{ - const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); - void *fdt = kinfo->fdt; - int res = 0; - /* Placeholder for reserved-memory\0 */ - const char resvbuf[16] = "reserved-memory"; - - if ( mem->nr_banks == 0 ) - /* No shared memory provided. */ - return 0; - - dt_dprintk("Create reserved-memory node\n"); - - res = fdt_begin_node(fdt, resvbuf); - if ( res ) - return res; - - res = fdt_property(fdt, "ranges", NULL, 0); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#address-cells", addrcells); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#size-cells", sizecells); - if ( res ) - return res; - - res = make_shm_resv_memory_node(kinfo, addrcells, sizecells); - if ( res ) - return res; - - res = fdt_end_node(fdt); - - return res; -} - -void __init early_print_info_shmem(void) -{ - const struct membanks *shmem = bootinfo_get_shmem(); - unsigned int bank; - unsigned int printed = 0; - - for ( bank = 0; bank < shmem->nr_banks; bank++, printed++ ) - if ( shmem->bank[bank].start != INVALID_PADDR ) - printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", printed, - shmem->bank[bank].start, - shmem->bank[bank].start + shmem->bank[bank].size - 1); -} - -void __init init_sharedmem_pages(void) -{ - const struct membanks *shmem = bootinfo_get_shmem(); - unsigned int bank; - - for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) - if ( shmem->bank[bank].start != INVALID_PADDR ) - init_staticmem_bank(&shmem->bank[bank]); -} - -int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, - struct rangeset *rangeset) -{ - const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); - unsigned int i; - - /* Remove static shared memory regions */ - for ( i = 0; i < shm_mem->nr_banks; i++ ) - { - paddr_t start, end; - int res; - - start = shm_mem->bank[i].start; - end = shm_mem->bank[i].start + shm_mem->bank[i].size; - res = rangeset_remove_range(rangeset, PFN_DOWN(start), - PFN_DOWN(end - 1)); - if ( res ) - { - printk(XENLOG_ERR - "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr", error: %d\n", - start, end, res); - return -EINVAL; - } - } - - return 0; -} - -void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, - __be32 *reg, int *nr_cells, - int addrcells, int sizecells) -{ - const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); - unsigned int i; - __be32 *cells; - - BUG_ON(!nr_cells || !reg); - - cells = ®[*nr_cells]; - for ( i = 0; i < mem->nr_banks; i++ ) - { - paddr_t start = mem->bank[i].start; - paddr_t size = mem->bank[i].size; - - *nr_cells += addrcells + sizecells; - BUG_ON(*nr_cells >= DT_MEM_NODE_REG_RANGE_SIZE); - dt_child_set_range(&cells, addrcells, sizecells, start, size); - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 7ecf5a8031..eece1370a3 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -162,6 +162,12 @@ config STATIC_MEMORY If unsure, say N. +config STATIC_SHM + bool "Statically shared memory on a dom0less system" if UNSUPPORTED + depends on STATIC_MEMORY + help + This option enables statically shared memory on a dom0less system. + config STATIC_EVTCHN bool "Static event channel support on a dom0less system" depends on DOM0LESS_BOOT diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile index ed11f2c3b4..13127296cb 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -8,3 +8,4 @@ obj-y += intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o +obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index aa44f5a67c..9df80291b1 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -13,11 +13,9 @@ #include #include #include +#include #include #include -#ifdef CONFIG_STATIC_SHM -#include -#endif static void __init __maybe_unused build_assertions(void) { diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index c8c5a04f24..3d503c6973 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -29,10 +29,7 @@ #include #include - -#if __has_include() -# include -#endif +#include #define XENSTORE_PFN_LATE_ALLOC UINT64_MAX @@ -505,11 +502,9 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) if ( ret ) goto err; -#ifdef CONFIG_STATIC_SHM ret = make_resv_memory_node(kinfo, addrcells, sizecells); if ( ret ) goto err; -#endif /* * domain_handle_dtb_bootmodule has to be called before the rest of @@ -802,11 +797,9 @@ static int __init construct_domU(struct domain *d, else assign_static_memory_11(d, &kinfo, node); -#ifdef CONFIG_STATIC_SHM rc = process_shm(d, &kinfo, node); if ( rc < 0 ) return rc; -#endif rc = init_vuart(d, &kinfo, node); if ( rc < 0 ) diff --git a/xen/common/device-tree/static-shmem.c b/xen/common/device-tree/static-shmem.c new file mode 100644 index 0000000000..8023c0a484 --- /dev/null +++ b/xen/common/device-tree/static-shmem.c @@ -0,0 +1,854 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +typedef struct { + struct domain *d; + const char *role_str; + paddr_t gbase; + struct shmem_membank_extra *bank_extra_info; +} alloc_heap_pages_cb_extra; + +static struct { + struct membanks_hdr common; + struct membank bank[NR_SHMEM_BANKS]; +} shm_heap_banks __initdata = { + .common.max_banks = NR_SHMEM_BANKS, + .common.type = STATIC_SHARED_MEMORY +}; + +static inline struct membanks *get_shmem_heap_banks(void) +{ + return container_of(&shm_heap_banks.common, struct membanks, common); +} + +static void __init __maybe_unused build_assertions(void) +{ + /* + * Check that no padding is between struct membanks "bank" flexible array + * member and struct shared_meminfo "bank" member + */ + BUILD_BUG_ON((offsetof(struct membanks, bank) != + offsetof(struct shared_meminfo, bank))); +} + +static const struct membank __init * +find_shm_bank_by_id(const struct membanks *shmem, const char *shm_id) +{ + unsigned int bank; + + for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) + { + if ( strcmp(shm_id, shmem->bank[bank].shmem_extra->shm_id) == 0 ) + break; + } + + if ( bank == shmem->nr_banks ) + return NULL; + + return &shmem->bank[bank]; +} + +/* + * This function checks whether the static shared memory region is + * already allocated to dom_io. + */ +static bool __init is_shm_allocated_to_domio(paddr_t pbase) +{ + struct page_info *page; + struct domain *d; + + page = maddr_to_page(pbase); + d = page_get_owner_and_reference(page); + if ( d == NULL ) + return false; + put_page(page); + + if ( d != dom_io ) + { + printk(XENLOG_ERR + "shm memory node has already been allocated to a specific owner %pd, Please check your configuration\n", + d); + return false; + } + + return true; +} + +static mfn_t __init acquire_shared_memory_bank(struct domain *d, + paddr_t pbase, paddr_t psize, + bool bank_from_heap) +{ + mfn_t smfn; + unsigned long nr_pfns; + int res; + + /* + * Pages of statically shared memory shall be included + * into domain_tot_pages(). + */ + nr_pfns = PFN_DOWN(psize); + if ( (UINT_MAX - d->max_pages) < nr_pfns ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", + d, nr_pfns); + return INVALID_MFN; + } + d->max_pages += nr_pfns; + + smfn = maddr_to_mfn(pbase); + if ( bank_from_heap ) + /* + * When host address is not provided, static shared memory is + * allocated from heap and shall be assigned to owner domain. + */ + res = assign_pages(maddr_to_page(pbase), nr_pfns, d, 0); + else + res = acquire_domstatic_pages(d, smfn, nr_pfns, 0); + + if ( res ) + { + printk(XENLOG_ERR "%pd: failed to %s static memory: %d.\n", d, + bank_from_heap ? "assign" : "acquire", res); + goto fail; + } + + return smfn; + + fail: + d->max_pages -= nr_pfns; + return INVALID_MFN; +} + +static int __init assign_shared_memory(struct domain *d, paddr_t gbase, + bool bank_from_heap, + const struct membank *shm_bank) +{ + mfn_t smfn; + int ret = 0; + unsigned long nr_pages, nr_borrowers, i; + struct page_info *page; + paddr_t pbase, psize; + + pbase = shm_bank->start; + psize = shm_bank->size; + nr_borrowers = shm_bank->shmem_extra->nr_shm_borrowers; + + smfn = acquire_shared_memory_bank(d, pbase, psize, bank_from_heap); + if ( mfn_eq(smfn, INVALID_MFN) ) + return -EINVAL; + + /* + * DOMID_IO is not auto-translated (i.e. it sees RAM 1:1). So we do not need + * to create mapping in the P2M. + */ + nr_pages = PFN_DOWN(psize); + if ( d != dom_io ) + { + ret = guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, + PFN_DOWN(psize)); + if ( ret ) + { + printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); + return ret; + } + } + + /* + * Instead of letting borrower domain get a page ref, we add as many + * additional reference as the number of borrowers when the owner + * is allocated, since there is a chance that owner is created + * after borrower. + * So if the borrower is created first, it will cause adding pages + * in the P2M without reference. + */ + page = mfn_to_page(smfn); + for ( i = 0; i < nr_pages; i++ ) + { + if ( !get_page_nr(page + i, d, nr_borrowers) ) + { + printk(XENLOG_ERR + "Failed to add %lu references to page %"PRI_mfn".\n", + nr_borrowers, mfn_x(smfn) + i); + goto fail; + } + } + + return 0; + + fail: + while ( --i >= 0 ) + put_page_nr(page + i, nr_borrowers); + return ret; +} + +static int __init +append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, + paddr_t size, const char *shm_id) +{ + struct membanks *shm_mem = kernel_info_get_shm_mem(kinfo); + struct shmem_membank_extra *shm_mem_extra; + + if ( shm_mem->nr_banks >= shm_mem->max_banks ) + return -ENOMEM; + + shm_mem_extra = &kinfo->shm_mem.extra[shm_mem->nr_banks]; + + shm_mem->bank[shm_mem->nr_banks].start = start; + shm_mem->bank[shm_mem->nr_banks].size = size; + safe_strcpy(shm_mem_extra->shm_id, shm_id); + shm_mem->bank[shm_mem->nr_banks].shmem_extra = shm_mem_extra; + shm_mem->nr_banks++; + + return 0; +} + +static int __init handle_shared_mem_bank(struct domain *d, paddr_t gbase, + const char *role_str, + bool bank_from_heap, + const struct membank *shm_bank) +{ + bool owner_dom_io = true; + paddr_t pbase, psize; + int ret; + + pbase = shm_bank->start; + psize = shm_bank->size; + + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( role_str != NULL ) + owner_dom_io = false; + + /* + * DOMID_IO is a fake domain and is not described in the Device-Tree. + * Therefore when the owner of the shared region is DOMID_IO, we will + * only find the borrowers. + */ + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") == 0) ) + { + /* + * We found the first borrower of the region, the owner was not + * specified, so they should be assigned to dom_io. + */ + ret = assign_shared_memory(owner_dom_io ? dom_io : d, gbase, + bank_from_heap, shm_bank); + if ( ret ) + return ret; + } + + if ( owner_dom_io || (strcmp(role_str, "borrower") == 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret = map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psize), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw); + if ( ret ) + return ret; + } + + return 0; +} + +static bool __init save_map_heap_pages(struct domain *d, struct page_info *pg, + unsigned int order, void *extra) +{ + alloc_heap_pages_cb_extra *b_extra = (alloc_heap_pages_cb_extra *)extra; + int idx = shm_heap_banks.common.nr_banks; + int ret = -ENOSPC; + + BUG_ON(!b_extra); + + if ( idx < shm_heap_banks.common.max_banks ) + { + shm_heap_banks.bank[idx].start = page_to_maddr(pg); + shm_heap_banks.bank[idx].size = (1ULL << (PAGE_SHIFT + order)); + shm_heap_banks.bank[idx].shmem_extra = b_extra->bank_extra_info; + shm_heap_banks.common.nr_banks++; + + ret = handle_shared_mem_bank(b_extra->d, b_extra->gbase, + b_extra->role_str, true, + &shm_heap_banks.bank[idx]); + if ( !ret ) + { + /* Increment guest physical address for next mapping */ + b_extra->gbase += shm_heap_banks.bank[idx].size; + return true; + } + } + + printk("Failed to allocate static shared memory from Xen heap: (%d)\n", + ret); + + return false; +} + +int __init process_shm(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + struct dt_device_node *shm_node; + + /* Hwdom case - shm node under /chosen */ + if ( !node ) + { + node = dt_find_node_by_path("/chosen"); + BUG_ON(!node); + } + + dt_for_each_child_node(node, shm_node) + { + const struct membank *boot_shm_bank; + const struct dt_property *prop; + const __be32 *cells; + uint32_t addr_cells; + paddr_t gbase, pbase, psize; + int ret = 0; + unsigned int i; + const char *role_str; + const char *shm_id; + + if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-v1") ) + continue; + + if ( dt_property_read_string(shm_node, "xen,shm-id", &shm_id) ) + { + printk("%pd: invalid \"xen,shm-id\" property", d); + return -EINVAL; + } + BUG_ON((strlen(shm_id) <= 0) || (strlen(shm_id) >= MAX_SHM_ID_LENGTH)); + + boot_shm_bank = find_shm_bank_by_id(bootinfo_get_shmem(), shm_id); + if ( !boot_shm_bank ) + { + printk("%pd: static shared memory bank not found: '%s'", d, shm_id); + return -ENOENT; + } + + pbase = boot_shm_bank->start; + psize = boot_shm_bank->size; + + /* "role" property is optional */ + if ( dt_property_read_string(shm_node, "role", &role_str) != 0 ) + role_str = NULL; + + /* + * xen,shared-mem = <[pbase,] gbase, size>; + * pbase is optional. + */ + addr_cells = dt_n_addr_cells(shm_node); + prop = dt_find_property(shm_node, "xen,shared-mem", NULL); + BUG_ON(!prop); + cells = (const __be32 *)prop->value; + + if ( pbase != INVALID_PADDR ) + { + /* guest phys address is after host phys address */ + gbase = dt_read_paddr(cells + addr_cells, addr_cells); + + if ( is_domain_direct_mapped(d) && (pbase != gbase) ) + { + printk("%pd: physical address 0x%"PRIpaddr" and guest address 0x%"PRIpaddr" are not direct-mapped.\n", + d, pbase, gbase); + return -EINVAL; + } + + for ( i = 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* The host physical address is supplied by the user */ + ret = handle_shared_mem_bank(d, gbase, role_str, false, + boot_shm_bank); + if ( ret ) + return ret; + } + else + { + /* + * The host physical address is not supplied by the user, so it + * means that the banks needs to be allocated from the Xen heap, + * look into the already allocated banks from the heap. + */ + const struct membank *alloc_bank = + find_shm_bank_by_id(get_shmem_heap_banks(), shm_id); + + if ( is_domain_direct_mapped(d) ) + { + printk("%pd: host and guest physical address must be supplied for direct-mapped domains\n", + d); + return -EINVAL; + } + + /* guest phys address is right at the beginning */ + gbase = dt_read_paddr(cells, addr_cells); + + if ( !alloc_bank ) + { + alloc_heap_pages_cb_extra cb_arg = { d, role_str, gbase, + boot_shm_bank->shmem_extra }; + + /* shm_id identified bank is not yet allocated */ + if ( !allocate_domheap_memory(NULL, psize, save_map_heap_pages, + &cb_arg) ) + { + printk(XENLOG_ERR + "Failed to allocate (%"PRIpaddr"KB) pages as static shared memory from heap\n", + psize >> 10); + return -EINVAL; + } + } + else + { + /* shm_id identified bank is already allocated */ + const struct membank *end_bank = + &shm_heap_banks.bank[shm_heap_banks.common.nr_banks]; + paddr_t gbase_bank = gbase; + + /* + * Static shared memory banks that are taken from the Xen heap + * are allocated sequentially in shm_heap_banks, so starting + * from the first bank found identified by shm_id, the code can + * just advance by one bank at the time until it reaches the end + * of the array or it finds another bank NOT identified by + * shm_id + */ + for ( ; alloc_bank < end_bank; alloc_bank++ ) + { + if ( strcmp(shm_id, alloc_bank->shmem_extra->shm_id) != 0 ) + break; + + ret = handle_shared_mem_bank(d, gbase_bank, role_str, true, + alloc_bank); + if ( ret ) + return ret; + + /* Increment guest physical address for next mapping */ + gbase_bank += alloc_bank->size; + } + } + } + + /* + * Record static shared memory region info for later setting + * up shm-node in guest device tree. + */ + ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); + if ( ret ) + return ret; + } + + return 0; +} + +int __init make_shm_resv_memory_node(const struct kernel_info *kinfo, + int addrcells, int sizecells) +{ + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); + void *fdt = kinfo->fdt; + unsigned int i = 0; + int res = 0; + + if ( mem->nr_banks == 0 ) + return 0; + + /* + * For each shared memory region, a range is exposed under + * the /reserved-memory node as a child node. Each range sub-node is + * named xen-shmem@
. + */ + dt_dprintk("Create xen-shmem node\n"); + + for ( ; i < mem->nr_banks; i++ ) + { + uint64_t start = mem->bank[i].start; + uint64_t size = mem->bank[i].size; + const char compat[] = "xen,shared-memory-v1"; + /* Worst case addrcells + sizecells */ + __be32 reg[GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS]; + __be32 *cells; + unsigned int len = (addrcells + sizecells) * sizeof(__be32); + + res = domain_fdt_begin_node(fdt, "xen-shmem", mem->bank[i].start); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + + cells = reg; + dt_child_set_range(&cells, addrcells, sizecells, start, size); + + res = fdt_property(fdt, "reg", reg, len); + if ( res ) + return res; + + dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + res = fdt_property_string(fdt, "xen,id", + mem->bank[i].shmem_extra->shm_id); + if ( res ) + return res; + + /* + * TODO: + * - xen,offset: (borrower VMs only) + * 64 bit integer offset within the owner virtual machine's shared + * memory region used for the mapping in the borrower VM + */ + res = fdt_property_u64(fdt, "xen,offset", 0); + if ( res ) + return res; + + res = fdt_end_node(fdt); + if ( res ) + return res; + } + + return res; +} + +int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, + uint32_t size_cells) +{ + const struct fdt_property *prop, *prop_id, *prop_role; + const __be32 *cell; + paddr_t paddr = INVALID_PADDR; + paddr_t gaddr, size, end; + struct membanks *mem = bootinfo_get_shmem(); + struct shmem_membank_extra *shmem_extra = bootinfo_get_shmem_extra(); + unsigned int i; + int len; + bool owner = false; + const char *shm_id; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: invalid #address-cells or #size-cells for static shared memory node.\n"); + return -EINVAL; + } + + /* + * "xen,shm-id" property holds an arbitrary string with a strict limit + * on the number of characters, MAX_SHM_ID_LENGTH + */ + prop_id = fdt_get_property(fdt, node, "xen,shm-id", NULL); + if ( !prop_id ) + return -ENOENT; + shm_id = (const char *)prop_id->data; + if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) == MAX_SHM_ID_LENGTH ) + { + printk("fdt: invalid xen,shm-id %s, it must be limited to %u characters\n", + shm_id, MAX_SHM_ID_LENGTH); + return -EINVAL; + } + + /* + * "role" property is optional and if it is defined explicitly, + * it must be either `owner` or `borrower`. + */ + prop_role = fdt_get_property(fdt, node, "role", NULL); + if ( prop_role ) + { + if ( !strcmp(prop_role->data, "owner") ) + owner = true; + else if ( strcmp(prop_role->data, "borrower") ) + { + printk("fdt: invalid `role` property for static shared memory node.\n"); + return -EINVAL; + } + } + + /* + * xen,shared-mem = ; + * Memory region starting from physical address #paddr of #size shall + * be mapped to guest physical address #gaddr as static shared memory + * region. + */ + prop = fdt_get_property(fdt, node, "xen,shared-mem", &len); + if ( !prop ) + return -ENOENT; + + cell = (const __be32 *)prop->data; + if ( len != dt_cells_to_size(address_cells + size_cells + address_cells) ) + { + if ( len == dt_cells_to_size(address_cells + size_cells) ) + device_tree_get_reg(&cell, address_cells, size_cells, &gaddr, + &size); + else + { + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } + } + else + { + device_tree_get_reg(&cell, address_cells, address_cells, &paddr, + &gaddr); + size = dt_next_cell(size_cells, &cell); + + if ( !IS_ALIGNED(paddr, PAGE_SIZE) ) + { + printk("fdt: physical address 0x%"PRIpaddr" is not suitably aligned.\n", + paddr); + return -EINVAL; + } + + end = paddr + size; + if ( end <= paddr ) + { + printk("fdt: static shared memory region %s overflow\n", shm_id); + return -EINVAL; + } + } + + if ( !IS_ALIGNED(gaddr, PAGE_SIZE) ) + { + printk("fdt: guest address 0x%"PRIpaddr" is not suitably aligned.\n", + gaddr); + return -EINVAL; + } + + if ( !size ) + { + printk("fdt: the size for static shared memory region can not be zero\n"); + return -EINVAL; + } + + if ( !IS_ALIGNED(size, PAGE_SIZE) ) + { + printk("fdt: size 0x%"PRIpaddr" is not suitably aligned\n", size); + return -EINVAL; + } + + for ( i = 0; i < mem->nr_banks; i++ ) + { + /* + * Meet the following check: + * - when host address is provided: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + * - when host address is not provided: + * 1) The shm ID matches and the region size exactly match + */ + bool paddr_assigned = (INVALID_PADDR != paddr); + + if ( strncmp(shm_id, shmem_extra[i].shm_id, MAX_SHM_ID_LENGTH) == 0 ) + { + /* + * Regions have same shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr is equal and size is equal (same region) + * - Fail: paddr doesn't match or size doesn't match (there + * cannot exists two shmem regions with same shm_id) + * 2) physical host address is NOT supplied: + * - OK: size is equal (same region) + * - Fail: size is not equal (same shm_id must identify only one + * region, there can't be two different regions with same + * shm_id) + */ + bool start_match = paddr_assigned ? (paddr == mem->bank[i].start) : + true; + + if ( start_match && (size == mem->bank[i].size) ) + break; + else + { + printk("fdt: different shared memory region could not share the same shm ID %s\n", + shm_id); + return -EINVAL; + } + } + + /* + * Regions have different shm_id (cases): + * 1) physical host address is supplied: + * - OK: paddr different, or size different (case where paddr + * is equal but psize is different are wrong, but they + * are handled later when checking for overlapping) + * - Fail: paddr equal and size equal (the same region can't be + * identified with different shm_id) + * 2) physical host address is NOT supplied: + * - OK: Both have different shm_id so even with same size they + * can exists + */ + if ( !paddr_assigned || (paddr != mem->bank[i].start) || + (size != mem->bank[i].size) ) + continue; + else + { + printk("fdt: xen,shm-id %s does not match for all the nodes using the same region\n", + shm_id); + return -EINVAL; + } + } + + if ( i == mem->nr_banks ) + { + if (i < mem->max_banks) + { + if ( (paddr != INVALID_PADDR) && + check_reserved_regions_overlap(paddr, size, false) ) + return -EINVAL; + + /* Static shared memory shall be reserved from any other use. */ + safe_strcpy(shmem_extra[mem->nr_banks].shm_id, shm_id); + mem->bank[mem->nr_banks].start = paddr; + mem->bank[mem->nr_banks].size = size; + mem->bank[mem->nr_banks].shmem_extra = &shmem_extra[mem->nr_banks]; + mem->nr_banks++; + } + else + { + printk("Warning: Max number of supported memory regions reached.\n"); + return -ENOSPC; + } + } + /* + * keep a count of the number of borrowers, which later may be used + * to calculate the reference count. + */ + if ( !owner ) + shmem_extra[i].nr_shm_borrowers++; + + return 0; +} + +int __init make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells) +{ + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); + void *fdt = kinfo->fdt; + int res = 0; + /* Placeholder for reserved-memory\0 */ + const char resvbuf[16] = "reserved-memory"; + + if ( mem->nr_banks == 0 ) + /* No shared memory provided. */ + return 0; + + dt_dprintk("Create reserved-memory node\n"); + + res = fdt_begin_node(fdt, resvbuf); + if ( res ) + return res; + + res = fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#address-cells", addrcells); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#size-cells", sizecells); + if ( res ) + return res; + + res = make_shm_resv_memory_node(kinfo, addrcells, sizecells); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + +void __init early_print_info_shmem(void) +{ + const struct membanks *shmem = bootinfo_get_shmem(); + unsigned int bank; + unsigned int printed = 0; + + for ( bank = 0; bank < shmem->nr_banks; bank++, printed++ ) + if ( shmem->bank[bank].start != INVALID_PADDR ) + printk(" SHMEM[%u]: %"PRIpaddr" - %"PRIpaddr"\n", printed, + shmem->bank[bank].start, + shmem->bank[bank].start + shmem->bank[bank].size - 1); +} + +void __init init_sharedmem_pages(void) +{ + const struct membanks *shmem = bootinfo_get_shmem(); + unsigned int bank; + + for ( bank = 0 ; bank < shmem->nr_banks; bank++ ) + if ( shmem->bank[bank].start != INVALID_PADDR ) + init_staticmem_bank(&shmem->bank[bank]); +} + +int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, + struct rangeset *rangeset) +{ + const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); + unsigned int i; + + /* Remove static shared memory regions */ + for ( i = 0; i < shm_mem->nr_banks; i++ ) + { + paddr_t start, end; + int res; + + start = shm_mem->bank[i].start; + end = shm_mem->bank[i].start + shm_mem->bank[i].size; + res = rangeset_remove_range(rangeset, PFN_DOWN(start), + PFN_DOWN(end - 1)); + if ( res ) + { + printk(XENLOG_ERR + "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr", error: %d\n", + start, end, res); + return -EINVAL; + } + } + + return 0; +} + +void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, + __be32 *reg, int *nr_cells, + int addrcells, int sizecells) +{ + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); + unsigned int i; + __be32 *cells; + + BUG_ON(!nr_cells || !reg); + + cells = ®[*nr_cells]; + for ( i = 0; i < mem->nr_banks; i++ ) + { + paddr_t start = mem->bank[i].start; + paddr_t size = mem->bank[i].size; + + *nr_cells += addrcells + sizecells; + BUG_ON(*nr_cells >= DT_MEM_NODE_REG_RANGE_SIZE); + dt_child_set_range(&cells, addrcells, sizecells, start, size); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/static-shmem.h b/xen/include/xen/static-shmem.h new file mode 100644 index 0000000000..76a4986912 --- /dev/null +++ b/xen/include/xen/static-shmem.h @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef XEN_STATIC_SHMEM_H +#define XEN_STATIC_SHMEM_H + +#include +#include + +#ifdef CONFIG_STATIC_SHM + +/* Worst case /memory node reg element: (addrcells + sizecells) */ +#define DT_MEM_NODE_REG_RANGE_SIZE ((NR_MEM_BANKS + NR_SHMEM_BANKS) * 4) + +int make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells); + +int process_shm(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node); + +int process_shm_node(const void *fdt, int node, uint32_t address_cells, + uint32_t size_cells); + +void early_print_info_shmem(void); + +void init_sharedmem_pages(void); + +int remove_shm_from_rangeset(const struct kernel_info *kinfo, + struct rangeset *rangeset); + +int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, + int sizecells); + +void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, + int *nr_cells, int addrcells, int sizecells); + +static inline struct membanks * +kernel_info_get_shm_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_shm_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, const struct membanks, common); +} + +#else /* !CONFIG_STATIC_SHM */ + +/* Worst case /memory node reg element: (addrcells + sizecells) */ +#define DT_MEM_NODE_REG_RANGE_SIZE (NR_MEM_BANKS * 4) + +static inline int make_resv_memory_node(const struct kernel_info *kinfo, + int addrcells, int sizecells) +{ + return 0; +} + +static inline int process_shm(struct domain *d, struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + return 0; +} + +static inline void init_sharedmem_pages(void) {}; + +static inline int remove_shm_from_rangeset(const struct kernel_info *kinfo, + struct rangeset *rangeset) +{ + return 0; +} + +static inline int make_shm_resv_memory_node(const struct kernel_info *kinfo, + int addrcells, int sizecells) +{ + return 0; +} + +static inline void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, + __be32 *reg, int *nr_cells, + int addrcells, int sizecells) {}; + +#endif /* CONFIG_STATIC_SHM */ + +#endif /* XEN_STATIC_SHMEM_H */ + +/* + * 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 Wed Jun 04 10:22:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005348.1384821 (Exim 4.92) (envelope-from ) id 1uMlFz-00049Q-8i; Wed, 04 Jun 2025 10:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005348.1384821; Wed, 04 Jun 2025 10: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 1uMlFz-00049I-5x; Wed, 04 Jun 2025 10:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1005348; Wed, 04 Jun 2025 10:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlFx-00049C-TA for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlFx-001rGm-2W for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlFx-00H74l-2O for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=Gz0ZZ7FMUs+SfMB5X22+GgLoj7e1bseQMdMHfifD+UY=; b=hT7lguwMoFm9yNcHuHJpJqLiUk Fmz4k7wa8C8RTXSd8pC7doe7WV86qVgVS1BpUMRyJXxDHhdI5MXHp/jm+zlg0/TtlJzhcO1nbsJhf 9YofmJPLp+X+j/ijn+LNs67x0ZJ66Detj0o+uh4rO0QTuC6iXn+JrTcEbovVkTovQ+QY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Add missing pci_dev forward declaration in asm/pci.h Message-Id: Date: Wed, 04 Jun 2025 10:22:01 +0000 commit 461510e87e019ffc91cec1d968571b4be3ac8367 Author: Alejandro Vallejo AuthorDate: Wed Jun 4 12:11:14 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:11:14 2025 +0200 x86: Add missing pci_dev forward declaration in asm/pci.h struct pci_dev is used in function prototypes within the header, so it must be forward declared for asm/pci.h not to depend on xen/pci.h being included first. Not a functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Jason Andryuk Reviewed-by: Stefano Stabellini --- xen/arch/x86/include/asm/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index bed99437cc..2e67cba8b9 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -13,6 +13,8 @@ || (id) == 0x01128086 || (id) == 0x01228086 \ || (id) == 0x010A8086 ) +struct pci_dev; + struct arch_pci_dev { vmask_t used_vectors; /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:22:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005349.1384824 (Exim 4.92) (envelope-from ) id 1uMlG9-0004B6-9m; Wed, 04 Jun 2025 10:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005349.1384824; Wed, 04 Jun 2025 10: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 1uMlG9-0004Ay-7I; Wed, 04 Jun 2025 10:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1005349; Wed, 04 Jun 2025 10:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlG7-0004Ao-Tf for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlG7-001rGq-2q for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlG7-00H78c-2h for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=4JcFCwoDaUubQ8QMhCvpCReaE/+dARyczcOHzQwM82w=; b=pNYlp1kADm7W8q4iRYuQKbnoR7 j26XXG2xFHqMu5LbHNZZ714fncltji2L5aP8VWfXE7niQAdaDsrv0RaT9dfAJJVn9+npoPmwI5shU uV9LciMtnXsnQiiINjiQPOI9WaIuWRYzn+kfQmTVxDWxDiksL1vyt9SMXjmmgNyIAVUA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: Move freeze/thaw_domains to common code Message-Id: Date: Wed, 04 Jun 2025 10:22:11 +0000 commit b48d8bc3e002dfe9d3f84b567979103b0c3a7784 Author: Mirela Simonovic AuthorDate: Wed Jun 4 12:11:40 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:11:40 2025 +0200 xen/x86: Move freeze/thaw_domains to common code The freeze_domains and thaw_domains functions are currently defined in x86-specific suspend code. These functions are also useful on other architectures, such as ARM, for implementing system-wide suspend and resume functionality. This patch moves these functions to common code so they can be reused across architectures. Signed-off-by: Mirela Simonovic Signed-off-by: Saeed Nowshadi Signed-off-by: Mykyta Poturai Signed-off-by: Mykola Kvach Acked-by: Jan Beulich --- xen/arch/x86/acpi/power.c | 25 ------------------------- xen/common/domain.c | 25 +++++++++++++++++++++++++ xen/include/xen/sched.h | 3 +++ 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 448aa9f3a7..2ac162c997 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -138,31 +138,6 @@ static void device_power_up(enum dev_power_saved saved) } } -static void freeze_domains(void) -{ - struct domain *d; - - rcu_read_lock(&domlist_read_lock); - /* - * Note that we iterate in order of domain-id. Hence we will pause dom0 - * first which is required for correctness (as only dom0 can add domains to - * the domain list). Otherwise we could miss concurrently-created domains. - */ - for_each_domain ( d ) - domain_pause(d); - rcu_read_unlock(&domlist_read_lock); -} - -static void thaw_domains(void) -{ - struct domain *d; - - rcu_read_lock(&domlist_read_lock); - for_each_domain ( d ) - domain_unpause(d); - rcu_read_unlock(&domlist_read_lock); -} - static void acpi_sleep_prepare(u32 state) { void *wakeup_vector_va; diff --git a/xen/common/domain.c b/xen/common/domain.c index abf1969e60..58c5ffc466 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -2405,6 +2405,31 @@ domid_t get_initial_domain_id(void) return hardware_domid; } +void freeze_domains(void) +{ + struct domain *d; + + rcu_read_lock(&domlist_read_lock); + /* + * Note that we iterate in order of domain-id. Hence we will pause dom0 + * first which is required for correctness (as only dom0 can add domains to + * the domain list). Otherwise we could miss concurrently-created domains. + */ + for_each_domain ( d ) + domain_pause(d); + rcu_read_unlock(&domlist_read_lock); +} + +void thaw_domains(void) +{ + struct domain *d; + + rcu_read_lock(&domlist_read_lock); + for_each_domain ( d ) + domain_unpause(d); + rcu_read_unlock(&domlist_read_lock); +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index b17aada5f5..62869cf6f2 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1070,6 +1070,9 @@ static inline struct vcpu *domain_vcpu(const struct domain *d, return vcpu_id >= d->max_vcpus ? NULL : d->vcpu[idx]; } +void freeze_domains(void); +void thaw_domains(void); + void cpu_init(void); /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005350.1384829 (Exim 4.92) (envelope-from ) id 1uMlGJ-0004DK-BL; Wed, 04 Jun 2025 10:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005350.1384829; Wed, 04 Jun 2025 10: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 1uMlGJ-0004DC-8f; Wed, 04 Jun 2025 10:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1005350; Wed, 04 Jun 2025 10:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlGI-0004D4-0q for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlGH-001rHE-3A for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlGH-00H7FB-32 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=MdmIJdoy5md40NY0afaQTBqqE90as9kuqkglFs0ylp8=; b=VgEey2xsVe0PtkT/CuXi3ltYMN nld3oyko6dzEut8o/463jg4rNnBvb0PlFl2sdxz9iSd/AMPtqRBlgofUeue/hLZMsrrLcRyN2rxR7 mUuO8mJG36/TFPFDCrjTQZEIG6IA3lIZnV1KJ4iulDbfi+eka8iHyMQN5DXiYDyHzSWs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vVMX: adjust VMPTRLD error handling Message-Id: Date: Wed, 04 Jun 2025 10:22:21 +0000 commit 25211747f5be293508dae80259e95b51e4af8171 Author: Jan Beulich AuthorDate: Wed Jun 4 12:12:40 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:12:40 2025 +0200 vVMX: adjust VMPTRLD error handling There are two issues there: When hvm_map_guest_frame_rw() yields a r/o page mapping, we fail to indicate the failure to the guest, and we fall over the NULL pointer in nvcpu->nv_vvmcx when subsequently invoking nvmx_set_vmcs_pointer() (if no earlier VMPTRLD put in place a valid value). Fixes: 5dbbaa0fe121 ("x86/vvmx: fix I/O and MSR bitmaps mapping") Reported-by: Manuel Andreas Signed-off-by: Jan Beulich Reviewed-By: Andrew Cooper --- xen/arch/x86/hvm/vmx/vvmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index ceb5e5a322..3c848ef546 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1820,7 +1820,8 @@ static int nvmx_handle_vmptrld(struct cpu_user_regs *regs) vvmcx = NULL; } } - else + + if ( !vvmcx ) { vmfail(regs, VMX_INSN_VMPTRLD_INVALID_PHYADDR); goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005351.1384833 (Exim 4.92) (envelope-from ) id 1uMlGT-0004Fs-Cl; Wed, 04 Jun 2025 10:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005351.1384833; Wed, 04 Jun 2025 10: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 1uMlGT-0004Fk-A5; Wed, 04 Jun 2025 10:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1005351; Wed, 04 Jun 2025 10:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlGS-0004FP-3L for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlGS-001rHR-0E for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlGS-00H7KX-07 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=9bqu5zCstKiaJLrKUL7kO8zYZtOdr0L0Dwe+mAKviPA=; b=vhnWByB+Pn56jurNDKT/azN7uF HtRN4q1W+ROtma+fbSv9evvmvknsDFGT/7wcKaeoJ0cl+1l2p8qvYKr0QwVwe4jWoTbwQ+VBAQe3L BirXpuTVQM90CZoMpnGMiNCMhi4Ypi7Hjt8QZ95xDPOtjKmL3yolsDCieW9PEVyVA4hk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] compat: add header guard to xlat.h Message-Id: Date: Wed, 04 Jun 2025 10:22:32 +0000 commit a0f56da94c3e2d4e077a749ddaace8536c3037fc Author: Jan Beulich AuthorDate: Wed Jun 4 12:13:19 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:13:19 2025 +0200 compat: add header guard to xlat.h This is to conform with Misra C:2012 Directive 4.10. Reported-by: Stefano Stabellini Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/include/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/include/Makefile b/xen/include/Makefile index 41b985f4d1..e71f419e8c 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -105,9 +105,14 @@ xlat-y := $(shell sed -ne 's,@arch@,$(compat-arch-y),g' -re 's,^[?!][[:blank:]]+ xlat-y := $(filter $(patsubst compat/%,%,$(headers-y)),$(xlat-y)) quiet_cmd_xlat_h = GEN $@ -cmd_xlat_h = \ - cat $(filter %.h,$^) >$@.new; \ - mv -f $@.new $@ +define cmd_xlat_h + echo "#ifndef COMPAT_XLAT_H" >$@.new; \ + echo "#define COMPAT_XLAT_H" >>$@.new; \ + cat $(filter %.h,$^) >>$@.new; \ + echo "" >>$@.new; \ + echo "#endif /* COMPAT_XLAT_H */" >>$@.new; \ + mv -f $@.new $@ +endef $(obj)/compat/xlat.h: $(addprefix $(obj)/compat/.xlat/,$(xlat-y)) FORCE $(call if_changed,xlat_h) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005352.1384837 (Exim 4.92) (envelope-from ) id 1uMlGd-0004IC-EJ; Wed, 04 Jun 2025 10:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005352.1384837; Wed, 04 Jun 2025 10: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 1uMlGd-0004I4-BQ; Wed, 04 Jun 2025 10:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1005352; Wed, 04 Jun 2025 10:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlGc-0004Hs-6O for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlGc-001rHY-0Y for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlGc-00H7SZ-0P for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=97isMVVs74gC3wuuj9uhPzpgKYEioZNIZxroX/GfFIg=; b=lInBTVKxdSjZDGAy40Hw8Rbd+x QVsqTa0KnNzMw1kgYCqakbfbuq12EYpOCvqtxrg79f9e0aLC1S/O6vt5GOyFR7rVCesmSonNtM2l4 Tf5moIbn/sI80br1TrTds2kTQssyTK6FfJZZbRKCA0UUUEDQo11/DllzOpWu04XHmH/Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: make mmio_ro_emulated_write() static Message-Id: Date: Wed, 04 Jun 2025 10:22:42 +0000 commit eb57fe072232c9836d085020450ce1434b21a819 Author: Jan Beulich AuthorDate: Wed Jun 4 12:13:41 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:13:41 2025 +0200 x86/PV: make mmio_ro_emulated_write() static It being non-static and it not having a declaration (anymore) violates one or more Misra rules, iirc. Fixes: ff3e5dfa7c2d ("x86/mm: move mmio_ro_emulated_write() to PV only file") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/ro-page-fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index 5ae7708077..9c6f668846 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -337,7 +337,7 @@ static int cf_check mmcfg_intercept_write( return X86EMUL_OKAY; } -int cf_check mmio_ro_emulated_write( +static int cf_check mmio_ro_emulated_write( enum x86_segment seg, unsigned long offset, void *p_data, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005410.1384891 (Exim 4.92) (envelope-from ) id 1uMllv-00022H-PN; Wed, 04 Jun 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 1005410.1384891; Wed, 04 Jun 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 1uMllv-000229-Ml; Wed, 04 Jun 2025 10:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1005410; Wed, 04 Jun 2025 10:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMllu-000223-8e for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMllt-001s7e-3A for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMllt-00HSbI-2y for xen-changelog@lists.xenproject.org; Wed, 04 Jun 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=eE/jbkkaR2lzA0SklaHVz+5beXioPP2xQL+XQu6JH3I=; b=1RA9V5SGV6cin/6+UjN9PXlBBT UqcgoQK3G8lBxO+vgdVqBMnQDFg7NWFS1tZh9BAzQykmpUwU7E/0LB8wE93KYfAuBnKFMo1p6Fr+H mA7+wNyWoKKg7LykdYISOH45uhrZg7vwi37mUJ5V7Fy8EvaywZBTCU3KRdp5zIWLnh88=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Add missing pci_dev forward declaration in asm/pci.h Message-Id: Date: Wed, 04 Jun 2025 10:55:01 +0000 commit 461510e87e019ffc91cec1d968571b4be3ac8367 Author: Alejandro Vallejo AuthorDate: Wed Jun 4 12:11:14 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:11:14 2025 +0200 x86: Add missing pci_dev forward declaration in asm/pci.h struct pci_dev is used in function prototypes within the header, so it must be forward declared for asm/pci.h not to depend on xen/pci.h being included first. Not a functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Jason Andryuk Reviewed-by: Stefano Stabellini --- xen/arch/x86/include/asm/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index bed99437cc..2e67cba8b9 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -13,6 +13,8 @@ || (id) == 0x01128086 || (id) == 0x01228086 \ || (id) == 0x010A8086 ) +struct pci_dev; + struct arch_pci_dev { vmask_t used_vectors; /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005411.1384895 (Exim 4.92) (envelope-from ) id 1uMlm5-000249-Qp; Wed, 04 Jun 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 1005411.1384895; Wed, 04 Jun 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 1uMlm5-000241-O7; Wed, 04 Jun 2025 10:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1005411; Wed, 04 Jun 2025 10:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlm4-00023l-5J for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlm4-001s7j-0R for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlm4-00HSgs-07 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=Q1fNpvwu0R5INsxkfvXzdIPTr51nLTRu/KHh4v4CTnQ=; b=sb3W93XXiuhBRDvAvYgn18Xr9J YyZMOCXmJ/Iue5cwfqU7dE4rQcYlTTdmOHjKY0tkTwmcV4vLsHIlQVinNw+HoJ4SOM9MuV4q4XB7e G4knWMfOxlXygozcBwgcPN+/+17EwPg1BTK3qGM/RCmOqXe7yX6vCgHshvvJzhq8LQMk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Move freeze/thaw_domains to common code Message-Id: Date: Wed, 04 Jun 2025 10:55:12 +0000 commit b48d8bc3e002dfe9d3f84b567979103b0c3a7784 Author: Mirela Simonovic AuthorDate: Wed Jun 4 12:11:40 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:11:40 2025 +0200 xen/x86: Move freeze/thaw_domains to common code The freeze_domains and thaw_domains functions are currently defined in x86-specific suspend code. These functions are also useful on other architectures, such as ARM, for implementing system-wide suspend and resume functionality. This patch moves these functions to common code so they can be reused across architectures. Signed-off-by: Mirela Simonovic Signed-off-by: Saeed Nowshadi Signed-off-by: Mykyta Poturai Signed-off-by: Mykola Kvach Acked-by: Jan Beulich --- xen/arch/x86/acpi/power.c | 25 ------------------------- xen/common/domain.c | 25 +++++++++++++++++++++++++ xen/include/xen/sched.h | 3 +++ 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 448aa9f3a7..2ac162c997 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -138,31 +138,6 @@ static void device_power_up(enum dev_power_saved saved) } } -static void freeze_domains(void) -{ - struct domain *d; - - rcu_read_lock(&domlist_read_lock); - /* - * Note that we iterate in order of domain-id. Hence we will pause dom0 - * first which is required for correctness (as only dom0 can add domains to - * the domain list). Otherwise we could miss concurrently-created domains. - */ - for_each_domain ( d ) - domain_pause(d); - rcu_read_unlock(&domlist_read_lock); -} - -static void thaw_domains(void) -{ - struct domain *d; - - rcu_read_lock(&domlist_read_lock); - for_each_domain ( d ) - domain_unpause(d); - rcu_read_unlock(&domlist_read_lock); -} - static void acpi_sleep_prepare(u32 state) { void *wakeup_vector_va; diff --git a/xen/common/domain.c b/xen/common/domain.c index abf1969e60..58c5ffc466 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -2405,6 +2405,31 @@ domid_t get_initial_domain_id(void) return hardware_domid; } +void freeze_domains(void) +{ + struct domain *d; + + rcu_read_lock(&domlist_read_lock); + /* + * Note that we iterate in order of domain-id. Hence we will pause dom0 + * first which is required for correctness (as only dom0 can add domains to + * the domain list). Otherwise we could miss concurrently-created domains. + */ + for_each_domain ( d ) + domain_pause(d); + rcu_read_unlock(&domlist_read_lock); +} + +void thaw_domains(void) +{ + struct domain *d; + + rcu_read_lock(&domlist_read_lock); + for_each_domain ( d ) + domain_unpause(d); + rcu_read_unlock(&domlist_read_lock); +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index b17aada5f5..62869cf6f2 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1070,6 +1070,9 @@ static inline struct vcpu *domain_vcpu(const struct domain *d, return vcpu_id >= d->max_vcpus ? NULL : d->vcpu[idx]; } +void freeze_domains(void); +void thaw_domains(void); + void cpu_init(void); /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005412.1384900 (Exim 4.92) (envelope-from ) id 1uMlmF-00026U-T1; Wed, 04 Jun 2025 10:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005412.1384900; Wed, 04 Jun 2025 10: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 1uMlmF-00026J-Pg; Wed, 04 Jun 2025 10:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1005412; Wed, 04 Jun 2025 10:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlmE-00026A-8S for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlmE-001s87-0j for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlmE-00HSoi-0c for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=RP01VS2TOgXSjAc/xTak2siGv8ARos9kZQ2kFyCSFrg=; b=GWOrwMkXJ80uSsPkbzkw6YPeoY mG0DGI4uEVv0ecgOhchb/aOxiZGMDSZ8n5Y7bfnBRuJK6rglFX0W0AG9MBp4flVtE0obTrPzk16Pu BX+qftmeGjzzIr3j+bC9zV1gYwMNVeRe/hGeUcdQFwVCdRKjsdFCWjAj68KI3WPA2nCU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vVMX: adjust VMPTRLD error handling Message-Id: Date: Wed, 04 Jun 2025 10:55:22 +0000 commit 25211747f5be293508dae80259e95b51e4af8171 Author: Jan Beulich AuthorDate: Wed Jun 4 12:12:40 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:12:40 2025 +0200 vVMX: adjust VMPTRLD error handling There are two issues there: When hvm_map_guest_frame_rw() yields a r/o page mapping, we fail to indicate the failure to the guest, and we fall over the NULL pointer in nvcpu->nv_vvmcx when subsequently invoking nvmx_set_vmcs_pointer() (if no earlier VMPTRLD put in place a valid value). Fixes: 5dbbaa0fe121 ("x86/vvmx: fix I/O and MSR bitmaps mapping") Reported-by: Manuel Andreas Signed-off-by: Jan Beulich Reviewed-By: Andrew Cooper --- xen/arch/x86/hvm/vmx/vvmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index ceb5e5a322..3c848ef546 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1820,7 +1820,8 @@ static int nvmx_handle_vmptrld(struct cpu_user_regs *regs) vvmcx = NULL; } } - else + + if ( !vvmcx ) { vmfail(regs, VMX_INSN_VMPTRLD_INVALID_PHYADDR); goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005413.1384903 (Exim 4.92) (envelope-from ) id 1uMlmP-00029K-VW; Wed, 04 Jun 2025 10:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005413.1384903; Wed, 04 Jun 2025 10: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 1uMlmP-00029D-Sk; Wed, 04 Jun 2025 10:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1005413; Wed, 04 Jun 2025 10:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlmO-000297-Bf for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlmO-001s8E-14 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlmO-00HSxN-0t for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=KkFcnwKnNltQRacin8jjXpUyVAKzRG+CDerpQg6TEqk=; b=AeN71Lsh7z7DVpHzRXjoFPDtzF T5hFgIpyUT7GqUSEctXbKuahvQHAWN7YvgsETgXjgj6YtLWedL6fmHqKPAL846MSAx0YvR7bRAVkE 6Udtq+4iY5+3qcNOkmI7xRmcbkFou2luLTlSO1xU24X5vNKDIqVKxiuKozLdEil5/W08=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] compat: add header guard to xlat.h Message-Id: Date: Wed, 04 Jun 2025 10:55:32 +0000 commit a0f56da94c3e2d4e077a749ddaace8536c3037fc Author: Jan Beulich AuthorDate: Wed Jun 4 12:13:19 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:13:19 2025 +0200 compat: add header guard to xlat.h This is to conform with Misra C:2012 Directive 4.10. Reported-by: Stefano Stabellini Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/include/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/include/Makefile b/xen/include/Makefile index 41b985f4d1..e71f419e8c 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -105,9 +105,14 @@ xlat-y := $(shell sed -ne 's,@arch@,$(compat-arch-y),g' -re 's,^[?!][[:blank:]]+ xlat-y := $(filter $(patsubst compat/%,%,$(headers-y)),$(xlat-y)) quiet_cmd_xlat_h = GEN $@ -cmd_xlat_h = \ - cat $(filter %.h,$^) >$@.new; \ - mv -f $@.new $@ +define cmd_xlat_h + echo "#ifndef COMPAT_XLAT_H" >$@.new; \ + echo "#define COMPAT_XLAT_H" >>$@.new; \ + cat $(filter %.h,$^) >>$@.new; \ + echo "" >>$@.new; \ + echo "#endif /* COMPAT_XLAT_H */" >>$@.new; \ + mv -f $@.new $@ +endef $(obj)/compat/xlat.h: $(addprefix $(obj)/compat/.xlat/,$(xlat-y)) FORCE $(call if_changed,xlat_h) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 10:55:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 10:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005414.1384907 (Exim 4.92) (envelope-from ) id 1uMlma-0002Bj-0f; Wed, 04 Jun 2025 10:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005414.1384907; Wed, 04 Jun 2025 10: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 1uMlmZ-0002Bb-UJ; Wed, 04 Jun 2025 10:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1005414; Wed, 04 Jun 2025 10:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMlmY-0002BM-EE for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMlmY-001sAf-1L for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMlmY-00HT5v-1E for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 10: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=i52KHCpIie+paveufxKJSg0I6+Bw4Tc7p5JZf+QpqGk=; b=jC2J8SQrczwkQCxCUH+1/NOAcT 4hn/mxWkYqmOvKKCVy1GRB9Ra41rMOr12YzhJo3m93qZFQWQDyi6Vfx5SudUWRjAWfm1jR2t2dCj8 rPY0IHfr8d3FyGdarb7IOeDKYBRw2VC8H0ShY1YQ+g8A8+rabglIVEIMTby76XPFIh+k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: make mmio_ro_emulated_write() static Message-Id: Date: Wed, 04 Jun 2025 10:55:42 +0000 commit eb57fe072232c9836d085020450ce1434b21a819 Author: Jan Beulich AuthorDate: Wed Jun 4 12:13:41 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 4 12:13:41 2025 +0200 x86/PV: make mmio_ro_emulated_write() static It being non-static and it not having a declaration (anymore) violates one or more Misra rules, iirc. Fixes: ff3e5dfa7c2d ("x86/mm: move mmio_ro_emulated_write() to PV only file") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/ro-page-fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index 5ae7708077..9c6f668846 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -337,7 +337,7 @@ static int cf_check mmcfg_intercept_write( return X86EMUL_OKAY; } -int cf_check mmio_ro_emulated_write( +static int cf_check mmio_ro_emulated_write( enum x86_segment seg, unsigned long offset, void *p_data, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 21:44:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 21:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005977.1385261 (Exim 4.92) (envelope-from ) id 1uMvty-0004nR-Pt; Wed, 04 Jun 2025 21:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005977.1385261; Wed, 04 Jun 2025 21: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 1uMvty-0004nJ-NH; Wed, 04 Jun 2025 21:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1005977; Wed, 04 Jun 2025 21:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMvtx-0004nD-Td for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 21:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMvtx-0025SB-2E for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 21:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMvtx-006WqL-1v for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 21: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=uj3iGOu4z3JNhoqD/T2/4FiQVEZAapH6Lqj4rmtdVgU=; b=j2ZiQsB5cstlLC9p3G7tPSKDDu 1g9jaM7r/OS/jdoQ2gMP72+8odyvGk+DJYX0XdxE2SiVdf8TtkuZuWqDTrmu91LFa56poXJSvnr/+ KO8AT5saW6IdGY0h22/GmV0lZhbRCAe92g6ptDiDvnWEAMTx03X3tNWqBSNFXZQ4LSN0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vgic-v2: Fix undefined behavior in vgic_fetch_itargetsr() Message-Id: Date: Wed, 04 Jun 2025 21:44:01 +0000 commit 82dc405bc1232f14867aa1dcf2b1406596dfe4ba Author: Jahan Murudi AuthorDate: Sun Jun 1 22:02:12 2025 +0530 Commit: Stefano Stabellini CommitDate: Wed Jun 4 14:16:51 2025 -0700 arm/vgic-v2: Fix undefined behavior in vgic_fetch_itargetsr() The current implementation performs left shift operations that may trigger undefined behavior when the target value is too large. This patch: 1. Changes the shift from signed (1) to unsigned (1U) to ensure well-defined behavior for all valid target values 2. Maintains identical functionality while fixing the UBSAN warning The issue was detected by UBSAN: (XEN) UBSAN: Undefined behaviour in arch/arm/vgic-v2.c:73:56 (XEN) left shift of 128 by 24 places cannot be represented in type 'int' (XEN) Xen WARN at common/ubsan/ubsan.c:174 Signed-off-by: Jahan Murudi Reviewed-by: Michal Orzel --- xen/arch/arm/vgic-v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index a19d610178..642407fd5b 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -70,7 +70,7 @@ static uint32_t vgic_fetch_itargetsr(struct vgic_irq_rank *rank, offset &= ~(NR_TARGETS_PER_ITARGETSR - 1); for ( i = 0; i < NR_TARGETS_PER_ITARGETSR; i++, offset++ ) - reg |= (1 << read_atomic(&rank->vcpu[offset])) << (i * NR_BITS_PER_TARGET); + reg |= (1U << read_atomic(&rank->vcpu[offset])) << (i * NR_BITS_PER_TARGET); return reg; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 21:44:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 21:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005978.1385265 (Exim 4.92) (envelope-from ) id 1uMvu8-0004pU-RJ; Wed, 04 Jun 2025 21:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005978.1385265; Wed, 04 Jun 2025 21: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 1uMvu8-0004pM-Od; Wed, 04 Jun 2025 21:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1005978; Wed, 04 Jun 2025 21:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMvu7-0004p8-R7 for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 21:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uMvu7-0025SS-2c for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 21:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMvu7-006WsD-2R for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 21: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=5KAx56l2Z5IOYhfcjZtzI1+JMJ7Wh3JJHyUnk52KeT0=; b=Voc6TyXShJGWw6jNrA0aoaJG9B k0rZ8eIpzaLOPecAVBlOql9b7SvG7HsexCsCcS7Howoq22owAchI6wVmnucrrRmP8bZ5wuG6iB+8z CV556mCOo4tEUT+SXoh3iOv31ewbGmYzxl+MMUpzrAGwH/vZAjGwdeADhADTzLMe1JMo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/console: introduce console input permission Message-Id: Date: Wed, 04 Jun 2025 21:44:11 +0000 commit c2dddce4b99dcf7235a8cae794512ecb51b6af07 Author: Denis Mukhin AuthorDate: Fri May 30 23:19:01 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Jun 4 14:24:26 2025 -0700 xen/console: introduce console input permission Add new flag to domain structure for marking permission to intercept the physical console input by the domain. Update console input switch logic accordingly. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/arch/arm/vpl011.c | 1 + xen/arch/x86/pv/shim.c | 2 ++ xen/common/domain.c | 2 ++ xen/drivers/char/console.c | 18 +++++++++++++++++- xen/include/xen/sched.h | 8 +++++++- 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 66047bf33c..480fc664fc 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -713,6 +713,7 @@ int domain_vpl011_init(struct domain *d, struct vpl011_init_info *info) } else { + d->console.input_allowed = true; vpl011->backend_in_domain = false; vpl011->backend.xen = xzalloc(struct vpl011_xen_backend); diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index c506cc0bec..bc2a7dd5fa 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -238,6 +238,8 @@ void __init pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4start, * guest from depleting the shim memory pool. */ d->max_pages = domain_tot_pages(d); + + d->console.input_allowed = true; } static void write_start_info(struct domain *d) diff --git a/xen/common/domain.c b/xen/common/domain.c index 58c5ffc466..153cd75340 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -831,6 +831,8 @@ struct domain *domain_create(domid_t domid, flags |= CDF_hardware; if ( old_hwdom ) old_hwdom->cdf &= ~CDF_hardware; + + d->console.input_allowed = true; } /* Holding CDF_* internal flags. */ diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 30701ae0b0..9a9836ba91 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -512,9 +512,21 @@ static unsigned int __read_mostly console_rx = 0; struct domain *console_get_domain(void) { + struct domain *d; + if ( console_rx == 0 ) return NULL; - return rcu_lock_domain_by_id(console_rx - 1); + + d = rcu_lock_domain_by_id(console_rx - 1); + if ( !d ) + return NULL; + + if ( d->console.input_allowed ) + return d; + + rcu_unlock_domain(d); + + return NULL; } void console_put_domain(struct domain *d) @@ -551,6 +563,10 @@ static void console_switch_input(void) if ( d ) { rcu_unlock_domain(d); + + if ( !d->console.input_allowed ) + continue; + console_rx = next_rx; printk("*** Serial input to DOM%u", domid); break; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 62869cf6f2..fe53d4fab7 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -512,7 +512,7 @@ struct domain bool auto_node_affinity; /* Is this guest fully privileged (aka dom0)? */ bool is_privileged; - /* Can this guest access the Xen console? */ + /* XSM: permission to use HYPERCALL_console_io hypercall */ bool is_console; /* Is this guest being debugged by dom0? */ bool debugger_attached; @@ -651,6 +651,12 @@ struct domain unsigned int num_llc_colors; const unsigned int *llc_colors; #endif + + /* Console settings. */ + struct { + /* Permission to take ownership of the physical console input. */ + bool input_allowed; + } console; } __aligned(PAGE_SIZE); static inline struct page_list_head *page_to_list( -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 22:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 22:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005987.1385268 (Exim 4.92) (envelope-from ) id 1uMwUl-0000lU-E0; Wed, 04 Jun 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 1005987.1385268; Wed, 04 Jun 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 1uMwUl-0000lM-BW; Wed, 04 Jun 2025 22:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1005987; Wed, 04 Jun 2025 22:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMwUj-0000lG-Uw for xen-changelog@lists.xenproject.org; Wed, 04 Jun 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 1uMwUj-0026E3-2B for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 22:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMwUj-006bLX-1i for xen-changelog@lists.xenproject.org; Wed, 04 Jun 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=FMvGF606OpaM9sYOXiGMfSaKCDwJJOblrwgEbj28mQA=; b=yOrySM4KI4tQ0ySe8KwXFBRGXw XTr6+9P496otdNU2FGqSSF2Bm3KCEJQxbiJIz7YKXIzj/m9f6VpR3z9a7s0JML3efKSxUZMq4fg2D YR/n6juLnDC4NnyIHKzVpxKSB8cbfstGsHObO+ig0bfQX0nu1wXdlkAD1nzrd2zDEbRc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/vgic-v2: Fix undefined behavior in vgic_fetch_itargetsr() Message-Id: Date: Wed, 04 Jun 2025 22:22:01 +0000 commit 82dc405bc1232f14867aa1dcf2b1406596dfe4ba Author: Jahan Murudi AuthorDate: Sun Jun 1 22:02:12 2025 +0530 Commit: Stefano Stabellini CommitDate: Wed Jun 4 14:16:51 2025 -0700 arm/vgic-v2: Fix undefined behavior in vgic_fetch_itargetsr() The current implementation performs left shift operations that may trigger undefined behavior when the target value is too large. This patch: 1. Changes the shift from signed (1) to unsigned (1U) to ensure well-defined behavior for all valid target values 2. Maintains identical functionality while fixing the UBSAN warning The issue was detected by UBSAN: (XEN) UBSAN: Undefined behaviour in arch/arm/vgic-v2.c:73:56 (XEN) left shift of 128 by 24 places cannot be represented in type 'int' (XEN) Xen WARN at common/ubsan/ubsan.c:174 Signed-off-by: Jahan Murudi Reviewed-by: Michal Orzel --- xen/arch/arm/vgic-v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index a19d610178..642407fd5b 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -70,7 +70,7 @@ static uint32_t vgic_fetch_itargetsr(struct vgic_irq_rank *rank, offset &= ~(NR_TARGETS_PER_ITARGETSR - 1); for ( i = 0; i < NR_TARGETS_PER_ITARGETSR; i++, offset++ ) - reg |= (1 << read_atomic(&rank->vcpu[offset])) << (i * NR_BITS_PER_TARGET); + reg |= (1U << read_atomic(&rank->vcpu[offset])) << (i * NR_BITS_PER_TARGET); return reg; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 04 22:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Jun 2025 22:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1005988.1385272 (Exim 4.92) (envelope-from ) id 1uMwUv-0000nc-FP; Wed, 04 Jun 2025 22:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1005988.1385272; Wed, 04 Jun 2025 22: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 1uMwUv-0000nU-Cv; Wed, 04 Jun 2025 22:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1005988; Wed, 04 Jun 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 1uMwUt-0000nI-Rj for xen-changelog@lists.xenproject.org; Wed, 04 Jun 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 1uMwUt-0026E9-2g for xen-changelog@lists.xenproject.org; Wed, 04 Jun 2025 22:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uMwUt-006bMV-2N for xen-changelog@lists.xenproject.org; Wed, 04 Jun 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=Hy40/N+E5niWfpBFcTWPdjGAjieLo7Av5+qpOQE+oHA=; b=6FP2mfhAqb/drnrLEADV4Q/KU5 kr2FMajaqdBtB1cZfLcxjzm/ndZpfEwsZloOxNwQU3tIN1msyFTXe7YIRZU07VA4ykC+S4H8HGp7J XEo4ErAd1Vt480k+Nhe1xhIPODSJeOZ5mZ97FrqyOMY7o0h5K/7z9i0Y8GmwfkBP+CCs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/console: introduce console input permission Message-Id: Date: Wed, 04 Jun 2025 22:22:11 +0000 commit c2dddce4b99dcf7235a8cae794512ecb51b6af07 Author: Denis Mukhin AuthorDate: Fri May 30 23:19:01 2025 +0000 Commit: Stefano Stabellini CommitDate: Wed Jun 4 14:24:26 2025 -0700 xen/console: introduce console input permission Add new flag to domain structure for marking permission to intercept the physical console input by the domain. Update console input switch logic accordingly. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/arch/arm/vpl011.c | 1 + xen/arch/x86/pv/shim.c | 2 ++ xen/common/domain.c | 2 ++ xen/drivers/char/console.c | 18 +++++++++++++++++- xen/include/xen/sched.h | 8 +++++++- 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 66047bf33c..480fc664fc 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -713,6 +713,7 @@ int domain_vpl011_init(struct domain *d, struct vpl011_init_info *info) } else { + d->console.input_allowed = true; vpl011->backend_in_domain = false; vpl011->backend.xen = xzalloc(struct vpl011_xen_backend); diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index c506cc0bec..bc2a7dd5fa 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -238,6 +238,8 @@ void __init pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4start, * guest from depleting the shim memory pool. */ d->max_pages = domain_tot_pages(d); + + d->console.input_allowed = true; } static void write_start_info(struct domain *d) diff --git a/xen/common/domain.c b/xen/common/domain.c index 58c5ffc466..153cd75340 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -831,6 +831,8 @@ struct domain *domain_create(domid_t domid, flags |= CDF_hardware; if ( old_hwdom ) old_hwdom->cdf &= ~CDF_hardware; + + d->console.input_allowed = true; } /* Holding CDF_* internal flags. */ diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 30701ae0b0..9a9836ba91 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -512,9 +512,21 @@ static unsigned int __read_mostly console_rx = 0; struct domain *console_get_domain(void) { + struct domain *d; + if ( console_rx == 0 ) return NULL; - return rcu_lock_domain_by_id(console_rx - 1); + + d = rcu_lock_domain_by_id(console_rx - 1); + if ( !d ) + return NULL; + + if ( d->console.input_allowed ) + return d; + + rcu_unlock_domain(d); + + return NULL; } void console_put_domain(struct domain *d) @@ -551,6 +563,10 @@ static void console_switch_input(void) if ( d ) { rcu_unlock_domain(d); + + if ( !d->console.input_allowed ) + continue; + console_rx = next_rx; printk("*** Serial input to DOM%u", domid); break; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 62869cf6f2..fe53d4fab7 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -512,7 +512,7 @@ struct domain bool auto_node_affinity; /* Is this guest fully privileged (aka dom0)? */ bool is_privileged; - /* Can this guest access the Xen console? */ + /* XSM: permission to use HYPERCALL_console_io hypercall */ bool is_console; /* Is this guest being debugged by dom0? */ bool debugger_attached; @@ -651,6 +651,12 @@ struct domain unsigned int num_llc_colors; const unsigned int *llc_colors; #endif + + /* Console settings. */ + struct { + /* Permission to take ownership of the physical console input. */ + bool input_allowed; + } console; } __aligned(PAGE_SIZE); static inline struct page_list_head *page_to_list( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 11:44:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 11:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008439.1387716 (Exim 4.92) (envelope-from ) id 1uNVUS-000435-1h; Fri, 06 Jun 2025 11:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008439.1387716; Fri, 06 Jun 2025 11: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 1uNVUR-00042x-VT; Fri, 06 Jun 2025 11:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1008439; Fri, 06 Jun 2025 11:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNVUQ-00042r-SI for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNVUQ-005Ej4-1h for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNVUQ-007WVw-1P for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11: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=28/4cLsDsflBFne65kD5sLR13hM74/GGsXmUoFuHy7U=; b=JmSUSWbr1Imra+Zp9uwqQUCKMB vbqGtOODsh0iyQBPwpbzx9/8Blr8M21YAvAH9JM3g3l+j/ETHgtuhoCkj8IU7z4i8hWVUPSLclbX+ kBSKkVoAK7x31C0tcEQxdenpX9aNZJtvvCXZQor77MpnYpsA3O6+LLnhpHafEKwAVp24=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Add SELECTED_JOBS_ONLY to analyze.yaml Message-Id: Date: Fri, 06 Jun 2025 11:44:02 +0000 commit 89a5fbb8e307a82a666fcbf508e3adb2ef8a2c61 Author: Anthony PERARD AuthorDate: Mon Jun 2 12:07:54 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:00:28 2025 +0200 CI: Add SELECTED_JOBS_ONLY to analyze.yaml Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper Acked-by: Stefano Stabellini --- automation/gitlab-ci/analyze.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index 35ff3620cf..5b00b9f25c 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -29,6 +29,9 @@ rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: never + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $WTOKEN && $CI_PROJECT_PATH =~ /^xen-project\/people\/.*$/ when: manual allow_failure: true -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 11:44:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 11:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008440.1387720 (Exim 4.92) (envelope-from ) id 1uNVUc-00044V-36; Fri, 06 Jun 2025 11:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008440.1387720; Fri, 06 Jun 2025 11: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 1uNVUc-00044N-0W; Fri, 06 Jun 2025 11:44:14 +0000 Received: by outflank-mailman (input) for mailman id 1008440; Fri, 06 Jun 2025 11:44:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNVUb-00044H-1D for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNVUb-005EjT-01 for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNVUa-007WbR-1s for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11: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=LyaDBEz8WFgbnZ31NRa19JfnEgfz3z8wjLTCk1MlTTQ=; b=fO0IJT9MiabkQR/7+198fPd34D RMYihnZlj9JzUl2WkEHXsswkZiHCMCHhtV3gQp7bbxch7DDUx6SbbP6CsetR/8RyzUaZELKIvQbEs 8nkKEUE747NWyAE5QKr3B1IbraVQiWXnDbTpPfYHV83e28pAW5tAb3JZgg0cYH2cJhmM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: Fix return value of test-rangeset Message-Id: Date: Fri, 06 Jun 2025 11:44:12 +0000 commit ddf34d4bb81b8b803bf90a57686d8a68be0b9eb5 Author: Anthony PERARD AuthorDate: Mon Jun 2 17:08:45 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:00:40 2025 +0200 tools/tests: Fix return value of test-rangeset Otherwise, failed tests are ignored by automated test. Fixes: 7bf777b42cad ("tootls/tests: introduce unit tests for rangesets") Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- tools/tests/rangeset/test-rangeset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/rangeset/test-rangeset.c b/tools/tests/rangeset/test-rangeset.c index 8b580e14eb..c14a908b4f 100644 --- a/tools/tests/rangeset/test-rangeset.c +++ b/tools/tests/rangeset/test-rangeset.c @@ -215,7 +215,7 @@ int main(int argc, char **argv) } } - return 0; + return ret_code; } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 11:44:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 11:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008441.1387723 (Exim 4.92) (envelope-from ) id 1uNVUm-00048A-4x; Fri, 06 Jun 2025 11:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008441.1387723; Fri, 06 Jun 2025 11: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 1uNVUm-000482-21; Fri, 06 Jun 2025 11:44:24 +0000 Received: by outflank-mailman (input) for mailman id 1008441; Fri, 06 Jun 2025 11:44:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNVUl-00047N-50 for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNVUl-005Ejd-0K for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNVUl-007Why-0B for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44: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=f/s5hr3rFyi6YA618VCj8DVjbJmtUz9NRkL/5oQLKQ8=; b=40/pslaaYVr01zTiFbkwW0bAaV doTMaoQ0zz+/D70mfd+I0ukchxPxrRzzGd5LpkDGAKPm2prN/YCw66XYuQZotVIMntCqmS7brWqqy v6Glge1NIuRVu4DWFIZekqycx+XUO8CeUFTtd3t++qtlXZlow0lIZt5FqzRf+4G6BWls=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Use CDATA avoid the need to escape tests outputs Message-Id: Date: Fri, 06 Jun 2025 11:44:23 +0000 commit a6eb429d51473a8a2adbee4d41afcc7861a8a0a6 Author: Anthony PERARD AuthorDate: Mon Jun 2 15:04:39 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:04:05 2025 +0200 CI: Use CDATA avoid the need to escape tests outputs This is easier than escaping individual characters, especially '&' and '<' which are problematic if present. We might still need to escape ']]>' if this string is present in the test output, but hopefully not. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini --- automation/scripts/run-tools-tests | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index 2bca1589db..18687f61a3 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -25,9 +25,10 @@ for f in "$1"/*; do echo "FAILED: $f" failed+=" $f" printf ' \n' "$f" "$ret" >> "$xml_out" - # TODO: could use xml escaping... but current tests seems to - # produce sane output + printf '> "$xml_out" + # TODO: Escape ']]>' if necessary cat /tmp/out >> "$xml_out" + printf ']]>\n' >> "$xml_out" printf ' \n' >> "$xml_out" else echo "PASSED" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 11:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 11:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008442.1387728 (Exim 4.92) (envelope-from ) id 1uNVUw-0004Ak-6T; Fri, 06 Jun 2025 11:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008442.1387728; Fri, 06 Jun 2025 11: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 1uNVUw-0004Ab-3M; Fri, 06 Jun 2025 11:44:34 +0000 Received: by outflank-mailman (input) for mailman id 1008442; Fri, 06 Jun 2025 11:44:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNVUv-0004AT-71 for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNVUv-005Ejh-0b for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNVUv-007Woi-0U for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44: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=9nNJ5v1RYHudOCR801oUjZdREztV7vCsPq9msOjSriE=; b=uE7N+Tr6h4nU9WNiwzBh+8Nbhk AYXU0Uh/wOKdgOYEBHI3Wnl+akAn0XE2tvENCUdytYcJY67uEW0Y4mxn4Sx/GcsrzwvcVixlLGlMD 4U8l8eCJAvtXSnPn0uWlkWpPk53tO4W1csp0D/GHGBOBSdUTWZHzTcyLsvT5bnBKEsq4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Fix status check for tools/tests Message-Id: Date: Fri, 06 Jun 2025 11:44:33 +0000 commit 1cdf18030814cb0ea45dce54bc3d23fae6818583 Author: Anthony PERARD AuthorDate: Mon Jun 2 11:19:22 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:06:34 2025 +0200 CI: Fix status check for tools/tests Without "pipefail", $? have the exit value of `tee`, which should always be 0. But instead of using "pipefail", do collect the value of from the test with $PIPESTATUS. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini --- automation/scripts/run-tools-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index 18687f61a3..cbdd79f6db 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -20,7 +20,7 @@ for f in "$1"/*; do echo "Running $f" printf ' \n' "$f" >> "$xml_out" "$f" 2>&1 | tee /tmp/out - ret=$? + ret=${PIPESTATUS[0]} if [ "$ret" -ne 0 ]; then echo "FAILED: $f" failed+=" $f" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 11:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 11:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008443.1387732 (Exim 4.92) (envelope-from ) id 1uNVV6-0004Cn-7J; Fri, 06 Jun 2025 11:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008443.1387732; Fri, 06 Jun 2025 11: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 1uNVV6-0004Cf-4h; Fri, 06 Jun 2025 11:44:44 +0000 Received: by outflank-mailman (input) for mailman id 1008443; Fri, 06 Jun 2025 11:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNVV5-0004CZ-9l for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNVV5-005Ejn-0s for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNVV5-007Wyg-0l for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 11:44: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=DyreWxnEGoHvinghZZWTVSOHEb8P3piu4wKjSEnS45s=; b=VVsunspZsP/CaVfR7JTQAfOvFo fOMuCQT7DrD+g/hwzxu6uuHSYrzz2Q8XvPy1rUY9HyL6tDqbcwglEspNdV0yVeOQdjdHhae6HKEuR YLrEFOYzXrMSqbnDFffe154bKR4fA3tNdRdBI+Tic1ULwvDUiHvvOvyPpa71E3f0lxRc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Add timing to junit Message-Id: Date: Fri, 06 Jun 2025 11:44:43 +0000 commit 321b74f29d76569efbc50cbf38ec5341d672c7b7 Author: Anthony PERARD AuthorDate: Mon Jun 2 14:55:05 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:07:26 2025 +0200 CI: Add timing to junit Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/scripts/run-tools-tests | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index cbdd79f6db..15766ca0f0 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -18,9 +18,12 @@ for f in "$1"/*; do continue fi echo "Running $f" - printf ' \n' "$f" >> "$xml_out" + time_start=$EPOCHREALTIME "$f" 2>&1 | tee /tmp/out ret=${PIPESTATUS[0]} + time_end=$EPOCHREALTIME + time_delta="$(bc <<<"$time_end - $time_start")" + printf ' \n' "$f" "$time_delta" >> "$xml_out" if [ "$ret" -ne 0 ]; then echo "FAILED: $f" failed+=" $f" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 12:22:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 12:22:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008489.1387748 (Exim 4.92) (envelope-from ) id 1uNW5D-00011b-9v; Fri, 06 Jun 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 1008489.1387748; Fri, 06 Jun 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 1uNW5D-00011T-7M; Fri, 06 Jun 2025 12:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1008489; Fri, 06 Jun 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 1uNW5C-00011N-KA for xen-changelog@lists.xenproject.org; Fri, 06 Jun 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 1uNW5C-005FWQ-1A for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNW5C-007vl8-0q for xen-changelog@lists.xenproject.org; Fri, 06 Jun 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=AVaz7p0EbEiwkDxi8FPqL4xAFxtieCm8cSs3gP3Biy8=; b=VvpJ7kWGbG8auS6ZS+8/Vm0Ju2 80TOYOwKsqs0YTHatPj1gJi9n7GZ1fj0bm815GvpH/ASjVELEK5kp9xUTBn7xr0UHCScYFoKa3ZOA hfHHeQCLBxEkKXxGmSR0cq5nt84S9B88Qr4/3Kx++P+WtjHcYOOX94nMb/AC1sq7Mls4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Add SELECTED_JOBS_ONLY to analyze.yaml Message-Id: Date: Fri, 06 Jun 2025 12:22:02 +0000 commit 89a5fbb8e307a82a666fcbf508e3adb2ef8a2c61 Author: Anthony PERARD AuthorDate: Mon Jun 2 12:07:54 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:00:28 2025 +0200 CI: Add SELECTED_JOBS_ONLY to analyze.yaml Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper Acked-by: Stefano Stabellini --- automation/gitlab-ci/analyze.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index 35ff3620cf..5b00b9f25c 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -29,6 +29,9 @@ rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: never + - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + - if: $SELECTED_JOBS_ONLY + when: never - if: $WTOKEN && $CI_PROJECT_PATH =~ /^xen-project\/people\/.*$/ when: manual allow_failure: true -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 12:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 12:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008490.1387753 (Exim 4.92) (envelope-from ) id 1uNW5N-00013N-BV; Fri, 06 Jun 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 1008490.1387753; Fri, 06 Jun 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 1uNW5N-00013F-8s; Fri, 06 Jun 2025 12:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1008490; Fri, 06 Jun 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 1uNW5M-000135-HE for xen-changelog@lists.xenproject.org; Fri, 06 Jun 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 1uNW5M-005FWp-1d for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNW5M-007vs1-1K for xen-changelog@lists.xenproject.org; Fri, 06 Jun 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=JUROuL7cy87wv9+LIfWLdEOG4oUM0mE7XPl4klj4JuM=; b=H9IL1sEAxpS/xAiUM127ofoaJb d7lpMDOydkcGvq+wmVq2vEMGOMN/4/XsCSV/np/S5PWiyhKNBo3OoC158W8fwsw5Fn5o+0YZqLU4k fgOr4scE8/r1uLRpgVaNXqVBYip9mGKM+BH2SYTz98sZ+COOQOneYgT6wbCvuxeKmJlI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: Fix return value of test-rangeset Message-Id: Date: Fri, 06 Jun 2025 12:22:12 +0000 commit ddf34d4bb81b8b803bf90a57686d8a68be0b9eb5 Author: Anthony PERARD AuthorDate: Mon Jun 2 17:08:45 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:00:40 2025 +0200 tools/tests: Fix return value of test-rangeset Otherwise, failed tests are ignored by automated test. Fixes: 7bf777b42cad ("tootls/tests: introduce unit tests for rangesets") Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- tools/tests/rangeset/test-rangeset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/rangeset/test-rangeset.c b/tools/tests/rangeset/test-rangeset.c index 8b580e14eb..c14a908b4f 100644 --- a/tools/tests/rangeset/test-rangeset.c +++ b/tools/tests/rangeset/test-rangeset.c @@ -215,7 +215,7 @@ int main(int argc, char **argv) } } - return 0; + return ret_code; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 12:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 12:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008491.1387757 (Exim 4.92) (envelope-from ) id 1uNW5X-00015Y-Cw; Fri, 06 Jun 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 1008491.1387757; Fri, 06 Jun 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 1uNW5X-00015Q-AM; Fri, 06 Jun 2025 12:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1008491; Fri, 06 Jun 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 1uNW5W-00015C-Lp for xen-changelog@lists.xenproject.org; Fri, 06 Jun 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 1uNW5W-005FWx-25 for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNW5W-007vy5-1o for xen-changelog@lists.xenproject.org; Fri, 06 Jun 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=DahGEvEbs9kGnP4/9cGx4ntU9Rku8yyRtQuRN018H4E=; b=kxFyEp0flXWxAPht4RH8zqP4Pu /r53Y0YG91cUZyRQEeoOe49i1BDV8IlNseE1LjmkvP6Iz+mwp3fPL1j437DD27LyYQCjJr7UoVslk qw8Zoaffly1J/PJhr54qs7tea4uitSQZy4HQNLEqUBiDxspAGXNPKSjQE9X5LcoBt5AY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Use CDATA avoid the need to escape tests outputs Message-Id: Date: Fri, 06 Jun 2025 12:22:22 +0000 commit a6eb429d51473a8a2adbee4d41afcc7861a8a0a6 Author: Anthony PERARD AuthorDate: Mon Jun 2 15:04:39 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:04:05 2025 +0200 CI: Use CDATA avoid the need to escape tests outputs This is easier than escaping individual characters, especially '&' and '<' which are problematic if present. We might still need to escape ']]>' if this string is present in the test output, but hopefully not. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini --- automation/scripts/run-tools-tests | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index 2bca1589db..18687f61a3 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -25,9 +25,10 @@ for f in "$1"/*; do echo "FAILED: $f" failed+=" $f" printf ' \n' "$f" "$ret" >> "$xml_out" - # TODO: could use xml escaping... but current tests seems to - # produce sane output + printf '> "$xml_out" + # TODO: Escape ']]>' if necessary cat /tmp/out >> "$xml_out" + printf ']]>\n' >> "$xml_out" printf ' \n' >> "$xml_out" else echo "PASSED" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 12:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 12:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008492.1387760 (Exim 4.92) (envelope-from ) id 1uNW5h-00017o-EL; Fri, 06 Jun 2025 12:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008492.1387760; Fri, 06 Jun 2025 12: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 1uNW5h-00017g-Bk; Fri, 06 Jun 2025 12:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1008492; Fri, 06 Jun 2025 12:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNW5g-00017X-QT for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNW5g-005FX7-2N for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNW5g-007w4l-2F for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12: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=ontIHPpgC9vLIOeIqZrc/n1bclFsiYPhCiciCcM1e5o=; b=zrcfIoV+cA3FxFbw1XgCM0xH4x I1HMUv3bt58HvpLZnI7hQOh4xC8QUyETwtck6yeYzvvQew6B2XyS3GgVhoIEAx6RKaqlZJCOBDlf8 L/NXzUgHlpKAaDfoqAlGV4hgsTJfhEEdyqmMlDbm0LqFPyd2KSDCFozi+3En+cSm4BwM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Fix status check for tools/tests Message-Id: Date: Fri, 06 Jun 2025 12:22:32 +0000 commit 1cdf18030814cb0ea45dce54bc3d23fae6818583 Author: Anthony PERARD AuthorDate: Mon Jun 2 11:19:22 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:06:34 2025 +0200 CI: Fix status check for tools/tests Without "pipefail", $? have the exit value of `tee`, which should always be 0. But instead of using "pipefail", do collect the value of from the test with $PIPESTATUS. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini --- automation/scripts/run-tools-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index 18687f61a3..cbdd79f6db 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -20,7 +20,7 @@ for f in "$1"/*; do echo "Running $f" printf ' \n' "$f" >> "$xml_out" "$f" 2>&1 | tee /tmp/out - ret=$? + ret=${PIPESTATUS[0]} if [ "$ret" -ne 0 ]; then echo "FAILED: $f" failed+=" $f" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 06 12:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Jun 2025 12:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1008493.1387765 (Exim 4.92) (envelope-from ) id 1uNW5r-00019r-Fy; Fri, 06 Jun 2025 12:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1008493.1387765; Fri, 06 Jun 2025 12: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 1uNW5r-00019j-D7; Fri, 06 Jun 2025 12:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1008493; Fri, 06 Jun 2025 12:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNW5q-00019Z-Tm for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uNW5q-005FXB-2f for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uNW5q-007wDE-2X for xen-changelog@lists.xenproject.org; Fri, 06 Jun 2025 12: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=+U0wFWaW8AciH30P2PlGnxaYOFXMTWgECvBXlgN6ayc=; b=QyR5mBbBjuIz1NooNurQjgbVck fTV0FiZhou9VkO1+D16+K1r5s3S5+Pk70nrKcLOFGim/R5WJkCLWsZvVz3jePX8pV9lDjkNHJ4C9C klKgyNXjQoMU5zVHoui9jCJCxXE5qzGFpmt7VrVArwOBGjJdY+RRMwUWVlOKk4jnGSHc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Add timing to junit Message-Id: Date: Fri, 06 Jun 2025 12:22:42 +0000 commit 321b74f29d76569efbc50cbf38ec5341d672c7b7 Author: Anthony PERARD AuthorDate: Mon Jun 2 14:55:05 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Jun 6 12:07:26 2025 +0200 CI: Add timing to junit Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/scripts/run-tools-tests | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automation/scripts/run-tools-tests b/automation/scripts/run-tools-tests index cbdd79f6db..15766ca0f0 100755 --- a/automation/scripts/run-tools-tests +++ b/automation/scripts/run-tools-tests @@ -18,9 +18,12 @@ for f in "$1"/*; do continue fi echo "Running $f" - printf ' \n' "$f" >> "$xml_out" + time_start=$EPOCHREALTIME "$f" 2>&1 | tee /tmp/out ret=${PIPESTATUS[0]} + time_end=$EPOCHREALTIME + time_delta="$(bc <<<"$time_end - $time_start")" + printf ' \n' "$f" "$time_delta" >> "$xml_out" if [ "$ret" -ne 0 ]; then echo "FAILED: $f" failed+=" $f" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 09 06:55:10 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jun 2025 06:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1010104.1388215 (Exim 4.92) (envelope-from ) id 1uOWPQ-0002JK-9Z; Mon, 09 Jun 2025 06:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1010104.1388215; Mon, 09 Jun 2025 06: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 1uOWPQ-0002JB-6V; Mon, 09 Jun 2025 06:55:04 +0000 Received: by outflank-mailman (input) for mailman id 1010104; Mon, 09 Jun 2025 06:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uOWPO-0002J5-6T for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 06:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uOWPN-00A8aP-3C for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uOWPN-005IOe-34 for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 06: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=dOEK4+bMzlYhFiMfhjG+pPnPEwq6whdOTsxnUA147Y4=; b=wfugx8ONn+P5jr29Q5aHwblp6I x6A25T0oTksBWKjOeQqT0w0h/PfuhaMs0zPqprzjtets4yDKC0p7A+V4wOAS6ZugzQTBM/ivb95Fy 9i+UlDLWdcucSzPerZnwH+FogteeSXKLBAsNpaA9S6e4nSNcx3JOfyD/E2JrzxtIJBvM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: head: document missing input registers for MMU functions Message-Id: Date: Mon, 09 Jun 2025 06:55:01 +0000 commit e6ac1b2b013795cbdb0b68421c8872de83920f73 Author: Mykola Kvach AuthorDate: Mon Jun 2 12:38:37 2025 +0300 Commit: Michal Orzel CommitDate: Mon Jun 9 08:48:42 2025 +0200 xen/arm64: head: document missing input registers for MMU functions Add missing input register descriptions to enable_secondary_cpu_mm and enable_boot_cpu_mm functions. This update improves code clarity and consistency in comments. No functional changes are introduced by this patch. Signed-off-by: Mykola Kvach Reviewed-by: Michal Orzel --- xen/arch/arm/arm64/mmu/head.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index 634156f83d..d14780ad19 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -313,6 +313,7 @@ END(enable_mmu) * * Inputs: * lr : Virtual address to return to. + * x20: phys offset * * Clobbers x0 - x6 */ @@ -337,6 +338,8 @@ END(enable_secondary_cpu_mm) * * Inputs: * lr : Virtual address to return to. + * x19: paddr(start) + * x20: phys offset * * Clobbers x0 - x6 */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 09 06:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jun 2025 06:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1010105.1388220 (Exim 4.92) (envelope-from ) id 1uOWPZ-0002Kh-Ax; Mon, 09 Jun 2025 06:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1010105.1388220; Mon, 09 Jun 2025 06: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 1uOWPZ-0002KZ-7r; Mon, 09 Jun 2025 06:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1010105; Mon, 09 Jun 2025 06:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uOWPY-0002KR-3g for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 06:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uOWPY-00A8aW-0F for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 06:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uOWPY-005IQb-09 for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 06: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=we08EqkLZExsrsVc9sTGx/SyN9I7tco/jkfc8UPa5nY=; b=AIchpluuEM38GlzjlDr5nsA6Zn 4FJu0qgoZaBLceHVmODHfb1V+oIf2TlRnwq2Vkyk8MreYWbyznbjIVBK40X5dO5MnHWVSjLdg4tKN MGowuetV1WYY9iwYnHVxISo6WYdK7PRyaCjcmgHYyRmvQVk3XYbIDuraavc0aRDVjAh0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Standardize R-Car platform Kconfig descriptions Message-Id: Date: Mon, 09 Jun 2025 06:55:12 +0000 commit 6bd3aa6d56d14bec008c296c69559b7d2f7e4282 Author: Jahan Murudi AuthorDate: Fri Jun 6 13:57:35 2025 +0530 Commit: Michal Orzel CommitDate: Mon Jun 9 08:49:10 2025 +0200 xen/arm: Standardize R-Car platform Kconfig descriptions Change "RCar3/RCar4" to "R-Car Gen3/Gen4" to match official Renesas branding. Aligns with documentation and industry-standard terminology. Signed-off-by: Jahan Murudi Reviewed-by: Michal Orzel --- xen/arch/arm/platforms/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/platforms/Kconfig b/xen/arch/arm/platforms/Kconfig index 87bf614788..c8bc0bfae3 100644 --- a/xen/arch/arm/platforms/Kconfig +++ b/xen/arch/arm/platforms/Kconfig @@ -22,21 +22,23 @@ config QEMU machine. config RCAR3 - bool "Renesas RCar3 support" + bool "Renesas R-Car Gen3 support" depends on ARM_64 select HAS_SCIF select IPMMU_VMSA help - Enable all the required drivers for Renesas RCar3 + Enable support for Renesas R-Car Generation 3 SoCs (H3, M3, etc.). + Includes all required drivers and platform-specific features. config RCAR4 - bool "Renesas RCar4 support" + bool "Renesas R-Car Gen4 support" depends on ARM_64 select HAS_SCIF select HAS_ITS select IPMMU_VMSA help - Enable all the required drivers for Renesas RCar4 + Enable support for Renesas R-Car Generation 4 SoCs (V4H, V4M, etc.). + Includes all required drivers and platform-specific features. config MPSOC bool "Xilinx Ultrascale+ MPSoC support" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 09 07:55:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jun 2025 07:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1010136.1388264 (Exim 4.92) (envelope-from ) id 1uOXLV-0003Iv-DS; Mon, 09 Jun 2025 07:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1010136.1388264; Mon, 09 Jun 2025 07:55: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 1uOXLV-0003In-AW; Mon, 09 Jun 2025 07:55:05 +0000 Received: by outflank-mailman (input) for mailman id 1010136; Mon, 09 Jun 2025 07:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uOXLT-0003Ih-F3 for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 07:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uOXLS-00A9tG-1N for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 07:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uOXLS-005PwO-1F for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 07: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=H+t+invRxFk2CNWPNWfmvKODXKd4c4nZqoXQ+nSk9fo=; b=bzO3KvkCchJ7brXchtemkWLkX4 v+izngRZmcRGH31tMtQP5F3UFPp6EzS4oz9Y99wF28RRq9RntlslN7PDvZqnkLfPecCfHxkWrdCbA JtUQnjc4K/x8a+VwUZ7yHnO7zpiF5ryJ1iVekT/4mRap6pSYWSDvwPVrpXxJ8yIr9YyI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: document missing input registers for MMU functions Message-Id: Date: Mon, 09 Jun 2025 07:55:02 +0000 commit e6ac1b2b013795cbdb0b68421c8872de83920f73 Author: Mykola Kvach AuthorDate: Mon Jun 2 12:38:37 2025 +0300 Commit: Michal Orzel CommitDate: Mon Jun 9 08:48:42 2025 +0200 xen/arm64: head: document missing input registers for MMU functions Add missing input register descriptions to enable_secondary_cpu_mm and enable_boot_cpu_mm functions. This update improves code clarity and consistency in comments. No functional changes are introduced by this patch. Signed-off-by: Mykola Kvach Reviewed-by: Michal Orzel --- xen/arch/arm/arm64/mmu/head.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index 634156f83d..d14780ad19 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -313,6 +313,7 @@ END(enable_mmu) * * Inputs: * lr : Virtual address to return to. + * x20: phys offset * * Clobbers x0 - x6 */ @@ -337,6 +338,8 @@ END(enable_secondary_cpu_mm) * * Inputs: * lr : Virtual address to return to. + * x19: paddr(start) + * x20: phys offset * * Clobbers x0 - x6 */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 09 07:55:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jun 2025 07:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1010137.1388267 (Exim 4.92) (envelope-from ) id 1uOXLe-0003Kp-Ej; Mon, 09 Jun 2025 07:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1010137.1388267; Mon, 09 Jun 2025 07: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 1uOXLe-0003Kh-Bs; Mon, 09 Jun 2025 07:55:14 +0000 Received: by outflank-mailman (input) for mailman id 1010137; Mon, 09 Jun 2025 07:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uOXLc-0003KP-I5 for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 07:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uOXLc-00A9tL-1h for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 07:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uOXLc-005Px8-1Y for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 07: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=W9OesXMMN5PwrDnZtCTwL8QmA2UYHTPQK5J0V+FkTAU=; b=rt+vNeXqYf5GBSnIH1VySqfoTx zkfLYfazP94rwmBO0QftGu7eIr7pjHSqjGwD8LVEbXCZoysQ3zEAv7/gwYpSC3axFO4T2jinwhijl vtut5tiFLa0a0Os6GqDSTg/OrIV6GKMwgxupnKXdBDJktW4ZB06UZq4jwQWGkaDTFKXE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Standardize R-Car platform Kconfig descriptions Message-Id: Date: Mon, 09 Jun 2025 07:55:12 +0000 commit 6bd3aa6d56d14bec008c296c69559b7d2f7e4282 Author: Jahan Murudi AuthorDate: Fri Jun 6 13:57:35 2025 +0530 Commit: Michal Orzel CommitDate: Mon Jun 9 08:49:10 2025 +0200 xen/arm: Standardize R-Car platform Kconfig descriptions Change "RCar3/RCar4" to "R-Car Gen3/Gen4" to match official Renesas branding. Aligns with documentation and industry-standard terminology. Signed-off-by: Jahan Murudi Reviewed-by: Michal Orzel --- xen/arch/arm/platforms/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/platforms/Kconfig b/xen/arch/arm/platforms/Kconfig index 87bf614788..c8bc0bfae3 100644 --- a/xen/arch/arm/platforms/Kconfig +++ b/xen/arch/arm/platforms/Kconfig @@ -22,21 +22,23 @@ config QEMU machine. config RCAR3 - bool "Renesas RCar3 support" + bool "Renesas R-Car Gen3 support" depends on ARM_64 select HAS_SCIF select IPMMU_VMSA help - Enable all the required drivers for Renesas RCar3 + Enable support for Renesas R-Car Generation 3 SoCs (H3, M3, etc.). + Includes all required drivers and platform-specific features. config RCAR4 - bool "Renesas RCar4 support" + bool "Renesas R-Car Gen4 support" depends on ARM_64 select HAS_SCIF select HAS_ITS select IPMMU_VMSA help - Enable all the required drivers for Renesas RCar4 + Enable support for Renesas R-Car Generation 4 SoCs (V4H, V4M, etc.). + Includes all required drivers and platform-specific features. config MPSOC bool "Xilinx Ultrascale+ MPSoC support" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 09 10:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jun 2025 10:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1010221.1388381 (Exim 4.92) (envelope-from ) id 1uOZoN-0003WX-Lc; Mon, 09 Jun 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 1010221.1388381; Mon, 09 Jun 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 1uOZoN-0003WP-Iz; Mon, 09 Jun 2025 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1010221; Mon, 09 Jun 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 1uOZoM-0003WJ-HY for xen-changelog@lists.xenproject.org; Mon, 09 Jun 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 1uOZoM-00ADPG-17 for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 10:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uOZoM-005mbC-0w for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 10: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=AsQbeJbJ3OvX5UFP5dbIb9c8heGJdiXP/dZNiyuT68w=; b=o54VCTOLGPoDFiymlqbEbPJdWQ ezCBjF/5vXqle5FBksju/C4iQM/SrhanpzmiLJG58gJQ11pH2HW2XxJs3LU392TVU0RRML/ECYyf3 hm/Wgj9NA11AsEf+tyeCPX0IvGt1uG97Gv85w524wrcf4J5qPEW+SK7ifjZTfJEH6230=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tests/vpci: Use $(CC) instead of $(HOSTCC) Message-Id: Date: Mon, 09 Jun 2025 10:33:02 +0000 commit 86a12671c5d33063b6f958bdcca7c9d14cd5aac8 Author: Michal Orzel AuthorDate: Wed Jun 4 09:21:28 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Jun 9 12:12:43 2025 +0200 tests/vpci: Use $(CC) instead of $(HOSTCC) Depending on the build environment, HOSTCC can be different than CC. With the recent `install` rule addition, this would put a binary of a wrong format in the destdir (e.g. building tests on x86 host for Arm target). Take the opportunity to adjust the `run` rule to only run the test if HOSTCC is CC, else print a warning message. Fixes: 96a587a05736 ("tools/tests: Add install target for vPCI") Signed-off-by: Michal Orzel Reviewed-by: Roger Pau Monné --- tools/tests/vpci/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 9450f7593a..97359ff67f 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -8,10 +8,14 @@ all: $(TARGET) .PHONY: run run: $(TARGET) +ifeq ($(CC),$(HOSTCC)) ./$(TARGET) +else + $(warning HOSTCC != CC, will not run test) +endif $(TARGET): vpci.c vpci.h list.h main.c emul.h - $(HOSTCC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c + $(CC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c .PHONY: clean clean: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 09 11:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Jun 2025 11:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1010244.1388415 (Exim 4.92) (envelope-from ) id 1uOaP9-0001ai-UA; Mon, 09 Jun 2025 11:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1010244.1388415; Mon, 09 Jun 2025 11: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 1uOaP9-0001aa-RV; Mon, 09 Jun 2025 11:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1010244; Mon, 09 Jun 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 1uOaP7-0001aU-N6 for xen-changelog@lists.xenproject.org; Mon, 09 Jun 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 1uOaP7-00AE8e-1w for xen-changelog@lists.xenproject.org; Mon, 09 Jun 2025 11:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uOaP7-005tcS-1o for xen-changelog@lists.xenproject.org; Mon, 09 Jun 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=hLJoaldj6sJ69O28Ehxj6eRWFhNFTJMJF+xfaFpDkbE=; b=WkoueARmuTUSxP0FZKC3AIpr6b zGSLWVnneNbHQkus2ylB74ttYgNnsNMzskPSmTFGCEtMbmOZE8Q22bkHsYPs4RUah0FsuFgOYXo5u NKuOjCENf3In8TpS+OZ7tFByxtHtBvTHS9Bl94vnmlWemIGu/lLrwNOtxgWqi95IQneA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tests/vpci: Use $(CC) instead of $(HOSTCC) Message-Id: Date: Mon, 09 Jun 2025 11:11:01 +0000 commit 86a12671c5d33063b6f958bdcca7c9d14cd5aac8 Author: Michal Orzel AuthorDate: Wed Jun 4 09:21:28 2025 +0200 Commit: Roger Pau Monne CommitDate: Mon Jun 9 12:12:43 2025 +0200 tests/vpci: Use $(CC) instead of $(HOSTCC) Depending on the build environment, HOSTCC can be different than CC. With the recent `install` rule addition, this would put a binary of a wrong format in the destdir (e.g. building tests on x86 host for Arm target). Take the opportunity to adjust the `run` rule to only run the test if HOSTCC is CC, else print a warning message. Fixes: 96a587a05736 ("tools/tests: Add install target for vPCI") Signed-off-by: Michal Orzel Reviewed-by: Roger Pau Monné --- tools/tests/vpci/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 9450f7593a..97359ff67f 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -8,10 +8,14 @@ all: $(TARGET) .PHONY: run run: $(TARGET) +ifeq ($(CC),$(HOSTCC)) ./$(TARGET) +else + $(warning HOSTCC != CC, will not run test) +endif $(TARGET): vpci.c vpci.h list.h main.c emul.h - $(HOSTCC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c + $(CC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c .PHONY: clean clean: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011384.1389764 (Exim 4.92) (envelope-from ) id 1uPHU7-0000tv-72; Wed, 11 Jun 2025 09:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011384.1389764; Wed, 11 Jun 2025 09: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 1uPHU7-0000tj-2n; Wed, 11 Jun 2025 09:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1011384; Wed, 11 Jun 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 1uPHU6-0000td-7B for xen-changelog@lists.xenproject.org; Wed, 11 Jun 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 1uPHU6-00DiUy-04 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHU5-002FmQ-2z for xen-changelog@lists.xenproject.org; Wed, 11 Jun 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=lgN0TA+bqP5AksBGrzC0MxLvYOGce3taCVFBSRz9IXs=; b=ayvjRR8U3ABgyv/aSCIsU0wvGr N4QX0OgdUIBW0Le/066IyxLdaxHdaR4p33QQDbX/nMsSAHruf1WTPvFHmdyIXApBZX+2FLQDj5XXW CLoXJsyG61qRJaiWuGeEhtuaP/8YCo3GguIrnT9+Serl9OZ1KplXpZ5YKjQtbIEMFvkY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] SUPPORT.md: mark xenstore live update as supported Message-Id: Date: Wed, 11 Jun 2025 09:11:01 +0000 commit dcc98a6352322b53422404dfd3dddaa3a90d4bb3 Author: Juergen Gross AuthorDate: Wed Jun 11 11:04:16 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:04:16 2025 +0200 SUPPORT.md: mark xenstore live update as supported Live update of xenstored is available since Xen 4.15 and it is tested on a regular basis since then. Switch the live update support from "Tech Preview" to "Supported". Signed-off-by: Juergen Gross Acked-by: Julien Grall --- SUPPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SUPPORT.md b/SUPPORT.md index d75cf018fc..f0b5718e84 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -270,7 +270,7 @@ or itself will not be regarded a security issue. ### C xenstored daemon Status: Supported - Status, Liveupdate: Tech Preview + Status, Liveupdate: Supported ### C xenstore stubdom PV -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011385.1389765 (Exim 4.92) (envelope-from ) id 1uPHUH-0000va-6b; Wed, 11 Jun 2025 09:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011385.1389765; Wed, 11 Jun 2025 09: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 1uPHUH-0000vT-4A; Wed, 11 Jun 2025 09:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1011385; Wed, 11 Jun 2025 09:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHUG-0000vF-5j for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHUG-00DiV2-0S for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHUG-002FpB-0E for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=IB4lqPmMC4HHJvv2hm1YlxfVEuCzul2ErzcaVKoPTQ8=; b=kiXdHSFtUMqwThk6wG0cXZo+Up HXToSyiTm8VZYlSIqbMCzosHMOvVNUbBaBO/wUREIhSxAKcRidaGZfSsrSIYF86vZIENG6E8CaHhZ 9bSHrhXFf7DTY1Ilec33rDujcPcBhtsmPDKj3N5b6Rmwa7OJxVi9yvEkxdd6NtIKlG44=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: remove outdated comment in xhci driver Message-Id: Date: Wed, 11 Jun 2025 09:11:12 +0000 commit d012a19845bb988064f47470954b793632c7a3c6 Author: Marek Marczykowski-Górecki AuthorDate: Wed Jun 11 11:04:44 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:04:44 2025 +0200 drivers/char: remove outdated comment in xhci driver The input handling is already implemented, and that limitation is not there anymore. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/xhci-dbc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index c45e4b6825..d011159d18 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -654,10 +654,6 @@ static void dbc_rx_trb(struct dbc *dbc, struct xhci_trb *trb, cache_flush(&ring->buf[start], end - start); } -/* - * Note that if IN transfer support is added, then this - * will need to be changed; it assumes an OUT transfer ring only - */ static void dbc_pop_events(struct dbc *dbc) { struct dbc_reg *reg = dbc->dbc_reg; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011386.1389770 (Exim 4.92) (envelope-from ) id 1uPHUR-0000y0-8U; Wed, 11 Jun 2025 09:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011386.1389770; Wed, 11 Jun 2025 09: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 1uPHUR-0000xs-5j; Wed, 11 Jun 2025 09:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1011386; Wed, 11 Jun 2025 09:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHUQ-0000xm-8S for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHUQ-00DiV6-0k for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHUQ-002Frq-0d for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=VWOWP3N1AoFsOqDjHUsyAXBPrgMYrNDXR1z1/z0mz6Y=; b=C/sJiKK6zt/bXJllEyYODRIO29 ubMNrD/cy2/TqaLmHZMXH7c1BmopfCJXlrRog2wwpUgTLpLMTFbR01UaWPhopwinDHYJne7vHfCja hlVuOeJk9rPIHB7LaWWFWdIOn09g4cClokSlCiuAzNg61qexuuP/ZbQY4Cge/XZhbOtw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci/header: Emulate legacy capability list for dom0 Message-Id: Date: Wed, 11 Jun 2025 09:11:22 +0000 commit 4df04b27d372e0c9496de914ac5ec25cd861e18f Author: Jiqian Chen AuthorDate: Wed Jun 11 11:05:03 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:05:03 2025 +0200 vpci/header: Emulate legacy capability list for dom0 Current logic of emulating legacy capability list is only for domU. So, expand it to emulate for dom0 too. Then it will be easy to hide a capability whose initialization fails in a function. And restrict adding PCI_STATUS register only for domU since dom0 has no limitation to access that register. Signed-off-by: Jiqian Chen Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 39 ++++++++++++++++++++++++++------------- xen/drivers/vpci/vpci.c | 6 ++++++ xen/include/xen/vpci.h | 2 ++ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 0fb3cfa6a3..d26cbba08e 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -758,9 +758,9 @@ static int vpci_init_capability_list(struct pci_dev *pdev) { int rc; bool mask_cap_list = false; + bool is_hwdom = is_hardware_domain(pdev->domain); - if ( !is_hardware_domain(pdev->domain) && - pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) + if ( pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) { /* Only expose capabilities to the guest that vPCI can handle. */ unsigned int next, ttl = 48; @@ -768,12 +768,18 @@ static int vpci_init_capability_list(struct pci_dev *pdev) PCI_CAP_ID_MSI, PCI_CAP_ID_MSIX, }; + /* + * For dom0, we should expose all capabilities instead of a fixed + * capabilities array, so setting n to 0 here is to get the next + * capability position directly in pci_find_next_cap_ttl. + */ + const unsigned int n = is_hwdom ? 0 : ARRAY_SIZE(supported_caps); next = pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); + supported_caps, n, &ttl); - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + rc = vpci_add_register(pdev->vpci, vpci_read_val, + is_hwdom ? vpci_hw_write8 : NULL, PCI_CAPABILITY_LIST, 1, (void *)(uintptr_t)next); if ( rc ) @@ -781,7 +787,7 @@ static int vpci_init_capability_list(struct pci_dev *pdev) next &= ~3; - if ( !next ) + if ( !next && !is_hwdom ) /* * If we don't have any supported capabilities to expose to the * guest, mask the PCI_STATUS_CAP_LIST bit in the status @@ -795,15 +801,18 @@ static int vpci_init_capability_list(struct pci_dev *pdev) next = pci_find_next_cap_ttl(pdev->sbdf, pos + PCI_CAP_LIST_NEXT, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); + supported_caps, n, &ttl); - rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, - pos + PCI_CAP_LIST_ID, 1, NULL); - if ( rc ) - return rc; + if ( !is_hwdom ) + { + rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, + pos + PCI_CAP_LIST_ID, 1, NULL); + if ( rc ) + return rc; + } - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + rc = vpci_add_register(pdev->vpci, vpci_read_val, + is_hwdom ? vpci_hw_write8 : NULL, pos + PCI_CAP_LIST_NEXT, 1, (void *)(uintptr_t)next); if ( rc ) @@ -813,6 +822,10 @@ static int vpci_init_capability_list(struct pci_dev *pdev) } } + /* Return early for the hw domain, no masking of PCI_STATUS. */ + if ( is_hwdom ) + return 0; + /* Utilize rsvdp_mask to hide PCI_STATUS_CAP_LIST from the guest. */ return vpci_add_register_mask(pdev->vpci, vpci_hw_read16, vpci_hw_write16, PCI_STATUS, 2, NULL, diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index d2f0f97e0a..09988f04c2 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -255,6 +255,12 @@ uint32_t cf_check vpci_hw_read32( return pci_conf_read32(pdev->sbdf, reg); } +void cf_check vpci_hw_write8( + const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) +{ + pci_conf_write8(pdev->sbdf, reg, val); +} + void cf_check vpci_hw_write16( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) { diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 475981cb81..fc8d5b470b 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -76,6 +76,8 @@ uint32_t cf_check vpci_hw_read16( const struct pci_dev *pdev, unsigned int reg, void *data); uint32_t cf_check vpci_hw_read32( const struct pci_dev *pdev, unsigned int reg, void *data); +void cf_check vpci_hw_write8( + const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data); void cf_check vpci_hw_write16( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011387.1389776 (Exim 4.92) (envelope-from ) id 1uPHUc-00010I-AZ; Wed, 11 Jun 2025 09:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011387.1389776; Wed, 11 Jun 2025 09: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 1uPHUc-00010A-78; Wed, 11 Jun 2025 09:11:34 +0000 Received: by outflank-mailman (input) for mailman id 1011387; Wed, 11 Jun 2025 09:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHUa-0000zx-Bk for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHUa-00DiVC-13 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHUa-002FuQ-0w for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=MkL0Dldq8Y9rHkEIatCEHh4quMdGZgxTFybGvG/BEnc=; b=pYQWC8LMbvqxoU9QYCyBv44qnZ CTjzpjZD3jrkVOq6EjwqvSuJqG1gzSJmigSHte2exFQk00vdwWH0t7Do+bHGFbtSOntrz5y7nmTT0 RZ7VlPB+nH/sJzvLy7m1WuteeSeOOPOI741aeT2i1lPPVA4jYybRqcIHWQdfoVlV7lnY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pmstat: Check size of PMSTAT_get_pxstat buffers Message-Id: Date: Wed, 11 Jun 2025 09:11:32 +0000 commit aa70996a6896dfc9de60f60540098b7d3ac3fb4f Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:05:42 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:05:42 2025 +0200 x86/pmstat: Check size of PMSTAT_get_pxstat buffers Check that the total number of states passed in and hence the size of buffers is sufficient to avoid writing more than the caller has allocated. The interface is not explicit about whether getpx.total is expected to be set by the caller in this case but since it is always set in libxenctrl it seems reasonable to check it and make it explicit. Fixes: c06a7db0c547 ("X86 and IA64: Update cpufreq statistic logic for supporting both x86 and ia64") Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 7 +++++-- xen/include/public/sysctl.h | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index c51b9ca358..0d570e28bf 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -103,8 +103,11 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); - ct = pmpt->perf.state_count; - if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct*ct) ) + ct = min(pmpt->perf.state_count, op->u.getpx.total + 0U); + + /* Avoid partial copying of 2-D array */ + if ( ct == op->u.getpx.total && + copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 9eca72865b..c804abb8b9 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -215,11 +215,22 @@ typedef struct pm_px_val pm_px_val_t; DEFINE_XEN_GUEST_HANDLE(pm_px_val_t); struct pm_px_stat { - uint8_t total; /* total Px states */ + /* + * IN: Number of elements in pt, number of rows/columns in trans_pt + * (PMSTAT_get_pxstat) + * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) + */ + uint8_t total; uint8_t usable; /* usable Px states */ uint8_t last; /* last Px state */ uint8_t cur; /* current Px state */ - XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ + /* + * OUT: Px transition table. This should have total * total elements. + * As it is a 2-D array, this will not be copied if input total is + * less than output total. (PMSTAT_get_pxstat) + */ + XEN_GUEST_HANDLE_64(uint64) trans_pt; + /* OUT: This should have total elements (PMSTAT_get_pxstat) */ XEN_GUEST_HANDLE_64(pm_px_val_t) pt; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011388.1389777 (Exim 4.92) (envelope-from ) id 1uPHUm-00012Z-B3; Wed, 11 Jun 2025 09:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011388.1389777; Wed, 11 Jun 2025 09: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 1uPHUm-00012S-8Z; Wed, 11 Jun 2025 09:11:44 +0000 Received: by outflank-mailman (input) for mailman id 1011388; Wed, 11 Jun 2025 09:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHUk-00012F-Ex for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHUk-00DiVH-1M for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHUk-002Fwe-1E for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=u22ihQPO6sTUHJy19OykmxZZmrkEwDt1lBbEu+g+Jhg=; b=cFqDewC2jw/IBAawKFpJzkIM4i 7OUlKeZLnnH0IVdBOQBLMAZcA9gLKxeICYpiOBxq3/8RmEUePvNjMIvENN4cpm27pdkkzPGyVvynU XrzUzfcWHs50FiKC+EV+BzcW4CL3fYgHjEzIgXiDHxWd6DAEj2XZbZqMkmKLM/+uX6xs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] public/sysctl: Clarify usage of pm_{px,cx}_stat Message-Id: Date: Wed, 11 Jun 2025 09:11:42 +0000 commit eac626eb4c9ff377c7794c426ab7e521ce5716bf Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:06:02 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:06:02 2025 +0200 public/sysctl: Clarify usage of pm_{px,cx}_stat Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich --- xen/include/public/sysctl.h | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index c804abb8b9..c9d96a06ff 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -221,9 +221,9 @@ struct pm_px_stat { * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) */ uint8_t total; - uint8_t usable; /* usable Px states */ - uint8_t last; /* last Px state */ - uint8_t cur; /* current Px state */ + uint8_t usable; /* OUT: usable Px states (PMSTAT_get_pxstat) */ + uint8_t last; /* OUT: last Px state (PMSTAT_get_pxstat) */ + uint8_t cur; /* OUT: current Px state (PMSTAT_get_pxstat) */ /* * OUT: Px transition table. This should have total * total elements. * As it is a 2-D array, this will not be copied if input total is @@ -235,14 +235,33 @@ struct pm_px_stat { }; struct pm_cx_stat { - uint32_t nr; /* entry nr in triggers & residencies, including C0 */ - uint32_t last; /* last Cx state */ - uint64_aligned_t idle_time; /* idle time from boot */ - XEN_GUEST_HANDLE_64(uint64) triggers; /* Cx trigger counts */ - XEN_GUEST_HANDLE_64(uint64) residencies; /* Cx residencies */ - uint32_t nr_pc; /* entry nr in pc[] */ - uint32_t nr_cc; /* entry nr in cc[] */ /* + * IN: Number of elements in triggers, residencies (PMSTAT_get_cxstat) + * OUT: entry nr in triggers & residencies, including C0 + * (PMSTAT_get_cxstat, PMSTAT_get_max_cx) + */ + uint32_t nr; + uint32_t last; /* OUT: last Cx state (PMSTAT_get_cxstat) */ + /* OUT: idle time from boot (PMSTAT_get_cxstat)*/ + uint64_aligned_t idle_time; + /* OUT: Cx trigger counts, nr elements (PMSTAT_get_cxstat) */ + XEN_GUEST_HANDLE_64(uint64) triggers; + /* OUT: Cx residencies, nr elements (PMSTAT_get_cxstat) */ + XEN_GUEST_HANDLE_64(uint64) residencies; + /* + * IN: entry nr in pc[] (PMSTAT_get_cxstat) + * OUT: Required size of pc[] for all known to Xen entries to be written + * (PMSTAT_get_cxstat) + */ + uint32_t nr_pc; + /* + * IN: entry nr in cc[] (PMSTAT_get_cxstat) + * OUT: Required size of cc[] for all known to Xen entries to be written + * (PMSTAT_get_cxstat) + */ + uint32_t nr_cc; + /* + * OUT: (PMSTAT_get_cxstat) * These two arrays may (and generally will) have unused slots; slots not * having a corresponding hardware register will not be written by the * hypervisor. It is therefore up to the caller to put a suitable sentinel -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011389.1389782 (Exim 4.92) (envelope-from ) id 1uPHUw-00015k-Cl; Wed, 11 Jun 2025 09:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011389.1389782; Wed, 11 Jun 2025 09: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 1uPHUw-00015c-9w; Wed, 11 Jun 2025 09:11:54 +0000 Received: by outflank-mailman (input) for mailman id 1011389; Wed, 11 Jun 2025 09:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHUu-00015P-HZ for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHUu-00DiVe-1d for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHUu-002FzV-1X for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=rT24+m0DhCyzc4hxaXvT876sOkLtXpbRRMBJyH/zW80=; b=SyStE3r2xYOSBKagc64lMqSZWl dzA7rn1IAZYcgfgmKGy+kWOX2+NoLGO3o2rfBBuwwCMRMvhsX2XzR6ZGxnjDaN8yGU/Q2nwf97zKS EAWHTLWnmLq78fej2RESNxZm5ZWXGiXxy6X1C2H0+WO3+YnXcqm+K4j1HtFR7ujFEBv4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] cpufreq: Avoid potential buffer overrun and leak Message-Id: Date: Wed, 11 Jun 2025 09:11:52 +0000 commit 2f36bef3d8478f304f262fffeca543de480872a4 Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:06:24 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:06:24 2025 +0200 cpufreq: Avoid potential buffer overrun and leak If set_px_pminfo is called a second time with a larger state_count than the first call, calls to PMSTAT_get_pxstat will read beyond the end of the pt and trans_pt buffers allocated in cpufreq_statistic_init() since they would have been allocated with the original state_count. Secondly, the states array leaks on each subsequent call of set_px_pminfo. Fix both these issues by ignoring subsequent calls to set_px_pminfo if it completed successfully previously. Return success rather than an error to avoid errors in the dom0 kernel log when reloading the xen_acpi_processor module. At the same time, fix a leak of the states array on error. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 19e2992335..635f6e8c61 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -517,7 +517,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } } - if ( perf->flags & XEN_PX_PSS ) + if ( perf->flags & XEN_PX_PSS && !pxpt->states ) { /* capability check */ if ( perf->state_count <= 1 ) @@ -534,6 +534,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) { + XFREE(pxpt->states); ret = -EFAULT; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011390.1389786 (Exim 4.92) (envelope-from ) id 1uPHV6-000182-EV; Wed, 11 Jun 2025 09:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011390.1389786; Wed, 11 Jun 2025 09: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 1uPHV6-00017u-BW; Wed, 11 Jun 2025 09:12:04 +0000 Received: by outflank-mailman (input) for mailman id 1011390; Wed, 11 Jun 2025 09:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHV4-00017h-KF for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHV4-00DiVy-1v for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHV4-002G3Y-1p for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=3vPSjZxlHp2omCxez6T5l17RCbP61HScvDKKKe4pew4=; b=BosZCeYhTgl4wRLR2WP/qTHPBd /piUJ10MfR8bCZ9VQKw85VstdGvtfuoWHXpCPwEQDX4kllk5jxYDIFK0QjALtFSo6dJMQtNUu0fq/ F20/99WTmaBQsrix3GLSGbUTUjNoKcTEginIv2OeIG1n+vVg5heUicYkSHhleY/HukXs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxc/PM: Ensure pxstat buffers are correctly sized Message-Id: Date: Wed, 11 Jun 2025 09:12:02 +0000 commit de6a05a8a0d5090f1cdb9b5449b034afcbe7a208 Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:06:45 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:06:45 2025 +0200 libxc/PM: Ensure pxstat buffers are correctly sized xc_pm_get_pxstat() requires the caller to allocate the pt and trans_pt buffers but then calls xc_pm_get_max_px() to determine how big they are (and hence how much Xen will copy into them). This is susceptible to races if xc_pm_get_max_px() changes so avoid the problem by requiring the caller to also pass in the size of the buffers. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Anthony PERARD --- tools/libs/ctrl/xc_pm.c | 22 ++++++++++------------ tools/misc/xenpm.c | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/libs/ctrl/xc_pm.c b/tools/libs/ctrl/xc_pm.c index ff7b5ada05..1f2430cac2 100644 --- a/tools/libs/ctrl/xc_pm.c +++ b/tools/libs/ctrl/xc_pm.c @@ -45,36 +45,34 @@ int xc_pm_get_max_px(xc_interface *xch, int cpuid, int *max_px) int xc_pm_get_pxstat(xc_interface *xch, int cpuid, struct xc_px_stat *pxpt) { struct xen_sysctl sysctl = {}; - /* Sizes unknown until xc_pm_get_max_px */ - DECLARE_NAMED_HYPERCALL_BOUNCE(trans, pxpt->trans_pt, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - DECLARE_NAMED_HYPERCALL_BOUNCE(pt, pxpt->pt, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_NAMED_HYPERCALL_BOUNCE(trans, pxpt->trans_pt, + pxpt->total * pxpt->total * sizeof(uint64_t), + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_NAMED_HYPERCALL_BOUNCE(pt, pxpt->pt, + pxpt->total * sizeof(struct xc_px_val), + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - int max_px, ret; + int ret; if ( !pxpt->trans_pt || !pxpt->pt ) { errno = EINVAL; return -1; } - if ( (ret = xc_pm_get_max_px(xch, cpuid, &max_px)) != 0) - return ret; - - HYPERCALL_BOUNCE_SET_SIZE(trans, max_px * max_px * sizeof(uint64_t)); - HYPERCALL_BOUNCE_SET_SIZE(pt, max_px * sizeof(struct xc_px_val)); if ( xc_hypercall_bounce_pre(xch, trans) ) - return ret; + return -1; if ( xc_hypercall_bounce_pre(xch, pt) ) { xc_hypercall_bounce_post(xch, trans); - return ret; + return -1; } sysctl.cmd = XEN_SYSCTL_get_pmstat; sysctl.u.get_pmstat.type = PMSTAT_get_pxstat; sysctl.u.get_pmstat.cpuid = cpuid; - sysctl.u.get_pmstat.u.getpx.total = max_px; + sysctl.u.get_pmstat.u.getpx.total = pxpt->total; set_xen_guest_handle(sysctl.u.get_pmstat.u.getpx.trans_pt, trans); set_xen_guest_handle(sysctl.u.get_pmstat.u.getpx.pt, pt); diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index db658ebadd..de319329e6 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -319,6 +319,7 @@ static int get_pxstat_by_cpuid(xc_interface *xc_handle, int cpuid, struct xc_px_ if ( !pxstat) return -EINVAL; + pxstat->total = max_px_num; pxstat->trans_pt = malloc(max_px_num * max_px_num * sizeof(uint64_t)); if ( !pxstat->trans_pt ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011391.1389790 (Exim 4.92) (envelope-from ) id 1uPHVG-0001Ad-Gk; Wed, 11 Jun 2025 09:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011391.1389790; Wed, 11 Jun 2025 09: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 1uPHVG-0001AW-EF; Wed, 11 Jun 2025 09:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1011391; Wed, 11 Jun 2025 09:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHVE-0001AK-NO for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHVE-00DiW3-2C for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHVE-002G7M-26 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=yFAV8JHo/uPyovTDvug0VFS43DkXbc/qNMq+ZCTLhJ4=; b=gi6MfZrK/crpaRQXOvw+wzbD4T L7/4I9i8RpLLTJyi/WyqzVRACVljScr9C7QsNzvIfjZl0Oxpz9bof4AC46RZihrQ7uYj6hGoOLkgQ YDa+Za06gy9YWQvc95R2TCwIIt1C+RKiSrN0HOJsPUUzFWsg21kw+thQUcZU8LkpITDo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxc/PM: Retry get_pxstat if data is incomplete Message-Id: Date: Wed, 11 Jun 2025 09:12:12 +0000 commit 1ff7f87e8f4ffff97901126927549ae7b7a7340d Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:07:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:07:00 2025 +0200 libxc/PM: Retry get_pxstat if data is incomplete If the total returned by Xen is more than the number of elements allocated, it means that the buffer was too small and so the data is incomplete. Retry to get all the data. Signed-off-by: Ross Lagerwall Reviewed-by: Anthony PERARD --- tools/misc/xenpm.c | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index de319329e6..d5387f5f06 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -312,29 +312,42 @@ static int get_pxstat_by_cpuid(xc_interface *xc_handle, int cpuid, struct xc_px_ int ret = 0; int max_px_num = 0; - ret = xc_pm_get_max_px(xc_handle, cpuid, &max_px_num); - if ( ret ) - return -errno; - if ( !pxstat) return -EINVAL; - pxstat->total = max_px_num; - pxstat->trans_pt = malloc(max_px_num * max_px_num * - sizeof(uint64_t)); - if ( !pxstat->trans_pt ) - return -ENOMEM; - pxstat->pt = malloc(max_px_num * sizeof(struct xc_px_val)); - if ( !pxstat->pt ) + for ( ; ; ) { - free(pxstat->trans_pt); - return -ENOMEM; - } + ret = xc_pm_get_max_px(xc_handle, cpuid, &max_px_num); + if ( ret ) + return -errno; - ret = xc_pm_get_pxstat(xc_handle, cpuid, pxstat); - if( ret ) - { - ret = -errno; + pxstat->total = max_px_num; + pxstat->trans_pt = malloc(max_px_num * max_px_num * + sizeof(uint64_t)); + if ( !pxstat->trans_pt ) + return -ENOMEM; + pxstat->pt = malloc(max_px_num * sizeof(struct xc_px_val)); + if ( !pxstat->pt ) + { + free(pxstat->trans_pt); + return -ENOMEM; + } + + ret = xc_pm_get_pxstat(xc_handle, cpuid, pxstat); + if ( ret ) + { + ret = -errno; + free(pxstat->trans_pt); + free(pxstat->pt); + pxstat->trans_pt = NULL; + pxstat->pt = NULL; + break; + } + + if ( pxstat->total <= max_px_num ) + break; + + /* get_max_px changed under our feet so the data is incomplete. */ free(pxstat->trans_pt); free(pxstat->pt); pxstat->trans_pt = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:12:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011392.1389793 (Exim 4.92) (envelope-from ) id 1uPHVQ-0001Cx-ID; Wed, 11 Jun 2025 09:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011392.1389793; Wed, 11 Jun 2025 09: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 1uPHVQ-0001Cq-Fh; Wed, 11 Jun 2025 09:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1011392; Wed, 11 Jun 2025 09:12:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHVO-0001CV-Pp for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHVO-00DiWB-2U for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHVO-002GAQ-2N for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=jTRrNdSVjfdueMvhumd74g3hXqCIRBfNz56biTeob10=; b=e3dQZkGyQRwFYzs5uuSBBrdN0t 72dQh7Rq8BkFFcepJCnyPVmUM2UllZQDILfU1UUVYsetWqxqPtTFObU6coeRH6cmRa48HWmkuJ2ui C2YhwcWlRgIrSQw3cCs9HkkwQU92ZmFcx9ioxbzMuOtkbildZopy7qrXf0Qia3nH01Ts=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pmstat: consolidate code into pmstat.c Message-Id: Date: Wed, 11 Jun 2025 09:12:22 +0000 commit bf0cd071db2a6cdd61e612cf44accad4e0e495e4 Author: Penny Zheng AuthorDate: Wed Jun 11 11:07:33 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:07:33 2025 +0200 xen/pmstat: consolidate code into pmstat.c We move the following functions into drivers/acpi/pmstat.c, as they are all designed for performance statistic: - cpufreq_residency_update() - cpufreq_statistic_reset() - cpufreq_statistic_update() - cpufreq_statistic_init() - cpufreq_statistic_exit() Consequently, variable "cpufreq_statistic_data" and "cpufreq_statistic_lock" shall become static. We also move out acpi_set_pdc_bits(), as it is the handler for sub-hypercall XEN_PM_PDC, and shall stay with the other handlers together in drivers/cpufreq/cpufreq.c. Various style corrections shall be applied at the same time while moving these functions, including: - brace for if() and for() shall live at a seperate line - add extra space before and after bracket of if() and for() - use array notation - convert uint32_t into unsigned int - convert u32 into uint32_t Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 202 +++++++++++++++++++++++++----- xen/drivers/cpufreq/cpufreq.c | 31 +++++ xen/drivers/cpufreq/utility.c | 163 ------------------------ xen/include/acpi/cpufreq/cpufreq.h | 2 - xen/include/acpi/cpufreq/processor_perf.h | 4 - 5 files changed, 201 insertions(+), 201 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 0d570e28bf..521db7e98e 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -41,7 +41,176 @@ #include #include -DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); +static DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); + +static DEFINE_PER_CPU(spinlock_t, cpufreq_statistic_lock); + +/********************************************************************* + * Px STATISTIC INFO * + *********************************************************************/ + +static void cpufreq_residency_update(unsigned int cpu, uint8_t state) +{ + uint64_t now, total_idle_ns; + int64_t delta; + struct pm_px *pxpt = per_cpu(cpufreq_statistic_data, cpu); + + total_idle_ns = get_cpu_idle_time(cpu); + now = NOW(); + + delta = (now - pxpt->prev_state_wall) - + (total_idle_ns - pxpt->prev_idle_wall); + + if ( likely(delta >= 0) ) + pxpt->u.pt[state].residency += delta; + + pxpt->prev_state_wall = now; + pxpt->prev_idle_wall = total_idle_ns; +} + +void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) +{ + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = + &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt || !pmpt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + pxpt->u.last = from; + pxpt->u.cur = to; + pxpt->u.pt[to].count++; + + cpufreq_residency_update(cpu, from); + + pxpt->u.trans_pt[from * pmpt->perf.state_count + to]++; + + spin_unlock(cpufreq_statistic_lock); +} + +int cpufreq_statistic_init(unsigned int cpu) +{ + unsigned int i, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock_init(cpufreq_statistic_lock); + + if ( !pmpt ) + return -EINVAL; + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return 0; + } + + count = pmpt->perf.state_count; + + pxpt = xzalloc(struct pm_px); + if ( !pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + + pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); + if ( !pxpt->u.trans_pt ) + { + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.pt = xzalloc_array(struct pm_px_val, count); + if ( !pxpt->u.pt ) + { + xfree(pxpt->u.trans_pt); + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.total = pmpt->perf.state_count; + pxpt->u.usable = pmpt->perf.state_count - pmpt->perf.platform_limit; + + for ( i = 0; i < pmpt->perf.state_count; i++ ) + pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; + + pxpt->prev_state_wall = NOW(); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); + + return 0; +} + +void cpufreq_statistic_exit(unsigned int cpu) +{ + struct pm_px *pxpt; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + xfree(pxpt->u.trans_pt); + xfree(pxpt->u.pt); + xfree(pxpt); + per_cpu(cpufreq_statistic_data, cpu) = NULL; + + spin_unlock(cpufreq_statistic_lock); +} + +static void cpufreq_statistic_reset(unsigned int cpu) +{ + unsigned int i, j, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + count = pmpt->perf.state_count; + + for ( i = 0; i < count; i++ ) + { + pxpt->u.pt[i].residency = 0; + pxpt->u.pt[i].count = 0; + + for ( j = 0; j < count; j++ ) + pxpt->u.trans_pt[i * count + j] = 0; + } + + pxpt->prev_state_wall = NOW(); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); +} /* * Get PM statistic info @@ -521,34 +690,3 @@ int do_pm_op(struct xen_sysctl_pm_op *op) return ret; } - -int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32) pdc) -{ - u32 bits[3]; - int ret; - - if ( copy_from_guest(bits, pdc, 2) ) - ret = -EFAULT; - else if ( bits[0] != ACPI_PDC_REVISION_ID || !bits[1] ) - ret = -EINVAL; - else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) - ret = -EFAULT; - else - { - u32 mask = 0; - - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) - mask |= ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) - mask |= ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) - mask |= ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; - bits[2] &= (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | - ACPI_PDC_SMP_C1PT) & ~mask; - ret = arch_acpi_set_pdc_bits(acpi_id, bits, mask); - } - if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) - ret = -EFAULT; - - return ret; -} diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 635f6e8c61..f47aad3f75 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -589,6 +589,37 @@ out: return ret; } +int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32) pdc) +{ + uint32_t bits[3]; + int ret; + + if ( copy_from_guest(bits, pdc, 2) ) + ret = -EFAULT; + else if ( bits[0] != ACPI_PDC_REVISION_ID || !bits[1] ) + ret = -EINVAL; + else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) + ret = -EFAULT; + else + { + uint32_t mask = 0; + + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) + mask |= ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) + mask |= ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) + mask |= ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; + bits[2] &= (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | + ACPI_PDC_SMP_C1PT) & ~mask; + ret = arch_acpi_set_pdc_bits(acpi_id, bits, mask); + } + if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) + ret = -EFAULT; + + return ret; +} + static void cpufreq_cmdline_common_para(struct cpufreq_policy *new_policy) { if (usr_max_freq) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 309c0682cf..723045b240 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -35,169 +35,6 @@ struct cpufreq_driver __read_mostly cpufreq_driver; struct processor_pminfo *__read_mostly processor_pminfo[NR_CPUS]; DEFINE_PER_CPU_READ_MOSTLY(struct cpufreq_policy *, cpufreq_cpu_policy); -DEFINE_PER_CPU(spinlock_t, cpufreq_statistic_lock); - -/********************************************************************* - * Px STATISTIC INFO * - *********************************************************************/ - -void cpufreq_residency_update(unsigned int cpu, uint8_t state) -{ - uint64_t now, total_idle_ns; - int64_t delta; - struct pm_px *pxpt = per_cpu(cpufreq_statistic_data, cpu); - - total_idle_ns = get_cpu_idle_time(cpu); - now = NOW(); - - delta = (now - pxpt->prev_state_wall) - - (total_idle_ns - pxpt->prev_idle_wall); - - if ( likely(delta >= 0) ) - pxpt->u.pt[state].residency += delta; - - pxpt->prev_state_wall = now; - pxpt->prev_idle_wall = total_idle_ns; -} - -void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) -{ - struct pm_px *pxpt; - struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( !pxpt || !pmpt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - pxpt->u.last = from; - pxpt->u.cur = to; - pxpt->u.pt[to].count++; - - cpufreq_residency_update(cpu, from); - - (*(pxpt->u.trans_pt + from * pmpt->perf.state_count + to))++; - - spin_unlock(cpufreq_statistic_lock); -} - -int cpufreq_statistic_init(unsigned int cpu) -{ - uint32_t i, count; - struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock_init(cpufreq_statistic_lock); - - if ( !pmpt ) - return -EINVAL; - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return 0; - } - - count = pmpt->perf.state_count; - - pxpt = xzalloc(struct pm_px); - if ( !pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); - if (!pxpt->u.trans_pt) { - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.pt = xzalloc_array(struct pm_px_val, count); - if (!pxpt->u.pt) { - xfree(pxpt->u.trans_pt); - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.total = count; - pxpt->u.usable = count - pmpt->perf.platform_limit; - - for ( i = 0; i < count; i++ ) - pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; - - pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpu); - - per_cpu(cpufreq_statistic_data, cpu) = pxpt; - - spin_unlock(cpufreq_statistic_lock); - - return 0; -} - -void cpufreq_statistic_exit(unsigned int cpu) -{ - struct pm_px *pxpt; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if (!pxpt) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - xfree(pxpt->u.trans_pt); - xfree(pxpt->u.pt); - xfree(pxpt); - per_cpu(cpufreq_statistic_data, cpu) = NULL; - - spin_unlock(cpufreq_statistic_lock); -} - -void cpufreq_statistic_reset(unsigned int cpu) -{ - uint32_t i, j, count; - struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - count = pmpt->perf.state_count; - - for (i=0; i < count; i++) { - pxpt->u.pt[i].residency = 0; - pxpt->u.pt[i].count = 0; - - for (j=0; j < count; j++) - *(pxpt->u.trans_pt + i*count + j) = 0; - } - - pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpu); - - spin_unlock(cpufreq_statistic_lock); -} - - /********************************************************************* * FREQUENCY TABLE HELPERS * *********************************************************************/ diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index a3c84143af..241117a9af 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -20,8 +20,6 @@ #include "processor_perf.h" -DECLARE_PER_CPU(spinlock_t, cpufreq_statistic_lock); - extern bool cpufreq_verbose; enum cpufreq_xen_opt { diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 301104e16f..6de43f8602 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -9,11 +9,9 @@ unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); -void cpufreq_residency_update(unsigned int cpu, uint8_t state); void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to); int cpufreq_statistic_init(unsigned int cpu); void cpufreq_statistic_exit(unsigned int cpu); -void cpufreq_statistic_reset(unsigned int cpu); int cpufreq_limit_change(unsigned int cpu); @@ -56,7 +54,5 @@ struct pm_px { uint64_t prev_idle_wall; }; -DECLARE_PER_CPU(struct pm_px *, cpufreq_statistic_data); - int cpufreq_cpu_init(unsigned int cpu); #endif /* __XEN_PROCESSOR_PM_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:12:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011393.1389798 (Exim 4.92) (envelope-from ) id 1uPHVa-0001FF-K3; Wed, 11 Jun 2025 09:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011393.1389798; Wed, 11 Jun 2025 09: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 1uPHVa-0001F7-H9; Wed, 11 Jun 2025 09:12:34 +0000 Received: by outflank-mailman (input) for mailman id 1011393; Wed, 11 Jun 2025 09:12:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHVY-0001Eq-TO for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHVY-00DiWL-2q for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHVY-002GEF-2g for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=/CZ5jDaoSHYSmiTTd34iOFYzpklXm6W6dz6DE4vHAsA=; b=fNyDDA1AqQImEmNG8KBEzV7NKm 8GupE71aq9KehlUrUMXgkNxhrlh/CioJwGNZMG1rXLE10qNFwdIThKYiD03ioq/eJibOQq6/PL2AV E1R2g89Cl+/ynfS84rLxrvB6HpqyKeqnZLezX1jlLZUruDII07f3yvJqwt9uUWo427u8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: make avail_domheap_pages() inlined into get_outstanding_claims() Message-Id: Date: Wed, 11 Jun 2025 09:12:32 +0000 commit b5157dcde497ed4434219283a4b89188b04f0b8f Author: Penny Zheng AuthorDate: Wed Jun 11 11:07:53 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:07:53 2025 +0200 xen: make avail_domheap_pages() inlined into get_outstanding_claims() Function avail_domheap_pages() is only invoked by get_outstanding_claims(), so it could be inlined into get_outstanding_claims(). Move up avail_heap_pages() to avoid declaration before get_outstanding_claims(). Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/page_alloc.c | 51 +++++++++++++++++++++---------------------------- xen/include/xen/mm.h | 1 - 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index e57a287133..b204f22f50 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -488,6 +488,27 @@ static long total_avail_pages; static DEFINE_SPINLOCK(heap_lock); static long outstanding_claims; /* total outstanding claims by all domains */ +static unsigned long avail_heap_pages( + unsigned int zone_lo, unsigned int zone_hi, unsigned int node) +{ + unsigned int i, zone; + unsigned long free_pages = 0; + + if ( zone_hi >= NR_ZONES ) + zone_hi = NR_ZONES - 1; + + for_each_online_node(i) + { + if ( !avail[i] ) + continue; + for ( zone = zone_lo; zone <= zone_hi; zone++ ) + if ( (node == -1) || (node == i) ) + free_pages += avail[i][zone]; + } + + return free_pages; +} + unsigned long domain_adjust_tot_pages(struct domain *d, long pages) { ASSERT(rspin_is_locked(&d->page_alloc_lock)); @@ -584,7 +605,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) { spin_lock(&heap_lock); *outstanding_pages = outstanding_claims; - *free_pages = avail_domheap_pages(); + *free_pages = avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); spin_unlock(&heap_lock); } @@ -1962,27 +1983,6 @@ static void init_heap_pages( } } -static unsigned long avail_heap_pages( - unsigned int zone_lo, unsigned int zone_hi, unsigned int node) -{ - unsigned int i, zone; - unsigned long free_pages = 0; - - if ( zone_hi >= NR_ZONES ) - zone_hi = NR_ZONES - 1; - - for_each_online_node(i) - { - if ( !avail[i] ) - continue; - for ( zone = zone_lo; zone <= zone_hi; zone++ ) - if ( (node == -1) || (node == i) ) - free_pages += avail[i][zone]; - } - - return free_pages; -} - /************************* * COLORED SIDE-ALLOCATOR * @@ -2796,13 +2796,6 @@ unsigned long avail_domheap_pages_region( return avail_heap_pages(zone_lo, zone_hi, node); } -unsigned long avail_domheap_pages(void) -{ - return avail_heap_pages(MEMZONE_XEN + 1, - NR_ZONES - 1, - -1); -} - unsigned long avail_node_heap_pages(unsigned int nodeid) { return avail_heap_pages(MEMZONE_XEN, NR_ZONES -1, nodeid); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index e89942b87d..93c037d618 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -141,7 +141,6 @@ struct page_info *alloc_domheap_pages( void free_domheap_pages(struct page_info *pg, unsigned int order); unsigned long avail_domheap_pages_region( unsigned int node, unsigned int min_width, unsigned int max_width); -unsigned long avail_domheap_pages(void); 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)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:12:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011394.1389803 (Exim 4.92) (envelope-from ) id 1uPHVk-0001Hb-Ly; Wed, 11 Jun 2025 09:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011394.1389803; Wed, 11 Jun 2025 09: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 1uPHVk-0001HP-Ib; Wed, 11 Jun 2025 09:12:44 +0000 Received: by outflank-mailman (input) for mailman id 1011394; Wed, 11 Jun 2025 09:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHVj-0001HF-0B for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHVi-00DiWP-39 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHVi-002GHS-33 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09: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=SB8q90AVhqVneZEu4cMpltapE6u+QpeK0R7MuMm6+RY=; b=FoVBxkxCYgI8iJQyaDHGHukEBR ow21J2VlCEgA5Rlyb0X98thckE8ALYYYMFFR7hzJrt4Gwjth08JrUealiSS2uaBpbSuQlP1lKgCrQ NlHg6qmYfsWabI7w01aw1tLf3a5TAlYiTkm6Kv9JS2B2EOV9LRx5KCwZDCy51SKXe/Xs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xenalyze: Add 2 missed VCPUOPs in vcpu_op_str Message-Id: Date: Wed, 11 Jun 2025 09:12:42 +0000 commit ed939591e4c6ccf794395fc78cd358aa24a94ed8 Author: Gang Ji AuthorDate: Wed Jun 11 11:08:11 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:08:11 2025 +0200 xenalyze: Add 2 missed VCPUOPs in vcpu_op_str The 2 missed ones are: register_runstate_phys_area and register_vcpu_time_phys_area. Fixes: d5df44275e7a ("domain: introduce GADDR based runstate area registration alternative") Fixes: 60e544a8c58f ("x86: introduce GADDR based secondary time area registration alternative") Signed-off-by: Gang Ji Reviewed-by: Andrew Cooper --- tools/xentrace/xenalyze.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index adc96dd7e4..1c13682aaa 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6513,7 +6513,8 @@ static const char *vcpu_op_str[] = { "register_runstate_memory_area", "set_periodic_timer", "stop_periodic_timer", "set_singleshot_timer", "stop_singleshot_timer", "register_vcpu_info", "send_nmi", "get_physid", - "register_vcpu_time_memory_area", + "register_vcpu_time_memory_area", "register_runstate_phys_area", + "register_vcpu_time_phys_area", }; static const char *sched_op_str[] = { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:12:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:12:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011395.1389806 (Exim 4.92) (envelope-from ) id 1uPHVt-0001Kh-P3; Wed, 11 Jun 2025 09:12:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011395.1389806; Wed, 11 Jun 2025 09: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 1uPHVt-0001KZ-MI; Wed, 11 Jun 2025 09:12:53 +0000 Received: by outflank-mailman (input) for mailman id 1011395; Wed, 11 Jun 2025 09:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHVt-0001KR-3C for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHVt-00DiWl-0E for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHVt-002GKG-05 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:12: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=ZEUvSNUbA3afjhGqXvtgXz82XFjMLPwJluiL9jyYuYw=; b=adjv6vpmasOFxOytBfJTqHPBoL ARQBu/EkJhSFL8nYVeKtcItxaKBvdrPgOdPd9xXTQRWukpM6FOd/vlMTZOQ068auCjtKy4ofXQHCZ fb9p4m5MD/ETdUlTBgIp9byO/DfoGbxOGfZvegsoEehPbfNpiSXqOv4x2n5FFk6sh924=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/dt: Add BOOTMOD_MICROCODE Message-Id: Date: Wed, 11 Jun 2025 09:12:53 +0000 commit efe0870d4a00321feda2f2d8d51045b460d41549 Author: Alejandro Vallejo AuthorDate: Wed Jun 11 11:08:28 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:08:28 2025 +0200 xen/dt: Add BOOTMOD_MICROCODE In preparation for x86 to start using bootmodule instead of boot_module Signed-off-by: Alejandro Vallejo Reviewed-by: Michal Orzel --- xen/common/device-tree/bootfdt.c | 2 ++ xen/common/device-tree/bootinfo.c | 1 + xen/include/xen/bootfdt.h | 1 + 3 files changed, 4 insertions(+) diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index 9df80291b1..9daea06e57 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -351,6 +351,8 @@ static void __init process_multiboot_node(const void *fdt, int node, kind = BOOTMOD_XSM; else if ( fdt_node_check_compatible(fdt, node, "multiboot,device-tree") == 0 ) kind = BOOTMOD_GUEST_DTB; + else if ( fdt_node_check_compatible(fdt, node, "multiboot,microcode") == 0 ) + kind = BOOTMOD_MICROCODE; else kind = BOOTMOD_UNKNOWN; diff --git a/xen/common/device-tree/bootinfo.c b/xen/common/device-tree/bootinfo.c index 76d652c0de..717cfa0962 100644 --- a/xen/common/device-tree/bootinfo.c +++ b/xen/common/device-tree/bootinfo.c @@ -31,6 +31,7 @@ const char * __init boot_module_kind_as_string(bootmodule_kind kind) case BOOTMOD_RAMDISK: return "Ramdisk"; case BOOTMOD_XSM: return "XSM"; case BOOTMOD_GUEST_DTB: return "DTB"; + case BOOTMOD_MICROCODE: return "Microcode"; case BOOTMOD_UNKNOWN: return "Unknown"; default: BUG(); } diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index 64db48f4fe..ff40f3078e 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -21,6 +21,7 @@ typedef enum { BOOTMOD_RAMDISK, BOOTMOD_XSM, BOOTMOD_GUEST_DTB, + BOOTMOD_MICROCODE, BOOTMOD_UNKNOWN } bootmodule_kind; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 09:13:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 09:13:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011396.1389810 (Exim 4.92) (envelope-from ) id 1uPHW3-0001NE-Qb; Wed, 11 Jun 2025 09:13:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011396.1389810; Wed, 11 Jun 2025 09:13: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 1uPHW3-0001N6-Np; Wed, 11 Jun 2025 09:13:03 +0000 Received: by outflank-mailman (input) for mailman id 1011396; Wed, 11 Jun 2025 09:13:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPHW3-0001Mu-5r for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:13:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPHW3-00DiX0-0U for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPHW3-002GNa-0P for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 09:13: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=dFxD3Ig9zjrUNkph5GGsR8uRr12OLXEwrAQRCEEGHyg=; b=5HK0HLgJuUrHH2YaxKH7sCd9WC /xtbA302aGLgF8rLtclv+Thmvlij9B32EMQCbFrlzPXY+9vvbe7kWYUNfnhWJqFd6aHqoAz2e54Uw qGxm6mjXWOVTatw4QDsYhjhOJ22698vaApuEUugkQz/6jA6r6cmMhicEVsfYvO/bwFow=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Introduce system suspend config option Message-Id: Date: Wed, 11 Jun 2025 09:13:03 +0000 commit 69c83031737b5fa490d292a9c11864e3fd85c872 Author: Mykyta Poturai AuthorDate: Wed Jun 11 11:09:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:09:00 2025 +0200 xen: Introduce system suspend config option This option enables the system suspend support. This is the mechanism that allows the system to be suspended to RAM and later resumed. The patch introduces three options: - HAS_SYSTEM_SUSPEND: indicates suspend support is available on the platform. - SYSTEM_SUSPEND_ALWAYS_ON: used for architectures where suspend must always be enabled. - SYSTEM_SUSPEND: user-facing option to enable/disable suspend if supported. Defaults to enabled if SYSTEM_SUSPEND_ALWAYS_ON is set and depends on HAS_SYSTEM_SUSPEND. On x86, both HAS_SYSTEM_SUSPEND and SYSTEM_SUSPEND_ALWAYS_ON are selected by default, making suspend support always enabled. The options are designed to be easily extensible to other architectures (e.g., PPC, RISC-V) as future support is added. Signed-off-by: Mykyta Poturai Signed-off-by: Mykola Kvach Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 7afe879710..752d5141bb 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -33,6 +33,7 @@ config X86 select HAS_VMAP select HAS_VPCI if HVM select NEEDS_LIBELF + select SYSTEM_SUSPEND_ALWAYS_ON config ARCH_DEFCONFIG string diff --git a/xen/common/Kconfig b/xen/common/Kconfig index eece1370a3..867710134a 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -122,6 +122,9 @@ config HAS_SCHED_GRANULARITY config HAS_STACK_PROTECTOR bool +config HAS_SYSTEM_SUSPEND + bool + config HAS_UBSAN bool @@ -593,4 +596,19 @@ config BUDDY_ALLOCATOR_SIZE Amount of memory reserved for the buddy allocator to serve Xen heap, working alongside the colored one. +config SYSTEM_SUSPEND_ALWAYS_ON + bool + select HAS_SYSTEM_SUSPEND + +config SYSTEM_SUSPEND + bool "System suspend support" if !SYSTEM_SUSPEND_ALWAYS_ON + depends on HAS_SYSTEM_SUSPEND + default SYSTEM_SUSPEND_ALWAYS_ON + help + This option enables the system suspend support. This is the + mechanism that allows the system to be suspended to RAM and + later resumed. + + If unsure, say N. + endmenu -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 12:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 12:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011675.1390138 (Exim 4.92) (envelope-from ) id 1uPKdb-0001zN-4M; Wed, 11 Jun 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 1011675.1390138; Wed, 11 Jun 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 1uPKdb-0001zF-1V; Wed, 11 Jun 2025 12:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1011675; Wed, 11 Jun 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 1uPKda-0001z9-96 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 12:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPKda-00DmST-0F for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 12:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPKda-002dg3-06 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 12: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=LjoHMeilYyrUpbOal3iZWWaRpMYpdcF6K31aLcSmfU4=; b=tmN10Ad30MEyQs+e2TnjdIBx6g ITo6OojQo98/bCgLKe104nc/vop1zDc4wBPVoOO0w1dGwddI0vRZcsYh5ay1DO3bGvvFhftww3CY6 MEc8Kf1Yh8wvJWVy/Az2fjUrE1wXJLRyV5qFmyXyk4z8JB2HQ61oeQI/nVqpLjVCV53Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ACPI: adjust decl of acpi_set_pdc_bits() Message-Id: Date: Wed, 11 Jun 2025 12:33:02 +0000 commit 657a95a2baed48dc2ed6f2fc7ef6161ad7ba010b Author: Jan Beulich AuthorDate: Wed Jun 11 14:24:48 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 14:24:48 2025 +0200 ACPI: adjust decl of acpi_set_pdc_bits() The commit referenced below changed the type of the first parameter. Misra C:2012 Rule 8.3 requires the declaration to follow suit. Fixes: bf0cd071db2a ("xen/pmstat: consolidate code into pmstat.c") Signed-off-by: Jan Beulich Reviewed-by: Nicola Vetrini --- xen/include/xen/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index bc4818c943..57e710a16d 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -186,7 +186,7 @@ static inline void acpi_set_csubstate_limit(unsigned int new_limit) { return; } #endif #ifdef XEN_GUEST_HANDLE -int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32)); +int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32)); #endif int arch_acpi_set_pdc_bits(u32 acpi_id, u32 *, u32 mask); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:44:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011756.1390229 (Exim 4.92) (envelope-from ) id 1uPLkJ-0006BW-Pg; Wed, 11 Jun 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 1011756.1390229; Wed, 11 Jun 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 1uPLkJ-0006BO-MZ; Wed, 11 Jun 2025 13:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1011756; Wed, 11 Jun 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 1uPLkI-0006B3-43 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 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 1uPLkH-00DnrU-2u for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLkH-002god-2m for xen-changelog@lists.xenproject.org; Wed, 11 Jun 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=8zGU3+iCmHA8Wdhr2VLAv8Vd4KuXMPZgKTuHSN0IhXQ=; b=Jb81iYJQY7ppQytkD8tpZKW4BZ N7Da6hQRt/RAAHfNzidyPR6k0c6OOXuOjRX3q4f9zEV2v4I7lNGf/He7DDEi2W72281PiWQXvEKma Y44YqSkAMCydzutsYC91dMDWJMKe+boLLiAOMh0L4lwL+QpjVaioP9VUnKyB3esL98t8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] SUPPORT.md: mark xenstore live update as supported Message-Id: Date: Wed, 11 Jun 2025 13:44:01 +0000 commit dcc98a6352322b53422404dfd3dddaa3a90d4bb3 Author: Juergen Gross AuthorDate: Wed Jun 11 11:04:16 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:04:16 2025 +0200 SUPPORT.md: mark xenstore live update as supported Live update of xenstored is available since Xen 4.15 and it is tested on a regular basis since then. Switch the live update support from "Tech Preview" to "Supported". Signed-off-by: Juergen Gross Acked-by: Julien Grall --- SUPPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SUPPORT.md b/SUPPORT.md index d75cf018fc..f0b5718e84 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -270,7 +270,7 @@ or itself will not be regarded a security issue. ### C xenstored daemon Status: Supported - Status, Liveupdate: Tech Preview + Status, Liveupdate: Supported ### C xenstore stubdom PV -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011758.1390235 (Exim 4.92) (envelope-from ) id 1uPLkT-0006E8-Qk; Wed, 11 Jun 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 1011758.1390235; Wed, 11 Jun 2025 13: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 1uPLkT-0006E0-Np; Wed, 11 Jun 2025 13:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1011758; Wed, 11 Jun 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 1uPLkS-0006Dj-3s for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLkS-00Dnra-0E for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLkR-002gpc-36 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 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=dpP1PCexmPZCqvAYSUuQo27bLpLPAiePVYkxUR9IZ9o=; b=7EAcKuQY9yar0tPokQ2iR1vopa ALGGd86EXp/RTBfFl5xjdW1V8vcHcd9gK74w/IrzzirTnLiRRTFjkpm2Sg2Za8EwXIKxDjpWR7yPC MYtbPdAPFgC3dIOQAOqMR5czJXzAZowNihlH7JsoNS9GWdq6vqagP4mOj/1VRz8RZRWI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: remove outdated comment in xhci driver Message-Id: Date: Wed, 11 Jun 2025 13:44:11 +0000 commit d012a19845bb988064f47470954b793632c7a3c6 Author: Marek Marczykowski-Górecki AuthorDate: Wed Jun 11 11:04:44 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:04:44 2025 +0200 drivers/char: remove outdated comment in xhci driver The input handling is already implemented, and that limitation is not there anymore. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- xen/drivers/char/xhci-dbc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index c45e4b6825..d011159d18 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -654,10 +654,6 @@ static void dbc_rx_trb(struct dbc *dbc, struct xhci_trb *trb, cache_flush(&ring->buf[start], end - start); } -/* - * Note that if IN transfer support is added, then this - * will need to be changed; it assumes an OUT transfer ring only - */ static void dbc_pop_events(struct dbc *dbc) { struct dbc_reg *reg = dbc->dbc_reg; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011759.1390238 (Exim 4.92) (envelope-from ) id 1uPLkd-0006Hj-SC; Wed, 11 Jun 2025 13:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011759.1390238; Wed, 11 Jun 2025 13: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 1uPLkd-0006Hc-PB; Wed, 11 Jun 2025 13:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1011759; Wed, 11 Jun 2025 13:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLkc-0006GU-70 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLkc-00Dnrs-0b for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLkc-002gqM-0Q for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13: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=tiozPvB2q/wsx9GTqqpnF+DcA84b1R9ZcM1lVmuIEE4=; b=JFqgoR8PSo0OrjjvPrWVve4zJB W1+FSuJUv7z9X9vVqRp7UUQwhde+mREnvkdvAjaU4u1Vpu2M9XP8RQuzWelICT5SMRgxQb89+mVvx jBA5GVCvzewhsaIEhqbN+/2c2mUs1knzzRTUlu4k86SQiMrBOt8aTQcyiQKhc42WDaj0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci/header: Emulate legacy capability list for dom0 Message-Id: Date: Wed, 11 Jun 2025 13:44:22 +0000 commit 4df04b27d372e0c9496de914ac5ec25cd861e18f Author: Jiqian Chen AuthorDate: Wed Jun 11 11:05:03 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:05:03 2025 +0200 vpci/header: Emulate legacy capability list for dom0 Current logic of emulating legacy capability list is only for domU. So, expand it to emulate for dom0 too. Then it will be easy to hide a capability whose initialization fails in a function. And restrict adding PCI_STATUS register only for domU since dom0 has no limitation to access that register. Signed-off-by: Jiqian Chen Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 39 ++++++++++++++++++++++++++------------- xen/drivers/vpci/vpci.c | 6 ++++++ xen/include/xen/vpci.h | 2 ++ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 0fb3cfa6a3..d26cbba08e 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -758,9 +758,9 @@ static int vpci_init_capability_list(struct pci_dev *pdev) { int rc; bool mask_cap_list = false; + bool is_hwdom = is_hardware_domain(pdev->domain); - if ( !is_hardware_domain(pdev->domain) && - pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) + if ( pci_conf_read16(pdev->sbdf, PCI_STATUS) & PCI_STATUS_CAP_LIST ) { /* Only expose capabilities to the guest that vPCI can handle. */ unsigned int next, ttl = 48; @@ -768,12 +768,18 @@ static int vpci_init_capability_list(struct pci_dev *pdev) PCI_CAP_ID_MSI, PCI_CAP_ID_MSIX, }; + /* + * For dom0, we should expose all capabilities instead of a fixed + * capabilities array, so setting n to 0 here is to get the next + * capability position directly in pci_find_next_cap_ttl. + */ + const unsigned int n = is_hwdom ? 0 : ARRAY_SIZE(supported_caps); next = pci_find_next_cap_ttl(pdev->sbdf, PCI_CAPABILITY_LIST, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); + supported_caps, n, &ttl); - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + rc = vpci_add_register(pdev->vpci, vpci_read_val, + is_hwdom ? vpci_hw_write8 : NULL, PCI_CAPABILITY_LIST, 1, (void *)(uintptr_t)next); if ( rc ) @@ -781,7 +787,7 @@ static int vpci_init_capability_list(struct pci_dev *pdev) next &= ~3; - if ( !next ) + if ( !next && !is_hwdom ) /* * If we don't have any supported capabilities to expose to the * guest, mask the PCI_STATUS_CAP_LIST bit in the status @@ -795,15 +801,18 @@ static int vpci_init_capability_list(struct pci_dev *pdev) next = pci_find_next_cap_ttl(pdev->sbdf, pos + PCI_CAP_LIST_NEXT, - supported_caps, - ARRAY_SIZE(supported_caps), &ttl); + supported_caps, n, &ttl); - rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, - pos + PCI_CAP_LIST_ID, 1, NULL); - if ( rc ) - return rc; + if ( !is_hwdom ) + { + rc = vpci_add_register(pdev->vpci, vpci_hw_read8, NULL, + pos + PCI_CAP_LIST_ID, 1, NULL); + if ( rc ) + return rc; + } - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + rc = vpci_add_register(pdev->vpci, vpci_read_val, + is_hwdom ? vpci_hw_write8 : NULL, pos + PCI_CAP_LIST_NEXT, 1, (void *)(uintptr_t)next); if ( rc ) @@ -813,6 +822,10 @@ static int vpci_init_capability_list(struct pci_dev *pdev) } } + /* Return early for the hw domain, no masking of PCI_STATUS. */ + if ( is_hwdom ) + return 0; + /* Utilize rsvdp_mask to hide PCI_STATUS_CAP_LIST from the guest. */ return vpci_add_register_mask(pdev->vpci, vpci_hw_read16, vpci_hw_write16, PCI_STATUS, 2, NULL, diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index d2f0f97e0a..09988f04c2 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -255,6 +255,12 @@ uint32_t cf_check vpci_hw_read32( return pci_conf_read32(pdev->sbdf, reg); } +void cf_check vpci_hw_write8( + const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) +{ + pci_conf_write8(pdev->sbdf, reg, val); +} + void cf_check vpci_hw_write16( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) { diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 475981cb81..fc8d5b470b 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -76,6 +76,8 @@ uint32_t cf_check vpci_hw_read16( const struct pci_dev *pdev, unsigned int reg, void *data); uint32_t cf_check vpci_hw_read32( const struct pci_dev *pdev, unsigned int reg, void *data); +void cf_check vpci_hw_write8( + const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data); void cf_check vpci_hw_write16( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011760.1390241 (Exim 4.92) (envelope-from ) id 1uPLkn-0006Ky-TB; Wed, 11 Jun 2025 13:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011760.1390241; Wed, 11 Jun 2025 13: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 1uPLkn-0006Kn-Qd; Wed, 11 Jun 2025 13:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1011760; Wed, 11 Jun 2025 13:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLkm-0006KZ-9j for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLkm-00Dnry-0s for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLkm-002gqo-0m for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13: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=cybrNl7+juxUgOifrncQXGlwZJ6f0CKnrnXX8jUwpK0=; b=YmFy47n1ZbYrswUA9FPkcxCf4W T4meN5lGy3wagJPSKWAFULygNFV2Eu6IJvcNGAhkKYVTPf2nuuGEIa82KSdw7gluYXkkshxbQo9L0 3XT/uRPu3HU3RcFaG7s0MX3iK0cLyf12c7lXaSKtsYxBa/LBDAUoMr0zlbqtV072J5fU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pmstat: Check size of PMSTAT_get_pxstat buffers Message-Id: Date: Wed, 11 Jun 2025 13:44:32 +0000 commit aa70996a6896dfc9de60f60540098b7d3ac3fb4f Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:05:42 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:05:42 2025 +0200 x86/pmstat: Check size of PMSTAT_get_pxstat buffers Check that the total number of states passed in and hence the size of buffers is sufficient to avoid writing more than the caller has allocated. The interface is not explicit about whether getpx.total is expected to be set by the caller in this case but since it is always set in libxenctrl it seems reasonable to check it and make it explicit. Fixes: c06a7db0c547 ("X86 and IA64: Update cpufreq statistic logic for supporting both x86 and ia64") Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 7 +++++-- xen/include/public/sysctl.h | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index c51b9ca358..0d570e28bf 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -103,8 +103,11 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); - ct = pmpt->perf.state_count; - if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct*ct) ) + ct = min(pmpt->perf.state_count, op->u.getpx.total + 0U); + + /* Avoid partial copying of 2-D array */ + if ( ct == op->u.getpx.total && + copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 9eca72865b..c804abb8b9 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -215,11 +215,22 @@ typedef struct pm_px_val pm_px_val_t; DEFINE_XEN_GUEST_HANDLE(pm_px_val_t); struct pm_px_stat { - uint8_t total; /* total Px states */ + /* + * IN: Number of elements in pt, number of rows/columns in trans_pt + * (PMSTAT_get_pxstat) + * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) + */ + uint8_t total; uint8_t usable; /* usable Px states */ uint8_t last; /* last Px state */ uint8_t cur; /* current Px state */ - XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ + /* + * OUT: Px transition table. This should have total * total elements. + * As it is a 2-D array, this will not be copied if input total is + * less than output total. (PMSTAT_get_pxstat) + */ + XEN_GUEST_HANDLE_64(uint64) trans_pt; + /* OUT: This should have total elements (PMSTAT_get_pxstat) */ XEN_GUEST_HANDLE_64(pm_px_val_t) pt; }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011761.1390246 (Exim 4.92) (envelope-from ) id 1uPLkx-0006Nc-Us; Wed, 11 Jun 2025 13:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011761.1390246; Wed, 11 Jun 2025 13:44: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 1uPLkx-0006NT-S4; Wed, 11 Jun 2025 13:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1011761; Wed, 11 Jun 2025 13:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLkw-0006NE-D4 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLkw-00Dns2-1D for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLkw-002grV-14 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13: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=jH7xEkuaxgcaW43G1tzpKR7V0FNgWBSP+gIuLn/zE6s=; b=IV+DVIgfGOiBE/ztcPjZfH4Xmo hiHo0XmkEKvUZVsQqJTLouzuCQXqgwyrUIaVaBJvL+2TnCiRvD1JOfZWQ+a+niBWbXu9WpaA7E5CI /vAdgJX5BASLtmNSzXDIo94s7mcFvy1Fi6UOJm826tTC6l4ab06ORrjRQ5SQGdVyDJEk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] public/sysctl: Clarify usage of pm_{px,cx}_stat Message-Id: Date: Wed, 11 Jun 2025 13:44:42 +0000 commit eac626eb4c9ff377c7794c426ab7e521ce5716bf Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:06:02 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:06:02 2025 +0200 public/sysctl: Clarify usage of pm_{px,cx}_stat Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Acked-by: Jan Beulich --- xen/include/public/sysctl.h | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index c804abb8b9..c9d96a06ff 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -221,9 +221,9 @@ struct pm_px_stat { * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) */ uint8_t total; - uint8_t usable; /* usable Px states */ - uint8_t last; /* last Px state */ - uint8_t cur; /* current Px state */ + uint8_t usable; /* OUT: usable Px states (PMSTAT_get_pxstat) */ + uint8_t last; /* OUT: last Px state (PMSTAT_get_pxstat) */ + uint8_t cur; /* OUT: current Px state (PMSTAT_get_pxstat) */ /* * OUT: Px transition table. This should have total * total elements. * As it is a 2-D array, this will not be copied if input total is @@ -235,14 +235,33 @@ struct pm_px_stat { }; struct pm_cx_stat { - uint32_t nr; /* entry nr in triggers & residencies, including C0 */ - uint32_t last; /* last Cx state */ - uint64_aligned_t idle_time; /* idle time from boot */ - XEN_GUEST_HANDLE_64(uint64) triggers; /* Cx trigger counts */ - XEN_GUEST_HANDLE_64(uint64) residencies; /* Cx residencies */ - uint32_t nr_pc; /* entry nr in pc[] */ - uint32_t nr_cc; /* entry nr in cc[] */ /* + * IN: Number of elements in triggers, residencies (PMSTAT_get_cxstat) + * OUT: entry nr in triggers & residencies, including C0 + * (PMSTAT_get_cxstat, PMSTAT_get_max_cx) + */ + uint32_t nr; + uint32_t last; /* OUT: last Cx state (PMSTAT_get_cxstat) */ + /* OUT: idle time from boot (PMSTAT_get_cxstat)*/ + uint64_aligned_t idle_time; + /* OUT: Cx trigger counts, nr elements (PMSTAT_get_cxstat) */ + XEN_GUEST_HANDLE_64(uint64) triggers; + /* OUT: Cx residencies, nr elements (PMSTAT_get_cxstat) */ + XEN_GUEST_HANDLE_64(uint64) residencies; + /* + * IN: entry nr in pc[] (PMSTAT_get_cxstat) + * OUT: Required size of pc[] for all known to Xen entries to be written + * (PMSTAT_get_cxstat) + */ + uint32_t nr_pc; + /* + * IN: entry nr in cc[] (PMSTAT_get_cxstat) + * OUT: Required size of cc[] for all known to Xen entries to be written + * (PMSTAT_get_cxstat) + */ + uint32_t nr_cc; + /* + * OUT: (PMSTAT_get_cxstat) * These two arrays may (and generally will) have unused slots; slots not * having a corresponding hardware register will not be written by the * hypervisor. It is therefore up to the caller to put a suitable sentinel -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011762.1390249 (Exim 4.92) (envelope-from ) id 1uPLl8-0006Qr-0I; Wed, 11 Jun 2025 13:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011762.1390249; Wed, 11 Jun 2025 13:44: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 1uPLl7-0006Qk-TT; Wed, 11 Jun 2025 13:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1011762; Wed, 11 Jun 2025 13:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLl6-0006QU-GD for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLl6-00DnsO-1W for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLl6-002gs4-1Q for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13: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=1fddSVZ5gC2g8KkcYDqz3c1Vq0QXgJWqwtloVjQ7+FU=; b=evYWtgnYzsNzc18GNaDlzpPhw+ j2Lt3eGr4O36GkrxBddHJc5BcILSnSVI3Y80gAbsw2btGL0Vi0RgNcmOw1sFTT00exmJ5dBT6R4t8 7BUTvsYCDfmsu8pYCYavjSO9HhHRIe0NHBdv37YXBUehwVlthvSqVO5mplXn5sIWaZqw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] cpufreq: Avoid potential buffer overrun and leak Message-Id: Date: Wed, 11 Jun 2025 13:44:52 +0000 commit 2f36bef3d8478f304f262fffeca543de480872a4 Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:06:24 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:06:24 2025 +0200 cpufreq: Avoid potential buffer overrun and leak If set_px_pminfo is called a second time with a larger state_count than the first call, calls to PMSTAT_get_pxstat will read beyond the end of the pt and trans_pt buffers allocated in cpufreq_statistic_init() since they would have been allocated with the original state_count. Secondly, the states array leaks on each subsequent call of set_px_pminfo. Fix both these issues by ignoring subsequent calls to set_px_pminfo if it completed successfully previously. Return success rather than an error to avoid errors in the dom0 kernel log when reloading the xen_acpi_processor module. At the same time, fix a leak of the states array on error. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 19e2992335..635f6e8c61 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -517,7 +517,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } } - if ( perf->flags & XEN_PX_PSS ) + if ( perf->flags & XEN_PX_PSS && !pxpt->states ) { /* capability check */ if ( perf->state_count <= 1 ) @@ -534,6 +534,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) { + XFREE(pxpt->states); ret = -EFAULT; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:45:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011763.1390254 (Exim 4.92) (envelope-from ) id 1uPLlH-0006Tr-2b; Wed, 11 Jun 2025 13:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011763.1390254; Wed, 11 Jun 2025 13: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 1uPLlH-0006Tj-06; Wed, 11 Jun 2025 13:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1011763; Wed, 11 Jun 2025 13:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLlG-0006Tc-Je for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLlG-00Dnss-1s for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLlG-002gsk-1i for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13: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=KjFwrY+PeSdgEfnmWjhlbvS2uUUDT7H+vyOA5Hxa+U0=; b=2rLsiouvePXfieGuU3TYgnUZCN +0VusPBFW1tV+lPwNA4leECBrQKrR73NmB8SwLy3/Y8hEORrDfF1aaYMqZF/bMBh8rKZx3KXTz6aK 0oPjbPcrx8Oibmdi64IB3uQL0CtHJN7m/7UopGv7SOLQLNRAH1MtdnUMZL2MkE7H9kvo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxc/PM: Ensure pxstat buffers are correctly sized Message-Id: Date: Wed, 11 Jun 2025 13:45:02 +0000 commit de6a05a8a0d5090f1cdb9b5449b034afcbe7a208 Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:06:45 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:06:45 2025 +0200 libxc/PM: Ensure pxstat buffers are correctly sized xc_pm_get_pxstat() requires the caller to allocate the pt and trans_pt buffers but then calls xc_pm_get_max_px() to determine how big they are (and hence how much Xen will copy into them). This is susceptible to races if xc_pm_get_max_px() changes so avoid the problem by requiring the caller to also pass in the size of the buffers. Suggested-by: Jan Beulich Signed-off-by: Ross Lagerwall Reviewed-by: Anthony PERARD --- tools/libs/ctrl/xc_pm.c | 22 ++++++++++------------ tools/misc/xenpm.c | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/tools/libs/ctrl/xc_pm.c b/tools/libs/ctrl/xc_pm.c index ff7b5ada05..1f2430cac2 100644 --- a/tools/libs/ctrl/xc_pm.c +++ b/tools/libs/ctrl/xc_pm.c @@ -45,36 +45,34 @@ int xc_pm_get_max_px(xc_interface *xch, int cpuid, int *max_px) int xc_pm_get_pxstat(xc_interface *xch, int cpuid, struct xc_px_stat *pxpt) { struct xen_sysctl sysctl = {}; - /* Sizes unknown until xc_pm_get_max_px */ - DECLARE_NAMED_HYPERCALL_BOUNCE(trans, pxpt->trans_pt, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - DECLARE_NAMED_HYPERCALL_BOUNCE(pt, pxpt->pt, 0, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_NAMED_HYPERCALL_BOUNCE(trans, pxpt->trans_pt, + pxpt->total * pxpt->total * sizeof(uint64_t), + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_NAMED_HYPERCALL_BOUNCE(pt, pxpt->pt, + pxpt->total * sizeof(struct xc_px_val), + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); - int max_px, ret; + int ret; if ( !pxpt->trans_pt || !pxpt->pt ) { errno = EINVAL; return -1; } - if ( (ret = xc_pm_get_max_px(xch, cpuid, &max_px)) != 0) - return ret; - - HYPERCALL_BOUNCE_SET_SIZE(trans, max_px * max_px * sizeof(uint64_t)); - HYPERCALL_BOUNCE_SET_SIZE(pt, max_px * sizeof(struct xc_px_val)); if ( xc_hypercall_bounce_pre(xch, trans) ) - return ret; + return -1; if ( xc_hypercall_bounce_pre(xch, pt) ) { xc_hypercall_bounce_post(xch, trans); - return ret; + return -1; } sysctl.cmd = XEN_SYSCTL_get_pmstat; sysctl.u.get_pmstat.type = PMSTAT_get_pxstat; sysctl.u.get_pmstat.cpuid = cpuid; - sysctl.u.get_pmstat.u.getpx.total = max_px; + sysctl.u.get_pmstat.u.getpx.total = pxpt->total; set_xen_guest_handle(sysctl.u.get_pmstat.u.getpx.trans_pt, trans); set_xen_guest_handle(sysctl.u.get_pmstat.u.getpx.pt, pt); diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index db658ebadd..de319329e6 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -319,6 +319,7 @@ static int get_pxstat_by_cpuid(xc_interface *xc_handle, int cpuid, struct xc_px_ if ( !pxstat) return -EINVAL; + pxstat->total = max_px_num; pxstat->trans_pt = malloc(max_px_num * max_px_num * sizeof(uint64_t)); if ( !pxstat->trans_pt ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:45:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011764.1390258 (Exim 4.92) (envelope-from ) id 1uPLlR-0006W6-46; Wed, 11 Jun 2025 13:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011764.1390258; Wed, 11 Jun 2025 13:45: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 1uPLlR-0006Vz-1R; Wed, 11 Jun 2025 13:45:13 +0000 Received: by outflank-mailman (input) for mailman id 1011764; Wed, 11 Jun 2025 13:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLlQ-0006Vt-OJ for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLlQ-00Dnsz-2L for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLlQ-002gtC-23 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45: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=LWVtl5n6EF1/nuUlETirYiBHw5xfdI7vR916fxYhex4=; b=lr0uQagj16T4Qpj5eLR44ypOjD 4X9MF0GEe3cxfo99RF8q2xrPPvxjs/4zQU4gXSbUnxAxx/hvsRF6OOqAL20GoApByZvDpLucie9rG rtkG+YITqsSvsMEDrwNx0MKfqe8ngKjmqiYOduVAcU4xqC0Yr68IXd4yPWb/miqxnePw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxc/PM: Retry get_pxstat if data is incomplete Message-Id: Date: Wed, 11 Jun 2025 13:45:12 +0000 commit 1ff7f87e8f4ffff97901126927549ae7b7a7340d Author: Ross Lagerwall AuthorDate: Wed Jun 11 11:07:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:07:00 2025 +0200 libxc/PM: Retry get_pxstat if data is incomplete If the total returned by Xen is more than the number of elements allocated, it means that the buffer was too small and so the data is incomplete. Retry to get all the data. Signed-off-by: Ross Lagerwall Reviewed-by: Anthony PERARD --- tools/misc/xenpm.c | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index de319329e6..d5387f5f06 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -312,29 +312,42 @@ static int get_pxstat_by_cpuid(xc_interface *xc_handle, int cpuid, struct xc_px_ int ret = 0; int max_px_num = 0; - ret = xc_pm_get_max_px(xc_handle, cpuid, &max_px_num); - if ( ret ) - return -errno; - if ( !pxstat) return -EINVAL; - pxstat->total = max_px_num; - pxstat->trans_pt = malloc(max_px_num * max_px_num * - sizeof(uint64_t)); - if ( !pxstat->trans_pt ) - return -ENOMEM; - pxstat->pt = malloc(max_px_num * sizeof(struct xc_px_val)); - if ( !pxstat->pt ) + for ( ; ; ) { - free(pxstat->trans_pt); - return -ENOMEM; - } + ret = xc_pm_get_max_px(xc_handle, cpuid, &max_px_num); + if ( ret ) + return -errno; - ret = xc_pm_get_pxstat(xc_handle, cpuid, pxstat); - if( ret ) - { - ret = -errno; + pxstat->total = max_px_num; + pxstat->trans_pt = malloc(max_px_num * max_px_num * + sizeof(uint64_t)); + if ( !pxstat->trans_pt ) + return -ENOMEM; + pxstat->pt = malloc(max_px_num * sizeof(struct xc_px_val)); + if ( !pxstat->pt ) + { + free(pxstat->trans_pt); + return -ENOMEM; + } + + ret = xc_pm_get_pxstat(xc_handle, cpuid, pxstat); + if ( ret ) + { + ret = -errno; + free(pxstat->trans_pt); + free(pxstat->pt); + pxstat->trans_pt = NULL; + pxstat->pt = NULL; + break; + } + + if ( pxstat->total <= max_px_num ) + break; + + /* get_max_px changed under our feet so the data is incomplete. */ free(pxstat->trans_pt); free(pxstat->pt); pxstat->trans_pt = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:45:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:45:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011765.1390262 (Exim 4.92) (envelope-from ) id 1uPLlb-0006ZO-61; Wed, 11 Jun 2025 13:45:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011765.1390262; Wed, 11 Jun 2025 13:45: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 1uPLlb-0006ZD-38; Wed, 11 Jun 2025 13:45:23 +0000 Received: by outflank-mailman (input) for mailman id 1011765; Wed, 11 Jun 2025 13:45:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLla-0006Z7-Rj for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLla-00Dnt3-2d for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLla-002gti-2W for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45: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=RZ8mXMxlLowS8nLa6WnwoAUo69cDnvXW/Zs9UrF6ct0=; b=sOu72+ex8USCX7gZb1BIqpqGTu u1t6vWzgug9tLHcecxOM8G7BMeESN4xNGhl1WU77X6FAKMKpCeUCxhMa8XZ/SPSXusCJHcKdBFZz4 uJj/cWGJ1kewCtXIy4lBP+hzeG3aClevUspfF98CMuhMuWbUIIf1kRMZWTcpnW1Pw83M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pmstat: consolidate code into pmstat.c Message-Id: Date: Wed, 11 Jun 2025 13:45:22 +0000 commit bf0cd071db2a6cdd61e612cf44accad4e0e495e4 Author: Penny Zheng AuthorDate: Wed Jun 11 11:07:33 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:07:33 2025 +0200 xen/pmstat: consolidate code into pmstat.c We move the following functions into drivers/acpi/pmstat.c, as they are all designed for performance statistic: - cpufreq_residency_update() - cpufreq_statistic_reset() - cpufreq_statistic_update() - cpufreq_statistic_init() - cpufreq_statistic_exit() Consequently, variable "cpufreq_statistic_data" and "cpufreq_statistic_lock" shall become static. We also move out acpi_set_pdc_bits(), as it is the handler for sub-hypercall XEN_PM_PDC, and shall stay with the other handlers together in drivers/cpufreq/cpufreq.c. Various style corrections shall be applied at the same time while moving these functions, including: - brace for if() and for() shall live at a seperate line - add extra space before and after bracket of if() and for() - use array notation - convert uint32_t into unsigned int - convert u32 into uint32_t Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 202 +++++++++++++++++++++++++----- xen/drivers/cpufreq/cpufreq.c | 31 +++++ xen/drivers/cpufreq/utility.c | 163 ------------------------ xen/include/acpi/cpufreq/cpufreq.h | 2 - xen/include/acpi/cpufreq/processor_perf.h | 4 - 5 files changed, 201 insertions(+), 201 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 0d570e28bf..521db7e98e 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -41,7 +41,176 @@ #include #include -DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); +static DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); + +static DEFINE_PER_CPU(spinlock_t, cpufreq_statistic_lock); + +/********************************************************************* + * Px STATISTIC INFO * + *********************************************************************/ + +static void cpufreq_residency_update(unsigned int cpu, uint8_t state) +{ + uint64_t now, total_idle_ns; + int64_t delta; + struct pm_px *pxpt = per_cpu(cpufreq_statistic_data, cpu); + + total_idle_ns = get_cpu_idle_time(cpu); + now = NOW(); + + delta = (now - pxpt->prev_state_wall) - + (total_idle_ns - pxpt->prev_idle_wall); + + if ( likely(delta >= 0) ) + pxpt->u.pt[state].residency += delta; + + pxpt->prev_state_wall = now; + pxpt->prev_idle_wall = total_idle_ns; +} + +void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) +{ + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = + &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt || !pmpt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + pxpt->u.last = from; + pxpt->u.cur = to; + pxpt->u.pt[to].count++; + + cpufreq_residency_update(cpu, from); + + pxpt->u.trans_pt[from * pmpt->perf.state_count + to]++; + + spin_unlock(cpufreq_statistic_lock); +} + +int cpufreq_statistic_init(unsigned int cpu) +{ + unsigned int i, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock_init(cpufreq_statistic_lock); + + if ( !pmpt ) + return -EINVAL; + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return 0; + } + + count = pmpt->perf.state_count; + + pxpt = xzalloc(struct pm_px); + if ( !pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + + pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); + if ( !pxpt->u.trans_pt ) + { + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.pt = xzalloc_array(struct pm_px_val, count); + if ( !pxpt->u.pt ) + { + xfree(pxpt->u.trans_pt); + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.total = pmpt->perf.state_count; + pxpt->u.usable = pmpt->perf.state_count - pmpt->perf.platform_limit; + + for ( i = 0; i < pmpt->perf.state_count; i++ ) + pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; + + pxpt->prev_state_wall = NOW(); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); + + return 0; +} + +void cpufreq_statistic_exit(unsigned int cpu) +{ + struct pm_px *pxpt; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + xfree(pxpt->u.trans_pt); + xfree(pxpt->u.pt); + xfree(pxpt); + per_cpu(cpufreq_statistic_data, cpu) = NULL; + + spin_unlock(cpufreq_statistic_lock); +} + +static void cpufreq_statistic_reset(unsigned int cpu) +{ + unsigned int i, j, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + count = pmpt->perf.state_count; + + for ( i = 0; i < count; i++ ) + { + pxpt->u.pt[i].residency = 0; + pxpt->u.pt[i].count = 0; + + for ( j = 0; j < count; j++ ) + pxpt->u.trans_pt[i * count + j] = 0; + } + + pxpt->prev_state_wall = NOW(); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); +} /* * Get PM statistic info @@ -521,34 +690,3 @@ int do_pm_op(struct xen_sysctl_pm_op *op) return ret; } - -int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32) pdc) -{ - u32 bits[3]; - int ret; - - if ( copy_from_guest(bits, pdc, 2) ) - ret = -EFAULT; - else if ( bits[0] != ACPI_PDC_REVISION_ID || !bits[1] ) - ret = -EINVAL; - else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) - ret = -EFAULT; - else - { - u32 mask = 0; - - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) - mask |= ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) - mask |= ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) - mask |= ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; - bits[2] &= (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | - ACPI_PDC_SMP_C1PT) & ~mask; - ret = arch_acpi_set_pdc_bits(acpi_id, bits, mask); - } - if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) - ret = -EFAULT; - - return ret; -} diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 635f6e8c61..f47aad3f75 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -589,6 +589,37 @@ out: return ret; } +int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32) pdc) +{ + uint32_t bits[3]; + int ret; + + if ( copy_from_guest(bits, pdc, 2) ) + ret = -EFAULT; + else if ( bits[0] != ACPI_PDC_REVISION_ID || !bits[1] ) + ret = -EINVAL; + else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) + ret = -EFAULT; + else + { + uint32_t mask = 0; + + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) + mask |= ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) + mask |= ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) + mask |= ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; + bits[2] &= (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | + ACPI_PDC_SMP_C1PT) & ~mask; + ret = arch_acpi_set_pdc_bits(acpi_id, bits, mask); + } + if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) + ret = -EFAULT; + + return ret; +} + static void cpufreq_cmdline_common_para(struct cpufreq_policy *new_policy) { if (usr_max_freq) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 309c0682cf..723045b240 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -35,169 +35,6 @@ struct cpufreq_driver __read_mostly cpufreq_driver; struct processor_pminfo *__read_mostly processor_pminfo[NR_CPUS]; DEFINE_PER_CPU_READ_MOSTLY(struct cpufreq_policy *, cpufreq_cpu_policy); -DEFINE_PER_CPU(spinlock_t, cpufreq_statistic_lock); - -/********************************************************************* - * Px STATISTIC INFO * - *********************************************************************/ - -void cpufreq_residency_update(unsigned int cpu, uint8_t state) -{ - uint64_t now, total_idle_ns; - int64_t delta; - struct pm_px *pxpt = per_cpu(cpufreq_statistic_data, cpu); - - total_idle_ns = get_cpu_idle_time(cpu); - now = NOW(); - - delta = (now - pxpt->prev_state_wall) - - (total_idle_ns - pxpt->prev_idle_wall); - - if ( likely(delta >= 0) ) - pxpt->u.pt[state].residency += delta; - - pxpt->prev_state_wall = now; - pxpt->prev_idle_wall = total_idle_ns; -} - -void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) -{ - struct pm_px *pxpt; - struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( !pxpt || !pmpt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - pxpt->u.last = from; - pxpt->u.cur = to; - pxpt->u.pt[to].count++; - - cpufreq_residency_update(cpu, from); - - (*(pxpt->u.trans_pt + from * pmpt->perf.state_count + to))++; - - spin_unlock(cpufreq_statistic_lock); -} - -int cpufreq_statistic_init(unsigned int cpu) -{ - uint32_t i, count; - struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock_init(cpufreq_statistic_lock); - - if ( !pmpt ) - return -EINVAL; - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return 0; - } - - count = pmpt->perf.state_count; - - pxpt = xzalloc(struct pm_px); - if ( !pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); - if (!pxpt->u.trans_pt) { - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.pt = xzalloc_array(struct pm_px_val, count); - if (!pxpt->u.pt) { - xfree(pxpt->u.trans_pt); - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.total = count; - pxpt->u.usable = count - pmpt->perf.platform_limit; - - for ( i = 0; i < count; i++ ) - pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; - - pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpu); - - per_cpu(cpufreq_statistic_data, cpu) = pxpt; - - spin_unlock(cpufreq_statistic_lock); - - return 0; -} - -void cpufreq_statistic_exit(unsigned int cpu) -{ - struct pm_px *pxpt; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if (!pxpt) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - xfree(pxpt->u.trans_pt); - xfree(pxpt->u.pt); - xfree(pxpt); - per_cpu(cpufreq_statistic_data, cpu) = NULL; - - spin_unlock(cpufreq_statistic_lock); -} - -void cpufreq_statistic_reset(unsigned int cpu) -{ - uint32_t i, j, count; - struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - count = pmpt->perf.state_count; - - for (i=0; i < count; i++) { - pxpt->u.pt[i].residency = 0; - pxpt->u.pt[i].count = 0; - - for (j=0; j < count; j++) - *(pxpt->u.trans_pt + i*count + j) = 0; - } - - pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpu); - - spin_unlock(cpufreq_statistic_lock); -} - - /********************************************************************* * FREQUENCY TABLE HELPERS * *********************************************************************/ diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index a3c84143af..241117a9af 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -20,8 +20,6 @@ #include "processor_perf.h" -DECLARE_PER_CPU(spinlock_t, cpufreq_statistic_lock); - extern bool cpufreq_verbose; enum cpufreq_xen_opt { diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 301104e16f..6de43f8602 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -9,11 +9,9 @@ unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); -void cpufreq_residency_update(unsigned int cpu, uint8_t state); void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to); int cpufreq_statistic_init(unsigned int cpu); void cpufreq_statistic_exit(unsigned int cpu); -void cpufreq_statistic_reset(unsigned int cpu); int cpufreq_limit_change(unsigned int cpu); @@ -56,7 +54,5 @@ struct pm_px { uint64_t prev_idle_wall; }; -DECLARE_PER_CPU(struct pm_px *, cpufreq_statistic_data); - int cpufreq_cpu_init(unsigned int cpu); #endif /* __XEN_PROCESSOR_PM_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:45:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011766.1390266 (Exim 4.92) (envelope-from ) id 1uPLlm-0006bV-7K; Wed, 11 Jun 2025 13:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011766.1390266; Wed, 11 Jun 2025 13: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 1uPLlm-0006bN-4h; Wed, 11 Jun 2025 13:45:34 +0000 Received: by outflank-mailman (input) for mailman id 1011766; Wed, 11 Jun 2025 13:45:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLlk-0006bD-U7 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLlk-00DntC-2u for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLlk-002guA-2p for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45: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=XFEmfI8R1GjB366TLGaoNC1AyuMUd1qdvkHK/d/pdag=; b=MzMxbcwloRsWmTT8KOKZrCoF7e nLNs70++3G1snsBNY+v4NTIn/IhzjzNwE7/r4L0DN6DuwT18GzTnmTOPAPsmSFIQMxLcM4adXUfG7 RVpZP1RNIQLHpJKNMp/rc5x4Gl+rP6Ij53ohiFtc/kYmSDQ7b4+SxLCGNvK1DsBYBzqg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: make avail_domheap_pages() inlined into get_outstanding_claims() Message-Id: Date: Wed, 11 Jun 2025 13:45:32 +0000 commit b5157dcde497ed4434219283a4b89188b04f0b8f Author: Penny Zheng AuthorDate: Wed Jun 11 11:07:53 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:07:53 2025 +0200 xen: make avail_domheap_pages() inlined into get_outstanding_claims() Function avail_domheap_pages() is only invoked by get_outstanding_claims(), so it could be inlined into get_outstanding_claims(). Move up avail_heap_pages() to avoid declaration before get_outstanding_claims(). Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/page_alloc.c | 51 +++++++++++++++++++++---------------------------- xen/include/xen/mm.h | 1 - 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index e57a287133..b204f22f50 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -488,6 +488,27 @@ static long total_avail_pages; static DEFINE_SPINLOCK(heap_lock); static long outstanding_claims; /* total outstanding claims by all domains */ +static unsigned long avail_heap_pages( + unsigned int zone_lo, unsigned int zone_hi, unsigned int node) +{ + unsigned int i, zone; + unsigned long free_pages = 0; + + if ( zone_hi >= NR_ZONES ) + zone_hi = NR_ZONES - 1; + + for_each_online_node(i) + { + if ( !avail[i] ) + continue; + for ( zone = zone_lo; zone <= zone_hi; zone++ ) + if ( (node == -1) || (node == i) ) + free_pages += avail[i][zone]; + } + + return free_pages; +} + unsigned long domain_adjust_tot_pages(struct domain *d, long pages) { ASSERT(rspin_is_locked(&d->page_alloc_lock)); @@ -584,7 +605,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) { spin_lock(&heap_lock); *outstanding_pages = outstanding_claims; - *free_pages = avail_domheap_pages(); + *free_pages = avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); spin_unlock(&heap_lock); } @@ -1962,27 +1983,6 @@ static void init_heap_pages( } } -static unsigned long avail_heap_pages( - unsigned int zone_lo, unsigned int zone_hi, unsigned int node) -{ - unsigned int i, zone; - unsigned long free_pages = 0; - - if ( zone_hi >= NR_ZONES ) - zone_hi = NR_ZONES - 1; - - for_each_online_node(i) - { - if ( !avail[i] ) - continue; - for ( zone = zone_lo; zone <= zone_hi; zone++ ) - if ( (node == -1) || (node == i) ) - free_pages += avail[i][zone]; - } - - return free_pages; -} - /************************* * COLORED SIDE-ALLOCATOR * @@ -2796,13 +2796,6 @@ unsigned long avail_domheap_pages_region( return avail_heap_pages(zone_lo, zone_hi, node); } -unsigned long avail_domheap_pages(void) -{ - return avail_heap_pages(MEMZONE_XEN + 1, - NR_ZONES - 1, - -1); -} - unsigned long avail_node_heap_pages(unsigned int nodeid) { return avail_heap_pages(MEMZONE_XEN, NR_ZONES -1, nodeid); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index e89942b87d..93c037d618 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -141,7 +141,6 @@ struct page_info *alloc_domheap_pages( void free_domheap_pages(struct page_info *pg, unsigned int order); unsigned long avail_domheap_pages_region( unsigned int node, unsigned int min_width, unsigned int max_width); -unsigned long avail_domheap_pages(void); 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)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:45:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011767.1390269 (Exim 4.92) (envelope-from ) id 1uPLlw-0006e5-AG; Wed, 11 Jun 2025 13:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011767.1390269; Wed, 11 Jun 2025 13:45: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 1uPLlw-0006dx-7g; Wed, 11 Jun 2025 13:45:44 +0000 Received: by outflank-mailman (input) for mailman id 1011767; Wed, 11 Jun 2025 13:45:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLlv-0006dp-0g for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLlu-00Dnvd-3D for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLlu-002guj-37 for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45: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=m5kSSDl2Ibgnsy1hJlMsgByroLYariDr4shg+2Ila9Q=; b=U8TIPI+QxYELH3e4mn4u6A45Sc 1fiGXHrwSY25o3qLdnghdBcn8z0aWdf9n9CX6LljUBqprwglDXArkRVV4j2AFXE7YxjXpDrjklanr 7RuxFmn9Ed//huMT3r2PxEZsJtFUEb5nVDiO6tru0lMIFtxTmhhzRGpIfZZfAu3WrLso=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenalyze: Add 2 missed VCPUOPs in vcpu_op_str Message-Id: Date: Wed, 11 Jun 2025 13:45:42 +0000 commit ed939591e4c6ccf794395fc78cd358aa24a94ed8 Author: Gang Ji AuthorDate: Wed Jun 11 11:08:11 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:08:11 2025 +0200 xenalyze: Add 2 missed VCPUOPs in vcpu_op_str The 2 missed ones are: register_runstate_phys_area and register_vcpu_time_phys_area. Fixes: d5df44275e7a ("domain: introduce GADDR based runstate area registration alternative") Fixes: 60e544a8c58f ("x86: introduce GADDR based secondary time area registration alternative") Signed-off-by: Gang Ji Reviewed-by: Andrew Cooper --- tools/xentrace/xenalyze.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index adc96dd7e4..1c13682aaa 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6513,7 +6513,8 @@ static const char *vcpu_op_str[] = { "register_runstate_memory_area", "set_periodic_timer", "stop_periodic_timer", "set_singleshot_timer", "stop_singleshot_timer", "register_vcpu_info", "send_nmi", "get_physid", - "register_vcpu_time_memory_area", + "register_vcpu_time_memory_area", "register_runstate_phys_area", + "register_vcpu_time_phys_area", }; static const char *sched_op_str[] = { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:45:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011768.1390274 (Exim 4.92) (envelope-from ) id 1uPLm6-0006gj-Bf; Wed, 11 Jun 2025 13:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011768.1390274; Wed, 11 Jun 2025 13:45: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 1uPLm6-0006gb-8y; Wed, 11 Jun 2025 13:45:54 +0000 Received: by outflank-mailman (input) for mailman id 1011768; Wed, 11 Jun 2025 13:45:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLm5-0006gU-3X for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLm5-00Dnw0-0G for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLm5-002gvF-0A for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:45: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=dldOm+auW9G8S/Z0fJKlnfKCxF7tmILGIK4Gr5I+ZgE=; b=YiJx/l/74SyybLyRXZAh17PEIH Wv97fNgdJ91OBWqYVwfVAFMo8I4HTphd9H90iBrKWXOJWiAzIzOquslZTMvoTurFfYepFrIQFkxHr QvIfEbQDhgCWJCLiKj6sUtx6wWTwuWIJNMyhVpQGOWOl+Jt2rBomAI3O27pnttZWT3mI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/dt: Add BOOTMOD_MICROCODE Message-Id: Date: Wed, 11 Jun 2025 13:45:53 +0000 commit efe0870d4a00321feda2f2d8d51045b460d41549 Author: Alejandro Vallejo AuthorDate: Wed Jun 11 11:08:28 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:08:28 2025 +0200 xen/dt: Add BOOTMOD_MICROCODE In preparation for x86 to start using bootmodule instead of boot_module Signed-off-by: Alejandro Vallejo Reviewed-by: Michal Orzel --- xen/common/device-tree/bootfdt.c | 2 ++ xen/common/device-tree/bootinfo.c | 1 + xen/include/xen/bootfdt.h | 1 + 3 files changed, 4 insertions(+) diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index 9df80291b1..9daea06e57 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -351,6 +351,8 @@ static void __init process_multiboot_node(const void *fdt, int node, kind = BOOTMOD_XSM; else if ( fdt_node_check_compatible(fdt, node, "multiboot,device-tree") == 0 ) kind = BOOTMOD_GUEST_DTB; + else if ( fdt_node_check_compatible(fdt, node, "multiboot,microcode") == 0 ) + kind = BOOTMOD_MICROCODE; else kind = BOOTMOD_UNKNOWN; diff --git a/xen/common/device-tree/bootinfo.c b/xen/common/device-tree/bootinfo.c index 76d652c0de..717cfa0962 100644 --- a/xen/common/device-tree/bootinfo.c +++ b/xen/common/device-tree/bootinfo.c @@ -31,6 +31,7 @@ const char * __init boot_module_kind_as_string(bootmodule_kind kind) case BOOTMOD_RAMDISK: return "Ramdisk"; case BOOTMOD_XSM: return "XSM"; case BOOTMOD_GUEST_DTB: return "DTB"; + case BOOTMOD_MICROCODE: return "Microcode"; case BOOTMOD_UNKNOWN: return "Unknown"; default: BUG(); } diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index 64db48f4fe..ff40f3078e 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -21,6 +21,7 @@ typedef enum { BOOTMOD_RAMDISK, BOOTMOD_XSM, BOOTMOD_GUEST_DTB, + BOOTMOD_MICROCODE, BOOTMOD_UNKNOWN } bootmodule_kind; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:46:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:46:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011769.1390278 (Exim 4.92) (envelope-from ) id 1uPLmG-0006ik-DF; Wed, 11 Jun 2025 13:46:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011769.1390278; Wed, 11 Jun 2025 13:46: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 1uPLmG-0006id-AJ; Wed, 11 Jun 2025 13:46:04 +0000 Received: by outflank-mailman (input) for mailman id 1011769; Wed, 11 Jun 2025 13:46:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLmF-0006iV-6B for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:46:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLmF-00DnwI-0X for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:46:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLmF-002gyL-0Q for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:46: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=y5cxrVfYwy2qkokzQeAR582B6KcuHL8SjxBM/ewPnAA=; b=SdV59stO02gCNuBA+HFStWlNQj nTHKFBkgMPgp0XxByHIw7Q5IJiqdssdKChSzwJgZUpG7zTwabLnHeUFY2rlxeTFGkYXTw7GtVg+zO PDXK/aBcSP/lIB4wRRCU+95QCjqsg0jYZYrL48H34RrEpZQJAVpTc1oQMj4caQSn/4RM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Introduce system suspend config option Message-Id: Date: Wed, 11 Jun 2025 13:46:03 +0000 commit 69c83031737b5fa490d292a9c11864e3fd85c872 Author: Mykyta Poturai AuthorDate: Wed Jun 11 11:09:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 11:09:00 2025 +0200 xen: Introduce system suspend config option This option enables the system suspend support. This is the mechanism that allows the system to be suspended to RAM and later resumed. The patch introduces three options: - HAS_SYSTEM_SUSPEND: indicates suspend support is available on the platform. - SYSTEM_SUSPEND_ALWAYS_ON: used for architectures where suspend must always be enabled. - SYSTEM_SUSPEND: user-facing option to enable/disable suspend if supported. Defaults to enabled if SYSTEM_SUSPEND_ALWAYS_ON is set and depends on HAS_SYSTEM_SUSPEND. On x86, both HAS_SYSTEM_SUSPEND and SYSTEM_SUSPEND_ALWAYS_ON are selected by default, making suspend support always enabled. The options are designed to be easily extensible to other architectures (e.g., PPC, RISC-V) as future support is added. Signed-off-by: Mykyta Poturai Signed-off-by: Mykola Kvach Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 7afe879710..752d5141bb 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -33,6 +33,7 @@ config X86 select HAS_VMAP select HAS_VPCI if HVM select NEEDS_LIBELF + select SYSTEM_SUSPEND_ALWAYS_ON config ARCH_DEFCONFIG string diff --git a/xen/common/Kconfig b/xen/common/Kconfig index eece1370a3..867710134a 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -122,6 +122,9 @@ config HAS_SCHED_GRANULARITY config HAS_STACK_PROTECTOR bool +config HAS_SYSTEM_SUSPEND + bool + config HAS_UBSAN bool @@ -593,4 +596,19 @@ config BUDDY_ALLOCATOR_SIZE Amount of memory reserved for the buddy allocator to serve Xen heap, working alongside the colored one. +config SYSTEM_SUSPEND_ALWAYS_ON + bool + select HAS_SYSTEM_SUSPEND + +config SYSTEM_SUSPEND + bool "System suspend support" if !SYSTEM_SUSPEND_ALWAYS_ON + depends on HAS_SYSTEM_SUSPEND + default SYSTEM_SUSPEND_ALWAYS_ON + help + This option enables the system suspend support. This is the + mechanism that allows the system to be suspended to RAM and + later resumed. + + If unsure, say N. + endmenu -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 11 13:46:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Jun 2025 13:46:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1011770.1390282 (Exim 4.92) (envelope-from ) id 1uPLmQ-0006lA-EQ; Wed, 11 Jun 2025 13:46:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1011770.1390282; Wed, 11 Jun 2025 13:46: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 1uPLmQ-0006l2-Bt; Wed, 11 Jun 2025 13:46:14 +0000 Received: by outflank-mailman (input) for mailman id 1011770; Wed, 11 Jun 2025 13:46:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPLmP-0006ku-8p for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:46:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPLmP-00DnwM-0n for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:46:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPLmP-002gyx-0h for xen-changelog@lists.xenproject.org; Wed, 11 Jun 2025 13:46: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=ToaYNBERnCK24WEFTt9uLPqq9GAY/kiMLE+CT6tlZB0=; b=rf7OhEDAsRBa9UDDP1lQszHoes c3zSincmzujMcUGhZfg6bqWWONPQIbk9D2mdxHfyk5J0nRvyIhyMqFN0Acn2266syazQn9FVcH5dD hgqPuoY1yPKhkXCOhwoguWivdhsrN9pTBycpt7SJS0JiF9qgxBx7NgMHTQZxi0kToiVI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ACPI: adjust decl of acpi_set_pdc_bits() Message-Id: Date: Wed, 11 Jun 2025 13:46:13 +0000 commit 657a95a2baed48dc2ed6f2fc7ef6161ad7ba010b Author: Jan Beulich AuthorDate: Wed Jun 11 14:24:48 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 11 14:24:48 2025 +0200 ACPI: adjust decl of acpi_set_pdc_bits() The commit referenced below changed the type of the first parameter. Misra C:2012 Rule 8.3 requires the declaration to follow suit. Fixes: bf0cd071db2a ("xen/pmstat: consolidate code into pmstat.c") Signed-off-by: Jan Beulich Reviewed-by: Nicola Vetrini --- xen/include/xen/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index bc4818c943..57e710a16d 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -186,7 +186,7 @@ static inline void acpi_set_csubstate_limit(unsigned int new_limit) { return; } #endif #ifdef XEN_GUEST_HANDLE -int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32)); +int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32)); #endif int arch_acpi_set_pdc_bits(u32 acpi_id, u32 *, u32 mask); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 11:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 11:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1012869.1391372 (Exim 4.92) (envelope-from ) id 1uPfpn-0002pC-8K; Thu, 12 Jun 2025 11:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1012869.1391372; Thu, 12 Jun 2025 11: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 1uPfpn-0002p4-5J; Thu, 12 Jun 2025 11:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1012869; Thu, 12 Jun 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 1uPfpl-0002of-O3 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPfpl-00FPrJ-25 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPfpl-003VDd-1x for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=FmwdV6jtfpRvpBFXGTbpVnbjHIxxsQQXD9B2pPEz9fQ=; b=TGRpACUWwXqGDImGbtgsb4pdn5 2G+PeKCdrlcGozMRbJEQ7t4Ul5ewjlvlMZ063e+JUpclNby0lHw2PrLO1EPOydpR71V0P0Ga4XQoi AAOBnuMfJUhN4DBQ/W3qM+AnqDbXwv0UvRCBG0emm9Ugl3JK/Sf/0kt4ITdpIylSg4xw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] helpers: init-dom0less: Drop libxenevtchn from LDLIBS Message-Id: Date: Thu, 12 Jun 2025 11:11:01 +0000 commit 0a7622b603f959db3e7128d6a82ed0e7aa802e7b Author: Michal Orzel AuthorDate: Tue Jun 10 11:33:26 2025 +0200 Commit: Michal Orzel CommitDate: Thu Jun 12 12:42:51 2025 +0200 helpers: init-dom0less: Drop libxenevtchn from LDLIBS It hasn't been used since the introduction of the script. Also drop relevant CFLAGS and header inclusion. Signed-off-by: Michal Orzel Acked-by: Andrew Cooper --- tools/helpers/Makefile | 3 +-- tools/helpers/init-dom0less.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 09590eb5b6..8262d9e75a 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -36,8 +36,7 @@ $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenlight) $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenctrl) -$(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenevtchn) -init-dom0less: LDLIBS += $(call xenlibs-ldlibs,ctrl evtchn toollog store light guest foreignmemory) +init-dom0less: LDLIBS += $(call xenlibs-ldlibs,ctrl toollog store light guest foreignmemory) .PHONY: all all: $(TARGETS) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index 91edf17b6c..a182dce563 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 11:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 11:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1012870.1391376 (Exim 4.92) (envelope-from ) id 1uPfpx-0002w1-9K; Thu, 12 Jun 2025 11:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1012870.1391376; Thu, 12 Jun 2025 11: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 1uPfpx-0002vt-6d; Thu, 12 Jun 2025 11:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1012870; Thu, 12 Jun 2025 11:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPfpv-0002v0-Qi for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPfpv-00FPre-2O for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPfpv-003VFV-2H for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=6jbkuj7Nfi8DPd7gjs5X/YpgWt89p4EAa6/3w2Q8P9w=; b=pN4BqKrhpeReH/+1r6jKfkC5EU fwrxnJvFmkRsxgs63oEQHrfyG1s+HJJKw69T0UhRWkh5urfdwENkFg1KKc52GoX3P5iPWLDDEwCjG 9iH4S7fugFhf4hsqEX1/G1PKpD04c7SHuFflncC4891rNify1iLi05XysOY8C/vmksJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: fix build with HAS_PCI Message-Id: Date: Thu, 12 Jun 2025 11:11:11 +0000 commit 4ce671963eb1f6d12879c75f5fd16325b222b212 Author: Stewart Hildebrand AuthorDate: Tue Jun 10 10:22:57 2025 -0400 Commit: Michal Orzel CommitDate: Thu Jun 12 12:43:05 2025 +0200 xen/arm: fix build with HAS_PCI In file included from ./include/xen/pci.h:72, from drivers/pci/pci.c:8: ./arch/arm/include/asm/pci.h:131:50: error: ‘struct rangeset’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] 131 | static inline int pci_sanitize_bar_memory(struct rangeset *r) | ^~~~~~~~ cc1: all warnings being treated as errors Fixes: 4acab25a9300 ("x86/vpci: fix handling of BAR overlaps with non-hole regions") Signed-off-by: Stewart Hildebrand Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 1605ec660d..64f0e6ce7e 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -23,6 +23,8 @@ extern bool pci_passthrough_enabled; +struct rangeset; + /* Arch pci dev struct */ struct arch_pci_dev { struct device dev; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 11:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 11:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1012873.1391380 (Exim 4.92) (envelope-from ) id 1uPfq7-00034h-Av; Thu, 12 Jun 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 1012873.1391380; Thu, 12 Jun 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 1uPfq7-00034Z-7y; Thu, 12 Jun 2025 11:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1012873; Thu, 12 Jun 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 1uPfq5-000333-Sj for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPfq5-00FPri-2i for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPfq5-003VGe-2a for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=1hVBlqHQt8gtykK7ri+NGpKxXR6ZqGWEyYVkOHKTJ2g=; b=mpe1RjS9KJF+As4cfR86AfZtkl KqBMsWUGV+0xmyLIvbeRDxiPDOpW83O0mcry726tB1c6JgqtYnqfXEgv8+Y9HWgcM87ajXdZrxDRQ CUIOjlX3OwDy4KgH3hmnEdXCABQIhdigfLAfdidOO6FFQFDF9x5H1wcMu6J04huoJ5Lw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: move declarations of device_tree_get_{reg,u32}() to xen/device_tree.h Message-Id: Date: Thu, 12 Jun 2025 11:11:21 +0000 commit fc24430d9730a86bf2194960df3f4208adcd547f Author: Oleksii Kurochko AuthorDate: Thu Jun 12 12:24:12 2025 +0200 Commit: Michal Orzel CommitDate: Thu Jun 12 12:44:06 2025 +0200 xen: move declarations of device_tree_get_{reg,u32}() to xen/device_tree.h The definitions of device_tree_get_reg() and device_tree_get_u32() are already in common code, so move their prototypes there as well. Signed-off-by: Oleksii Kurochko Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/setup.h | 6 ------ xen/include/xen/device_tree.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 6cf272c160..2b58549c1a 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -53,12 +53,6 @@ void setup_mm(void); extern uint32_t hyp_traps_vector[]; void init_traps(void); -void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, - uint32_t size_cells, paddr_t *start, paddr_t *size); - -u32 device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt); - int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt, struct rangeset *iomem_ranges, struct rangeset *irq_ranges); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 6dc1fb5159..75017e4266 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -949,6 +949,12 @@ int dt_get_pci_domain_nr(struct dt_device_node *node); struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle); +void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, + uint32_t size_cells, paddr_t *start, paddr_t *size); + +u32 device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt); + #ifdef CONFIG_DEVICE_TREE_DEBUG #define dt_dprintk(fmt, args...) \ printk(XENLOG_DEBUG fmt, ## args) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 11:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 11:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1012932.1391454 (Exim 4.92) (envelope-from ) id 1uPgWN-0004F9-F5; Thu, 12 Jun 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 1012932.1391454; Thu, 12 Jun 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 1uPgWN-0004F2-Bw; Thu, 12 Jun 2025 11:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1012932; Thu, 12 Jun 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 1uPgWM-0004Ew-45 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPgWL-00FQdF-2t for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPgWL-003X1w-2m for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11: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=xKebuetmKvXUHwjPXpBOYdUo+7SPaE4UokgpYTF4ihs=; b=K90F0actq1Uw1l2RnvKBenJrta GHdT/JhfbYBYHjnukooAm2KoJj4PYktgjQPXZr331jqEjGQ7PqkL3aK6O21dwVp4g/4V4/IgdIOZa vDPPfG1aDE5R4b4+p8fa91nFKGxck/TVxKRGM2eWTiOMGfvCUu8sgfqrkal0QFANLbDY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] helpers: init-dom0less: Drop libxenevtchn from LDLIBS Message-Id: Date: Thu, 12 Jun 2025 11:55:01 +0000 commit 0a7622b603f959db3e7128d6a82ed0e7aa802e7b Author: Michal Orzel AuthorDate: Tue Jun 10 11:33:26 2025 +0200 Commit: Michal Orzel CommitDate: Thu Jun 12 12:42:51 2025 +0200 helpers: init-dom0less: Drop libxenevtchn from LDLIBS It hasn't been used since the introduction of the script. Also drop relevant CFLAGS and header inclusion. Signed-off-by: Michal Orzel Acked-by: Andrew Cooper --- tools/helpers/Makefile | 3 +-- tools/helpers/init-dom0less.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 09590eb5b6..8262d9e75a 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -36,8 +36,7 @@ $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenlight) $(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenctrl) -$(INIT_DOM0LESS_OBJS): CFLAGS += $(CFLAGS_libxenevtchn) -init-dom0less: LDLIBS += $(call xenlibs-ldlibs,ctrl evtchn toollog store light guest foreignmemory) +init-dom0less: LDLIBS += $(call xenlibs-ldlibs,ctrl toollog store light guest foreignmemory) .PHONY: all all: $(TARGETS) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index 91edf17b6c..a182dce563 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 11:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 11:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1012933.1391458 (Exim 4.92) (envelope-from ) id 1uPgWX-0004Ho-Hy; Thu, 12 Jun 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 1012933.1391458; Thu, 12 Jun 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 1uPgWX-0004Hg-FI; Thu, 12 Jun 2025 11:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1012933; Thu, 12 Jun 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 1uPgWW-0004HX-0y for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPgWV-00FQda-3D for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPgWV-003X2b-35 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11: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=wihYdJiXyfZoYJ4vs1z8kDNLYuUzeChq6Z71VjqYHyc=; b=67x0Az/x6OtDEdvjNwDCYoMdFY dRQOAxL4F/dVSpVYAECz2Bqa9fI6aXxCgk9ECU8eIrGLi9kHb+OUmdnvt6+x1oLEu0k5cG5j1Ew4r tiFuLo+LOVwvgScdBWAcrdHsTq/V5JxHaMIxnu+6+Y8dGJdC5AYprXN7LSJPiFhivSbk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: fix build with HAS_PCI Message-Id: Date: Thu, 12 Jun 2025 11:55:11 +0000 commit 4ce671963eb1f6d12879c75f5fd16325b222b212 Author: Stewart Hildebrand AuthorDate: Tue Jun 10 10:22:57 2025 -0400 Commit: Michal Orzel CommitDate: Thu Jun 12 12:43:05 2025 +0200 xen/arm: fix build with HAS_PCI In file included from ./include/xen/pci.h:72, from drivers/pci/pci.c:8: ./arch/arm/include/asm/pci.h:131:50: error: ‘struct rangeset’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] 131 | static inline int pci_sanitize_bar_memory(struct rangeset *r) | ^~~~~~~~ cc1: all warnings being treated as errors Fixes: 4acab25a9300 ("x86/vpci: fix handling of BAR overlaps with non-hole regions") Signed-off-by: Stewart Hildebrand Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 1605ec660d..64f0e6ce7e 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -23,6 +23,8 @@ extern bool pci_passthrough_enabled; +struct rangeset; + /* Arch pci dev struct */ struct arch_pci_dev { struct device dev; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 11:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 11:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1012934.1391461 (Exim 4.92) (envelope-from ) id 1uPgWh-0004KD-JO; Thu, 12 Jun 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 1012934.1391461; Thu, 12 Jun 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 1uPgWh-0004K5-Ge; Thu, 12 Jun 2025 11:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1012934; Thu, 12 Jun 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 1uPgWg-0004Jq-4r for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPgWg-00FQdh-0N for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 11:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPgWg-003X2z-0A for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=E1MP1hvnR2NC0Wfz1FRLRcrTJRcM8uqR5Ern6c6PVso=; b=rx2b7x34L4EcPwLEzum2m/kYQk Z79seQMUq2neBzEFU5IBqzDDlojj/0O8RltOd7nqORcTdRgqfuUakDB99VqdPFoNYmXqa2xxhjdd8 oQLz0oq/OC3WIksA4CxrlCKvIHitTN1Z9mUYL9Ekv6u7gV8RmPmPNrPxQ02jakw6hogE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: move declarations of device_tree_get_{reg,u32}() to xen/device_tree.h Message-Id: Date: Thu, 12 Jun 2025 11:55:22 +0000 commit fc24430d9730a86bf2194960df3f4208adcd547f Author: Oleksii Kurochko AuthorDate: Thu Jun 12 12:24:12 2025 +0200 Commit: Michal Orzel CommitDate: Thu Jun 12 12:44:06 2025 +0200 xen: move declarations of device_tree_get_{reg,u32}() to xen/device_tree.h The definitions of device_tree_get_reg() and device_tree_get_u32() are already in common code, so move their prototypes there as well. Signed-off-by: Oleksii Kurochko Reviewed-by: Michal Orzel --- xen/arch/arm/include/asm/setup.h | 6 ------ xen/include/xen/device_tree.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 6cf272c160..2b58549c1a 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -53,12 +53,6 @@ void setup_mm(void); extern uint32_t hyp_traps_vector[]; void init_traps(void); -void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, - uint32_t size_cells, paddr_t *start, paddr_t *size); - -u32 device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt); - int handle_device(struct domain *d, struct dt_device_node *dev, p2m_type_t p2mt, struct rangeset *iomem_ranges, struct rangeset *irq_ranges); diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 6dc1fb5159..75017e4266 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -949,6 +949,12 @@ int dt_get_pci_domain_nr(struct dt_device_node *node); struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle); +void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, + uint32_t size_cells, paddr_t *start, paddr_t *size); + +u32 device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt); + #ifdef CONFIG_DEVICE_TREE_DEBUG #define dt_dprintk(fmt, args...) \ printk(XENLOG_DEBUG fmt, ## args) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 12:55:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 12:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1013040.1391555 (Exim 4.92) (envelope-from ) id 1uPhSS-0000nk-8l; Thu, 12 Jun 2025 12:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1013040.1391555; Thu, 12 Jun 2025 12: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 1uPhSS-0000nc-6C; Thu, 12 Jun 2025 12:55:04 +0000 Received: by outflank-mailman (input) for mailman id 1013040; Thu, 12 Jun 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 1uPhSQ-0000nW-2P for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPhSP-00FRkI-2g for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 12:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPhSP-003ZiM-2O for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 12: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=4Ww0rGeUEgaC+VNNNmySP1oozZ1nPLyAXDvTyNaFjKo=; b=Pd+HCU9q6EYTSWDAS1dxRqUYcB hRMLJ/eydF6rh7WYj84RscoAx1P1X5XdhtQpJo36UR2b2WU72DgXLf0PHOWiL7q5Mx00xKTREG27j vFNOj4MEazMBWN8MGTxM22Z5jVYbT4K6L3L8VfO/rMc392xYRbjbnrSK5WeDA+DqBP7c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: fix late hwdom feature Message-Id: Date: Thu, 12 Jun 2025 12:55:01 +0000 commit 8dd642a4792a61fac8084c6bf7244602e7220d7a Author: Denis Mukhin AuthorDate: Thu Jun 12 14:45:41 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 12 14:45:41 2025 +0200 xen/domain: fix late hwdom feature Fix get_initial_domain_id() which returns hardware_domid and thus breaks late hwdom feature [1]. [1] https://lore.kernel.org/xen-devel/a4c860d7-1fa0-43f4-8ae1-af59b7c6506f@xen.org/ Fixes: f147ccf2b3c8 ("xen/consoled: clean up console handling for PV shim") Reported-by: Julien Grall Signed-off-by: Denis Mukhin Acked-by: Jan Beulich --- xen/common/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 153cd75340..e566a18747 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -2404,7 +2404,7 @@ domid_t get_initial_domain_id(void) if ( pv_shim ) return pv_shim_get_initial_domain_id(); #endif - return hardware_domid; + return 0; } void freeze_domains(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 12:55:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 12:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1013041.1391560 (Exim 4.92) (envelope-from ) id 1uPhSa-0000pU-AZ; Thu, 12 Jun 2025 12:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1013041.1391560; Thu, 12 Jun 2025 12: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 1uPhSa-0000pM-7g; Thu, 12 Jun 2025 12:55:12 +0000 Received: by outflank-mailman (input) for mailman id 1013041; Thu, 12 Jun 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 1uPhSa-0000pC-1M for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPhSZ-00FRko-35 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 12:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPhSZ-003Zik-2x for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 12: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=Ko0xqwwwzz7XL4R/itpmD5P+LphaJ6iacJjhfp+VlX8=; b=D2rlNSYySd194Y8RlCkWOfIguI jYezFrPiDEy+BneAcqCAGIfXFXQIKw5CTVUrbOMogUXbBuIHUPckpNhJDWE7pLt7fIbZ6HMOH63Wc hcQVGsG/0tNyRLzl57JnRcYS6CAaQq4wNMVidfaHB+OpONOBfeE3QV12zxdvT8T/qEvg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: FLUSH_CACHE -> FLUSH_CACHE_EVICT Message-Id: Date: Thu, 12 Jun 2025 12:55:11 +0000 commit 73c7f19946db86d1018fdfa72f2d824230c11a84 Author: Jan Beulich AuthorDate: Thu Jun 12 14:46:23 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 12 14:46:23 2025 +0200 x86: FLUSH_CACHE -> FLUSH_CACHE_EVICT This is to make the difference to FLUSH_CACHE_WRITEBACK more explicit. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Jason Andryuk --- xen/arch/x86/flushtlb.c | 8 ++++---- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/mtrr.c | 6 +++--- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/flushtlb.h | 2 +- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/pv/emul-priv-op.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c index 796b25dad6..94b2a30e8d 100644 --- a/xen/arch/x86/flushtlb.c +++ b/xen/arch/x86/flushtlb.c @@ -232,7 +232,7 @@ unsigned int flush_area_local(const void *va, unsigned int flags) if ( flags & FLUSH_HVM_ASID_CORE ) hvm_flush_guest_tlbs(); - if ( flags & (FLUSH_CACHE | FLUSH_CACHE_WRITEBACK) ) + if ( flags & (FLUSH_CACHE_EVICT | FLUSH_CACHE_WRITEBACK) ) { const struct cpuinfo_x86 *c = ¤t_cpu_data; unsigned long sz = 0; @@ -245,13 +245,13 @@ unsigned int flush_area_local(const void *va, unsigned int flags) c->x86_clflush_size && c->x86_cache_size && sz && ((sz >> 10) < c->x86_cache_size) ) { - if ( flags & FLUSH_CACHE ) + if ( flags & FLUSH_CACHE_EVICT ) cache_flush(va, sz); else cache_writeback(va, sz); - flags &= ~(FLUSH_CACHE | FLUSH_CACHE_WRITEBACK); + flags &= ~(FLUSH_CACHE_EVICT | FLUSH_CACHE_WRITEBACK); } - else if ( flags & FLUSH_CACHE ) + else if ( flags & FLUSH_CACHE_EVICT ) wbinvd(); else wbnoinvd(); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4cb2e13046..056360d5fe 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2277,7 +2277,7 @@ void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value) domain_pause_nosync(v->domain); /* Flush physical caches. */ - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); hvm_set_uc_mode(v, 1); domain_unpause(v->domain); diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4b8afad2c5..99e3b4062b 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -618,7 +618,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, break; /* fall through */ default: - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); break; } return 0; @@ -684,7 +684,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, p2m_memory_type_changed(d); if ( type != X86_MT_WB ) - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); return rc; } @@ -799,7 +799,7 @@ void memory_type_changed(struct domain *d) (!boot_cpu_has(X86_FEATURE_XEN_SELFSNOOP) || (is_iommu_enabled(d) && !iommu_snoop)) ) { - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); } } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e33a38c1e4..db1799bb43 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2316,7 +2316,7 @@ static void svm_vmexit_mce_intercept( static void cf_check svm_wbinvd_intercept(void) { if ( cache_flush_permitted(current->domain) ) - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); } static void svm_vmexit_do_invalidate_cache(struct cpu_user_regs *regs, diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 57d49364db..c86f73f6d1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1929,7 +1929,7 @@ void cf_check vmx_do_resume(void) { int cpu = v->arch.hvm.vmx.active_cpu; if ( cpu != -1 ) - flush_mask(cpumask_of(cpu), FLUSH_CACHE); + flush_mask(cpumask_of(cpu), FLUSH_CACHE_EVICT); } vmx_clear_vmcs(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d8879c304e..218cb2c1af 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3844,7 +3844,7 @@ static void cf_check vmx_wbinvd_intercept(void) return; if ( cpu_has_wbinvd_exiting ) - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); else wbinvd(); } diff --git a/xen/arch/x86/include/asm/flushtlb.h b/xen/arch/x86/include/asm/flushtlb.h index cd625f9114..019d886f2b 100644 --- a/xen/arch/x86/include/asm/flushtlb.h +++ b/xen/arch/x86/include/asm/flushtlb.h @@ -113,7 +113,7 @@ void switch_cr3_cr4(unsigned long cr3, unsigned long cr4); /* Flush TLBs (or parts thereof) including global mappings */ #define FLUSH_TLB_GLOBAL 0x200 /* Flush data caches */ -#define FLUSH_CACHE 0x400 +#define FLUSH_CACHE_EVICT 0x400 /* VA for the flush has a valid mapping */ #define FLUSH_VA_VALID 0x800 /* Flush CPU state */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 657623336c..e7fd56c7ce 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3821,7 +3821,7 @@ long do_mmuext_op( if ( !cpumask_intersects(mask, per_cpu(cpu_sibling_mask, cpu)) ) __cpumask_set_cpu(cpu, mask); - flush_mask(mask, FLUSH_CACHE); + flush_mask(mask, FLUSH_CACHE_EVICT); } else rc = -EACCES; @@ -5395,7 +5395,7 @@ int map_pages_to_xen( if ( (flags & _PAGE_PRESENT) && \ (((o_) ^ flags) & PAGE_CACHE_ATTRS) ) \ { \ - flush_flags |= FLUSH_CACHE; \ + flush_flags |= FLUSH_CACHE_EVICT; \ if ( virt >= DIRECTMAP_VIRT_START && \ virt < HYPERVISOR_VIRT_END ) \ flush_flags |= FLUSH_VA_VALID; \ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 463befe043..f3f012f8fb 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1205,7 +1205,7 @@ static int cf_check cache_op( else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) flush_all(FLUSH_CACHE_WRITEBACK); else - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 12:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 12:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1013042.1391564 (Exim 4.92) (envelope-from ) id 1uPhSl-0000rz-Bq; Thu, 12 Jun 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 1013042.1391564; Thu, 12 Jun 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 1uPhSl-0000rr-9B; Thu, 12 Jun 2025 12:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1013042; Thu, 12 Jun 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 1uPhSk-0000rg-4W for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPhSk-00FRkt-0B for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 12:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPhSk-003ZjL-02 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=KDUe73u0lJP7NyxmI7esYPsllE4v1jgC5DHLeTBnbCE=; b=KKBCzEuWZ70U2rc69Hj1Kfakal DMUj4c1z1OFtQUu2dTprnkMOIEcbS5JjMcPUIanwbA6yhxOu+RLyfAuuYa8dPR+Ei4PZquYCWxgA9 q0ergz/t403Fidqvt6wFRO/LTtXq9pbyGYBfZCazkc2yr5iLW48/kpS9cEe2qadmVHLw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vVMX: use reg_read() Message-Id: Date: Thu, 12 Jun 2025 12:55:22 +0000 commit 229a11aac7bf52f4532ab732ed10f173bd332cd0 Author: Jan Beulich AuthorDate: Thu Jun 12 14:46:51 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 12 14:46:51 2025 +0200 vVMX: use reg_read() Let's avoid such open-coding. There's also no need to use guest_cpu_user_regs(), when the function has a suitable parameter. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 3c848ef546..2432af58e0 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -2675,7 +2675,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { case VMX_CR_ACCESS_TYPE_MOV_TO_CR: { - val = *decode_gpr(guest_cpu_user_regs(), qual.gpr); + val = reg_read(regs, qual.gpr); if ( qual.cr == 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 14:55:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 14:55:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1013185.1391694 (Exim 4.92) (envelope-from ) id 1uPjKZ-0005xi-9z; Thu, 12 Jun 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 1013185.1391694; Thu, 12 Jun 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 1uPjKZ-0005xa-7R; Thu, 12 Jun 2025 14:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1013185; Thu, 12 Jun 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 1uPjKY-0005xK-2X for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPjKX-00FUG7-2p for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 14:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPjKX-003dzj-2U for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=oGgQO//3q4hc9iKRSXEuDFn4d3hRY+AKcyhJofAGb/U=; b=z50/78t4lAfT+EIhTgUGLQSSyI frZyJQGxVDHZHKg9ez/el6gdsdfO2eButoc44uVYaQiYCkrVHIdj/VQ08ZOX3JD0TidPc5ZzmUjU+ F7dqyj8Kq/XnSOhKVdIn5F2ExBoKzcvnubbPrBCNmj3qi0kbZlqf4gneEoFfiL3MV9zg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: fix late hwdom feature Message-Id: Date: Thu, 12 Jun 2025 14:55:01 +0000 commit 8dd642a4792a61fac8084c6bf7244602e7220d7a Author: Denis Mukhin AuthorDate: Thu Jun 12 14:45:41 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 12 14:45:41 2025 +0200 xen/domain: fix late hwdom feature Fix get_initial_domain_id() which returns hardware_domid and thus breaks late hwdom feature [1]. [1] https://lore.kernel.org/xen-devel/a4c860d7-1fa0-43f4-8ae1-af59b7c6506f@xen.org/ Fixes: f147ccf2b3c8 ("xen/consoled: clean up console handling for PV shim") Reported-by: Julien Grall Signed-off-by: Denis Mukhin Acked-by: Jan Beulich --- xen/common/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 153cd75340..e566a18747 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -2404,7 +2404,7 @@ domid_t get_initial_domain_id(void) if ( pv_shim ) return pv_shim_get_initial_domain_id(); #endif - return hardware_domid; + return 0; } void freeze_domains(void) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 14:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 14:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1013186.1391697 (Exim 4.92) (envelope-from ) id 1uPjKj-00060L-BO; Thu, 12 Jun 2025 14:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1013186.1391697; Thu, 12 Jun 2025 14: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 1uPjKj-00060B-8o; Thu, 12 Jun 2025 14:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1013186; Thu, 12 Jun 2025 14:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uPjKi-000601-64 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 14:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uPjKi-00FUGS-0I for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 14:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPjKh-003e05-36 for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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=iYdPCiGFVSa98PEPMEDFBucYxvPhvHPj/hcpaF70WAc=; b=P+0Vg26p894TG50IZPbPKoVLIH 75zFws7QSI/7GrpawX+HSrJNHGmpCIXteo4FKnRAm/67gjuxJn+yfY65/w40nVNCErpXHGTbRIWHk 6TatFWFZpK2ykkAdssunvJA8+mtbgEN5xDebQoIPNZmYqe79bpzSRc+QkHjZFC2IFiP4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: FLUSH_CACHE -> FLUSH_CACHE_EVICT Message-Id: Date: Thu, 12 Jun 2025 14:55:11 +0000 commit 73c7f19946db86d1018fdfa72f2d824230c11a84 Author: Jan Beulich AuthorDate: Thu Jun 12 14:46:23 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 12 14:46:23 2025 +0200 x86: FLUSH_CACHE -> FLUSH_CACHE_EVICT This is to make the difference to FLUSH_CACHE_WRITEBACK more explicit. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Jason Andryuk --- xen/arch/x86/flushtlb.c | 8 ++++---- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/mtrr.c | 6 +++--- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/flushtlb.h | 2 +- xen/arch/x86/mm.c | 4 ++-- xen/arch/x86/pv/emul-priv-op.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c index 796b25dad6..94b2a30e8d 100644 --- a/xen/arch/x86/flushtlb.c +++ b/xen/arch/x86/flushtlb.c @@ -232,7 +232,7 @@ unsigned int flush_area_local(const void *va, unsigned int flags) if ( flags & FLUSH_HVM_ASID_CORE ) hvm_flush_guest_tlbs(); - if ( flags & (FLUSH_CACHE | FLUSH_CACHE_WRITEBACK) ) + if ( flags & (FLUSH_CACHE_EVICT | FLUSH_CACHE_WRITEBACK) ) { const struct cpuinfo_x86 *c = ¤t_cpu_data; unsigned long sz = 0; @@ -245,13 +245,13 @@ unsigned int flush_area_local(const void *va, unsigned int flags) c->x86_clflush_size && c->x86_cache_size && sz && ((sz >> 10) < c->x86_cache_size) ) { - if ( flags & FLUSH_CACHE ) + if ( flags & FLUSH_CACHE_EVICT ) cache_flush(va, sz); else cache_writeback(va, sz); - flags &= ~(FLUSH_CACHE | FLUSH_CACHE_WRITEBACK); + flags &= ~(FLUSH_CACHE_EVICT | FLUSH_CACHE_WRITEBACK); } - else if ( flags & FLUSH_CACHE ) + else if ( flags & FLUSH_CACHE_EVICT ) wbinvd(); else wbnoinvd(); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4cb2e13046..056360d5fe 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2277,7 +2277,7 @@ void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value) domain_pause_nosync(v->domain); /* Flush physical caches. */ - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); hvm_set_uc_mode(v, 1); domain_unpause(v->domain); diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4b8afad2c5..99e3b4062b 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -618,7 +618,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, break; /* fall through */ default: - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); break; } return 0; @@ -684,7 +684,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, p2m_memory_type_changed(d); if ( type != X86_MT_WB ) - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); return rc; } @@ -799,7 +799,7 @@ void memory_type_changed(struct domain *d) (!boot_cpu_has(X86_FEATURE_XEN_SELFSNOOP) || (is_iommu_enabled(d) && !iommu_snoop)) ) { - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); } } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e33a38c1e4..db1799bb43 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2316,7 +2316,7 @@ static void svm_vmexit_mce_intercept( static void cf_check svm_wbinvd_intercept(void) { if ( cache_flush_permitted(current->domain) ) - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); } static void svm_vmexit_do_invalidate_cache(struct cpu_user_regs *regs, diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 57d49364db..c86f73f6d1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1929,7 +1929,7 @@ void cf_check vmx_do_resume(void) { int cpu = v->arch.hvm.vmx.active_cpu; if ( cpu != -1 ) - flush_mask(cpumask_of(cpu), FLUSH_CACHE); + flush_mask(cpumask_of(cpu), FLUSH_CACHE_EVICT); } vmx_clear_vmcs(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d8879c304e..218cb2c1af 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3844,7 +3844,7 @@ static void cf_check vmx_wbinvd_intercept(void) return; if ( cpu_has_wbinvd_exiting ) - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); else wbinvd(); } diff --git a/xen/arch/x86/include/asm/flushtlb.h b/xen/arch/x86/include/asm/flushtlb.h index cd625f9114..019d886f2b 100644 --- a/xen/arch/x86/include/asm/flushtlb.h +++ b/xen/arch/x86/include/asm/flushtlb.h @@ -113,7 +113,7 @@ void switch_cr3_cr4(unsigned long cr3, unsigned long cr4); /* Flush TLBs (or parts thereof) including global mappings */ #define FLUSH_TLB_GLOBAL 0x200 /* Flush data caches */ -#define FLUSH_CACHE 0x400 +#define FLUSH_CACHE_EVICT 0x400 /* VA for the flush has a valid mapping */ #define FLUSH_VA_VALID 0x800 /* Flush CPU state */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 657623336c..e7fd56c7ce 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3821,7 +3821,7 @@ long do_mmuext_op( if ( !cpumask_intersects(mask, per_cpu(cpu_sibling_mask, cpu)) ) __cpumask_set_cpu(cpu, mask); - flush_mask(mask, FLUSH_CACHE); + flush_mask(mask, FLUSH_CACHE_EVICT); } else rc = -EACCES; @@ -5395,7 +5395,7 @@ int map_pages_to_xen( if ( (flags & _PAGE_PRESENT) && \ (((o_) ^ flags) & PAGE_CACHE_ATTRS) ) \ { \ - flush_flags |= FLUSH_CACHE; \ + flush_flags |= FLUSH_CACHE_EVICT; \ if ( virt >= DIRECTMAP_VIRT_START && \ virt < HYPERVISOR_VIRT_END ) \ flush_flags |= FLUSH_VA_VALID; \ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 463befe043..f3f012f8fb 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1205,7 +1205,7 @@ static int cf_check cache_op( else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) flush_all(FLUSH_CACHE_WRITEBACK); else - flush_all(FLUSH_CACHE); + flush_all(FLUSH_CACHE_EVICT); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 12 14:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Jun 2025 14:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1013188.1391701 (Exim 4.92) (envelope-from ) id 1uPjKt-00063J-Cp; Thu, 12 Jun 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 1013188.1391701; Thu, 12 Jun 2025 14: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 1uPjKt-00063C-AE; Thu, 12 Jun 2025 14:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1013188; Thu, 12 Jun 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 1uPjKs-00062z-8d for xen-changelog@lists.xenproject.org; Thu, 12 Jun 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 1uPjKs-00FUGW-0l for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 14:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uPjKs-003e0T-0T for xen-changelog@lists.xenproject.org; Thu, 12 Jun 2025 14: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=TgNHTKBYdRV4tqiVETLtE0vYHMnElA6eXPc4v/IcbWs=; b=Ub0kbhq8AJ79vyqgICUqZ4bw24 W5R/fCjXuaLcX8pK5qjrn3B3MvqwBY1ymr9cvFfUThIDH2kiG4Pib3vBj66s8irV+KRS9o1i0FYj9 rmMIecgQiCqb1yRR6iue+V90TgdZBkIb6lP5GwQZXCOR253rS+TKWvFnwCSUhl+ngJBw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vVMX: use reg_read() Message-Id: Date: Thu, 12 Jun 2025 14:55:22 +0000 commit 229a11aac7bf52f4532ab732ed10f173bd332cd0 Author: Jan Beulich AuthorDate: Thu Jun 12 14:46:51 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 12 14:46:51 2025 +0200 vVMX: use reg_read() Let's avoid such open-coding. There's also no need to use guest_cpu_user_regs(), when the function has a suitable parameter. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 3c848ef546..2432af58e0 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -2675,7 +2675,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, { case VMX_CR_ACCESS_TYPE_MOV_TO_CR: { - val = *decode_gpr(guest_cpu_user_regs(), qual.gpr); + val = reg_read(regs, qual.gpr); if ( qual.cr == 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 13 16:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Jun 2025 16:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1014739.1392867 (Exim 4.92) (envelope-from ) id 1uQ7Ky-0006fL-1Y; Fri, 13 Jun 2025 16:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1014739.1392867; Fri, 13 Jun 2025 16: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 1uQ7Kx-0006f8-Ul; Fri, 13 Jun 2025 16:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1014739; Fri, 13 Jun 2025 16:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uQ7Kx-0006f2-BB for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uQ7Kw-00HCLk-1F for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uQ7Kw-004ZU6-0l for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16: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=xygQpvYmP5bD4VuHVZO4a+OfhjRqet+45P/tBQogu2o=; b=ti4ZJVw6ely/mmeoONEtPoTDjw WQdIIk4W96fdgcPRgMHj2Be7mw5+IUD/mK/XnyuEMZJM3VsQpffHejpHPJ1g9tP1TVlDJxYeeJhwp BkvpwFCmxbJimS3pUcikC7A1a6fv4aSIq99/8rSKarXd3d1pBIx0P7dO41suLGZSAwtw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/kernel: Move parse_params() back into __init Message-Id: Date: Fri, 13 Jun 2025 16:33:02 +0000 commit d5a2873112d347f80968a7c0048ae7d8bd600a57 Author: Andrew Cooper AuthorDate: Tue Jun 3 13:39:10 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 13 15:47:18 2025 +0100 xen/kernel: Move parse_params() back into __init It's non-init caller was dropped in Xen 4.14. No functional change. Fixes: 02e9a9cf2095 ("xen: remove XEN_SYSCTL_set_parameter support") Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- xen/common/kernel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 8b63ca55f1..5be668ba85 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -67,8 +67,9 @@ static int assign_integer_param(const struct kernel_param *param, uint64_t val) return 0; } -static int parse_params(const char *cmdline, const struct kernel_param *start, - const struct kernel_param *end) +static int __init parse_params( + const char *cmdline, const struct kernel_param *start, + const struct kernel_param *end) { char opt[MAX_PARAM_SIZE], *optval, *optkey, *q; const char *p = cmdline, *key; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 13 16:33:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Jun 2025 16:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1014740.1392871 (Exim 4.92) (envelope-from ) id 1uQ7L8-0006gt-2t; Fri, 13 Jun 2025 16:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1014740.1392871; Fri, 13 Jun 2025 16: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 1uQ7L7-0006gm-W9; Fri, 13 Jun 2025 16:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1014740; Fri, 13 Jun 2025 16:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uQ7L6-0006gW-IM for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uQ7L6-00HCLo-1j for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uQ7L6-004ZV0-1Q for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16: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=hQAS+eStPvoO0Yv2+5IAwIgL8kGanuq9iWaAOXlo9pw=; b=wAmTUBpYYpMh5MQay2xEbuIAhF Mnstk3gFc7tZ/J6BF0GeZj0Bj4iExTgeD5Ej0fTZQrTOca1tbWMZn1gYp5cPCyPRyUt1G+q+CElCw GvBDTTXJP8gZ8D5Bv6suoMc3aWSiD1uK+LFYAr1gZsdgYvFFrF8r9YBq0QPAPXlB6ypg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Fix domain_cmdline_size() Message-Id: Date: Fri, 13 Jun 2025 16:33:12 +0000 commit 3998da124ac046d0d95d919f3bb8a394b287dc55 Author: Andrew Cooper AuthorDate: Wed Jun 4 00:33:46 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 13 15:47:18 2025 +0100 x86/boot: Fix domain_cmdline_size() The early exit from domain_cmdline_size() is buggy. Even if there's no bootloader cmdline and no kextra, there still might be Xen parameters to forward, and therefore a nonzero cmdline length. Explain what the function is doing, and rewrite it to be both more legible and more extendible. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 1f5cb67bd0..d47b99f1b2 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -980,15 +980,22 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li return n; } +/* + * Calculate the maximum possible size of the dom0 cmdline. Pieces of the + * dom0 cmdline optionally come from the bootloader directly, from Xen's + * cmdline (following " -- "), and individual Xen parameters are forwarded + * too. + */ static size_t __init domain_cmdline_size(const struct boot_info *bi, const struct boot_domain *bd) { - size_t s = bi->kextra ? strlen(bi->kextra) : 0; + size_t s = 0; - s += bd->kernel->cmdline_pa ? strlen(__va(bd->kernel->cmdline_pa)) : 0; + if ( bd->kernel->cmdline_pa ) + s += strlen(__va(bd->kernel->cmdline_pa)); - if ( s == 0 ) - return s; + if ( bi->kextra ) + s += strlen(bi->kextra); /* * Certain parameters from the Xen command line may be added to the dom0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 13 16:33:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Jun 2025 16:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1014742.1392875 (Exim 4.92) (envelope-from ) id 1uQ7LI-0006jW-44; Fri, 13 Jun 2025 16:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1014742.1392875; Fri, 13 Jun 2025 16: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 1uQ7LI-0006jO-1N; Fri, 13 Jun 2025 16:33:24 +0000 Received: by outflank-mailman (input) for mailman id 1014742; Fri, 13 Jun 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 1uQ7LG-0006jA-Lh for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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 1uQ7LG-00HCLs-22 for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uQ7LG-004ZVb-1u for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 16: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=UI29zQlgo53WxIdusc+jteSBd6mPuko2ceFp295unjM=; b=4tGIk0ILq1JkWRh37qWN2qOJAj Y6/h5+uGUsr5Wny5Yw/IgtbJA+YsVATAKNyzb/bpeEG2YJQcBBUJpQ8H+Z+l9MIdsuif2mhq4CdGK mmi0cRBJiw6JHMdX6eCLn21/GqHySah6093xbL6taA9AiIsgjKOY7J49dVndFu5yqZqY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: Process pending softirqs while dumping VMC[SB]s Message-Id: Date: Fri, 13 Jun 2025 16:33:22 +0000 commit 5f31c46139be87d7c2e9d021f684e5ed646c8e87 Author: Andrew Cooper AuthorDate: Wed Jun 4 13:56:13 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 13 15:47:18 2025 +0100 x86/hvm: Process pending softirqs while dumping VMC[SB]s 24 guests with 8 vcpus each is sufficient to hit a 5 second watchdog. Drop a piece of trailing whitespace while here. Reported-by: Aidan Allen Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Tested-by: Aidan Allen --- xen/arch/x86/hvm/svm/vmcb.c | 4 ++++ xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 4e1f61dbe0..839d3ff91b 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -12,6 +12,8 @@ #include #include #include +#include + #include #include #include @@ -246,6 +248,8 @@ static void cf_check vmcb_dump(unsigned char ch) } printk("\tVCPU %d\n", v->vcpu_id); svm_vmcb_dump("key_handler", v->arch.hvm.svm.vmcb); + + process_pending_softirqs(); } } diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index c86f73f6d1..e7fca4bf33 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -2165,7 +2165,7 @@ static void cf_check vmcs_dump(unsigned char ch) { struct domain *d; struct vcpu *v; - + printk("*********** VMCS Areas **************\n"); rcu_read_lock(&domlist_read_lock); @@ -2184,6 +2184,8 @@ static void cf_check vmcs_dump(unsigned char ch) } printk("\tVCPU %d\n", v->vcpu_id); vmcs_dump_vcpu(v); + + process_pending_softirqs(); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 13 17:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Jun 2025 17:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1014765.1392878 (Exim 4.92) (envelope-from ) id 1uQ86N-0004Qz-Cp; Fri, 13 Jun 2025 17:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1014765.1392878; Fri, 13 Jun 2025 17: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 1uQ86N-0004Qr-AM; Fri, 13 Jun 2025 17:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1014765; Fri, 13 Jun 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 1uQ86M-0004Ql-8t for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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 1uQ86M-00HDF4-0J for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 17:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uQ86M-004hCv-09 for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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=dnTcVx5a0mCt4fx/cAKHAls0fIoEH0zl+jAQS8i/OeQ=; b=aneP26pI2KC3lNbupjoYcGPwY9 8j3hef1Mg0pKajyX6c1Tf/2ChNICtt1wNDVDM3wWlduJ8fingzxZaF+o789pFI74KYgftnTeyqFrS mGbvNsn3edIvtgVko7oe0XsIzjh8nONBUeH+n8D4g2AfIsvzG0J2Pi7Opb5EWFUQvNJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/kernel: Move parse_params() back into __init Message-Id: Date: Fri, 13 Jun 2025 17:22:02 +0000 commit d5a2873112d347f80968a7c0048ae7d8bd600a57 Author: Andrew Cooper AuthorDate: Tue Jun 3 13:39:10 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 13 15:47:18 2025 +0100 xen/kernel: Move parse_params() back into __init It's non-init caller was dropped in Xen 4.14. No functional change. Fixes: 02e9a9cf2095 ("xen: remove XEN_SYSCTL_set_parameter support") Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- xen/common/kernel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 8b63ca55f1..5be668ba85 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -67,8 +67,9 @@ static int assign_integer_param(const struct kernel_param *param, uint64_t val) return 0; } -static int parse_params(const char *cmdline, const struct kernel_param *start, - const struct kernel_param *end) +static int __init parse_params( + const char *cmdline, const struct kernel_param *start, + const struct kernel_param *end) { char opt[MAX_PARAM_SIZE], *optval, *optkey, *q; const char *p = cmdline, *key; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 13 17:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Jun 2025 17:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1014766.1392883 (Exim 4.92) (envelope-from ) id 1uQ86X-0004Sb-Ea; Fri, 13 Jun 2025 17:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1014766.1392883; Fri, 13 Jun 2025 17: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 1uQ86X-0004ST-Bg; Fri, 13 Jun 2025 17:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1014766; Fri, 13 Jun 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 1uQ86W-0004SL-9E for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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 1uQ86W-00HDFA-0p for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 17:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uQ86W-004hDd-0U for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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=f/JuBb+4CSu57pHsrfYAeTCwNvfAUtsGx/XvuwSr0PQ=; b=FeldiHVfLkZNS96htZAq89Lx56 cIL5JjXP4bsGcZc4sM9Ku8eRPZE26G0eA+FTSJ/gsGK9CS2UR1Pvg9+aOLCstScS5XVRs3gDyLhpQ 1XdoFalJakyqU2Nz7egrrIcTfQdJEhuiQZbvy4BBvfN6aalrU2vbwXEx6zh+C58ux6xI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Fix domain_cmdline_size() Message-Id: Date: Fri, 13 Jun 2025 17:22:12 +0000 commit 3998da124ac046d0d95d919f3bb8a394b287dc55 Author: Andrew Cooper AuthorDate: Wed Jun 4 00:33:46 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 13 15:47:18 2025 +0100 x86/boot: Fix domain_cmdline_size() The early exit from domain_cmdline_size() is buggy. Even if there's no bootloader cmdline and no kextra, there still might be Xen parameters to forward, and therefore a nonzero cmdline length. Explain what the function is doing, and rewrite it to be both more legible and more extendible. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 1f5cb67bd0..d47b99f1b2 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -980,15 +980,22 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li return n; } +/* + * Calculate the maximum possible size of the dom0 cmdline. Pieces of the + * dom0 cmdline optionally come from the bootloader directly, from Xen's + * cmdline (following " -- "), and individual Xen parameters are forwarded + * too. + */ static size_t __init domain_cmdline_size(const struct boot_info *bi, const struct boot_domain *bd) { - size_t s = bi->kextra ? strlen(bi->kextra) : 0; + size_t s = 0; - s += bd->kernel->cmdline_pa ? strlen(__va(bd->kernel->cmdline_pa)) : 0; + if ( bd->kernel->cmdline_pa ) + s += strlen(__va(bd->kernel->cmdline_pa)); - if ( s == 0 ) - return s; + if ( bi->kextra ) + s += strlen(bi->kextra); /* * Certain parameters from the Xen command line may be added to the dom0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 13 17:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Jun 2025 17:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1014767.1392887 (Exim 4.92) (envelope-from ) id 1uQ86h-0004Ut-Fa; Fri, 13 Jun 2025 17:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1014767.1392887; Fri, 13 Jun 2025 17: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 1uQ86h-0004Ul-D1; Fri, 13 Jun 2025 17:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1014767; Fri, 13 Jun 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 1uQ86g-0004UZ-EF for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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 1uQ86g-00HDFI-17 for xen-changelog@lists.xenproject.org; Fri, 13 Jun 2025 17:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uQ86g-004hDz-10 for xen-changelog@lists.xenproject.org; Fri, 13 Jun 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=lEk5SMm/arrHI+Jpthoi0NsynoeU+U6x+ycPdij6Zfg=; b=e8b5li/A59HzTfEQyIk9YQGBcG s0+BHr99sU4agihG8oaY0h/v9wBSbow3eu2W92/FwOqmUN26L6oip3voWb8rCEwW/XtjhuWu6YqQo UEQa2vqT/eWBn+okyyhI+1Bu4lZ1NPSKBQbCMSHnhjP6r1f0055S5L/KYBsipi0+/Ea8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Process pending softirqs while dumping VMC[SB]s Message-Id: Date: Fri, 13 Jun 2025 17:22:22 +0000 commit 5f31c46139be87d7c2e9d021f684e5ed646c8e87 Author: Andrew Cooper AuthorDate: Wed Jun 4 13:56:13 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 13 15:47:18 2025 +0100 x86/hvm: Process pending softirqs while dumping VMC[SB]s 24 guests with 8 vcpus each is sufficient to hit a 5 second watchdog. Drop a piece of trailing whitespace while here. Reported-by: Aidan Allen Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Tested-by: Aidan Allen --- xen/arch/x86/hvm/svm/vmcb.c | 4 ++++ xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 4e1f61dbe0..839d3ff91b 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -12,6 +12,8 @@ #include #include #include +#include + #include #include #include @@ -246,6 +248,8 @@ static void cf_check vmcb_dump(unsigned char ch) } printk("\tVCPU %d\n", v->vcpu_id); svm_vmcb_dump("key_handler", v->arch.hvm.svm.vmcb); + + process_pending_softirqs(); } } diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index c86f73f6d1..e7fca4bf33 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -2165,7 +2165,7 @@ static void cf_check vmcs_dump(unsigned char ch) { struct domain *d; struct vcpu *v; - + printk("*********** VMCS Areas **************\n"); rcu_read_lock(&domlist_read_lock); @@ -2184,6 +2184,8 @@ static void cf_check vmcs_dump(unsigned char ch) } printk("\tVCPU %d\n", v->vcpu_id); vmcs_dump_vcpu(v); + + process_pending_softirqs(); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 08:22:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 08:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1016865.1393809 (Exim 4.92) (envelope-from ) id 1uR56Q-0004HI-Hu; Mon, 16 Jun 2025 08:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1016865.1393809; Mon, 16 Jun 2025 08: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 1uR56Q-0004HA-FG; Mon, 16 Jun 2025 08:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1016865; Mon, 16 Jun 2025 08:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR56Q-0004H4-20 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR56P-004Sgr-2p for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR56P-0077Tx-2i for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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=T1Gm/ZYgJWYYemiIiwoPwZTdIS+AYfVws6mDRr5NPc0=; b=3MjtMhO63ZaERHD1MSWg/lrl9F rK3DFUdInMxtIhq1mf4fzJzcb5HcJrAdK40FklT3rgsGYx6clrErJWoprSH8LOfDk1QAmXbtVS0GZ HtKlcL6HIZuguJtwquh/lzszF6uuRKHlYCJzt5o3DcwM53Xx/GhP3w9rnrsNwKh2xW6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/pci: Add minor comment for maximum capability constant Message-Id: Date: Mon, 16 Jun 2025 08:22:01 +0000 commit fd1a4550bffa9e4b923d20f2ce7d52fd2d3c3a11 Author: Frediano Ziglio AuthorDate: Mon Jun 16 10:13:48 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:13:48 2025 +0200 drivers/pci: Add minor comment for maximum capability constant The comment is similar to extended capabilities in the function below. Signed-off-by: Frediano Ziglio Acked-by: Jan Beulich --- xen/drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index acf4cebe42..e1ddde90eb 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -11,7 +11,7 @@ unsigned int pci_find_cap_offset(pci_sbdf_t sbdf, unsigned int cap) { u8 id; - int max_cap = 48; + int max_cap = 48; /* 192 bytes, minimum 4 bytes per capability */ u8 pos = PCI_CAPABILITY_LIST; u16 status; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 08:22:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 08:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1016866.1393813 (Exim 4.92) (envelope-from ) id 1uR56a-0004JC-JP; Mon, 16 Jun 2025 08:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1016866.1393813; Mon, 16 Jun 2025 08: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 1uR56a-0004J4-Gf; Mon, 16 Jun 2025 08:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1016866; Mon, 16 Jun 2025 08:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR56a-0004Iw-0O for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR56Z-004Sgw-39 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR56Z-0077Ub-31 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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=ANLvFCtDF9vJsfJ9j8B6AAsOYGg8L1Pzsc7drhaKmyE=; b=nzyFdYssydSyJGT9PjP6dCg72v CFVODQ4sYE5tmC8z1jtw7D8qj+VR8vuO47+MPbLnnb2Xz1Q8A1XrnTn1GML8H04DIMpfVLWDJZfI4 IsdH3zZfYSWO8k+A6zjcTv2zmy3WwoAcegdFU4l1pRRKxNXtnSsFSQn9x5kTFeHTfCMQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/gnttab: Remove xen/grant_table.h cyclic include Message-Id: Date: Mon, 16 Jun 2025 08:22:11 +0000 commit 218b41f5718159704c035005e2e0cb737acb9375 Author: Alejandro Vallejo AuthorDate: Mon Jun 16 10:14:10 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:14:10 2025 +0200 arm/gnttab: Remove xen/grant_table.h cyclic include The way they currently include each other, with one of the includes being conditional on CONFIG_GRANT_TABLE, makes it hard to know which contents are included when. Break the cycle by removing the asm/grant_table.h include. Not a functional change because. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/grant_table.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/arm/include/asm/grant_table.h b/xen/arch/arm/include/asm/grant_table.h index c5d87b60c4..c47058a3a0 100644 --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -1,7 +1,6 @@ #ifndef __ASM_GRANT_TABLE_H__ #define __ASM_GRANT_TABLE_H__ -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 08:22:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 08:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1016867.1393817 (Exim 4.92) (envelope-from ) id 1uR56k-0004Lj-Kv; Mon, 16 Jun 2025 08:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1016867.1393817; Mon, 16 Jun 2025 08:22: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 1uR56k-0004Lb-I7; Mon, 16 Jun 2025 08:22:22 +0000 Received: by outflank-mailman (input) for mailman id 1016867; Mon, 16 Jun 2025 08:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR56k-0004LR-4I for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR56k-004Sh4-0F for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR56k-0077Uz-06 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08: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=jUgqEPWh2nPmMSxoiMMkU10Pv/miqxtuDUNBPDDFpZE=; b=zD2ZceedXiHfKcVJX+sivKSHVB /KINA8wJpZoslsKsRiDesDo/COnhguz9ABcqN7y8MHf7GynmmPuQo+O/Kvfbt53PdAKB2/wJTAVXR XqJRZDbQ7c4tQ/tV9V6mBkPS2Q9ASPHtLQX9PbJMjN59M2h67zUW22M0ByjjzCi1K+KY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Preinitialise all modules to be of kind BOOTMOD_UNKNOWN Message-Id: Date: Mon, 16 Jun 2025 08:22:22 +0000 commit 4f48bd785122ceedc619876df745ae60b2445623 Author: Alejandro Vallejo AuthorDate: Mon Jun 16 10:14:37 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:14:37 2025 +0200 x86: Preinitialise all modules to be of kind BOOTMOD_UNKNOWN A later patch removes boot_module and replaces its uses with bootmodule. The equivalent field for "type" doesn't have BOOTMOD_UNKNOWN as a zero value, so it must be explicitly set in the static xen_boot_info. Not a functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d47b99f1b2..f32efa7c60 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -298,6 +298,12 @@ struct boot_info __initdata xen_boot_info = { .loader = "unknown", .cmdline = "", .domains = { [0 ... MAX_NR_BOOTDOMS - 1] = { .domid = DOMID_INVALID } }, + /* + * There's a MAX_NR_BOOTMODS-th entry in the array. It's not off by one. + * + * The extra entry exists to be able to add the Xen image as a module. + */ + .mods = { [0 ... MAX_NR_BOOTMODS] = { .type = BOOTMOD_UNKNOWN } }, }; static struct boot_info *__init multiboot_fill_boot_info( -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 08:22:32 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 08:22:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1016868.1393821 (Exim 4.92) (envelope-from ) id 1uR56u-0004OA-MU; Mon, 16 Jun 2025 08:22:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1016868.1393821; Mon, 16 Jun 2025 08:22: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 1uR56u-0004O0-JX; Mon, 16 Jun 2025 08:22:32 +0000 Received: by outflank-mailman (input) for mailman id 1016868; Mon, 16 Jun 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 1uR56u-0004Nt-6O for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR56u-004ShU-0X for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR56u-0077VR-0R for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08: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=NSn6xbpJekPssYxOQbQqCDReFzY4fk4+9cqe6c9do2w=; b=cfgi4xtDITukHxVqwC1Z1eDYJp e4m9UJBh8Xkn4iBDgi5l02SpO3sA7pRDKuhLg9JtEWugj/ASabfIZiqsdNF4GbCR/iM2k7jXqNHrS erlGhRXQCoGDB7KxstN/dtqVA9QiEJcYKNyymSapcGAXl1obhX/e8GSHnSK6NYJ5COy0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: rework asm/mm.h and asm/page.h includes to match other architectures Message-Id: Date: Mon, 16 Jun 2025 08:22:32 +0000 commit 17104a7462bb0bffd9105f517b2b93bfc213e749 Author: Oleksii Kurochko AuthorDate: Mon Jun 16 10:14:59 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:14:59 2025 +0200 xen/riscv: rework asm/mm.h and asm/page.h includes to match other architectures To align with other architectures where is included from (and not the other way around), the following changes are made: - Since is no longer included in : - Move the definitions of paddr_to_pte() and pte_to_paddr() to , as paddr_to_pfn() and pte_to_paddr() are already defined there. - Move _vmap_to_mfn() to because mfn_from_pte() is defined there and open-code it inside macros vmap_to_mfn(). - Drop the inclusion of from to resolve a compilation error: ./include/xen/domain_page.h:63:12: error: implicit declaration of function '__mfn_to_virt'; did you mean 'mfn_to_nid'? [-Werror=implicit-function-declaration] 63 | return __mfn_to_virt(mfn_x(mfn)); This happens because __mfn_to_virt() is defined in , but due to the current include chain: static inline void *map_domain_page_global(mfn_t mfn) { return __mfn_to_virt(mfn_x(mfn)); } ... ... #define __mfn_to_virt() ... This leads to a circular dependency and the build error above. As a result, since is no longer included in , the flush_page_to_ram() definition cannot remain there. It is now moved to riscv/mm.c. Including from does not cause issues with the declaration/definition of clear_page() when is included, and also prevents build errors such as: common/domain.c: In function 'alloc_domain_struct': common/domain.c:797:5: error: implicit declaration of function 'clear_page';did you mean 'steal_page'? [-Werror=implicit-function-declaration] 797 | clear_page(d); | ^~~~~~~~~~ | steal_page caused by using clear_page() in common/domain.c. Signed-off-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/riscv/include/asm/mm.h | 24 +++++++++++++++++++++--- xen/arch/riscv/include/asm/page.h | 35 +---------------------------------- xen/arch/riscv/mm.c | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h index 01bbd92a06..9283616c02 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -12,6 +12,7 @@ #include #include +#include #include extern vaddr_t directmap_virt_start; @@ -19,11 +20,21 @@ extern vaddr_t directmap_virt_start; #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) +static inline pte_t paddr_to_pte(paddr_t paddr, + unsigned int permissions) +{ + return (pte_t) { .pte = (paddr_to_pfn(paddr) << PTE_PPN_SHIFT) | permissions }; +} + +static inline paddr_t pte_to_paddr(pte_t pte) +{ + return pfn_to_paddr(pte.pte >> PTE_PPN_SHIFT); +} + #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) #define maddr_to_mfn(ma) _mfn(paddr_to_pfn(ma)) -#define vmap_to_mfn(va) _vmap_to_mfn((vaddr_t)(va)) #define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) static inline void *maddr_to_virt(paddr_t ma) @@ -35,6 +46,15 @@ static inline void *maddr_to_virt(paddr_t ma) return (void *)va; } +#define mfn_from_pte(pte) maddr_to_mfn(pte_to_paddr(pte)) + +#define vmap_to_mfn(va) \ +({ \ + pte_t __entry = pt_walk((vaddr_t)(va), NULL); \ + BUG_ON(!pte_is_mapping(__entry)); \ + maddr_to_mfn(pte_to_paddr(__entry)); \ +}) + /* * virt_to_maddr() is expected to work with virtual addresses from either * the directmap region or Xen's linkage (XEN_VIRT_START) region. @@ -76,8 +96,6 @@ static inline unsigned long virt_to_maddr(unsigned long va) #define virt_to_mfn(va) __virt_to_mfn(va) #define mfn_to_virt(mfn) __mfn_to_virt(mfn) -#define mfn_from_pte(pte) maddr_to_mfn(pte_to_paddr(pte)) - struct page_info { /* Each frame can be threaded onto a doubly-linked list. */ diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h index 4cb0179648..0684229790 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -7,12 +7,10 @@ #include #include -#include #include #include #include -#include #include #define VPN_MASK (PAGETABLE_ENTRIES - 1UL) @@ -114,17 +112,6 @@ typedef struct { #endif } pte_t; -static inline pte_t paddr_to_pte(paddr_t paddr, - unsigned int permissions) -{ - return (pte_t) { .pte = (paddr_to_pfn(paddr) << PTE_PPN_SHIFT) | permissions }; -} - -static inline paddr_t pte_to_paddr(pte_t pte) -{ - return pfn_to_paddr(pte.pte >> PTE_PPN_SHIFT); -} - static inline bool pte_is_valid(pte_t p) { return p.pte & PTE_VALID; @@ -198,18 +185,7 @@ static inline void invalidate_icache(void) #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) #define copy_page(dp, sp) memcpy(dp, sp, PAGE_SIZE) -static inline void flush_page_to_ram(unsigned long mfn, bool sync_icache) -{ - const void *v = map_domain_page(_mfn(mfn)); - - if ( clean_and_invalidate_dcache_va_range(v, PAGE_SIZE) ) - BUG(); - - unmap_domain_page(v); - - if ( sync_icache ) - invalidate_icache(); -} +void flush_page_to_ram(unsigned long mfn, bool sync_icache); /* Write a pagetable entry. */ static inline void write_pte(pte_t *p, pte_t pte) @@ -231,15 +207,6 @@ static inline pte_t pte_from_mfn(mfn_t mfn, pte_attr_t flags) pte_t pt_walk(vaddr_t va, unsigned int *pte_level); -static inline mfn_t _vmap_to_mfn(vaddr_t va) -{ - pte_t entry = pt_walk(va, NULL); - - BUG_ON(!pte_is_mapping(entry)); - - return mfn_from_pte(entry); -} - #endif /* __ASSEMBLY__ */ #endif /* ASM__RISCV__PAGE_H */ diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index 4047d67c0e..774ea42f2d 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -613,3 +614,16 @@ void __iomem *ioremap(paddr_t pa, size_t len) { return ioremap_attr(pa, len, PAGE_HYPERVISOR_NOCACHE); } + +void flush_page_to_ram(unsigned long mfn, bool sync_icache) +{ + const void *v = map_domain_page(_mfn(mfn)); + + if ( clean_and_invalidate_dcache_va_range(v, PAGE_SIZE) ) + BUG(); + + unmap_domain_page(v); + + if ( sync_icache ) + invalidate_icache(); +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 08:22:42 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 08:22:42 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1016869.1393825 (Exim 4.92) (envelope-from ) id 1uR574-0004QG-Nc; Mon, 16 Jun 2025 08:22:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1016869.1393825; Mon, 16 Jun 2025 08:22: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 1uR574-0004Q8-L4; Mon, 16 Jun 2025 08:22:42 +0000 Received: by outflank-mailman (input) for mailman id 1016869; Mon, 16 Jun 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 1uR574-0004Q2-9j for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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 1uR574-004ShY-0s for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR574-0077Vs-0j for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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=YrkelCUoujIqauuomuxtjy00gIPtAcxOr7jMEgDTjb4=; b=XH933jDdIa+WGOhil8n1vrzrf2 6a4kveuHCeKJUBWk38b5Ub7pyH6Di0kZjX5V/LC5jSvKlgy0cqa9Z0VXF1Sqk9TElur2MIGa4+YFs RsbOaNBV5QNnOvzzkWCRvxECwT/7dfFQqj1ZZVWEpLBT9liUEmCVOJ58lf+VO2cFx6bk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: dt_processor_hartid() implementation Message-Id: Date: Mon, 16 Jun 2025 08:22:42 +0000 commit dc89505f8098ba9f1b24d2e2b7ce885574c4bfdf Author: Oleksii Kurochko AuthorDate: Mon Jun 16 10:15:21 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:15:21 2025 +0200 xen/riscv: dt_processor_hartid() implementation Implements dt_processor_hartid() to get the hart ID of the given device tree node and do some checks if CPU is available and given device tree node has proper riscv,isa property. As a helper function dt_get_hartid() is introduced to deal specifically with reg propery of a CPU device node. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/smp.h | 4 +++ xen/arch/riscv/smpboot.c | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/xen/arch/riscv/include/asm/smp.h b/xen/arch/riscv/include/asm/smp.h index 5e170b57b3..eb58b6576b 100644 --- a/xen/arch/riscv/include/asm/smp.h +++ b/xen/arch/riscv/include/asm/smp.h @@ -26,6 +26,10 @@ static inline void set_cpuid_to_hartid(unsigned long cpuid, void setup_tp(unsigned int cpuid); +struct dt_device_node; +int dt_processor_hartid(const struct dt_device_node *node, + unsigned long *hartid); + #endif /* diff --git a/xen/arch/riscv/smpboot.c b/xen/arch/riscv/smpboot.c index 0f9c2cc54a..470f6d1311 100644 --- a/xen/arch/riscv/smpboot.c +++ b/xen/arch/riscv/smpboot.c @@ -1,6 +1,9 @@ #include +#include +#include #include #include +#include #include @@ -14,3 +17,77 @@ void __init smp_prepare_boot_cpu(void) cpumask_set_cpu(0, &cpu_possible_map); cpumask_set_cpu(0, &cpu_online_map); } + +/** + * dt_get_hartid - Get the hartid from a CPU device node + * + * @cpun: CPU number(logical index) for which device node is required + * + * Return: The hartid for the CPU node or ~0UL if not found. + */ +static unsigned long dt_get_hartid(const struct dt_device_node *cpun) +{ + const __be32 *cell; + unsigned int ac; + uint32_t len; + + ac = dt_n_addr_cells(cpun); + cell = dt_get_property(cpun, "reg", &len); + + /* + * If ac > 2, the result may be truncated or meaningless unless + * dt_read_number() supports wider integers. + * + * TODO: drop (ac > 2) when dt_read_number() will support wider + * integers. + */ + if ( !cell || !ac || (ac > 2) || (ac > len / sizeof(*cell)) ) + return ~0UL; + + return dt_read_number(cell, ac); +} + +/* + * Returns the hartid of the given device tree node, or -ENODEV if the node + * isn't an enabled and valid RISC-V hart node. + */ +int dt_processor_hartid(const struct dt_device_node *node, + unsigned long *hartid) +{ + const char *isa; + int ret; + + if ( !dt_device_is_compatible(node, "riscv") ) + { + printk("Found incompatible CPU\n"); + return -ENODEV; + } + + *hartid = dt_get_hartid(node); + if ( *hartid == ~0UL ) + { + printk("Found CPU without CPU ID\n"); + return -ENODATA; + } + + if ( !dt_device_is_available(node)) + { + printk("CPU with hartid=%#lx is not available\n", *hartid); + return -ENODEV; + } + + if ( (ret = dt_property_read_string(node, "riscv,isa", &isa)) ) + { + printk("CPU with hartid=%#lx has no \"riscv,isa\" property\n", *hartid); + return ret; + } + + if ( isa[0] != 'r' || isa[1] != 'v' ) + { + printk("CPU with hartid=%#lx has an invalid ISA of \"%s\"\n", *hartid, + isa); + return -ENODEV; + } + + return 0; +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 08:22:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 08:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1016870.1393830 (Exim 4.92) (envelope-from ) id 1uR57F-0004Sh-Pp; Mon, 16 Jun 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 1016870.1393830; Mon, 16 Jun 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 1uR57F-0004SZ-MW; Mon, 16 Jun 2025 08:22:53 +0000 Received: by outflank-mailman (input) for mailman id 1016870; Mon, 16 Jun 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 1uR57E-0004SQ-CC for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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 1uR57E-004Shc-17 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 08:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR57E-0077WE-12 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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=//7UPdZDKk0mOeB7sxozvF7RghvKw+s1oTy10JrHGxI=; b=hWPBe3ydZIpqV7Eraoj5Su82md Ksvq4YSv4lSpDP+f69yKYei+uo9GO4MMqm210ExE1+DEyBuY+UX2Mkd2eg/bk3/kLQaTfbkk7DGa3 KFmpQhbvjeB3Ou8pnBBWtchaAk09w3/aROTeP513xP3fTosVUMQFJPJ7O5JUYtKj3L2k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce register_intc_ops() and intc_hw_ops Message-Id: Date: Mon, 16 Jun 2025 08:22:52 +0000 commit 0aae2e3a91674da585b06555efa6eeff5937d0da Author: Oleksii Kurochko AuthorDate: Mon Jun 16 10:15:41 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:15:41 2025 +0200 xen/riscv: introduce register_intc_ops() and intc_hw_ops Introduce the intc_hw_operations structure to encapsulate interrupt controller-specific data and operations. This structure includes: - A pointer to interrupt controller information (`intc_info`) - Callbacks to initialize the controller and set IRQ type/priority - A reference to an interupt controller descriptor (`host_irq_type`) - number of interrupt controller irqs. Add function register_intc_ops() to mentioned above structure. Co-developed-by: Romain Caritey Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/intc.h | 19 +++++++++++++++++++ xen/arch/riscv/intc.c | 9 +++++++++ 2 files changed, 28 insertions(+) diff --git a/xen/arch/riscv/include/asm/intc.h b/xen/arch/riscv/include/asm/intc.h index 81f74736ba..434c9d0781 100644 --- a/xen/arch/riscv/include/asm/intc.h +++ b/xen/arch/riscv/include/asm/intc.h @@ -14,11 +14,30 @@ enum intc_version { INTC_APLIC, }; +struct irq_desc; + struct intc_info { enum intc_version hw_version; const struct dt_device_node *node; }; +struct intc_hw_operations { + /* Hold intc hw information */ + const struct intc_info *info; + /* Initialize the intc and the boot CPU */ + int (*init)(void); + + /* hw_irq_controller to enable/disable/eoi host irq */ + const struct hw_interrupt_type *host_irq_type; + + /* Set IRQ type */ + void (*set_irq_type)(struct irq_desc *desc, unsigned int type); + /* Set IRQ priority */ + void (*set_irq_priority)(struct irq_desc *desc, unsigned int priority); +}; + void intc_preinit(void); +void register_intc_ops(const struct intc_hw_operations *ops); + #endif /* ASM__RISCV__INTERRUPT_CONTOLLER_H */ diff --git a/xen/arch/riscv/intc.c b/xen/arch/riscv/intc.c index 4061a3c457..1ecd651bf3 100644 --- a/xen/arch/riscv/intc.c +++ b/xen/arch/riscv/intc.c @@ -5,6 +5,15 @@ #include #include +#include + +static const struct intc_hw_operations *__ro_after_init intc_hw_ops; + +void __init register_intc_ops(const struct intc_hw_operations *ops) +{ + intc_hw_ops = ops; +} + void __init intc_preinit(void) { if ( acpi_disabled ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 09:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 09:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017081.1394035 (Exim 4.92) (envelope-from ) id 1uR5rq-0003Qb-T1; Mon, 16 Jun 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 1017081.1394035; Mon, 16 Jun 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 1uR5rq-0003QT-QP; Mon, 16 Jun 2025 09:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1017081; Mon, 16 Jun 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 1uR5rq-0003Op-Gm for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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 1uR5rq-004Tfd-0v for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR5rq-0079eg-0Y for xen-changelog@lists.xenproject.org; Mon, 16 Jun 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=Qcaqbp4CdbiLBIizcX6mxXyocMzYwGFWfD0WDqaAatE=; b=PlCWVRL/P0xO/RsQt8E1uWAZ5a 1za4bGvAU3BgN2oeN/AmmDmezkptF29VjqCaQfudPgFBLkRMM4ng3W+At93dva5ixhNQFPzu8mc7r oTCuvGd6gzbyt9tfZiDT/Bpqgy74obsZNhAs3AxO2eggnSaF/EhKv9BMM0c1KbaEQ/dA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/pci: Add minor comment for maximum capability constant Message-Id: Date: Mon, 16 Jun 2025 09:11:02 +0000 commit fd1a4550bffa9e4b923d20f2ce7d52fd2d3c3a11 Author: Frediano Ziglio AuthorDate: Mon Jun 16 10:13:48 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:13:48 2025 +0200 drivers/pci: Add minor comment for maximum capability constant The comment is similar to extended capabilities in the function below. Signed-off-by: Frediano Ziglio Acked-by: Jan Beulich --- xen/drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index acf4cebe42..e1ddde90eb 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -11,7 +11,7 @@ unsigned int pci_find_cap_offset(pci_sbdf_t sbdf, unsigned int cap) { u8 id; - int max_cap = 48; + int max_cap = 48; /* 192 bytes, minimum 4 bytes per capability */ u8 pos = PCI_CAPABILITY_LIST; u16 status; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 09:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 09:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017082.1394038 (Exim 4.92) (envelope-from ) id 1uR5s0-0003WX-UC; Mon, 16 Jun 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 1017082.1394038; Mon, 16 Jun 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 1uR5s0-0003WP-Rk; Mon, 16 Jun 2025 09:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1017082; Mon, 16 Jun 2025 09:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR5s0-0003WJ-DL for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR5s0-004Tfj-1D for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR5s0-0079fR-15 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09: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=RYlV0OTzUnXJbXSaSvoFYg5nLr6OJFcMY4AjBQLfM2g=; b=luF7lAPgExOdgRv92Ksdbc9979 tJNhqBFsILCFq4Hns/q5CxAyWNcRNWW2E7JDzl5phzxyYUlQKHAjyty466JyWAIz4Fh+zHvUSucj9 SIn4FPQ5+8TxNWZZNfpzXuy6sHjlpOsrUk5pIgkNLCFMuyhVclMa5B4gtiWNaPrpAa0g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/gnttab: Remove xen/grant_table.h cyclic include Message-Id: Date: Mon, 16 Jun 2025 09:11:12 +0000 commit 218b41f5718159704c035005e2e0cb737acb9375 Author: Alejandro Vallejo AuthorDate: Mon Jun 16 10:14:10 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:14:10 2025 +0200 arm/gnttab: Remove xen/grant_table.h cyclic include The way they currently include each other, with one of the includes being conditional on CONFIG_GRANT_TABLE, makes it hard to know which contents are included when. Break the cycle by removing the asm/grant_table.h include. Not a functional change because. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/grant_table.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/arm/include/asm/grant_table.h b/xen/arch/arm/include/asm/grant_table.h index c5d87b60c4..c47058a3a0 100644 --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -1,7 +1,6 @@ #ifndef __ASM_GRANT_TABLE_H__ #define __ASM_GRANT_TABLE_H__ -#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 09:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 09:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017083.1394042 (Exim 4.92) (envelope-from ) id 1uR5sA-0003dy-Vo; Mon, 16 Jun 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 1017083.1394042; Mon, 16 Jun 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 1uR5sA-0003dr-TC; Mon, 16 Jun 2025 09:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1017083; Mon, 16 Jun 2025 09:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR5sA-0003di-HH for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR5sA-004Tfq-1a for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR5sA-0079fy-1P for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09: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=qtlz+i/90EYdrqCfzb15WPG/SEiocYaNyDU5ZBDxYp0=; b=XYnuvCFM5Ca9zYJwAsVaSFaixM 17QJExfs0O3fWpfLP688nOypSNI8Km5wYjvZu37pa1nBvcVgK5kFR74ODGVfjzKy8YTxjhne2cgn9 yx3hvlPVH9eWmLrbW7qDfbRhxlKgKzx9QJ1rCAy7fjUy0dM6CyUO8Xa7fiSH+vT+pRlA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Preinitialise all modules to be of kind BOOTMOD_UNKNOWN Message-Id: Date: Mon, 16 Jun 2025 09:11:22 +0000 commit 4f48bd785122ceedc619876df745ae60b2445623 Author: Alejandro Vallejo AuthorDate: Mon Jun 16 10:14:37 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:14:37 2025 +0200 x86: Preinitialise all modules to be of kind BOOTMOD_UNKNOWN A later patch removes boot_module and replaces its uses with bootmodule. The equivalent field for "type" doesn't have BOOTMOD_UNKNOWN as a zero value, so it must be explicitly set in the static xen_boot_info. Not a functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d47b99f1b2..f32efa7c60 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -298,6 +298,12 @@ struct boot_info __initdata xen_boot_info = { .loader = "unknown", .cmdline = "", .domains = { [0 ... MAX_NR_BOOTDOMS - 1] = { .domid = DOMID_INVALID } }, + /* + * There's a MAX_NR_BOOTMODS-th entry in the array. It's not off by one. + * + * The extra entry exists to be able to add the Xen image as a module. + */ + .mods = { [0 ... MAX_NR_BOOTMODS] = { .type = BOOTMOD_UNKNOWN } }, }; static struct boot_info *__init multiboot_fill_boot_info( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 09:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 09:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017084.1394047 (Exim 4.92) (envelope-from ) id 1uR5sL-0003iu-1A; Mon, 16 Jun 2025 09:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1017084.1394047; Mon, 16 Jun 2025 09: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 1uR5sK-0003im-Uk; Mon, 16 Jun 2025 09:11:32 +0000 Received: by outflank-mailman (input) for mailman id 1017084; Mon, 16 Jun 2025 09:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR5sK-0003ig-Jh for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR5sK-004TgD-1r for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR5sK-0079gR-1l for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09: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=UGQ5bt0aDxYmVn2g9pOFjAx4rF/J869uWvAtnrOwo0o=; b=Ea3iAdueHlF2g8xSp5VXT4yUd+ 9NzsPvNzhXmg5pJPGABoAHC0e0C2gznxMcmhXClfTxXvNAI6yqqD7qUu+vj+9hgUZgGg4FsLXwZXp gRN2HjzTYdemMGEAjYt2h6+OPL0561hPjTcG5xJ+ZY8u4NgE3G1O3OicvaodSZ7Lh6cg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: rework asm/mm.h and asm/page.h includes to match other architectures Message-Id: Date: Mon, 16 Jun 2025 09:11:32 +0000 commit 17104a7462bb0bffd9105f517b2b93bfc213e749 Author: Oleksii Kurochko AuthorDate: Mon Jun 16 10:14:59 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:14:59 2025 +0200 xen/riscv: rework asm/mm.h and asm/page.h includes to match other architectures To align with other architectures where is included from (and not the other way around), the following changes are made: - Since is no longer included in : - Move the definitions of paddr_to_pte() and pte_to_paddr() to , as paddr_to_pfn() and pte_to_paddr() are already defined there. - Move _vmap_to_mfn() to because mfn_from_pte() is defined there and open-code it inside macros vmap_to_mfn(). - Drop the inclusion of from to resolve a compilation error: ./include/xen/domain_page.h:63:12: error: implicit declaration of function '__mfn_to_virt'; did you mean 'mfn_to_nid'? [-Werror=implicit-function-declaration] 63 | return __mfn_to_virt(mfn_x(mfn)); This happens because __mfn_to_virt() is defined in , but due to the current include chain: static inline void *map_domain_page_global(mfn_t mfn) { return __mfn_to_virt(mfn_x(mfn)); } ... ... #define __mfn_to_virt() ... This leads to a circular dependency and the build error above. As a result, since is no longer included in , the flush_page_to_ram() definition cannot remain there. It is now moved to riscv/mm.c. Including from does not cause issues with the declaration/definition of clear_page() when is included, and also prevents build errors such as: common/domain.c: In function 'alloc_domain_struct': common/domain.c:797:5: error: implicit declaration of function 'clear_page';did you mean 'steal_page'? [-Werror=implicit-function-declaration] 797 | clear_page(d); | ^~~~~~~~~~ | steal_page caused by using clear_page() in common/domain.c. Signed-off-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/riscv/include/asm/mm.h | 24 +++++++++++++++++++++--- xen/arch/riscv/include/asm/page.h | 35 +---------------------------------- xen/arch/riscv/mm.c | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h index 01bbd92a06..9283616c02 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -12,6 +12,7 @@ #include #include +#include #include extern vaddr_t directmap_virt_start; @@ -19,11 +20,21 @@ extern vaddr_t directmap_virt_start; #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) +static inline pte_t paddr_to_pte(paddr_t paddr, + unsigned int permissions) +{ + return (pte_t) { .pte = (paddr_to_pfn(paddr) << PTE_PPN_SHIFT) | permissions }; +} + +static inline paddr_t pte_to_paddr(pte_t pte) +{ + return pfn_to_paddr(pte.pte >> PTE_PPN_SHIFT); +} + #define gfn_to_gaddr(gfn) pfn_to_paddr(gfn_x(gfn)) #define gaddr_to_gfn(ga) _gfn(paddr_to_pfn(ga)) #define mfn_to_maddr(mfn) pfn_to_paddr(mfn_x(mfn)) #define maddr_to_mfn(ma) _mfn(paddr_to_pfn(ma)) -#define vmap_to_mfn(va) _vmap_to_mfn((vaddr_t)(va)) #define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) static inline void *maddr_to_virt(paddr_t ma) @@ -35,6 +46,15 @@ static inline void *maddr_to_virt(paddr_t ma) return (void *)va; } +#define mfn_from_pte(pte) maddr_to_mfn(pte_to_paddr(pte)) + +#define vmap_to_mfn(va) \ +({ \ + pte_t __entry = pt_walk((vaddr_t)(va), NULL); \ + BUG_ON(!pte_is_mapping(__entry)); \ + maddr_to_mfn(pte_to_paddr(__entry)); \ +}) + /* * virt_to_maddr() is expected to work with virtual addresses from either * the directmap region or Xen's linkage (XEN_VIRT_START) region. @@ -76,8 +96,6 @@ static inline unsigned long virt_to_maddr(unsigned long va) #define virt_to_mfn(va) __virt_to_mfn(va) #define mfn_to_virt(mfn) __mfn_to_virt(mfn) -#define mfn_from_pte(pte) maddr_to_mfn(pte_to_paddr(pte)) - struct page_info { /* Each frame can be threaded onto a doubly-linked list. */ diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h index 4cb0179648..0684229790 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -7,12 +7,10 @@ #include #include -#include #include #include #include -#include #include #define VPN_MASK (PAGETABLE_ENTRIES - 1UL) @@ -114,17 +112,6 @@ typedef struct { #endif } pte_t; -static inline pte_t paddr_to_pte(paddr_t paddr, - unsigned int permissions) -{ - return (pte_t) { .pte = (paddr_to_pfn(paddr) << PTE_PPN_SHIFT) | permissions }; -} - -static inline paddr_t pte_to_paddr(pte_t pte) -{ - return pfn_to_paddr(pte.pte >> PTE_PPN_SHIFT); -} - static inline bool pte_is_valid(pte_t p) { return p.pte & PTE_VALID; @@ -198,18 +185,7 @@ static inline void invalidate_icache(void) #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) #define copy_page(dp, sp) memcpy(dp, sp, PAGE_SIZE) -static inline void flush_page_to_ram(unsigned long mfn, bool sync_icache) -{ - const void *v = map_domain_page(_mfn(mfn)); - - if ( clean_and_invalidate_dcache_va_range(v, PAGE_SIZE) ) - BUG(); - - unmap_domain_page(v); - - if ( sync_icache ) - invalidate_icache(); -} +void flush_page_to_ram(unsigned long mfn, bool sync_icache); /* Write a pagetable entry. */ static inline void write_pte(pte_t *p, pte_t pte) @@ -231,15 +207,6 @@ static inline pte_t pte_from_mfn(mfn_t mfn, pte_attr_t flags) pte_t pt_walk(vaddr_t va, unsigned int *pte_level); -static inline mfn_t _vmap_to_mfn(vaddr_t va) -{ - pte_t entry = pt_walk(va, NULL); - - BUG_ON(!pte_is_mapping(entry)); - - return mfn_from_pte(entry); -} - #endif /* __ASSEMBLY__ */ #endif /* ASM__RISCV__PAGE_H */ diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index 4047d67c0e..774ea42f2d 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -613,3 +614,16 @@ void __iomem *ioremap(paddr_t pa, size_t len) { return ioremap_attr(pa, len, PAGE_HYPERVISOR_NOCACHE); } + +void flush_page_to_ram(unsigned long mfn, bool sync_icache) +{ + const void *v = map_domain_page(_mfn(mfn)); + + if ( clean_and_invalidate_dcache_va_range(v, PAGE_SIZE) ) + BUG(); + + unmap_domain_page(v); + + if ( sync_icache ) + invalidate_icache(); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 09:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 09:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017085.1394052 (Exim 4.92) (envelope-from ) id 1uR5sW-0003qq-3w; Mon, 16 Jun 2025 09:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1017085.1394052; Mon, 16 Jun 2025 09: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 1uR5sV-0003qg-WA; Mon, 16 Jun 2025 09:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1017085; Mon, 16 Jun 2025 09:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR5sU-0003p2-MU for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR5sU-004TgI-28 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR5sU-0079gw-22 for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09: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=kvXn5ixDbr+mvrp2heOjOuAFVCUfD1aSr1gq0JkGC8k=; b=S/CkXRHcrV2GKmXrOdjHHUV7+M FuSTyQqsRgSsTu31LNOhl6dxOLzMKm6h40wnCBeCcbzBDWu8ptxm54nbWkMDgDKpIge2PB61tk34j odugIKaD7QxtbgUzoAL8LpwP9dCrm4RI6Ut3EpMDlOE1xIMDRIDFMRoSO0/3LH/zg6/I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: dt_processor_hartid() implementation Message-Id: Date: Mon, 16 Jun 2025 09:11:42 +0000 commit dc89505f8098ba9f1b24d2e2b7ce885574c4bfdf Author: Oleksii Kurochko AuthorDate: Mon Jun 16 10:15:21 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:15:21 2025 +0200 xen/riscv: dt_processor_hartid() implementation Implements dt_processor_hartid() to get the hart ID of the given device tree node and do some checks if CPU is available and given device tree node has proper riscv,isa property. As a helper function dt_get_hartid() is introduced to deal specifically with reg propery of a CPU device node. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/smp.h | 4 +++ xen/arch/riscv/smpboot.c | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/xen/arch/riscv/include/asm/smp.h b/xen/arch/riscv/include/asm/smp.h index 5e170b57b3..eb58b6576b 100644 --- a/xen/arch/riscv/include/asm/smp.h +++ b/xen/arch/riscv/include/asm/smp.h @@ -26,6 +26,10 @@ static inline void set_cpuid_to_hartid(unsigned long cpuid, void setup_tp(unsigned int cpuid); +struct dt_device_node; +int dt_processor_hartid(const struct dt_device_node *node, + unsigned long *hartid); + #endif /* diff --git a/xen/arch/riscv/smpboot.c b/xen/arch/riscv/smpboot.c index 0f9c2cc54a..470f6d1311 100644 --- a/xen/arch/riscv/smpboot.c +++ b/xen/arch/riscv/smpboot.c @@ -1,6 +1,9 @@ #include +#include +#include #include #include +#include #include @@ -14,3 +17,77 @@ void __init smp_prepare_boot_cpu(void) cpumask_set_cpu(0, &cpu_possible_map); cpumask_set_cpu(0, &cpu_online_map); } + +/** + * dt_get_hartid - Get the hartid from a CPU device node + * + * @cpun: CPU number(logical index) for which device node is required + * + * Return: The hartid for the CPU node or ~0UL if not found. + */ +static unsigned long dt_get_hartid(const struct dt_device_node *cpun) +{ + const __be32 *cell; + unsigned int ac; + uint32_t len; + + ac = dt_n_addr_cells(cpun); + cell = dt_get_property(cpun, "reg", &len); + + /* + * If ac > 2, the result may be truncated or meaningless unless + * dt_read_number() supports wider integers. + * + * TODO: drop (ac > 2) when dt_read_number() will support wider + * integers. + */ + if ( !cell || !ac || (ac > 2) || (ac > len / sizeof(*cell)) ) + return ~0UL; + + return dt_read_number(cell, ac); +} + +/* + * Returns the hartid of the given device tree node, or -ENODEV if the node + * isn't an enabled and valid RISC-V hart node. + */ +int dt_processor_hartid(const struct dt_device_node *node, + unsigned long *hartid) +{ + const char *isa; + int ret; + + if ( !dt_device_is_compatible(node, "riscv") ) + { + printk("Found incompatible CPU\n"); + return -ENODEV; + } + + *hartid = dt_get_hartid(node); + if ( *hartid == ~0UL ) + { + printk("Found CPU without CPU ID\n"); + return -ENODATA; + } + + if ( !dt_device_is_available(node)) + { + printk("CPU with hartid=%#lx is not available\n", *hartid); + return -ENODEV; + } + + if ( (ret = dt_property_read_string(node, "riscv,isa", &isa)) ) + { + printk("CPU with hartid=%#lx has no \"riscv,isa\" property\n", *hartid); + return ret; + } + + if ( isa[0] != 'r' || isa[1] != 'v' ) + { + printk("CPU with hartid=%#lx has an invalid ISA of \"%s\"\n", *hartid, + isa); + return -ENODEV; + } + + return 0; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 16 09:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 16 Jun 2025 09:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017086.1394055 (Exim 4.92) (envelope-from ) id 1uR5sg-0003wm-4H; Mon, 16 Jun 2025 09:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1017086.1394055; Mon, 16 Jun 2025 09: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 1uR5sg-0003wd-1T; Mon, 16 Jun 2025 09:11:54 +0000 Received: by outflank-mailman (input) for mailman id 1017086; Mon, 16 Jun 2025 09:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uR5se-0003vN-PA for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uR5se-004TgM-2P for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uR5se-0079hI-2J for xen-changelog@lists.xenproject.org; Mon, 16 Jun 2025 09: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=lMOpmu8R0U3Eaqk9HuqIP/odYMn/p/RMiePI2o/gmFE=; b=CxGfzsHCRnKx2s4kk1HjakV9od e944t6r6kIusOEgPTB1Gzke6AC8zfgTybhx073ZRl/X4O7xLn5cx7UZDx+g3UC59FMSXMZDAWRZfN GLNCeFJ8lgwYKq2oz+DjEbBkZl7D6O2ks3N9QOJS111JarXKPvApNPO1sJt1/LDmV5nw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce register_intc_ops() and intc_hw_ops Message-Id: Date: Mon, 16 Jun 2025 09:11:52 +0000 commit 0aae2e3a91674da585b06555efa6eeff5937d0da Author: Oleksii Kurochko AuthorDate: Mon Jun 16 10:15:41 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 16 10:15:41 2025 +0200 xen/riscv: introduce register_intc_ops() and intc_hw_ops Introduce the intc_hw_operations structure to encapsulate interrupt controller-specific data and operations. This structure includes: - A pointer to interrupt controller information (`intc_info`) - Callbacks to initialize the controller and set IRQ type/priority - A reference to an interupt controller descriptor (`host_irq_type`) - number of interrupt controller irqs. Add function register_intc_ops() to mentioned above structure. Co-developed-by: Romain Caritey Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/intc.h | 19 +++++++++++++++++++ xen/arch/riscv/intc.c | 9 +++++++++ 2 files changed, 28 insertions(+) diff --git a/xen/arch/riscv/include/asm/intc.h b/xen/arch/riscv/include/asm/intc.h index 81f74736ba..434c9d0781 100644 --- a/xen/arch/riscv/include/asm/intc.h +++ b/xen/arch/riscv/include/asm/intc.h @@ -14,11 +14,30 @@ enum intc_version { INTC_APLIC, }; +struct irq_desc; + struct intc_info { enum intc_version hw_version; const struct dt_device_node *node; }; +struct intc_hw_operations { + /* Hold intc hw information */ + const struct intc_info *info; + /* Initialize the intc and the boot CPU */ + int (*init)(void); + + /* hw_irq_controller to enable/disable/eoi host irq */ + const struct hw_interrupt_type *host_irq_type; + + /* Set IRQ type */ + void (*set_irq_type)(struct irq_desc *desc, unsigned int type); + /* Set IRQ priority */ + void (*set_irq_priority)(struct irq_desc *desc, unsigned int priority); +}; + void intc_preinit(void); +void register_intc_ops(const struct intc_hw_operations *ops); + #endif /* ASM__RISCV__INTERRUPT_CONTOLLER_H */ diff --git a/xen/arch/riscv/intc.c b/xen/arch/riscv/intc.c index 4061a3c457..1ecd651bf3 100644 --- a/xen/arch/riscv/intc.c +++ b/xen/arch/riscv/intc.c @@ -5,6 +5,15 @@ #include #include +#include + +static const struct intc_hw_operations *__ro_after_init intc_hw_ops; + +void __init register_intc_ops(const struct intc_hw_operations *ops) +{ + intc_hw_ops = ops; +} + void __init intc_preinit(void) { if ( acpi_disabled ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 07:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 07:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017776.1394760 (Exim 4.92) (envelope-from ) id 1uRQTH-0005Qu-V8; Tue, 17 Jun 2025 07:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1017776.1394760; Tue, 17 Jun 2025 07: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 1uRQTH-0005Qm-Sc; Tue, 17 Jun 2025 07:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1017776; Tue, 17 Jun 2025 07:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRQTG-0005Qg-CV for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRQTG-0065gx-0X for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRQTG-008A6e-0O for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07: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=1MbYOpmaYNxN7v7lxtaznrTs2UDhSqTbJw6YCCtt3rE=; b=cQEbwetxNy6ifrE3P8L4O2vVF8 2Zo6oXQrpV2wBFdyEs0hg0jO/2ye8CHyrkTUfgpmjV60m52lqrQsy202MOl7bzNNaJ+ZxDoYCIvF5 8FdaGlCRGUcClpU+M+wvuj5ufDjPqF1P//DPDi5gNf13hG0bCtAx926CETwRU7gZbwPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Introduce MPU memory region map structure Message-Id: Date: Tue, 17 Jun 2025 07:11:02 +0000 commit b84be0ff09a94f02a7f15c24d33fe884a492d975 Author: Ayan Kumar Halder AuthorDate: Wed Jun 11 15:35:39 2025 +0100 Commit: Michal Orzel CommitDate: Tue Jun 17 08:31:52 2025 +0200 arm/mpu: Introduce MPU memory region map structure Introduce pr_t typedef which is a structure having the prbar and prlar members, each being structured as the registers of the AArch32 Armv8-R architecture. Also, define MPU_REGION_RES0 to 0 as there are no reserved 0 bits beyond the BASE or LIMIT bitfields in prbar or prlar respectively. In pr_of_addr(), enclose prbar and prlar arm64 specific bitfields with appropriate macros. So, that this function can be later reused for arm32 as well. Signed-off-by: Ayan Kumar Halder Reviewed-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/include/asm/arm32/mpu.h | 34 ++++++++++++++++++++++++++++++++-- xen/arch/arm/mpu/mm.c | 4 ++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/mpu.h b/xen/arch/arm/include/asm/arm32/mpu.h index f0d4d4055c..0a6930b3a0 100644 --- a/xen/arch/arm/include/asm/arm32/mpu.h +++ b/xen/arch/arm/include/asm/arm32/mpu.h @@ -5,10 +5,40 @@ #ifndef __ASSEMBLY__ +/* + * Unlike arm64, there are no reserved 0 bits beyond base and limit bitfield in + * prbar and prlar registers respectively. + */ +#define MPU_REGION_RES0 0x0 + +/* Hypervisor Protection Region Base Address Register */ +typedef union { + struct { + unsigned int xn:1; /* Execute-Never */ + unsigned int ap_0:1; /* Access Permission AP[0] */ + unsigned int ro:1; /* Access Permission AP[1] */ + unsigned int sh:2; /* Shareability */ + unsigned int res0:1; + unsigned int base:26; /* Base Address */ + } reg; + uint32_t bits; +} prbar_t; + +/* Hypervisor Protection Region Limit Address Register */ +typedef union { + struct { + unsigned int en:1; /* Region enable */ + unsigned int ai:3; /* Memory Attribute Index */ + unsigned int res0:2; + unsigned int limit:26; /* Limit Address */ + } reg; + uint32_t bits; +} prlar_t; + /* MPU Protection Region */ typedef struct { - uint32_t prbar; - uint32_t prlar; + prbar_t prbar; + prlar_t prlar; } pr_t; #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 86fbe105af..3d37beab57 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -167,7 +167,9 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) /* Build up value for PRBAR_EL2. */ prbar = (prbar_t) { .reg = { +#ifdef CONFIG_ARM_64 .xn_0 = 0, +#endif .xn = PAGE_XN_MASK(flags), .ap_0 = 0, .ro = PAGE_RO_MASK(flags) @@ -206,7 +208,9 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) /* Build up value for PRLAR_EL2. */ prlar = (prlar_t) { .reg = { +#ifdef CONFIG_ARM_64 .ns = 0, /* Hyp mode is in secure world */ +#endif .ai = attr_idx, .en = 1, /* Region enabled */ }}; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 07:11:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 07:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017777.1394765 (Exim 4.92) (envelope-from ) id 1uRQTS-0005So-0E; Tue, 17 Jun 2025 07:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1017777.1394765; Tue, 17 Jun 2025 07: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 1uRQTR-0005Sg-Tx; Tue, 17 Jun 2025 07:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1017777; Tue, 17 Jun 2025 07:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRQTQ-0005SS-9U for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRQTQ-0065h4-0p for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRQTQ-008A76-0i for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07: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=AsClIjPGpreOeWfKMIQOMeYIFzyJ08Jzp4OI4uMFk34=; b=NViks/8lCHFRGFag6e9xeG71jf I6j0kTOkDJJkRg4K97oLeB8V7tSm7JnjQ9Rmw0folQjgqpwAhdJ/xrStEAG/0PDK+aS5HoaLEp+rK SBCLLW5b2BYB4Dz43wnS5oMynK56I+0O6/3NCtEuQ+Nt3l6mb+rsPKfSlG5Hitc/sMmI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Provide and populate MPU C data structures Message-Id: Date: Tue, 17 Jun 2025 07:11:12 +0000 commit 3c63d6b3304f4c01fc2e98009e1ef45cd7155453 Author: Ayan Kumar Halder AuthorDate: Wed Jun 11 15:35:40 2025 +0100 Commit: Michal Orzel CommitDate: Tue Jun 17 08:31:52 2025 +0200 arm/mpu: Provide and populate MPU C data structures Modify Arm32 assembly boot code to reset any unused MPU region, initialise 'max_mpu_regions' with the number of supported MPU regions and set/clear the bitmap 'xen_mpumap_mask' used to track the enabled regions. Introduce cache.S to hold arm32 cache related functions. Use the macro definition for "dcache_line_size" from linux. Change the order of registers in prepare_xen_region() as 'strd' instruction is used to store {prbar, prlar} in arm32. Thus, 'prbar' has to be a even numbered register and 'prlar' is the consecutively ordered register. Signed-off-by: Ayan Kumar Halder Acked-by: Julien Grall Reviewed-by: Luca Fancellu --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/asm-offsets.c | 6 +++++ xen/arch/arm/arm32/cache.S | 43 ++++++++++++++++++++++++++++++++ xen/arch/arm/arm32/mpu/head.S | 41 ++++++++++++++++++++++++------ xen/arch/arm/include/asm/mpu/regions.inc | 2 +- 5 files changed, 84 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 537969d753..531168f58a 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -2,6 +2,7 @@ obj-y += lib/ obj-$(CONFIG_MMU) += mmu/ obj-$(CONFIG_MPU) += mpu/ +obj-y += cache.o obj-$(CONFIG_EARLY_PRINTK) += debug.o obj-y += domctl.o obj-y += domain.o diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c index 8bbb0f938e..c203ce269d 100644 --- a/xen/arch/arm/arm32/asm-offsets.c +++ b/xen/arch/arm/arm32/asm-offsets.c @@ -75,6 +75,12 @@ void __dummy__(void) OFFSET(INITINFO_stack, struct init_info, stack); BLANK(); + +#ifdef CONFIG_MPU + DEFINE(XEN_MPUMAP_MASK_sizeof, sizeof(xen_mpumap_mask)); + DEFINE(XEN_MPUMAP_sizeof, sizeof(xen_mpumap)); + BLANK(); +#endif } /* diff --git a/xen/arch/arm/arm32/cache.S b/xen/arch/arm/arm32/cache.S new file mode 100644 index 0000000000..b21bc66793 --- /dev/null +++ b/xen/arch/arm/arm32/cache.S @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Cache maintenance */ + +#include + +/* dcache_line_size - get the minimum D-cache line size from the CTR register */ + .macro dcache_line_size, reg, tmp + mrc CP32(\tmp, CTR) /* read ctr */ + lsr \tmp, \tmp, #16 + and \tmp, \tmp, #0xf /* cache line size encoding */ + mov \reg, #4 /* bytes per word */ + mov \reg, \reg, lsl \tmp /* actual cache line size */ + .endm + +/* + * __invalidate_dcache_area(addr, size) + * + * Ensure that the data held in the cache for the buffer is invalidated. + * + * - addr - start address of the buffer + * - size - size of the buffer + * + * Clobbers r0 - r3 + */ +FUNC(__invalidate_dcache_area) + dcache_line_size r2, r3 + add r1, r0, r1 + sub r3, r2, #1 + bic r0, r0, r3 +1: mcr CP32(r0, DCIMVAC) /* invalidate D line / unified line */ + add r0, r0, r2 + cmp r0, r1 + blo 1b + dsb sy + ret +END(__invalidate_dcache_area) + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm32/mpu/head.S b/xen/arch/arm/arm32/mpu/head.S index b2c5245e51..6a631626a7 100644 --- a/xen/arch/arm/arm32/mpu/head.S +++ b/xen/arch/arm/arm32/mpu/head.S @@ -46,43 +46,68 @@ END(enable_mpu) */ FUNC(enable_boot_cpu_mm) /* Get the number of regions specified in MPUIR_EL2 */ - mrc CP32(r5, MPUIR_EL2) - and r5, r5, #NUM_MPU_REGIONS_MASK + mrc CP32(r3, MPUIR_EL2) + and r3, r3, #NUM_MPU_REGIONS_MASK + + mov_w r0, max_mpu_regions + str r3, [r0] + mcr CP32(r0, DCIMVAC) /* Invalidate cache for max_mpu_regions addr */ /* x0: region sel */ mov r0, #0 /* Xen text section. */ mov_w r1, _stext mov_w r2, _etext - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_TEXT_PRBAR /* Xen read-only data section. */ mov_w r1, _srodata mov_w r2, _erodata - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_RO_PRBAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_RO_PRBAR /* Xen read-only after init and data section. (RW data) */ mov_w r1, __ro_after_init_start mov_w r2, __init_begin - prepare_xen_region r0, r1, r2, r3, r4, r5 + prepare_xen_region r0, r1, r2, r4, r5, r3 /* Xen code section. */ mov_w r1, __init_begin mov_w r2, __init_data_begin - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_TEXT_PRBAR /* Xen data and BSS section. */ mov_w r1, __init_data_begin mov_w r2, __bss_end - prepare_xen_region r0, r1, r2, r3, r4, r5 + prepare_xen_region r0, r1, r2, r4, r5, r3 #ifdef CONFIG_EARLY_PRINTK /* Xen early UART section. */ mov_w r1, CONFIG_EARLY_UART_BASE_ADDRESS mov_w r2, (CONFIG_EARLY_UART_BASE_ADDRESS + CONFIG_EARLY_UART_SIZE) - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR #endif +zero_mpu: + /* Reset remaining MPU regions */ + cmp r0, r3 + beq out_zero_mpu + mov r1, #0 + mov r2, #1 + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prlar=REGION_DISABLED_PRLAR + b zero_mpu + +out_zero_mpu: + /* Invalidate data cache for MPU data structures */ + mov r4, lr + mov_w r0, xen_mpumap_mask + mov r1, #XEN_MPUMAP_MASK_sizeof + bl __invalidate_dcache_area + + ldr r0, =xen_mpumap + mov r1, #XEN_MPUMAP_sizeof + bl __invalidate_dcache_area + mov lr, r4 + b enable_mpu END(enable_boot_cpu_mm) diff --git a/xen/arch/arm/include/asm/mpu/regions.inc b/xen/arch/arm/include/asm/mpu/regions.inc index 6b8c233e6c..23fead3b21 100644 --- a/xen/arch/arm/include/asm/mpu/regions.inc +++ b/xen/arch/arm/include/asm/mpu/regions.inc @@ -24,7 +24,7 @@ #define XEN_MPUMAP_ENTRY_SHIFT 0x3 /* 8 byte structure */ .macro store_pair reg1, reg2, dst - .word 0xe7f000f0 /* unimplemented */ + strd \reg1, \reg2, [\dst] .endm #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 07:11:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 07:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1017778.1394769 (Exim 4.92) (envelope-from ) id 1uRQTc-0005Vm-1j; Tue, 17 Jun 2025 07:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1017778.1394769; Tue, 17 Jun 2025 07: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 1uRQTb-0005Ve-VN; Tue, 17 Jun 2025 07:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1017778; Tue, 17 Jun 2025 07:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRQTa-0005Ux-Cp for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRQTa-0065hA-1A for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRQTa-008A7U-11 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 07: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=ETnA4MszT5BurYwvAVyAV8vj+wk3OeUcs4xSDjjuXZA=; b=iJusYgCvX/+CBo7LSge7peQvt4 ouIIxwQ0crn9JOvSWQJrFq6ZfV6QhevtOSLik4HhfwUSjsSBH8X7szCpWnBXP/tSYAxRwJxszSQu+ fNnU4gC8ejbLoYoHa7ECXjJDw8PHBoUNq7cv9/kRLVZjFeIjnEOEiI6qi3QinCQmSkXE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Fix P2M root page tables invalidation Message-Id: Date: Tue, 17 Jun 2025 07:11:22 +0000 commit 14c57887f36937c1deb9eeca852c3a7595d2d0b8 Author: Michal Orzel AuthorDate: Mon Jun 16 08:56:48 2025 +0200 Commit: Michal Orzel CommitDate: Tue Jun 17 08:31:52 2025 +0200 xen/arm: Fix P2M root page tables invalidation Fix the condition part of the for loop in p2m_invalidate_root() that uses P2M_ROOT_LEVEL instead of P2M_ROOT_PAGES. The goal here is to invalidate all root page tables (that can be concatenated), so the loop must iterate through all these pages. Root level can be 0 or 1, whereas there can be 1,2,8,16 root pages. The issue may lead to some pages not being invalidated and therefore the guest access won't be trapped. We use it to track pages accessed by guest for set/way emulation provided no IOMMU, IOMMU not enabled for the domain or P2M not shared with IOMMU. Fixes: 2148a125b73b ("xen/arm: Track page accessed between batch of Set/Way operations") Reported-by: Oleksii Kurochko Signed-off-by: Michal Orzel Reviewed-by: Julien Grall --- xen/arch/arm/mmu/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/mmu/p2m.c b/xen/arch/arm/mmu/p2m.c index d96078f547..67296dabb5 100644 --- a/xen/arch/arm/mmu/p2m.c +++ b/xen/arch/arm/mmu/p2m.c @@ -1291,7 +1291,7 @@ static void p2m_invalidate_root(struct p2m_domain *p2m) p2m_write_lock(p2m); - for ( i = 0; i < P2M_ROOT_LEVEL; i++ ) + for ( i = 0; i < P2M_ROOT_PAGES; i++ ) p2m_invalidate_table(p2m, page_to_mfn(p2m->root + i)); p2m_write_unlock(p2m); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 15:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 15:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018291.1395184 (Exim 4.92) (envelope-from ) id 1uRYTj-0003YB-8C; Tue, 17 Jun 2025 15:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018291.1395184; Tue, 17 Jun 2025 15: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 1uRYTj-0003Y3-5d; Tue, 17 Jun 2025 15:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1018291; Tue, 17 Jun 2025 15:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRYTh-0003Xx-Sq for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRYTh-006GGM-2U for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRYTh-008X5T-2M for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15: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=m7RbcWA91xQKc5anDviQHbzxDx16KtDVaDQVKVsZQlg=; b=gMAE7e20wnY4uyfcg2Od4IEVXy XaO3gT7U/lYJufgkhu7uhrD+aJdNdw9iNmcLjqLmJdxTdJGwIzr2DfTlrWZutdxtC1rCm4zTbsWL+ 0Ri94V2IgClvI+Ef97M0EDElFMR6UKnwm/rXqzrcUSLu1fAheIBMRDGNkaJvRyCwuCfk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Introduce MPU memory region map structure Message-Id: Date: Tue, 17 Jun 2025 15:44:01 +0000 commit b84be0ff09a94f02a7f15c24d33fe884a492d975 Author: Ayan Kumar Halder AuthorDate: Wed Jun 11 15:35:39 2025 +0100 Commit: Michal Orzel CommitDate: Tue Jun 17 08:31:52 2025 +0200 arm/mpu: Introduce MPU memory region map structure Introduce pr_t typedef which is a structure having the prbar and prlar members, each being structured as the registers of the AArch32 Armv8-R architecture. Also, define MPU_REGION_RES0 to 0 as there are no reserved 0 bits beyond the BASE or LIMIT bitfields in prbar or prlar respectively. In pr_of_addr(), enclose prbar and prlar arm64 specific bitfields with appropriate macros. So, that this function can be later reused for arm32 as well. Signed-off-by: Ayan Kumar Halder Reviewed-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/include/asm/arm32/mpu.h | 34 ++++++++++++++++++++++++++++++++-- xen/arch/arm/mpu/mm.c | 4 ++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/mpu.h b/xen/arch/arm/include/asm/arm32/mpu.h index f0d4d4055c..0a6930b3a0 100644 --- a/xen/arch/arm/include/asm/arm32/mpu.h +++ b/xen/arch/arm/include/asm/arm32/mpu.h @@ -5,10 +5,40 @@ #ifndef __ASSEMBLY__ +/* + * Unlike arm64, there are no reserved 0 bits beyond base and limit bitfield in + * prbar and prlar registers respectively. + */ +#define MPU_REGION_RES0 0x0 + +/* Hypervisor Protection Region Base Address Register */ +typedef union { + struct { + unsigned int xn:1; /* Execute-Never */ + unsigned int ap_0:1; /* Access Permission AP[0] */ + unsigned int ro:1; /* Access Permission AP[1] */ + unsigned int sh:2; /* Shareability */ + unsigned int res0:1; + unsigned int base:26; /* Base Address */ + } reg; + uint32_t bits; +} prbar_t; + +/* Hypervisor Protection Region Limit Address Register */ +typedef union { + struct { + unsigned int en:1; /* Region enable */ + unsigned int ai:3; /* Memory Attribute Index */ + unsigned int res0:2; + unsigned int limit:26; /* Limit Address */ + } reg; + uint32_t bits; +} prlar_t; + /* MPU Protection Region */ typedef struct { - uint32_t prbar; - uint32_t prlar; + prbar_t prbar; + prlar_t prlar; } pr_t; #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 86fbe105af..3d37beab57 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -167,7 +167,9 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) /* Build up value for PRBAR_EL2. */ prbar = (prbar_t) { .reg = { +#ifdef CONFIG_ARM_64 .xn_0 = 0, +#endif .xn = PAGE_XN_MASK(flags), .ap_0 = 0, .ro = PAGE_RO_MASK(flags) @@ -206,7 +208,9 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) /* Build up value for PRLAR_EL2. */ prlar = (prlar_t) { .reg = { +#ifdef CONFIG_ARM_64 .ns = 0, /* Hyp mode is in secure world */ +#endif .ai = attr_idx, .en = 1, /* Region enabled */ }}; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 15:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 15:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018292.1395190 (Exim 4.92) (envelope-from ) id 1uRYTt-0003Zn-9w; Tue, 17 Jun 2025 15:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018292.1395190; Tue, 17 Jun 2025 15: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 1uRYTt-0003Zd-71; Tue, 17 Jun 2025 15:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1018292; Tue, 17 Jun 2025 15:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRYTs-0003ZT-11 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRYTr-006GGT-32 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRYTr-008X6o-2f for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15: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=BfE5Dhq+KRZUOzNBLR7CnoRozuBmqKslzNJrZYVWwbM=; b=LJPWEMKtVX+tSdTJEER2TnDVUC HVND9ZFpi7dZvr7FpIUiJinKTNn7sTOD3FbLAVQoLLt8a+5oeaxd7nnOC2GXj6TXhXLuom4+6iTb1 3b4BC44Ivs2VK1RSQKN8Hk4144G1m6BAgjDj2gS0mjaTyccJQB2/Q7b1+9MwfLdly+dE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Provide and populate MPU C data structures Message-Id: Date: Tue, 17 Jun 2025 15:44:11 +0000 commit 3c63d6b3304f4c01fc2e98009e1ef45cd7155453 Author: Ayan Kumar Halder AuthorDate: Wed Jun 11 15:35:40 2025 +0100 Commit: Michal Orzel CommitDate: Tue Jun 17 08:31:52 2025 +0200 arm/mpu: Provide and populate MPU C data structures Modify Arm32 assembly boot code to reset any unused MPU region, initialise 'max_mpu_regions' with the number of supported MPU regions and set/clear the bitmap 'xen_mpumap_mask' used to track the enabled regions. Introduce cache.S to hold arm32 cache related functions. Use the macro definition for "dcache_line_size" from linux. Change the order of registers in prepare_xen_region() as 'strd' instruction is used to store {prbar, prlar} in arm32. Thus, 'prbar' has to be a even numbered register and 'prlar' is the consecutively ordered register. Signed-off-by: Ayan Kumar Halder Acked-by: Julien Grall Reviewed-by: Luca Fancellu --- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm32/asm-offsets.c | 6 +++++ xen/arch/arm/arm32/cache.S | 43 ++++++++++++++++++++++++++++++++ xen/arch/arm/arm32/mpu/head.S | 41 ++++++++++++++++++++++++------ xen/arch/arm/include/asm/mpu/regions.inc | 2 +- 5 files changed, 84 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 537969d753..531168f58a 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -2,6 +2,7 @@ obj-y += lib/ obj-$(CONFIG_MMU) += mmu/ obj-$(CONFIG_MPU) += mpu/ +obj-y += cache.o obj-$(CONFIG_EARLY_PRINTK) += debug.o obj-y += domctl.o obj-y += domain.o diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c index 8bbb0f938e..c203ce269d 100644 --- a/xen/arch/arm/arm32/asm-offsets.c +++ b/xen/arch/arm/arm32/asm-offsets.c @@ -75,6 +75,12 @@ void __dummy__(void) OFFSET(INITINFO_stack, struct init_info, stack); BLANK(); + +#ifdef CONFIG_MPU + DEFINE(XEN_MPUMAP_MASK_sizeof, sizeof(xen_mpumap_mask)); + DEFINE(XEN_MPUMAP_sizeof, sizeof(xen_mpumap)); + BLANK(); +#endif } /* diff --git a/xen/arch/arm/arm32/cache.S b/xen/arch/arm/arm32/cache.S new file mode 100644 index 0000000000..b21bc66793 --- /dev/null +++ b/xen/arch/arm/arm32/cache.S @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Cache maintenance */ + +#include + +/* dcache_line_size - get the minimum D-cache line size from the CTR register */ + .macro dcache_line_size, reg, tmp + mrc CP32(\tmp, CTR) /* read ctr */ + lsr \tmp, \tmp, #16 + and \tmp, \tmp, #0xf /* cache line size encoding */ + mov \reg, #4 /* bytes per word */ + mov \reg, \reg, lsl \tmp /* actual cache line size */ + .endm + +/* + * __invalidate_dcache_area(addr, size) + * + * Ensure that the data held in the cache for the buffer is invalidated. + * + * - addr - start address of the buffer + * - size - size of the buffer + * + * Clobbers r0 - r3 + */ +FUNC(__invalidate_dcache_area) + dcache_line_size r2, r3 + add r1, r0, r1 + sub r3, r2, #1 + bic r0, r0, r3 +1: mcr CP32(r0, DCIMVAC) /* invalidate D line / unified line */ + add r0, r0, r2 + cmp r0, r1 + blo 1b + dsb sy + ret +END(__invalidate_dcache_area) + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm32/mpu/head.S b/xen/arch/arm/arm32/mpu/head.S index b2c5245e51..6a631626a7 100644 --- a/xen/arch/arm/arm32/mpu/head.S +++ b/xen/arch/arm/arm32/mpu/head.S @@ -46,43 +46,68 @@ END(enable_mpu) */ FUNC(enable_boot_cpu_mm) /* Get the number of regions specified in MPUIR_EL2 */ - mrc CP32(r5, MPUIR_EL2) - and r5, r5, #NUM_MPU_REGIONS_MASK + mrc CP32(r3, MPUIR_EL2) + and r3, r3, #NUM_MPU_REGIONS_MASK + + mov_w r0, max_mpu_regions + str r3, [r0] + mcr CP32(r0, DCIMVAC) /* Invalidate cache for max_mpu_regions addr */ /* x0: region sel */ mov r0, #0 /* Xen text section. */ mov_w r1, _stext mov_w r2, _etext - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_TEXT_PRBAR /* Xen read-only data section. */ mov_w r1, _srodata mov_w r2, _erodata - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_RO_PRBAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_RO_PRBAR /* Xen read-only after init and data section. (RW data) */ mov_w r1, __ro_after_init_start mov_w r2, __init_begin - prepare_xen_region r0, r1, r2, r3, r4, r5 + prepare_xen_region r0, r1, r2, r4, r5, r3 /* Xen code section. */ mov_w r1, __init_begin mov_w r2, __init_data_begin - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_TEXT_PRBAR /* Xen data and BSS section. */ mov_w r1, __init_data_begin mov_w r2, __bss_end - prepare_xen_region r0, r1, r2, r3, r4, r5 + prepare_xen_region r0, r1, r2, r4, r5, r3 #ifdef CONFIG_EARLY_PRINTK /* Xen early UART section. */ mov_w r1, CONFIG_EARLY_UART_BASE_ADDRESS mov_w r2, (CONFIG_EARLY_UART_BASE_ADDRESS + CONFIG_EARLY_UART_SIZE) - prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR #endif +zero_mpu: + /* Reset remaining MPU regions */ + cmp r0, r3 + beq out_zero_mpu + mov r1, #0 + mov r2, #1 + prepare_xen_region r0, r1, r2, r4, r5, r3, attr_prlar=REGION_DISABLED_PRLAR + b zero_mpu + +out_zero_mpu: + /* Invalidate data cache for MPU data structures */ + mov r4, lr + mov_w r0, xen_mpumap_mask + mov r1, #XEN_MPUMAP_MASK_sizeof + bl __invalidate_dcache_area + + ldr r0, =xen_mpumap + mov r1, #XEN_MPUMAP_sizeof + bl __invalidate_dcache_area + mov lr, r4 + b enable_mpu END(enable_boot_cpu_mm) diff --git a/xen/arch/arm/include/asm/mpu/regions.inc b/xen/arch/arm/include/asm/mpu/regions.inc index 6b8c233e6c..23fead3b21 100644 --- a/xen/arch/arm/include/asm/mpu/regions.inc +++ b/xen/arch/arm/include/asm/mpu/regions.inc @@ -24,7 +24,7 @@ #define XEN_MPUMAP_ENTRY_SHIFT 0x3 /* 8 byte structure */ .macro store_pair reg1, reg2, dst - .word 0xe7f000f0 /* unimplemented */ + strd \reg1, \reg2, [\dst] .endm #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 15:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 15:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018293.1395194 (Exim 4.92) (envelope-from ) id 1uRYU3-0003cs-D0; Tue, 17 Jun 2025 15:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018293.1395194; Tue, 17 Jun 2025 15: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 1uRYU3-0003cj-8R; Tue, 17 Jun 2025 15:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1018293; Tue, 17 Jun 2025 15:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRYU2-0003bi-25 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRYU2-006GGd-06 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRYU1-008X85-3D for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 15:44: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=ylNEweGjlIk2yYJjLvLv4NtHC2W5UJomCRT539Patvs=; b=BmhCGtsNlerD7YrRC14rvvXzb8 2zLlLkdJCKH/oHB3xE6AuWfolqAYcP2bu6f2HB2Alxe9RulP28BhINF8Ie/JsvHtgrjSi90zBXIbL hNcB34WsedzBeWmTxTBXrppTQZj0OxRX8P43/efNjDcDPSjf/o2W/oe9tIQeE77HyIWw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Fix P2M root page tables invalidation Message-Id: Date: Tue, 17 Jun 2025 15:44:21 +0000 commit 14c57887f36937c1deb9eeca852c3a7595d2d0b8 Author: Michal Orzel AuthorDate: Mon Jun 16 08:56:48 2025 +0200 Commit: Michal Orzel CommitDate: Tue Jun 17 08:31:52 2025 +0200 xen/arm: Fix P2M root page tables invalidation Fix the condition part of the for loop in p2m_invalidate_root() that uses P2M_ROOT_LEVEL instead of P2M_ROOT_PAGES. The goal here is to invalidate all root page tables (that can be concatenated), so the loop must iterate through all these pages. Root level can be 0 or 1, whereas there can be 1,2,8,16 root pages. The issue may lead to some pages not being invalidated and therefore the guest access won't be trapped. We use it to track pages accessed by guest for set/way emulation provided no IOMMU, IOMMU not enabled for the domain or P2M not shared with IOMMU. Fixes: 2148a125b73b ("xen/arm: Track page accessed between batch of Set/Way operations") Reported-by: Oleksii Kurochko Signed-off-by: Michal Orzel Reviewed-by: Julien Grall --- xen/arch/arm/mmu/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/mmu/p2m.c b/xen/arch/arm/mmu/p2m.c index d96078f547..67296dabb5 100644 --- a/xen/arch/arm/mmu/p2m.c +++ b/xen/arch/arm/mmu/p2m.c @@ -1291,7 +1291,7 @@ static void p2m_invalidate_root(struct p2m_domain *p2m) p2m_write_lock(p2m); - for ( i = 0; i < P2M_ROOT_LEVEL; i++ ) + for ( i = 0; i < P2M_ROOT_PAGES; i++ ) p2m_invalidate_table(p2m, page_to_mfn(p2m->root + i)); p2m_write_unlock(p2m); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:33:11 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018545.1395417 (Exim 4.92) (envelope-from ) id 1uRerY-0004M7-7o; Tue, 17 Jun 2025 22:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018545.1395417; Tue, 17 Jun 2025 22: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 1uRerY-0004Ly-4p; Tue, 17 Jun 2025 22:33:04 +0000 Received: by outflank-mailman (input) for mailman id 1018545; Tue, 17 Jun 2025 22:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRerW-0004Ls-7x for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRerW-006Oac-09 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRerV-008wHf-3C for xen-changelog@lists.xenproject.org; Tue, 17 Jun 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=KMmqE3RvJ8jVn+G+GUCJW5HBTiL6DqknHdUu21frvlk=; b=5HF0PxoK8mMY6OA3D7vTKfPC1g TmiM0p5dztqDs+vCxtpW40ebC2pRBDE263+uu13RUQ0en1vkiBRssQJygya+JObu89s/d70qWEIiQ GJC1PZLyWvVMyuoQOGOuWjIZg9w0d+QY7nXG3n9xaUPkK8JHkORDqwoOrUnAHbQFunsU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add way to disable traps on accesses to unmapped addresses Message-Id: Date: Tue, 17 Jun 2025 22:33:01 +0000 commit 980aff4e8fcd19b6f0bcd4ac6041b868cfc35d4d Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:38:22 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 xen/arm: Add way to disable traps on accesses to unmapped addresses Add a per-domain way to optionally disable traps for accesses to unmapped addresses. The domain flag is general but it's only implemented for Arm for now. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arm.c | 3 +++ xen/arch/arm/dom0less-build.c | 3 +++ xen/arch/arm/domain.c | 3 ++- xen/arch/arm/domain_build.c | 3 ++- xen/arch/arm/io.c | 37 +++++++++++++++++++++++++++++++++++-- xen/arch/x86/domain.c | 7 +++++++ xen/common/domain.c | 3 ++- xen/include/public/domctl.h | 4 +++- 8 files changed, 57 insertions(+), 6 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 75c811053c..9530996e72 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -233,6 +233,9 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, config->arch.sve_vl = d_config->b_info.arch_arm.sve_vl / 128U; } + /* Trap accesses to unmapped areas. */ + config->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; + return 0; } diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 20aabf6be5..981af5079f 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -343,6 +343,9 @@ void __init arch_create_domUs(struct dt_device_node *node, panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); #endif } + + /* Trap accesses to unmapped areas. */ + d_cfg->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; } int __init init_intc_phandle(struct kernel_info *kinfo, const char *name, diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 45aeb8bddc..be58a23dd7 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -612,7 +612,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) unsigned int max_vcpus; unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu | - XEN_DOMCTL_CDF_xs_domain ); + XEN_DOMCTL_CDF_xs_domain | + XEN_DOMCTL_CDF_trap_unmapped_accesses ); unsigned int sve_vl_bits = sve_decode_vl(config->arch.sve_vl); if ( (config->flags & ~flags_optional) != flags_required ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 590f38e520..845c92614b 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1971,7 +1971,8 @@ void __init create_dom0(void) { struct domain *dom0; struct xen_domctl_createdomain dom0_cfg = { - .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, + .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | + XEN_DOMCTL_CDF_trap_unmapped_accesses, .max_evtchn_port = -1, .max_grant_frames = gnttab_dom0_frames(), .max_maptrack_frames = -1, diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index 5a4b0e8f25..e599bbe043 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -21,6 +21,32 @@ #include "decode.h" +/* Handler for unmapped ranges. Writes ignored, reads return all ones. */ +static int unmapped_read(struct vcpu *v, mmio_info_t *info, register_t *r, + void *priv) +{ + uint64_t mask = GENMASK((1U << info->dabt.size) * 8 - 1, 0); + + /* Mask off upper bits. */ + *r = UINT64_MAX & mask; + return 1; +} + +static int unmapped_write(struct vcpu *v, mmio_info_t *info, register_t r, + void *priv) +{ + return 1; +} + +static const struct mmio_handler_ops unmapped_ops = { + .read = unmapped_read, + .write = unmapped_write +}; + +static const struct mmio_handler unmapped_handler = { + .ops = &unmapped_ops +}; + static enum io_state handle_read(const struct mmio_handler *handler, struct vcpu *v, mmio_info_t *info) @@ -175,11 +201,18 @@ enum io_state try_handle_mmio(struct cpu_user_regs *regs, handler = find_mmio_handler(v->domain, info->gpa); if ( !handler ) { + bool trap_unmapped = v->domain->options & + XEN_DOMCTL_CDF_trap_unmapped_accesses; rc = try_fwd_ioserv(regs, v, info); if ( rc == IO_HANDLED ) return handle_ioserv(regs, v); - - return rc; + else if ( rc == IO_UNHANDLED && !trap_unmapped ) + { + /* Fallback to the unmapped handler. */ + handler = &unmapped_handler; + } else { + return rc; + } } /* diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 7536b6c871..fb7aea9168 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -713,6 +713,13 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) } } + if ( config->flags & XEN_DOMCTL_CDF_trap_unmapped_accesses ) + { + dprintk(XENLOG_INFO, "Unsupported trap_unmapped_accesses flag %#x\n", + config->flags); + return -EINVAL; + } + if ( config->arch.misc_flags & ~XEN_X86_MSR_RELAXED ) { dprintk(XENLOG_INFO, "Invalid arch misc flags %#x\n", diff --git a/xen/common/domain.c b/xen/common/domain.c index e566a18747..434d32901b 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -721,7 +721,8 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu | + XEN_DOMCTL_CDF_trap_unmapped_accesses) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5b2063eed9..be19ab5e26 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -66,9 +66,11 @@ struct xen_domctl_createdomain { #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) /* Should we expose the vPMU to the guest? */ #define XEN_DOMCTL_CDF_vpmu (1U << 7) +/* Should we trap guest accesses to unmapped addresses? */ +#define XEN_DOMCTL_CDF_trap_unmapped_accesses (1U << 8) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_trap_unmapped_accesses uint32_t flags; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:33:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018546.1395422 (Exim 4.92) (envelope-from ) id 1uReri-0004NY-9V; Tue, 17 Jun 2025 22:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018546.1395422; Tue, 17 Jun 2025 22: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 1uReri-0004NQ-6E; Tue, 17 Jun 2025 22:33:14 +0000 Received: by outflank-mailman (input) for mailman id 1018546; Tue, 17 Jun 2025 22:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRerg-0004NE-5u for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRerg-006Oag-0T for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRerg-008wIf-0K for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=Ojhknovyy3PUeJjjBE5LPvXfsREL7tp5bYXCzH/gUfM=; b=ujQOKGklHPg9u7z8blDo7hpe+y JSRh5ge7yM+mXNLA0FkR9XxHw8R3s+gv9E73Qp3j0/aerVazsZOBr2oUqk9SxGufcDg0KMP802I41 CnmDRI12tXeUhHEQCeagt2+VFmNCUiLrC7YzyRY4eY45ncj87zLo0faqRK/w1ZNSVINM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: dom0less: Add trap-unmapped-accesses Message-Id: Date: Tue, 17 Jun 2025 22:33:12 +0000 commit 5f91a9b209cb8a7ecf353ccdb836a73761b9e2e3 Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:38:23 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 xen/arm: dom0less: Add trap-unmapped-accesses Add the trap-unmapped-accesses per-domain fdt property. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 10 ++++++++++ xen/arch/arm/dom0less-build.c | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 59fa96a82e..07acc7ba64 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -225,6 +225,16 @@ with the following properties: option is provided with a non zero value, but the platform doesn't support SVE. +- trap-unmapped-accesses + + Optional. An integer that configures handling of accesses to unmapped + address ranges. + If set to 0, guest accesses will read all bits as ones, e.g 0xFFFFFFFF + for a 32bit access and writes will be ignored. + If set to 1, guest accesses will trap. + + The default is 1 when trap-unmapped-accesses is absent. + - xen,enhanced A string property. Possible property values are: diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 981af5079f..4b285cff5e 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -344,8 +344,15 @@ void __init arch_create_domUs(struct dt_device_node *node, #endif } - /* Trap accesses to unmapped areas. */ + /* Trap unmapped accesses by default. */ d_cfg->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; + if ( dt_property_read_u32(node, "trap-unmapped-accesses", &val) ) + { + if ( val > 1 ) + panic("trap-unmapped-accesses: supported values are 0 or 1"); + if ( !val ) + d_cfg->flags &= ~XEN_DOMCTL_CDF_trap_unmapped_accesses; + } } int __init init_intc_phandle(struct kernel_info *kinfo, const char *name, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018547.1395425 (Exim 4.92) (envelope-from ) id 1uRerr-0004Q4-Cd; Tue, 17 Jun 2025 22:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018547.1395425; Tue, 17 Jun 2025 22: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 1uRerr-0004Pw-9i; Tue, 17 Jun 2025 22:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1018547; Tue, 17 Jun 2025 22:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRerq-0004Po-9D for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRerq-006Oak-0p for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRerq-008wJW-0i for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=/DVungrBVHmFFbXhhKHx1FmKuVO1PUEnzNmwkbVCbBI=; b=dxt4uyF1hy1YlBY6GD5+88duvo sWDQYKdB6dagQtHTkogvp59b1ZQtGJzBMnRoHW5oKZMxEZALecAgCxx6bVHSAkHazZ0c8D8o5Rv9v 0ceAGqp/mM/uPHG3GKWLhbQ5qCCem+F3jhx32lDuoWrkSA6bbixhXTKNl+6w+XZKkZuM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/arm: Add the trap_unmapped_accesses xl config option Message-Id: Date: Tue, 17 Jun 2025 22:33:22 +0000 commit d057628757ffe5ead8bf6d27cc8127cb50b9bea7 Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:53:04 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 tools/arm: Add the trap_unmapped_accesses xl config option Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- docs/man/xl.cfg.5.pod.in | 9 +++++++++ tools/include/libxl.h | 7 +++++++ tools/libs/light/libxl_arm.c | 6 +++--- tools/libs/light/libxl_create.c | 3 +++ tools/libs/light/libxl_types.idl | 1 + tools/libs/light/libxl_x86.c | 6 ++++++ tools/xl/xl_parse.c | 3 +++ 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index c388899306..075e89e6d2 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -3056,6 +3056,15 @@ will be used for the domain. Otherwise, the value specified by the `nr_spis` parameter will be used. The number of SPIs should match the highest interrupt ID that will be assigned to the domain. +=item B + +An Optional boolean parameter that configures handling of accesses to unmapped +address ranges. If enabled, guest accesses will trap. If disabled, guest +accesses will read all bits as ones, e.g 0xFFFFFFFF for a 32bit access and +writes will be ignored. + +This option is only implemented for Arm where the default is enabled. + =back =head3 x86 diff --git a/tools/include/libxl.h b/tools/include/libxl.h index b7ad7735ca..24c81cf145 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -549,6 +549,13 @@ */ #define LIBXL_HAVE_VPMU 1 +/* + * LIBXL_HAVE_TRAP_UNMAPPED_ACCESSES indicates that libxl_domain_build_info + * has a trap_unmapped_accesses parameter, which allows the control of how + * accesses to unmapped adresses behave. + */ +#define LIBXL_HAVE_TRAP_UNMAPPED_ACCESSES 1 + /* * LIBXL_HAVE_PHYSINFO_CAP_GNTTAB indicates that libxl_physinfo has a * cap_gnttab_v1/2 fields, which indicates the available grant table ABIs. diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 9530996e72..afc62a5299 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -233,9 +233,6 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, config->arch.sve_vl = d_config->b_info.arch_arm.sve_vl / 128U; } - /* Trap accesses to unmapped areas. */ - config->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; - return 0; } @@ -1714,6 +1711,9 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, /* ACPI is disabled by default */ libxl_defbool_setdefault(&b_info->acpi, false); + /* Trapping of unmapped accesses enabled by default. */ + libxl_defbool_setdefault(&b_info->trap_unmapped_accesses, true); + /* Sanitise SVE parameter */ if (b_info->arch_arm.sve_vl) { unsigned int max_sve_vl = diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 8bc768b515..625ce5b040 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -605,6 +605,9 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, if (libxl_defbool_val(b_info->vpmu)) create.flags |= XEN_DOMCTL_CDF_vpmu; + if (libxl_defbool_val(b_info->trap_unmapped_accesses)) + create.flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; + assert(info->passthrough != LIBXL_PASSTHROUGH_DEFAULT); LOG(DETAIL, "passthrough: %s", libxl_passthrough_to_string(info->passthrough)); diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 1985153830..57ae16ae78 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -736,6 +736,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vmtrace_buf_kb", integer), ("vpmu", libxl_defbool), + ("trap_unmapped_accesses", libxl_defbool), ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 867addfcab..60d4e8661c 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -26,6 +26,11 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, if (libxl_defbool_val(d_config->b_info.arch_x86.msr_relaxed)) config->arch.misc_flags |= XEN_X86_MSR_RELAXED; + if (libxl_defbool_val(d_config->b_info.trap_unmapped_accesses)) { + LOG(ERROR, "trap_unmapped_accesses is not supported on x86\n"); + return ERROR_FAIL; + } + return 0; } @@ -813,6 +818,7 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, { libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); + libxl_defbool_setdefault(&b_info->trap_unmapped_accesses, false); if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { /* diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 219e924779..98b3612d0f 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2972,6 +2972,9 @@ skip_usbdev: if (!xlu_cfg_get_long (config, "nr_spis", &l, 0)) b_info->arch_arm.nr_spis = l; + xlu_cfg_get_defbool(config, "trap_unmapped_accesses", + &b_info->trap_unmapped_accesses, 0); + parse_vkb_list(config, d_config); d_config->virtios = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018548.1395429 (Exim 4.92) (envelope-from ) id 1uRes1-0004S4-Dw; Tue, 17 Jun 2025 22:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018548.1395429; Tue, 17 Jun 2025 22: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 1uRes1-0004Rw-BN; Tue, 17 Jun 2025 22:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1018548; Tue, 17 Jun 2025 22:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRes0-0004RX-EM for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRes0-006Oaq-1A for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRes0-008wKR-0z for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=o85IJ2GY5lP1uMYW9eEwDJ/WpXFRd7nFsUqyou+1k4E=; b=WYeW/exSNG/xjIWomm1S/3DNHc AeYWj/ZvnhWmEx/hT1+ty+fur1RlO+YsIbsOz/IiWGlODt7YjnTL4PL9BTfKqvDu6EO1VhgJ6XRn7 3GMugXe7HfiU0e/bU/fDvDZm17JnSvPNNCTLgJ7ss1xJs/LBM4zugFXxr204yaEAgP+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/ocaml: Update bindings for CDF_TRAP_UNMAPPED_ACCESSES Message-Id: Date: Tue, 17 Jun 2025 22:33:32 +0000 commit ab02a120c0a546e5aacb9cd8145ee652a9cb6caa Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:53:05 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 tools/ocaml: Update bindings for CDF_TRAP_UNMAPPED_ACCESSES Signed-off-by: Edgar E. Iglesias Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 2690f9a923..7e1aabad6c 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -70,6 +70,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPMU + | CDF_TRAP_UNMAPPED_ACCESSES type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index febbe1f6ae..f44dba61ae 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -63,6 +63,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPMU + | CDF_TRAP_UNMAPPED_ACCESSES type domain_create_iommu_opts = | IOMMU_NO_SHAREPT -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:33:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018549.1395433 (Exim 4.92) (envelope-from ) id 1uResB-0004U2-FJ; Tue, 17 Jun 2025 22:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018549.1395433; Tue, 17 Jun 2025 22: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 1uResB-0004Tu-Ci; Tue, 17 Jun 2025 22:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1018549; Tue, 17 Jun 2025 22:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uResA-0004Tg-HG for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uResA-006Oau-1R for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uResA-008wLT-1L for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=F/B8eRYv9YgwlXcWpsCN4X48TPmTUp0ebvBXz/gF1Hc=; b=GmxoI20rJApbn5QAjNYAwNhBFb R8ob+rGodD3aJHuwXwlUyrcgqeRvzYuWSJ8B+ZH1KGqnDnRm+Dzg53bRS8TNzAhQcqEDMeyMss37U EzDOUqVTTPnOVI+MSC9i7UhNovpOXZ4UpLgTP0CD0tpioCEI9Jogv88TTUiYqgC4pxB4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/golang: Regenerate bindings for trap_unmapped_accesses Message-Id: Date: Tue, 17 Jun 2025 22:33:42 +0000 commit fefc4edfbc2a898904f595004f08ba67df39726f Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:53:06 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 tools/golang: Regenerate bindings for trap_unmapped_accesses Signed-off-by: Edgar E. Iglesias Acked-by: Nick Rosbrook --- tools/golang/xenlight/helpers.gen.go | 6 ++++++ tools/golang/xenlight/types.gen.go | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 90846ea8e8..191be87297 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1170,6 +1170,9 @@ x.Altp2M = Altp2MMode(xc.altp2m) x.VmtraceBufKb = int(xc.vmtrace_buf_kb) if err := x.Vpmu.fromC(&xc.vpmu);err != nil { 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) } return nil} @@ -1695,6 +1698,9 @@ xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb) if err := x.Vpmu.toC(&xc.vpmu); err != nil { 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) } return nil diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index e7667f1ce3..656933c6c9 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -606,6 +606,7 @@ MsrRelaxed Defbool Altp2M Altp2MMode VmtraceBufKb int Vpmu Defbool +TrapUnmappedAccesses Defbool } type DomainBuildInfoTypeUnion interface { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:33:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018550.1395436 (Exim 4.92) (envelope-from ) id 1uResL-0004Wv-Gk; Tue, 17 Jun 2025 22:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018550.1395436; Tue, 17 Jun 2025 22: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 1uResL-0004Wn-EA; Tue, 17 Jun 2025 22:33:53 +0000 Received: by outflank-mailman (input) for mailman id 1018550; Tue, 17 Jun 2025 22:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uResK-0004We-Hy for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uResK-006Oay-1i for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uResK-008wM1-1c for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=F3Kq+ExV24D5CEO3hteg707nIv28ql5kIFE9Unsd0f0=; b=RFGiZeTSxKn3qXCZ3UxZ43cgsA k0eBhQ0P/MoZmohcXzJTi+t9ZNn7k9V0xjCa47Ybnp10ziJoLWjW4Wn+Js+SO7uUGLEHx/hh8Y/QS DYbA3l6nEwLU4gkUeCGq1O2KPm9MSMPH2UiUPLZ9MGqZ1sjAIAasFl1Yris8c0yWPHxQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] console: Do not duplicate early printk messages on conring flush Message-Id: Date: Tue, 17 Jun 2025 22:33:52 +0000 commit f6f8fbb25865e2d41b6e91d255ab51a173b432ce Author: Michal Orzel AuthorDate: Tue Jun 17 09:19:40 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 console: Do not duplicate early printk messages on conring flush Commit f6d1bfa16052 introduced flushing conring in console_init_preirq(). However, when CONFIG_EARLY_PRINTK is enabled, the early boot messages had already been sent to serial before main console initialization. This results in all the early boot messages being duplicated. Change conring_flush() to accept argument listing devices to which to flush conring. We don't want to send to serial at console initialization when using early printk, but we want these messages to be send at conring dump triggered by keyhandler. Fixes: f6d1bfa16052 ("xen/console: introduce conring_flush()") Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 9a9836ba91..5879e31786 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -453,9 +453,9 @@ void console_serial_puts(const char *s, size_t nr) } /* - * Flush contents of the conring to the physical console devices. + * Flush contents of the conring to the selected console devices. */ -static int conring_flush(void) +static int conring_flush(unsigned int flags) { uint32_t idx, len, sofar, c; unsigned int order; @@ -479,7 +479,7 @@ static int conring_flush(void) c += len; } - console_send(buf, sofar, CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); + console_send(buf, sofar, flags); free_xenheap_pages(buf, order); @@ -491,7 +491,7 @@ static void cf_check conring_dump_keyhandler(unsigned char key) int rc; printk("'%c' pressed -> dumping console ring buffer (dmesg)\n", key); - rc = conring_flush(); + rc = conring_flush(CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); if ( rc ) printk("failed to dump console ring buffer: %d\n", rc); } @@ -1042,6 +1042,7 @@ void __init console_init_preirq(void) { char *p; int sh; + unsigned int flags = CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV; serial_init_preirq(); @@ -1084,8 +1085,15 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); pv_console_set_rx_handler(serial_rx); - /* NB: send conring contents to all enabled physical consoles, if any */ - conring_flush(); + /* + * NB: send conring contents to all enabled physical consoles, if any. + * Skip serial if CONFIG_EARLY_PRINTK is enabled, which means the early + * messages have already been sent to serial. + */ + if ( IS_ENABLED(CONFIG_EARLY_PRINTK) ) + flags &= ~CONSOLE_SERIAL; + + conring_flush(flags); /* HELLO WORLD --- start-of-day banner text. */ nrspin_lock(&console_lock); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:34:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018551.1395441 (Exim 4.92) (envelope-from ) id 1uResV-0004Zu-I2; Tue, 17 Jun 2025 22:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018551.1395441; Tue, 17 Jun 2025 22: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 1uResV-0004Zn-FV; Tue, 17 Jun 2025 22:34:03 +0000 Received: by outflank-mailman (input) for mailman id 1018551; Tue, 17 Jun 2025 22:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uResU-0004Zd-Mo for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uResU-006ObY-20 for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uResU-008wN0-1t for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=pAHDI6Y8aIPtTGRS1jGVm3jU0mwcer/uttQYB5pw1JA=; b=NGQuoYtUfAz/GJaelF1jW87uHd 1EhDACSjMmnmtXNTnCbuiSPeT+gdwI4+K1Us2N7XizAeUTrOuW2247oy9hkimDezAEP/8rnJVYs+Z 2/gWE3KDVa9EYAoJWLhVfVk1RfcfhFvNmNVSSYisoRiwMacbXyPAuQuXqhu8aBIld4oI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: rewrite emulation_flags_ok() Message-Id: Date: Tue, 17 Jun 2025 22:34:02 +0000 commit 337f0ad8d486de8e95c981c695dce7dcb4ea0cbb Author: Denis Mukhin AuthorDate: Tue Jun 17 17:56:51 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:05 2025 -0700 xen/domain: rewrite emulation_flags_ok() Rewrite emulation_flags_ok() to simplify future modifications. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Roger Pau Monné --- xen/arch/x86/domain.c | 79 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fb7aea9168..d025befe3d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -750,32 +750,75 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return 0; } +/* + * Verify that the domain's emulation flags resolve to a supported configuration. + * + * This ensures we only allow a known, safe subset of emulation combinations + * (for both functionality and security). Arbitrary mixes are likely to cause + * errors (e.g. null pointer dereferences). + * + * NB: use the internal X86_EMU_XXX symbols, not the public XEN_X86_EMU_XXX + * symbols, to take build-time config options (e.g. CONFIG_HVM) into account + * for short-circuited emulations. + */ static bool emulation_flags_ok(const struct domain *d, uint32_t emflags) { + enum { + CAP_PV = BIT(0, U), + CAP_HVM = BIT(1, U), + CAP_HWDOM = BIT(2, U), + CAP_DOMU = BIT(3, U), + }; + static const struct { + unsigned int caps; + uint32_t min; + uint32_t opt; + } configs[] = { +#ifdef CONFIG_PV + /* PV dom0 and domU */ + { + .caps = CAP_PV | CAP_HWDOM | CAP_DOMU, + .opt = X86_EMU_PIT, + }, +#endif /* #ifdef CONFIG_PV */ + +#ifdef CONFIG_HVM + /* PVH dom0 */ + { + .caps = CAP_HVM | CAP_HWDOM, + .min = X86_EMU_LAPIC | X86_EMU_IOAPIC | X86_EMU_VPCI, + }, + + /* PVH domU */ + { + .caps = CAP_HVM | CAP_DOMU, + .min = X86_EMU_LAPIC, + }, + + /* HVM domU */ + { + .caps = CAP_HVM | CAP_DOMU, + .min = X86_EMU_ALL & ~(X86_EMU_VPCI | X86_EMU_USE_PIRQ), + /* HVM PIRQ feature is user-selectable. */ + .opt = X86_EMU_USE_PIRQ, + }, +#endif /* #ifdef CONFIG_HVM */ + }; + unsigned int i; + unsigned int caps = (is_pv_domain(d) ? CAP_PV : CAP_HVM) | + (is_hardware_domain(d) ? CAP_HWDOM : CAP_DOMU); + #ifdef CONFIG_HVM /* This doesn't catch !CONFIG_HVM case but it is better than nothing */ BUILD_BUG_ON(X86_EMU_ALL != XEN_X86_EMU_ALL); #endif - if ( is_hvm_domain(d) ) - { - if ( is_hardware_domain(d) && - emflags != (X86_EMU_VPCI | X86_EMU_LAPIC | X86_EMU_IOAPIC) ) - return false; - if ( !is_hardware_domain(d) && - /* HVM PIRQ feature is user-selectable. */ - (emflags & ~X86_EMU_USE_PIRQ) != - (X86_EMU_ALL & ~(X86_EMU_VPCI | X86_EMU_USE_PIRQ)) && - emflags != X86_EMU_LAPIC ) - return false; - } - else if ( emflags != 0 && emflags != X86_EMU_PIT ) - { - /* PV or classic PVH. */ - return false; - } + for ( i = 0; i < ARRAY_SIZE(configs); i++ ) + if ( (caps & configs[i].caps) == caps && + (emflags & ~configs[i].opt) == configs[i].min ) + return true; - return true; + return false; } void __init arch_init_idle_domain(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:34:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:34:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018552.1395445 (Exim 4.92) (envelope-from ) id 1uResf-0004cR-Jf; Tue, 17 Jun 2025 22:34:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018552.1395445; Tue, 17 Jun 2025 22:34: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 1uResf-0004cJ-Gv; Tue, 17 Jun 2025 22:34:13 +0000 Received: by outflank-mailman (input) for mailman id 1018552; Tue, 17 Jun 2025 22:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRese-0004cB-No for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRese-006Obc-2H for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRese-008wNU-2B for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22: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=cM+X+nLDDWWxeIH0e0khsVo7YHHas8Xhsggn2jje3Z4=; b=4Tux03nzp0q0n0cpJz2qxPbuSp 1ZuI4tWJCRcLHoAZlnIfHDYGWZjP7Hou4hQbpZLI2us5qu34GJPkdkdouQoYeKOSimlmOtmlPQ4Nx 39nJwlVltLoOZY/oj67vwNSQSomcDUTWc0AlyfeNfptFcWnYjaCF1pObxaEPrzjXZoY8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: disable terminal echo in xilinx test scripts Message-Id: Date: Tue, 17 Jun 2025 22:34:12 +0000 commit 2f73ef4bd7222d120e593dccb13b5e79b642af56 Author: Victor Lira AuthorDate: Tue Jun 17 09:44:49 2025 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:52 2025 -0700 automation: disable terminal echo in xilinx test scripts The default terminal settings in Linux will enable echo which interferes with these tests. Set the value in the script to avoid failure caused by a settings reset. Signed-off-by: Victor Lira Acked-by: Stefano Stabellini --- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 71cdb295b2..6970a8658d 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -165,7 +165,7 @@ sleep 5 sh /scratch/gitlab-runner/${TEST_BOARD}.sh 1 sleep 5 set +e -stty -F ${SERIAL_DEV} 57600 +stty -F ${SERIAL_DEV} 57600 -echo # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 293232eebf..1d7162f1b3 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -128,7 +128,7 @@ cd $START # connect to serial SERIAL_DEV="/dev/serial/zynq" set +e -stty -F ${SERIAL_DEV} 115200 +stty -F ${SERIAL_DEV} 115200 -echo # Capture test result and power off board before exiting. export PASSED="${passed}" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 17 22:34:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 17 Jun 2025 22:34:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018553.1395448 (Exim 4.92) (envelope-from ) id 1uResp-0004fV-LB; Tue, 17 Jun 2025 22:34:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018553.1395448; Tue, 17 Jun 2025 22:34: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 1uResp-0004fO-IG; Tue, 17 Jun 2025 22:34:23 +0000 Received: by outflank-mailman (input) for mailman id 1018553; Tue, 17 Jun 2025 22:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uReso-0004eQ-QC for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uReso-006Obm-2W for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uReso-008wO9-2R for xen-changelog@lists.xenproject.org; Tue, 17 Jun 2025 22:34: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=i+MY1JzPGdQ3L0yWUPTM9JT+ilhx5a7HJGsPFf1JZeY=; b=dC5V/1zOOif/mB7rG4ui1MoPyd aChn2eF5wUdePj1/IxihhBNMkbshyCF1pbBH0l9uNMPGaZsxFqPB2cRqbv/JIuPA1etX0aK/Dp+Sa JUVe257pFD9CzfYEs7DOO0ZPdo1cQh3PBU1/7+PARWKqf42OeprNNIiBfNjy5wDctcXA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: update my email address Message-Id: Date: Tue, 17 Jun 2025 22:34:22 +0000 commit a5345249c8db83fb3967aaf558f7dbdfc171d1a0 Author: Nick Rosbrook AuthorDate: Tue Jun 17 11:00:02 2025 -0400 Commit: Stefano Stabellini CommitDate: Tue Jun 17 14:02:43 2025 -0700 MAINTAINERS: update my email address Change rosbrookn@gmail.com -> enr0n@ubuntu.com Signed-off-by: Nick Rosbrook Acked-by: Stefano Stabellini --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 13f31b0c1b..9aa7dd2f57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -330,7 +330,7 @@ F: xen/arch/x86/debug.c F: tools/debugger/gdbsx/ GOLANG BINDINGS -M: Nick Rosbrook +M: Nick Rosbrook R: George Dunlap S: Maintained F: tools/golang -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 00:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 00:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018630.1395503 (Exim 4.92) (envelope-from ) id 1uRgOM-0002eZ-FV; Wed, 18 Jun 2025 00:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018630.1395503; Wed, 18 Jun 2025 00: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 1uRgOM-0002eR-Cp; Wed, 18 Jun 2025 00:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1018630; Wed, 18 Jun 2025 00:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRgOL-0002eL-Vw for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRgOL-006R3t-2t for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRgOL-0091Ru-2l for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00: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=OX1ahp4h2WWrZBIYkQ8Cix0ry8QVKm/QSBbh2gsXFGU=; b=oHYIGzmeQtDzvKO2XKfLtBtKwq aXl2AjFB+C/ZvlEdJWoUjJw4Sk2hrKVvo9GHCMZ9NpWvulTSYcYNZ+KYRrOk69Jf4hw7El2qsD9Y/ 5twsHFhCHc5bj2VRWzPWeUiR8mDwVn20kb2xSPX57Pay17spbbu7ALsV76/D/JkTkNGo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: exclude xen,reg from direct-map domU extended regions Message-Id: Date: Wed, 18 Jun 2025 00:11:01 +0000 commit 3af8a6ed8e1db75bee5c51268507333f9f5772a3 Author: Stewart Hildebrand AuthorDate: Tue Jun 17 13:54:04 2025 -0400 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:30:17 2025 -0700 xen/arm: exclude xen,reg from direct-map domU extended regions Similarly to fba1b0974dd8, when a device is passed through to a direct-map dom0less domU, the xen,reg ranges may overlap with the extended regions. Remove xen,reg from direct-map domU extended regions. Take the opportunity to update the comment ahead of find_memory_holes(). Signed-off-by: Stewart Hildebrand Reviewed-by: Michal Orzel --- xen/arch/arm/domain_build.c | 80 ++++++++++++++++++++++++++++++++--- xen/common/device-tree/domain-build.c | 5 +++ 2 files changed, 80 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 845c92614b..4ff161887e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -792,15 +792,17 @@ static int __init handle_pci_range(const struct dt_device_node *dev, } /* - * Find the holes in the Host DT which can be exposed to Dom0 as extended - * regions for the special memory mappings. In order to calculate regions - * we exclude every addressable memory region described by "reg" and "ranges" - * properties from the maximum possible addressable physical memory range: + * Find the holes in the Host DT which can be exposed to hwdom or a direct-map + * domU as extended regions for the special memory mappings. In order to + * calculate regions we exclude every addressable memory region described by + * "reg" and "ranges" properties from the maximum possible addressable physical + * memory range: * - MMIO * - Host RAM * - PCI aperture * - Static shared memory regions, which are described by special property * "xen,shared-mem" + * - xen,reg mappings */ static int __init find_memory_holes(const struct kernel_info *kinfo, struct membanks *ext_regions) @@ -882,6 +884,13 @@ static int __init find_memory_holes(const struct kernel_info *kinfo, } } + if ( kinfo->xen_reg_assigned ) + { + res = rangeset_subtract(mem_holes, kinfo->xen_reg_assigned); + if ( res ) + goto out; + } + start = 0; end = (1ULL << p2m_ipa_bits) - 1; res = rangeset_report_ranges(mem_holes, PFN_DOWN(start), PFN_DOWN(end), @@ -962,11 +971,51 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, return res; } +static int __init count(unsigned long s_gfn, unsigned long e_gfn, void *data) +{ + unsigned int *cnt = data; + + (*cnt)++; + + return 0; +} + +static unsigned int __init count_ranges(struct rangeset *r) +{ + unsigned int cnt = 0; + + (void) rangeset_report_ranges(r, 0, PFN_DOWN((1ULL << p2m_ipa_bits) - 1), + count, &cnt); + + return cnt; +} + +static int __init rangeset_to_membank(unsigned long s_gfn, unsigned long e_gfn, + void *data) +{ + struct membanks *membank = data; + paddr_t s = pfn_to_paddr(s_gfn); + paddr_t e = pfn_to_paddr(e_gfn + 1); + + if ( membank->nr_banks >= membank->max_banks ) + return 0; + + membank->bank[membank->nr_banks].start = s; + membank->bank[membank->nr_banks].size = e - s; + membank->nr_banks++; + + return 0; +} + static int __init find_host_extended_regions(const struct kernel_info *kinfo, struct membanks *ext_regions) { int res; struct membanks *gnttab = membanks_xzalloc(1, MEMORY); + struct membanks *xen_reg = + kinfo->xen_reg_assigned + ? membanks_xzalloc(count_ranges(kinfo->xen_reg_assigned), MEMORY) + : NULL; /* * Exclude the following regions: @@ -974,6 +1023,7 @@ static int __init find_host_extended_regions(const struct kernel_info *kinfo, * 2) Remove reserved memory * 3) Grant table assigned to domain * 4) Remove static shared memory (when the feature is enabled) + * 5) Remove xen,reg */ const struct membanks *mem_banks[] = { kernel_info_get_mem_const(kinfo), @@ -982,12 +1032,29 @@ static int __init find_host_extended_regions(const struct kernel_info *kinfo, #ifdef CONFIG_STATIC_SHM bootinfo_get_shmem(), #endif + xen_reg, }; dt_dprintk("Find unallocated memory for extended regions\n"); if ( !gnttab ) - return -ENOMEM; + { + res = -ENOMEM; + goto out; + } + + if ( kinfo->xen_reg_assigned ) + { + if ( !xen_reg ) + { + res = -ENOMEM; + goto out; + } + + rangeset_report_ranges(kinfo->xen_reg_assigned, 0, + PFN_DOWN((1ULL << p2m_ipa_bits) - 1), + rangeset_to_membank, xen_reg); + } gnttab->nr_banks = 1; gnttab->bank[0].start = kinfo->gnttab_start; @@ -995,6 +1062,9 @@ static int __init find_host_extended_regions(const struct kernel_info *kinfo, res = find_unallocated_memory(kinfo, mem_banks, ARRAY_SIZE(mem_banks), ext_regions, add_ext_regions); + + out: + xfree(xen_reg); xfree(gnttab); return res; diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 6b8b8d7cac..99ea81198a 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -193,6 +193,10 @@ int __init find_unallocated_memory(const struct kernel_info *kinfo, /* Remove all regions listed in mem_banks */ for ( i = 0; i < nr_mem_banks; i++ ) + { + if ( !mem_banks[i] ) + continue; + for ( j = 0; j < mem_banks[i]->nr_banks; j++ ) { start = mem_banks[i]->bank[j].start; @@ -212,6 +216,7 @@ int __init find_unallocated_memory(const struct kernel_info *kinfo, goto out; } } + } start = 0; end = (1ULL << p2m_ipa_bits) - 1; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 00:11:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 00:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018631.1395506 (Exim 4.92) (envelope-from ) id 1uRgOW-0002gC-Gm; Wed, 18 Jun 2025 00:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018631.1395506; Wed, 18 Jun 2025 00: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 1uRgOW-0002g5-EK; Wed, 18 Jun 2025 00:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1018631; Wed, 18 Jun 2025 00:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRgOW-0002fz-0s for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRgOV-006R46-3C for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRgOV-0091Sc-34 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00: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=FOTbsp/1Mp57xEOyKZyQmi7gh6nCaPwN2X6ORB8PcQU=; b=MrVuJY/3Ip1vMeHzlWXYns4nHM JdM87UWASEtGKz5VZoqcYacgTeejo3OM6y8EFlC2/LQHsZQAwY9BlkyHRlhlr7dkcp/g/o/i56c/5 D4o+y9L/THL3nBYdyxUUCMKfu1tlWk+WG9bLB/AnJtPRPoBKl+MfvKOq2aiDnGkE7C/s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/arm: exclude iomem from domU extended regions Message-Id: Date: Wed, 18 Jun 2025 00:11:11 +0000 commit 108308feeff4df92cec9191884ebb7b155bc8de5 Author: Stewart Hildebrand AuthorDate: Tue Jun 17 13:54:05 2025 -0400 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:30:18 2025 -0700 tools/arm: exclude iomem from domU extended regions When a device is passed through to a xl domU, the iomem ranges may overlap with the extended regions. Remove iomem from extended regions. Signed-off-by: Stewart Hildebrand Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_arm.c | 110 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 91 insertions(+), 19 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index afc62a5299..4a19a8d22b 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -798,6 +798,8 @@ static int make_timer_node(libxl__gc *gc, void *fdt, return 0; } +#define MAX_NR_EXT_REGIONS 256 + static int make_hypervisor_node(libxl__gc *gc, void *fdt, const libxl_version_info *vers) { @@ -821,7 +823,7 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, */ res = fdt_property_reg_placeholder(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, - GUEST_RAM_BANKS + 1); + MAX_NR_EXT_REGIONS + 1); if (res) return res; /* @@ -1517,17 +1519,29 @@ static void finalise_one_node(libxl__gc *gc, void *fdt, const char *uname, #define EXT_REGION_MIN_SIZE xen_mk_ullong(0x0004000000) /* 64MB */ -static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) +static int compare_iomem(const void *a, const void *b) +{ + const libxl_iomem_range *x = a, *y = b; + + if (x->gfn < y->gfn) + return -1; + if (x->gfn > y->gfn) + return 1; + return 0; +} + +static int finalize_hypervisor_node(libxl__gc *gc, + libxl_domain_build_info *b_info, + struct xc_dom_image *dom) { void *fdt = dom->devicetree_blob; - uint64_t region_size[GUEST_RAM_BANKS] = {0}, region_base[GUEST_RAM_BANKS], - bankend[GUEST_RAM_BANKS]; + uint64_t region_base[MAX_NR_EXT_REGIONS], region_size[MAX_NR_EXT_REGIONS]; uint32_t regs[(GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS) * - (GUEST_RAM_BANKS + 1)]; + (MAX_NR_EXT_REGIONS + 1)]; be32 *cells = ®s[0]; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; - unsigned int i, len, nr_regions = 0; + unsigned int i, j, len, nr_regions = 0; libxl_dominfo info; int offset, rc; @@ -1542,20 +1556,82 @@ static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) if (info.gpaddr_bits > 64) return ERROR_INVAL; + qsort(b_info->iomem, b_info->num_iomem, sizeof(libxl_iomem_range), + compare_iomem); + /* * Try to allocate separate 2MB-aligned extended regions from the first * and second RAM banks taking into the account the maximum supported * guest physical address space size and the amount of memory assigned * to the guest. */ - for (i = 0; i < GUEST_RAM_BANKS; i++) { - region_base[i] = bankbase[i] + + for (i = 0; i < GUEST_RAM_BANKS && nr_regions < MAX_NR_EXT_REGIONS; i++) { + struct { + uint64_t start; + uint64_t end; /* inclusive */ + } unallocated; + uint64_t unallocated_size = 0; + + unallocated.start = bankbase[i] + ALIGN_UP_TO_2MB((uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT); - bankend[i] = ~0ULL >> (64 - info.gpaddr_bits); - bankend[i] = min(bankend[i], bankbase[i] + banksize[i] - 1); - if (bankend[i] > region_base[i]) - region_size[i] = bankend[i] - region_base[i] + 1; + unallocated.end = ~0ULL >> (64 - info.gpaddr_bits); + unallocated.end = min(unallocated.end, bankbase[i] + banksize[i] - 1); + + if (unallocated.end >= unallocated.start) + unallocated_size = unallocated.end - unallocated.start + 1; + + if (unallocated_size < EXT_REGION_MIN_SIZE) + continue; + + /* Exclude iomem */ + for (j = 0; j < b_info->num_iomem && nr_regions < MAX_NR_EXT_REGIONS; + j++) { + struct { + uint64_t start; + uint64_t end; /* inclusive */ + } iomem; + + iomem.start = b_info->iomem[j].gfn << XC_PAGE_SHIFT; + iomem.end = ((b_info->iomem[j].gfn + b_info->iomem[j].number) + << XC_PAGE_SHIFT) - 1; + + if (iomem.end >= unallocated.start + && iomem.start <= unallocated.end) { + + if (iomem.start <= unallocated.start) { + unallocated.start = iomem.end + 1; + + if (unallocated.start > unallocated.end) + break; + } else { + uint64_t size = iomem.start - unallocated.start; + + if (size >= EXT_REGION_MIN_SIZE) { + region_base[nr_regions] = unallocated.start; + region_size[nr_regions] = size; + nr_regions++; + } + + unallocated.start = iomem.end + 1; + + if (unallocated.start > unallocated.end) + break; + } + } + } + + if (unallocated.end >= unallocated.start + && nr_regions < MAX_NR_EXT_REGIONS) + { + uint64_t size = unallocated.end - unallocated.start + 1; + + if (size >= EXT_REGION_MIN_SIZE) { + region_base[nr_regions] = unallocated.start; + region_size[nr_regions] = size; + nr_regions++; + } + } } /* @@ -1565,16 +1641,12 @@ static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); - for (i = 0; i < GUEST_RAM_BANKS; i++) { - if (region_size[i] < EXT_REGION_MIN_SIZE) - continue; - + for (i = 0; i < nr_regions; i++) { LOG(DEBUG, "Extended region %u: %#"PRIx64"->%#"PRIx64"", - nr_regions, region_base[i], region_base[i] + region_size[i]); + i, region_base[i], region_base[i] + region_size[i] - 1); set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, region_base[i], region_size[i]); - nr_regions++; } if (!nr_regions) @@ -1626,7 +1698,7 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, } - res = finalize_hypervisor_node(gc, dom); + res = finalize_hypervisor_node(gc, &d_config->b_info, dom); if (res) return res; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 00:11:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 00:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018632.1395511 (Exim 4.92) (envelope-from ) id 1uRgOg-0002iA-IS; Wed, 18 Jun 2025 00:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018632.1395511; Wed, 18 Jun 2025 00: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 1uRgOg-0002i2-Fl; Wed, 18 Jun 2025 00:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1018632; Wed, 18 Jun 2025 00:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRgOg-0002hu-3Y for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRgOg-006R4A-0G for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRgOg-0091Ti-09 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00: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=fO9waJ+87dG6h/z0oe+rqU6RuDs5DAZ+u4Os3YaDjZk=; b=iN9Dl4keooVfs4+4/YqWfCM22B Hj9LB6ILYPwXQ0Tg1bcbWzb5v3bs5aOTzETgWvjZfzXqYX4FdcqvTpR9jDoZLHQCISOcPANqXmRAn H3tUFmL2n3+8tIKek4kOQ1O+wvaTtybgv+wCpsYh/g9IilWMVHYY9dUKJp3DEM8DKBPc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: allow PCI host bridge to have private data Message-Id: Date: Wed, 18 Jun 2025 00:11:22 +0000 commit 92b72ab868c7fe2eb219e69bb1dfdd5fac9a1cf1 Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:20 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:32:31 2025 -0700 xen/arm: allow PCI host bridge to have private data Some of the PCI host bridges require private data. Add priv field to struct pci_host_bridge, so such bridges may populate it with their private data. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 64f0e6ce7e..dca9fa4e4c 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -68,6 +68,7 @@ struct pci_host_bridge { uint16_t segment; /* Segment number */ struct pci_config_window* cfg; /* Pointer to the bridge config window */ const struct pci_ops *ops; + void *priv; /* Private data of the bridge. */ }; struct pci_ops { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 00:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 00:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018633.1395515 (Exim 4.92) (envelope-from ) id 1uRgOr-0002kf-Jg; Wed, 18 Jun 2025 00:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018633.1395515; Wed, 18 Jun 2025 00: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 1uRgOr-0002kX-H1; Wed, 18 Jun 2025 00:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1018633; Wed, 18 Jun 2025 00:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRgOq-0002kQ-6F for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRgOq-006R4E-0X for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRgOq-0091UF-0Q for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00: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=o65qiQwxkTVNyALdAS/bOTFUJi8kbh5LLZDPqFrR0So=; b=YU07jbfKqjfLFkja2kBggqrEWH eY0FzqdpnkAFpYYYEkHXKP/EGWxG+KnphLIeOqZaxx/QdttHxwwozMe8B0c9r6kIHHDF9o8U8bRP3 M2ztPT4T8p+4KTFpkwWnmTe7HOrborQiq2eLhJIZjs2sOUbqjILQHv79L1CFtvhaxNXE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: make pci_host_common_probe return the bridge Message-Id: Date: Wed, 18 Jun 2025 00:11:32 +0000 commit fdff9cfdda03962591c2fae06e15370db160f139 Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:21 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:32:39 2025 -0700 xen/arm: make pci_host_common_probe return the bridge Some of the PCI host bridges require additional processing during the probe phase. For that they need to access struct bridge of the probed host, so return pointer to the new bridge from pci_host_common_probe. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 5 +++-- xen/arch/arm/pci/pci-host-common.c | 12 ++++++------ xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index dca9fa4e4c..9e8b17c827 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -18,6 +18,7 @@ #ifdef CONFIG_HAS_PCI #include +#include #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) @@ -97,8 +98,8 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -int pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops); +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index c0faf0f436..53953d4895 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -208,8 +208,8 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -int pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops) +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; @@ -217,11 +217,11 @@ int pci_host_common_probe(struct dt_device_node *dev, int domain; if ( dt_device_for_passthrough(dev) ) - return 0; + return NULL; bridge = pci_alloc_host_bridge(); if ( !bridge ) - return -ENOMEM; + return ERR_PTR(-ENOMEM); /* Parse and map our Configuration Space windows */ cfg = gen_pci_init(dev, ops); @@ -244,12 +244,12 @@ int pci_host_common_probe(struct dt_device_node *dev, bridge->segment = domain; pci_add_host_bridge(bridge); - return 0; + return bridge; err_exit: xfree(bridge); - return err; + return ERR_PTR(err); } /* diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index 46de6e43cc..a6ffbda174 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return pci_host_common_probe(dev, &pci_generic_ecam_ops); + return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops)); } DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 101edb8593..a38f2e019e 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -47,7 +47,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return pci_host_common_probe(dev, &nwl_pcie_ops); + return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops)); } DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 00:11:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 00:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018634.1395519 (Exim 4.92) (envelope-from ) id 1uRgP1-0002nD-Lb; Wed, 18 Jun 2025 00:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018634.1395519; Wed, 18 Jun 2025 00: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 1uRgP1-0002n6-IW; Wed, 18 Jun 2025 00:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1018634; Wed, 18 Jun 2025 00:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRgP0-0002mq-BL for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRgP0-006R4L-0r for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRgP0-0091Ul-0i for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00: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=bVsqOw8mFBBmZlOUtn51/N8dbv6imlRqnroUq063fHk=; b=KMLTg0VQVmM/KCB6nzOpL6dhpu +M9Fr+TxEn9PFDTcIrrsylYcx2yjHaoNuzHEZY+dQa2OUonwiTA+UniGW3rh28UsNn2bmbZzwUUEW 5ssw8y8NulbO5vyGfYJ9d66xBYms1Sax5G9/joy+mpA+JDbbibJ054sRt0do6plVrFKA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add support for PCI child bus Message-Id: Date: Wed, 18 Jun 2025 00:11:42 +0000 commit fe4ca5630b1f2d1c602d47c5182399ead82f9320 Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:21 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:52:06 2025 -0700 xen/arm: add support for PCI child bus PCI host bridges often have different ways to access the root and child bus configuration spaces. One of the examples is Designware's host bridge and its multiple clones [1]. Linux kernel implements this by instantiating a child bus when device drivers provide not only the usual pci_ops to access ECAM space (this is the case for the generic host bridge), but also means to access the child bus which has a dedicated configuration space and own implementation for accessing the bus, e.g. child_ops. For Xen it is not feasible to fully implement PCI bus infrastructure as Linux kernel does, but still child bus can be supported. Add support for the PCI child bus which includes the following changes: - introduce bus mapping functions depending on SBDF - assign bus start and end for the child bus and re-configure the same for the parent (root) bus - make pci_find_host_bridge be aware of multiple busses behind the same bridge - update pci_host_bridge_mappings, so it also doesn't map to guest the memory spaces belonging to the child bus - make pci_host_common_probe accept one more pci_ops structure for the child bus - install MMIO handlers for the child bus for hardware domain - re-work vpci_mmio_{write|read} with parent and child approach in mind [1] https://elixir.bootlin.com/linux/v5.15/source/drivers/pci/controller/dwc Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 20 +++++++- xen/arch/arm/pci/ecam.c | 1 + xen/arch/arm/pci/pci-access.c | 37 ++++++++++++--- xen/arch/arm/pci/pci-host-common.c | 84 +++++++++++++++++++++++++++------- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 3 +- xen/arch/arm/vpci.c | 91 +++++++++++++++++++++++++++++-------- 7 files changed, 194 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 9e8b17c827..37a6f14dd4 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -69,6 +69,9 @@ struct pci_host_bridge { uint16_t segment; /* Segment number */ struct pci_config_window* cfg; /* Pointer to the bridge config window */ const struct pci_ops *ops; + /* Child bus */ + struct pci_config_window *child_cfg; + const struct pci_ops *child_ops; void *priv; /* Private data of the bridge. */ }; @@ -82,6 +85,9 @@ struct pci_ops { bool (*need_p2m_hwdom_mapping)(struct domain *d, struct pci_host_bridge *bridge, uint64_t addr); + void (*init_bus_range)(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg); }; /* @@ -98,8 +104,10 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops); +struct pci_host_bridge * +pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, @@ -135,6 +143,14 @@ bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); static inline int pci_sanitize_bar_memory(struct rangeset *r) { return 0; } +void pci_generic_init_bus_range(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg); + +void pci_generic_init_bus_range_child(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg); + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c index 3987f96b01..c979af7302 100644 --- a/xen/arch/arm/pci/ecam.c +++ b/xen/arch/arm/pci/ecam.c @@ -60,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = { .read = pci_generic_config_read, .write = pci_generic_config_write, .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, } }; diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c index 9f9aac43d7..4a94867501 100644 --- a/xen/arch/arm/pci/pci-access.c +++ b/xen/arch/arm/pci/pci-access.c @@ -18,10 +18,31 @@ #define INVALID_VALUE (~0U) #define PCI_ERR_VALUE(len) GENMASK(0, len * 8) +static const struct pci_ops *get_ops(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf) +{ + if ( bridge->child_ops ) + { + struct pci_config_window *cfg = bridge->child_cfg; + + if ( (sbdf.bus >= cfg->busn_start) && (sbdf.bus <= cfg->busn_end) ) + return bridge->child_ops; + } + return bridge->ops; +} + +static inline void __iomem *map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t reg) +{ + const struct pci_ops *ops = get_ops(bridge, sbdf); + + return ops->map_bus(bridge, sbdf, reg); +} + int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value) { - void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + void __iomem *addr = map_bus(bridge, sbdf, reg); if ( !addr ) { @@ -50,7 +71,7 @@ int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value) { - void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + void __iomem *addr = map_bus(bridge, sbdf, reg); if ( !addr ) return -ENODEV; @@ -78,14 +99,16 @@ static uint32_t pci_config_read(pci_sbdf_t sbdf, unsigned int reg, { uint32_t val = PCI_ERR_VALUE(len); struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + const struct pci_ops *ops; if ( unlikely(!bridge) ) return val; - if ( unlikely(!bridge->ops->read) ) + ops = get_ops(bridge, sbdf); + if ( unlikely(!ops->read) ) return val; - bridge->ops->read(bridge, sbdf, reg, len, &val); + ops->read(bridge, sbdf, reg, len, &val); return val; } @@ -94,14 +117,16 @@ static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, uint32_t val) { struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + const struct pci_ops *ops; if ( unlikely(!bridge) ) return; - if ( unlikely(!bridge->ops->write) ) + ops = get_ops(bridge, sbdf); + if ( unlikely(!ops->write) ) return; - bridge->ops->write(bridge, sbdf, reg, len, val); + ops->write(bridge, sbdf, reg, len, val); } /* diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 53953d4895..487c545f3a 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -57,17 +57,12 @@ static void pci_ecam_free(struct pci_config_window *cfg) xfree(cfg); } -static struct pci_config_window * __init -gen_pci_init(struct dt_device_node *dev, const struct pci_ecam_ops *ops) +void __init pci_generic_init_bus_range(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg) { - int err, cfg_reg_idx; u32 bus_range[2]; - paddr_t addr, size; - struct pci_config_window *cfg; - - cfg = xzalloc(struct pci_config_window); - if ( !cfg ) - return NULL; + int err; err = dt_property_read_u32_array(dev, "bus-range", bus_range, ARRAY_SIZE(bus_range)); @@ -82,6 +77,35 @@ gen_pci_init(struct dt_device_node *dev, const struct pci_ecam_ops *ops) if ( cfg->busn_end > cfg->busn_start + 0xff ) cfg->busn_end = cfg->busn_start + 0xff; } +} + +void __init pci_generic_init_bus_range_child(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg) +{ + cfg->busn_start = bridge->cfg->busn_start + 1; + cfg->busn_end = bridge->cfg->busn_end; + bridge->cfg->busn_end = bridge->cfg->busn_start; + + printk(XENLOG_INFO "Root bus end updated: [bus %x-%x]\n", + bridge->cfg->busn_start, bridge->cfg->busn_end); +} + +static struct pci_config_window *__init +gen_pci_init(struct dt_device_node *dev, struct pci_host_bridge *bridge, + const struct pci_ecam_ops *ops) +{ + int err, cfg_reg_idx; + paddr_t addr, size; + struct pci_config_window *cfg; + + cfg = xzalloc(struct pci_config_window); + if ( !cfg ) + return NULL; + if ( !ops || !ops->pci_ops.init_bus_range ) + goto err_exit; + + ops->pci_ops.init_bus_range(dev, bridge, cfg); if ( ops->cfg_reg_index ) { @@ -208,8 +232,10 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops) +struct pci_host_bridge * +pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; @@ -224,7 +250,7 @@ struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, return ERR_PTR(-ENOMEM); /* Parse and map our Configuration Space windows */ - cfg = gen_pci_init(dev, ops); + cfg = gen_pci_init(dev, bridge, ops); if ( !cfg ) { err = -ENOMEM; @@ -242,10 +268,28 @@ struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, BUG(); } bridge->segment = domain; + + if ( child_ops ) + { + /* Parse and map child's Configuration Space windows */ + cfg = gen_pci_init(dev, bridge, child_ops); + if ( !cfg ) + { + err = -ENOMEM; + goto err_child; + } + + bridge->child_cfg = cfg; + bridge->child_ops = &child_ops->pci_ops; + } + pci_add_host_bridge(bridge); return bridge; +err_child: + xfree(bridge->cfg); + err_exit: xfree(bridge); @@ -280,9 +324,12 @@ struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus) { if ( bridge->segment != segment ) continue; - if ( (bus < bridge->cfg->busn_start) || (bus > bridge->cfg->busn_end) ) - continue; - return bridge; + if ( bridge->child_cfg && (bus >= bridge->child_cfg->busn_start) && + (bus <= bridge->child_cfg->busn_end) ) + return bridge; + if ( (bus >= bridge->cfg->busn_start) && + (bus <= bridge->cfg->busn_end) ) + return bridge; } return NULL; @@ -348,6 +395,7 @@ int __init pci_host_bridge_mappings(struct domain *d) { const struct dt_device_node *dev = bridge->dt_node; unsigned int i; + bool need_mapping; for ( i = 0; i < dt_number_of_address(dev); i++ ) { @@ -363,7 +411,11 @@ int __init pci_host_bridge_mappings(struct domain *d) return err; } - if ( bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr) ) + need_mapping = bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr); + if ( !need_mapping && bridge->child_ops ) + need_mapping = + bridge->child_ops->need_p2m_hwdom_mapping(d, bridge, addr); + if ( need_mapping ) { err = map_range_to_domain(dev, addr, size, &mr_data); if ( err ) diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index a6ffbda174..47cf144831 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops)); + return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops, NULL)); } DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index a38f2e019e..2c4afa7a19 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -35,6 +35,7 @@ const struct pci_ecam_ops nwl_pcie_ops = { .read = pci_generic_config_read, .write = pci_generic_config_write, .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, } }; @@ -47,7 +48,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops)); + return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops, NULL)); } DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 0ce11ffcc5..d41aa383a8 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -8,15 +8,17 @@ #include static pci_sbdf_t vpci_sbdf_from_gpa(const struct pci_host_bridge *bridge, - paddr_t gpa) + paddr_t gpa, bool use_root) { pci_sbdf_t sbdf; if ( bridge ) { - sbdf.sbdf = VPCI_ECAM_BDF(gpa - bridge->cfg->phys_addr); + const struct pci_config_window *cfg = use_root ? bridge->cfg + : bridge->child_cfg; + sbdf.sbdf = VPCI_ECAM_BDF(gpa - cfg->phys_addr); sbdf.seg = bridge->segment; - sbdf.bus += bridge->cfg->busn_start; + sbdf.bus += cfg->busn_start; } else sbdf.sbdf = VPCI_ECAM_BDF(gpa - GUEST_VPCI_ECAM_BASE); @@ -24,18 +26,14 @@ static pci_sbdf_t vpci_sbdf_from_gpa(const struct pci_host_bridge *bridge, return sbdf; } -static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, - register_t *r, void *p) +static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, register_t *r, + pci_sbdf_t sbdf) { - struct pci_host_bridge *bridge = p; - pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); const unsigned int access_size = (1U << info->dabt.size) * 8; const register_t invalid = GENMASK_ULL(access_size - 1, 0); /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; - ASSERT(!bridge == !is_hardware_domain(v->domain)); - if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { @@ -48,33 +46,86 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, return 0; } -static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, - register_t r, void *p) +static int vpci_mmio_read_root(struct vcpu *v, mmio_info_t *info, register_t *r, + void *p) +{ + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, true); + + ASSERT(!bridge == !is_hardware_domain(v->domain)); + + return vpci_mmio_read(v, info, r, sbdf); +} + +static int vpci_mmio_read_child(struct vcpu *v, mmio_info_t *info, + register_t *r, void *p) { struct pci_host_bridge *bridge = p; - pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, false); ASSERT(!bridge == !is_hardware_domain(v->domain)); + return vpci_mmio_read(v, info, r, sbdf); +} + +static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, register_t r, + pci_sbdf_t sbdf) +{ return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, r); } +static int vpci_mmio_write_root(struct vcpu *v, mmio_info_t *info, register_t r, + void *p) +{ + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, true); + + ASSERT(!bridge == !is_hardware_domain(v->domain)); + + return vpci_mmio_write(v, info, r, sbdf); +} + +static int vpci_mmio_write_child(struct vcpu *v, mmio_info_t *info, + register_t r, void *p) +{ + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, false); + + ASSERT(!bridge == !is_hardware_domain(v->domain)); + + return vpci_mmio_write(v, info, r, sbdf); +} + static const struct mmio_handler_ops vpci_mmio_handler = { - .read = vpci_mmio_read, - .write = vpci_mmio_write, + .read = vpci_mmio_read_root, + .write = vpci_mmio_write_root, +}; + +static const struct mmio_handler_ops vpci_mmio_handler_child = { + .read = vpci_mmio_read_child, + .write = vpci_mmio_write_child, }; static int vpci_setup_mmio_handler_cb(struct domain *d, struct pci_host_bridge *bridge) { struct pci_config_window *cfg = bridge->cfg; + int count = 1; register_mmio_handler(d, &vpci_mmio_handler, cfg->phys_addr, cfg->size, bridge); - /* We have registered a single MMIO handler. */ - return 1; + if ( bridge->child_ops ) + { + struct pci_config_window *child_cfg = bridge->child_cfg; + + register_mmio_handler(d, &vpci_mmio_handler_child, child_cfg->phys_addr, + child_cfg->size, bridge); + count++; + } + + return count; } int domain_vpci_init(struct domain *d) @@ -105,8 +156,12 @@ int domain_vpci_init(struct domain *d) static int vpci_get_num_handlers_cb(struct domain *d, struct pci_host_bridge *bridge) { - /* Each bridge has a single MMIO handler for the configuration space. */ - return 1; + int count = 1; + + if ( bridge->child_cfg ) + count++; + + return count; } unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 00:11:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 00:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018635.1395523 (Exim 4.92) (envelope-from ) id 1uRgPB-0002px-Oq; Wed, 18 Jun 2025 00:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018635.1395523; Wed, 18 Jun 2025 00: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 1uRgPB-0002pp-M1; Wed, 18 Jun 2025 00:11:53 +0000 Received: by outflank-mailman (input) for mailman id 1018635; Wed, 18 Jun 2025 00:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRgPA-0002pb-CU for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRgPA-006R4U-19 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRgPA-0091VE-12 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 00: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=red52dR0QL7g1nCu93p1eVDnPMUlf65nYPcJz9hS0mM=; b=OlUHt94odG6GUVyTBM2aaEw2As KSzshUvVBTBCyK0JlPI4t7C8fNqZxwePk4IJp86kHNWpCssLVLKVDD/mcFsx7RHuMBRwNbPy757X+ pI5HDUkVl7vul7JdOnnGX0o3CK0DTSNz9oHyQOd58nnl0YZGaWfYP40d+RoPIgapGjv8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add support for R-Car Gen4 PCI host controller Message-Id: Date: Wed, 18 Jun 2025 00:11:52 +0000 commit d3d36bb494a69cb2b60b53cdbabab45c0fafc25c Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:22 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:52:13 2025 -0700 xen/arm: add support for R-Car Gen4 PCI host controller Add support for Renesas R-Car Gen4 PCI host controller, specifically targeting the S4 and V4H SoCs. The implementation includes configuration read/write operations for both root and child buses. For accessing the child bus, iATU is used for address translation. The host controller needs to be initialized by Dom0 first to be properly handled by Xen. Xen itself only handles the runtime configuration of the iATU for accessing different child devices. iATU programming is done similarly to Linux, where only window 0 is used for dynamic configuration, and it is reconfigured for every config space read/write. Code common to all DesignWare PCI host controllers is located in a separate file to allow for easy reuse in other DesignWare-based PCI host controllers. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- MAINTAINERS | 5 + xen/arch/arm/pci/Makefile | 2 + xen/arch/arm/pci/pci-designware.c | 405 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-designware.h | 90 +++++++++ xen/arch/arm/pci/pci-host-rcar4.c | 94 +++++++++ 5 files changed, 596 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9aa7dd2f57..fcd24b3d58 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -473,6 +473,11 @@ M: Anthony Perard S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git +RCAR PCI +M: Mykyta Poturai +S: Supported +F: xen/arch/arm/pci/pci-host-rcar4.c + REMUS S: Orphan F: docs/README.remus diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile index 1d045ade01..ca6135e282 100644 --- a/xen/arch/arm/pci/Makefile +++ b/xen/arch/arm/pci/Makefile @@ -4,3 +4,5 @@ obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o obj-y += pci-host-zynqmp.o +obj-y += pci-designware.o +obj-y += pci-host-rcar4.o diff --git a/xen/arch/arm/pci/pci-designware.c b/xen/arch/arm/pci/pci-designware.c new file mode 100644 index 0000000000..47dd2dd4c0 --- /dev/null +++ b/xen/arch/arm/pci/pci-designware.c @@ -0,0 +1,405 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on Linux drivers/pci/controller/dwc/pcie-designware.c + * Based on xen/arch/arm/pci/pci-host-generic.c + * + */ + +#include +#include + +#include "pci-designware.h" +/** + * upper_32_bits - return bits 32-63 of a number + * @n: the number we're accessing + * + * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress + * the "right shift count >= width of type" warning when that quantity is + * 32-bits. + */ +#define upper_32_bits(n) ((uint32_t)(((n) >> 16) >> 16)) + +/** + * lower_32_bits - return bits 0-31 of a number + * @n: the number we're accessing + */ +#define lower_32_bits(n) ((uint32_t)((n) & 0xffffffffU)) + +static int dw_pcie_read(void __iomem *addr, unsigned int len, uint32_t *val) +{ + if ( !IS_ALIGNED((uintptr_t)addr, len) ) + { + *val = 0; + return -EFAULT; + } + + switch ( len ) + { + case 1: + *val = readb(addr); + break; + case 2: + *val = readw(addr); + break; + case 4: + *val = readl(addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +static int dw_pcie_write(void __iomem *addr, unsigned int len, uint32_t val) +{ + if ( !IS_ALIGNED((uintptr_t)addr, len) ) + return -EFAULT; + + switch ( len ) + { + case 1: + writeb(val, addr); + break; + case 2: + writew(val, addr); + break; + case 4: + writel(val, addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +static uint32_t dw_pcie_read_dbi(struct pci_host_bridge *bridge, uint32_t reg, + size_t size) +{ + void __iomem *addr = bridge->cfg->win + reg; + uint32_t val; + int ret; + + ret = dw_pcie_read(addr, size, &val); + if ( ret ) + printk(XENLOG_G_ERR "Read DBI address failed\n"); + + return val; +} + +static void dw_pcie_write_dbi(struct pci_host_bridge *bridge, uint32_t reg, + size_t size, uint32_t val) +{ + void __iomem *addr = bridge->cfg->win + reg; + int ret; + + ret = dw_pcie_write(addr, size, val); + if ( ret ) + printk(XENLOG_G_ERR "Write DBI address failed\n"); +} + +static uint32_t dw_pcie_readl_dbi(struct pci_host_bridge *bridge, uint32_t reg) +{ + return dw_pcie_read_dbi(bridge, reg, sizeof(uint32_t)); +} + +static void dw_pcie_writel_dbi(struct pci_host_bridge *pci, uint32_t reg, + uint32_t val) +{ + dw_pcie_write_dbi(pci, reg, sizeof(uint32_t), val); +} + +static void dw_pcie_read_iatu_unroll_enabled(struct pci_host_bridge *bridge) +{ + struct dw_pcie_priv *priv = bridge->priv; + uint32_t val; + + val = dw_pcie_readl_dbi(bridge, PCIE_ATU_VIEWPORT); + if ( val == 0xffffffffU ) + priv->iatu_unroll_enabled = true; + + printk(XENLOG_G_DEBUG "%s iATU unroll: %sabled\n", + dt_node_full_name(bridge->dt_node), + priv->iatu_unroll_enabled ? "en" : "dis"); +} + +static uint32_t dw_pcie_readl_atu(struct pci_host_bridge *pci, uint32_t reg) +{ + struct dw_pcie_priv *priv = pci->priv; + int ret; + uint32_t val; + + ret = dw_pcie_read(priv->atu_base + reg, 4, &val); + if ( ret ) + printk(XENLOG_G_ERR "Read ATU address %x failed\n", reg); + + return val; +} + +static void dw_pcie_writel_atu(struct pci_host_bridge *pci, uint32_t reg, + uint32_t val) +{ + struct dw_pcie_priv *priv = pci->priv; + int ret; + + ret = dw_pcie_write(priv->atu_base + reg, 4, val); + if ( ret ) + printk(XENLOG_G_ERR "Write ATU address %x failed\n", reg); +} + +static uint32_t dw_pcie_readl_ob_unroll(struct pci_host_bridge *pci, + uint32_t index, uint32_t reg) +{ + uint32_t offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); + + return dw_pcie_readl_atu(pci, offset + reg); +} + +static void dw_pcie_writel_ob_unroll(struct pci_host_bridge *pci, + uint32_t index, uint32_t reg, uint32_t val) +{ + uint32_t offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); + + dw_pcie_writel_atu(pci, offset + reg, val); +} + +static int dw_pcie_prog_outbound_atu_unroll(struct pci_host_bridge *pci, + uint8_t func_no, int index, + int type, uint64_t cpu_addr, + uint64_t pci_addr, uint64_t size) +{ + uint32_t retries, val; + uint64_t limit_addr = cpu_addr + size - 1; + + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_LOWER_BASE, + lower_32_bits(cpu_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_UPPER_BASE, + upper_32_bits(cpu_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_LOWER_LIMIT, + lower_32_bits(limit_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_UPPER_LIMIT, + upper_32_bits(limit_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_LOWER_TARGET, + lower_32_bits(pci_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_UPPER_TARGET, + upper_32_bits(pci_addr)); + val = type | PCIE_ATU_FUNC_NUM(func_no); + val = upper_32_bits(size - 1) ? val | PCIE_ATU_INCREASE_REGION_SIZE : val; + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL1, val); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2, + PCIE_ATU_ENABLE); + + /* + * Make sure ATU enable takes effect before any subsequent config + * and I/O accesses. + */ + for ( retries = 0; retries < LINK_WAIT_MAX_IATU_RETRIES; retries++ ) + { + val = dw_pcie_readl_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2); + if ( val & PCIE_ATU_ENABLE ) + return 0; + + mdelay(LINK_WAIT_IATU_DELAY_MS); + } + printk(XENLOG_G_ERR "Outbound iATU is not being enabled\n"); + + return -ENXIO; +} + +static int __dw_pcie_prog_outbound_atu(struct pci_host_bridge *pci, + uint8_t func_no, int index, int type, + uint64_t cpu_addr, uint64_t pci_addr, + uint64_t size) +{ + struct dw_pcie_priv *priv = pci->priv; + uint32_t retries, val; + + if ( priv->iatu_unroll_enabled ) + return dw_pcie_prog_outbound_atu_unroll(pci, func_no, index, type, + cpu_addr, pci_addr, size); + + dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, + PCIE_ATU_REGION_OUTBOUND | index); + dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_BASE, lower_32_bits(cpu_addr)); + dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_BASE, upper_32_bits(cpu_addr)); + dw_pcie_writel_dbi(pci, PCIE_ATU_LIMIT, lower_32_bits(cpu_addr + size - 1)); + if ( priv->version >= 0x460A ) + dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_LIMIT, + upper_32_bits(cpu_addr + size - 1)); + dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET, lower_32_bits(pci_addr)); + dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_TARGET, upper_32_bits(pci_addr)); + val = type | PCIE_ATU_FUNC_NUM(func_no); + val = ((upper_32_bits(size - 1)) && (priv->version >= 0x460A)) + ? val | PCIE_ATU_INCREASE_REGION_SIZE + : val; + dw_pcie_writel_dbi(pci, PCIE_ATU_CR1, val); + dw_pcie_writel_dbi(pci, PCIE_ATU_CR2, PCIE_ATU_ENABLE); + + /* + * Make sure ATU enable takes effect before any subsequent config + * and I/O accesses. + */ + for ( retries = 0; retries < LINK_WAIT_MAX_IATU_RETRIES; retries++ ) + { + val = dw_pcie_readl_dbi(pci, PCIE_ATU_CR2); + if ( val & PCIE_ATU_ENABLE ) + return 0; + + mdelay(LINK_WAIT_IATU_DELAY_MS); + } + printk(XENLOG_G_ERR "Outbound iATU is not being enabled\n"); + + return -ENXIO; +} + +static int dw_pcie_prog_outbound_atu(struct pci_host_bridge *pci, int index, + int type, uint64_t cpu_addr, + uint64_t pci_addr, uint64_t size) +{ + return __dw_pcie_prog_outbound_atu(pci, 0, index, type, cpu_addr, pci_addr, + size); +} + +void dw_pcie_set_version(struct pci_host_bridge *bridge, unsigned int version) +{ + struct dw_pcie_priv *priv = bridge->priv; + + priv->version = version; +} + +void __iomem *dw_pcie_child_map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t where) +{ + uint32_t busdev; + int ret; + + busdev = PCIE_ATU_BUS(sbdf.bus) | PCIE_ATU_DEV(PCI_SLOT(sbdf.devfn)) | + PCIE_ATU_FUNC(PCI_FUNC(sbdf.devfn)); + + /* FIXME: Parent is the root bus, so use PCIE_ATU_TYPE_CFG0. */ + ret = dw_pcie_prog_outbound_atu(bridge, PCIE_ATU_REGION_INDEX1, + PCIE_ATU_TYPE_CFG0, + bridge->child_cfg->phys_addr, busdev, + bridge->child_cfg->size); + if ( ret ) + return 0; + + return bridge->child_cfg->win + where; +} + +int dw_pcie_child_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value) +{ + struct dw_pcie_priv *priv = bridge->priv; + int ret; + + /* + * FIXME: we cannot read iATU settings at the early initialization + * (probe) as the host's HW is not yet initialized at that phase. + * This read operation is the very first thing Domain-0 will do + * during its initialization, so take this opportunity and read + * iATU setting now. + */ + if ( unlikely(!priv->iatu_unroll_initilized) ) + { + dw_pcie_read_iatu_unroll_enabled(bridge); + priv->iatu_unroll_initilized = true; + } + + ret = pci_generic_config_read(bridge, sbdf, reg, len, value); + if ( !ret && (priv->num_viewport <= 2) ) + ret = dw_pcie_prog_outbound_atu(bridge, PCIE_ATU_REGION_INDEX1, + PCIE_ATU_TYPE_IO, + bridge->child_cfg->phys_addr, 0, + bridge->child_cfg->size); + + return ret; +} + +int dw_pcie_child_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value) +{ + struct dw_pcie_priv *priv = bridge->priv; + int ret; + + ret = pci_generic_config_write(bridge, sbdf, reg, len, value); + if ( !ret && (priv->num_viewport <= 2) ) + ret = dw_pcie_prog_outbound_atu(bridge, PCIE_ATU_REGION_INDEX1, + PCIE_ATU_TYPE_IO, + bridge->child_cfg->phys_addr, 0, + bridge->child_cfg->size); + return ret; +} + +bool __init dw_pcie_child_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr) +{ + struct pci_config_window *cfg = bridge->child_cfg; + + /* + * We do not want ECAM address space to be mapped in Domain-0's p2m, + * so we can trap access to it. + */ + return cfg->phys_addr != addr; +} + +struct pci_host_bridge *__init +dw_pcie_host_probe(struct dt_device_node *dev, const void *data, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops) +{ + struct pci_host_bridge *bridge; + struct dw_pcie_priv *priv; + + paddr_t atu_phys_addr; + paddr_t atu_size; + int atu_idx, ret; + + bridge = pci_host_common_probe(dev, ops, child_ops); + if ( IS_ERR(bridge) ) + return bridge; + + priv = xzalloc(struct dw_pcie_priv); + if ( !priv ) + return ERR_PTR(-ENOMEM); + + bridge->priv = priv; + + atu_idx = dt_property_match_string(dev, "reg-names", "atu"); + if ( atu_idx < 0 ) + { + printk(XENLOG_ERR "Cannot find \"atu\" range index in device tree\n"); + return ERR_PTR(atu_idx); + } + ret = dt_device_get_address(dev, atu_idx, &atu_phys_addr, &atu_size); + if ( ret ) + { + printk(XENLOG_ERR "Cannot find \"atu\" range in device tree\n"); + return ERR_PTR(ret); + } + printk("iATU at [mem 0x%" PRIpaddr "-0x%" PRIpaddr "]\n", atu_phys_addr, + atu_phys_addr + atu_size - 1); + priv->atu_base = ioremap_nocache(atu_phys_addr, atu_size); + if ( !priv->atu_base ) + { + printk(XENLOG_ERR "iATU ioremap failed\n"); + return ERR_PTR(ENXIO); + } + + if ( !dt_property_read_u32(dev, "num-viewport", &priv->num_viewport) ) + priv->num_viewport = 2; + + /* + * FIXME: we cannot read iATU unroll enable now as the host bridge's + * HW is not yet initialized by Domain-0: leave it for later. + */ + + printk(XENLOG_INFO "%s number of view ports: %d\n", dt_node_full_name(dev), + priv->num_viewport); + + return bridge; +} diff --git a/xen/arch/arm/pci/pci-designware.h b/xen/arch/arm/pci/pci-designware.h new file mode 100644 index 0000000000..7efb1dc9a2 --- /dev/null +++ b/xen/arch/arm/pci/pci-designware.h @@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on Linux drivers/pci/controller/dwc/pcie-designware.c + * Based on xen/arch/arm/pci/pci-host-generic.c + */ + +#include +#include + +#ifndef __PCI_DESIGNWARE_H__ +#define __PCI_DESIGNWARE_H__ + + +#define PCIE_ATU_VIEWPORT 0x900 +#define PCIE_ATU_REGION_OUTBOUND 0 +#define PCIE_ATU_CR1 0x904 +#define PCIE_ATU_INCREASE_REGION_SIZE BIT(13, UL) +#define PCIE_ATU_CR2 0x908 +#define PCIE_ATU_ENABLE BIT(31, UL) +#define PCIE_ATU_LOWER_BASE 0x90C +#define PCIE_ATU_UPPER_BASE 0x910 +#define PCIE_ATU_LIMIT 0x914 +#define PCIE_ATU_LOWER_TARGET 0x918 +#define PCIE_ATU_UPPER_TARGET 0x91C +#define PCIE_ATU_UPPER_LIMIT 0x924 + +#define PCIE_ATU_REGION_INDEX1 0x1 +#define PCIE_ATU_TYPE_IO 0x2 +#define PCIE_ATU_TYPE_CFG0 0x4 + +#define FIELD_PREP(_mask, _val) \ + (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) + +#define PCIE_ATU_BUS(x) FIELD_PREP(GENMASK(31, 24), (x)) +#define PCIE_ATU_DEV(x) FIELD_PREP(GENMASK(23, 19), (x)) +#define PCIE_ATU_FUNC(x) FIELD_PREP(GENMASK(18, 16), (x)) + +/* Register address builder */ +#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(region) \ + ((region) << 9) + +/* + * iATU Unroll-specific register definitions + * From 4.80 core version the address translation will be made by unroll + */ +#define PCIE_ATU_UNR_REGION_CTRL1 0x00 +#define PCIE_ATU_UNR_REGION_CTRL2 0x04 +#define PCIE_ATU_UNR_LOWER_BASE 0x08 +#define PCIE_ATU_UNR_UPPER_BASE 0x0C +#define PCIE_ATU_UNR_LOWER_LIMIT 0x10 +#define PCIE_ATU_UNR_LOWER_TARGET 0x14 +#define PCIE_ATU_UNR_UPPER_TARGET 0x18 +#define PCIE_ATU_UNR_UPPER_LIMIT 0x20 + +#define PCIE_ATU_FUNC_NUM(pf) ((pf) << 20) + +/* Parameters for the waiting for iATU enabled routine */ +#define LINK_WAIT_MAX_IATU_RETRIES 5 +#define LINK_WAIT_IATU_DELAY_MS 10 + +struct dw_pcie_priv { + uint32_t num_viewport; + bool iatu_unroll_initilized; + bool iatu_unroll_enabled; + void __iomem *atu_base; + unsigned int version; +}; + +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, + pci_sbdf_t sbdf, uint32_t where); + +int dw_pcie_child_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value); + +int dw_pcie_child_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value); + +bool __init dw_pcie_child_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr); + +struct pci_host_bridge *__init +dw_pcie_host_probe(struct dt_device_node *dev, const void *data, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops); +#endif /* __PCI_DESIGNWARE_H__ */ diff --git a/xen/arch/arm/pci/pci-host-rcar4.c b/xen/arch/arm/pci/pci-host-rcar4.c new file mode 100644 index 0000000000..62d2130a63 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-rcar4.c @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on xen/arch/arm/pci/pci-host-generic.c + */ + +#include +#include + +#include +#include +#include + +#include "pci-designware.h" + +#define RCAR4_DWC_VERSION 0x520A + +/* + * PCI host bridges often have different ways to access the root and child + * bus config spaces: + * "dbi" : the aperture where root port's own configuration registers + * are available. + * "config": child's configuration space + * "atu" : iATU registers for DWC version 4.80 or later + */ +static int __init rcar4_cfg_reg_index(struct dt_device_node *np) +{ + return dt_property_match_string(np, "reg-names", "dbi"); +} + +static int __init rcar4_child_cfg_reg_index(struct dt_device_node *np) +{ + return dt_property_match_string(np, "reg-names", "config"); +} + +/* ECAM ops */ +const struct pci_ecam_ops rcar4_pcie_ops = { + .bus_shift = 20, + .cfg_reg_index = rcar4_cfg_reg_index, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, + } +}; + +const struct pci_ecam_ops rcar4_pcie_child_ops = { + .bus_shift = 20, + .cfg_reg_index = rcar4_child_cfg_reg_index, + .pci_ops = { + .map_bus = dw_pcie_child_map_bus, + .read = dw_pcie_child_config_read, + .write = dw_pcie_child_config_write, + .need_p2m_hwdom_mapping = dw_pcie_child_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range_child, + } +}; + +static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = { + { .compatible = "renesas,r8a779f0-pcie" }, + { .compatible = "renesas,r8a779g0-pcie" }, + {}, +}; + +static int __init pci_host_rcar4_probe(struct dt_device_node *dev, + const void *data) +{ + struct pci_host_bridge *bridge; + + bridge = dw_pcie_host_probe(dev, data, &rcar4_pcie_ops, + &rcar4_pcie_child_ops); + + dw_pcie_set_version(bridge, RCAR4_DWC_VERSION); + + return 0; +} + +DT_DEVICE_START(pci_gen, "PCI HOST R-CAR GEN4", DEVICE_PCI_HOSTBRIDGE) +.dt_match = rcar4_pcie_dt_match, +.init = pci_host_rcar4_probe, +DT_DEVICE_END + +/* + * 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 Wed Jun 18 01:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018688.1395577 (Exim 4.92) (envelope-from ) id 1uRhKR-0003Yn-Tu; Wed, 18 Jun 2025 01:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018688.1395577; Wed, 18 Jun 2025 01: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 1uRhKR-0003Yf-RC; Wed, 18 Jun 2025 01:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1018688; Wed, 18 Jun 2025 01:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhKQ-0003YZ-MX for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhKQ-007cx4-1C for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhKQ-0094Aj-14 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=cYSnNWfQlf+5ZmcohKyGFlg3pPkCf472h0zHiaxsuLk=; b=R1UCcb/YUu36HUVl2nSdWM+rwr eub9lOCOUAECcQyJcGv3cMSTpUGFXBXUn85GK4BppaiBj9sZBLfH8V9tUnXJPI+o+BLvB3ygpJUZT rR9J7XbyQftzu3mz6Owwev9KorqLSHzINW1+swjj0FTceAI/boaTXR4nfgxfROxAvsLI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add way to disable traps on accesses to unmapped addresses Message-Id: Date: Wed, 18 Jun 2025 01:11:02 +0000 commit 980aff4e8fcd19b6f0bcd4ac6041b868cfc35d4d Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:38:22 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 xen/arm: Add way to disable traps on accesses to unmapped addresses Add a per-domain way to optionally disable traps for accesses to unmapped addresses. The domain flag is general but it's only implemented for Arm for now. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arm.c | 3 +++ xen/arch/arm/dom0less-build.c | 3 +++ xen/arch/arm/domain.c | 3 ++- xen/arch/arm/domain_build.c | 3 ++- xen/arch/arm/io.c | 37 +++++++++++++++++++++++++++++++++++-- xen/arch/x86/domain.c | 7 +++++++ xen/common/domain.c | 3 ++- xen/include/public/domctl.h | 4 +++- 8 files changed, 57 insertions(+), 6 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 75c811053c..9530996e72 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -233,6 +233,9 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, config->arch.sve_vl = d_config->b_info.arch_arm.sve_vl / 128U; } + /* Trap accesses to unmapped areas. */ + config->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; + return 0; } diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 20aabf6be5..981af5079f 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -343,6 +343,9 @@ void __init arch_create_domUs(struct dt_device_node *node, panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); #endif } + + /* Trap accesses to unmapped areas. */ + d_cfg->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; } int __init init_intc_phandle(struct kernel_info *kinfo, const char *name, diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 45aeb8bddc..be58a23dd7 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -612,7 +612,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) unsigned int max_vcpus; unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu | - XEN_DOMCTL_CDF_xs_domain ); + XEN_DOMCTL_CDF_xs_domain | + XEN_DOMCTL_CDF_trap_unmapped_accesses ); unsigned int sve_vl_bits = sve_decode_vl(config->arch.sve_vl); if ( (config->flags & ~flags_optional) != flags_required ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 590f38e520..845c92614b 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1971,7 +1971,8 @@ void __init create_dom0(void) { struct domain *dom0; struct xen_domctl_createdomain dom0_cfg = { - .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, + .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | + XEN_DOMCTL_CDF_trap_unmapped_accesses, .max_evtchn_port = -1, .max_grant_frames = gnttab_dom0_frames(), .max_maptrack_frames = -1, diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index 5a4b0e8f25..e599bbe043 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -21,6 +21,32 @@ #include "decode.h" +/* Handler for unmapped ranges. Writes ignored, reads return all ones. */ +static int unmapped_read(struct vcpu *v, mmio_info_t *info, register_t *r, + void *priv) +{ + uint64_t mask = GENMASK((1U << info->dabt.size) * 8 - 1, 0); + + /* Mask off upper bits. */ + *r = UINT64_MAX & mask; + return 1; +} + +static int unmapped_write(struct vcpu *v, mmio_info_t *info, register_t r, + void *priv) +{ + return 1; +} + +static const struct mmio_handler_ops unmapped_ops = { + .read = unmapped_read, + .write = unmapped_write +}; + +static const struct mmio_handler unmapped_handler = { + .ops = &unmapped_ops +}; + static enum io_state handle_read(const struct mmio_handler *handler, struct vcpu *v, mmio_info_t *info) @@ -175,11 +201,18 @@ enum io_state try_handle_mmio(struct cpu_user_regs *regs, handler = find_mmio_handler(v->domain, info->gpa); if ( !handler ) { + bool trap_unmapped = v->domain->options & + XEN_DOMCTL_CDF_trap_unmapped_accesses; rc = try_fwd_ioserv(regs, v, info); if ( rc == IO_HANDLED ) return handle_ioserv(regs, v); - - return rc; + else if ( rc == IO_UNHANDLED && !trap_unmapped ) + { + /* Fallback to the unmapped handler. */ + handler = &unmapped_handler; + } else { + return rc; + } } /* diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 7536b6c871..fb7aea9168 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -713,6 +713,13 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) } } + if ( config->flags & XEN_DOMCTL_CDF_trap_unmapped_accesses ) + { + dprintk(XENLOG_INFO, "Unsupported trap_unmapped_accesses flag %#x\n", + config->flags); + return -EINVAL; + } + if ( config->arch.misc_flags & ~XEN_X86_MSR_RELAXED ) { dprintk(XENLOG_INFO, "Invalid arch misc flags %#x\n", diff --git a/xen/common/domain.c b/xen/common/domain.c index e566a18747..434d32901b 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -721,7 +721,8 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu | + XEN_DOMCTL_CDF_trap_unmapped_accesses) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5b2063eed9..be19ab5e26 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -66,9 +66,11 @@ struct xen_domctl_createdomain { #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) /* Should we expose the vPMU to the guest? */ #define XEN_DOMCTL_CDF_vpmu (1U << 7) +/* Should we trap guest accesses to unmapped addresses? */ +#define XEN_DOMCTL_CDF_trap_unmapped_accesses (1U << 8) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_trap_unmapped_accesses uint32_t flags; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:11:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018689.1395580 (Exim 4.92) (envelope-from ) id 1uRhKc-0003b4-0N; Wed, 18 Jun 2025 01:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018689.1395580; Wed, 18 Jun 2025 01: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 1uRhKb-0003aw-U9; Wed, 18 Jun 2025 01:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1018689; Wed, 18 Jun 2025 01:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhKa-0003aj-Id for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhKa-007cxB-1a for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhKa-0094BJ-1M for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=F5raQf3FaRtSfHnzKfy9xBia1lB/xS5DnzLtZKiapPM=; b=oAT9Ka6jcxUAuQvuHYk/MoaR9N GytMEsBnXBVVyViRM0rnv0PCqi4DGAN9oP/OmNZxMaJ5deAmgsD7gh1kxYMAVB9SloBbOo4tSjGBM 78WtzSCWj1YHe91vWLIPY4EcSDqy5C7yAPMpDEduOoVyOwphoAumtQf91YqWO9E5AAzk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: dom0less: Add trap-unmapped-accesses Message-Id: Date: Wed, 18 Jun 2025 01:11:12 +0000 commit 5f91a9b209cb8a7ecf353ccdb836a73761b9e2e3 Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:38:23 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 xen/arm: dom0less: Add trap-unmapped-accesses Add the trap-unmapped-accesses per-domain fdt property. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 10 ++++++++++ xen/arch/arm/dom0less-build.c | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 59fa96a82e..07acc7ba64 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -225,6 +225,16 @@ with the following properties: option is provided with a non zero value, but the platform doesn't support SVE. +- trap-unmapped-accesses + + Optional. An integer that configures handling of accesses to unmapped + address ranges. + If set to 0, guest accesses will read all bits as ones, e.g 0xFFFFFFFF + for a 32bit access and writes will be ignored. + If set to 1, guest accesses will trap. + + The default is 1 when trap-unmapped-accesses is absent. + - xen,enhanced A string property. Possible property values are: diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 981af5079f..4b285cff5e 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -344,8 +344,15 @@ void __init arch_create_domUs(struct dt_device_node *node, #endif } - /* Trap accesses to unmapped areas. */ + /* Trap unmapped accesses by default. */ d_cfg->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; + if ( dt_property_read_u32(node, "trap-unmapped-accesses", &val) ) + { + if ( val > 1 ) + panic("trap-unmapped-accesses: supported values are 0 or 1"); + if ( !val ) + d_cfg->flags &= ~XEN_DOMCTL_CDF_trap_unmapped_accesses; + } } int __init init_intc_phandle(struct kernel_info *kinfo, const char *name, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:11:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018690.1395584 (Exim 4.92) (envelope-from ) id 1uRhKm-0003dK-1w; Wed, 18 Jun 2025 01:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018690.1395584; Wed, 18 Jun 2025 01: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 1uRhKl-0003dC-VY; Wed, 18 Jun 2025 01:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1018690; Wed, 18 Jun 2025 01:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhKk-0003cx-KW for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhKk-007cxI-1x for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhKk-0094Bq-1p for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=oXqyRVKDSwOE4syxysgvPaOt615wO98XvKcrcBIfTtg=; b=Hu6D3/RedUrwtFiDGeflxW3mKw mdi00uZLjNseOHLsFGD8lHN9yEoKFFvdMNrkmpZYbV85DSxVk/Df0xRUI6vMojEE6tgSmLWTDRE05 8tVsNOF+LzRGg1IELUUNyFGuzp3UqpYwj98uPeVxuryAcZTp6vgeot0dopxjvLX7Vd5k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/arm: Add the trap_unmapped_accesses xl config option Message-Id: Date: Wed, 18 Jun 2025 01:11:22 +0000 commit d057628757ffe5ead8bf6d27cc8127cb50b9bea7 Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:53:04 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 tools/arm: Add the trap_unmapped_accesses xl config option Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- docs/man/xl.cfg.5.pod.in | 9 +++++++++ tools/include/libxl.h | 7 +++++++ tools/libs/light/libxl_arm.c | 6 +++--- tools/libs/light/libxl_create.c | 3 +++ tools/libs/light/libxl_types.idl | 1 + tools/libs/light/libxl_x86.c | 6 ++++++ tools/xl/xl_parse.c | 3 +++ 7 files changed, 32 insertions(+), 3 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index c388899306..075e89e6d2 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -3056,6 +3056,15 @@ will be used for the domain. Otherwise, the value specified by the `nr_spis` parameter will be used. The number of SPIs should match the highest interrupt ID that will be assigned to the domain. +=item B + +An Optional boolean parameter that configures handling of accesses to unmapped +address ranges. If enabled, guest accesses will trap. If disabled, guest +accesses will read all bits as ones, e.g 0xFFFFFFFF for a 32bit access and +writes will be ignored. + +This option is only implemented for Arm where the default is enabled. + =back =head3 x86 diff --git a/tools/include/libxl.h b/tools/include/libxl.h index b7ad7735ca..24c81cf145 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -549,6 +549,13 @@ */ #define LIBXL_HAVE_VPMU 1 +/* + * LIBXL_HAVE_TRAP_UNMAPPED_ACCESSES indicates that libxl_domain_build_info + * has a trap_unmapped_accesses parameter, which allows the control of how + * accesses to unmapped adresses behave. + */ +#define LIBXL_HAVE_TRAP_UNMAPPED_ACCESSES 1 + /* * LIBXL_HAVE_PHYSINFO_CAP_GNTTAB indicates that libxl_physinfo has a * cap_gnttab_v1/2 fields, which indicates the available grant table ABIs. diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 9530996e72..afc62a5299 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -233,9 +233,6 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, config->arch.sve_vl = d_config->b_info.arch_arm.sve_vl / 128U; } - /* Trap accesses to unmapped areas. */ - config->flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; - return 0; } @@ -1714,6 +1711,9 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, /* ACPI is disabled by default */ libxl_defbool_setdefault(&b_info->acpi, false); + /* Trapping of unmapped accesses enabled by default. */ + libxl_defbool_setdefault(&b_info->trap_unmapped_accesses, true); + /* Sanitise SVE parameter */ if (b_info->arch_arm.sve_vl) { unsigned int max_sve_vl = diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 8bc768b515..625ce5b040 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -605,6 +605,9 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, if (libxl_defbool_val(b_info->vpmu)) create.flags |= XEN_DOMCTL_CDF_vpmu; + if (libxl_defbool_val(b_info->trap_unmapped_accesses)) + create.flags |= XEN_DOMCTL_CDF_trap_unmapped_accesses; + assert(info->passthrough != LIBXL_PASSTHROUGH_DEFAULT); LOG(DETAIL, "passthrough: %s", libxl_passthrough_to_string(info->passthrough)); diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 1985153830..57ae16ae78 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -736,6 +736,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vmtrace_buf_kb", integer), ("vpmu", libxl_defbool), + ("trap_unmapped_accesses", libxl_defbool), ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 867addfcab..60d4e8661c 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -26,6 +26,11 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, if (libxl_defbool_val(d_config->b_info.arch_x86.msr_relaxed)) config->arch.misc_flags |= XEN_X86_MSR_RELAXED; + if (libxl_defbool_val(d_config->b_info.trap_unmapped_accesses)) { + LOG(ERROR, "trap_unmapped_accesses is not supported on x86\n"); + return ERROR_FAIL; + } + return 0; } @@ -813,6 +818,7 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, { libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); + libxl_defbool_setdefault(&b_info->trap_unmapped_accesses, false); if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { /* diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 219e924779..98b3612d0f 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2972,6 +2972,9 @@ skip_usbdev: if (!xlu_cfg_get_long (config, "nr_spis", &l, 0)) b_info->arch_arm.nr_spis = l; + xlu_cfg_get_defbool(config, "trap_unmapped_accesses", + &b_info->trap_unmapped_accesses, 0); + parse_vkb_list(config, d_config); d_config->virtios = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:11:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018691.1395589 (Exim 4.92) (envelope-from ) id 1uRhKw-0003fD-3K; Wed, 18 Jun 2025 01:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018691.1395589; Wed, 18 Jun 2025 01: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 1uRhKw-0003f5-0n; Wed, 18 Jun 2025 01:11:34 +0000 Received: by outflank-mailman (input) for mailman id 1018691; Wed, 18 Jun 2025 01:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhKu-0003ez-Mx for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhKu-007cxP-2C for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhKu-0094CL-27 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=4+uj0dS6+7y+u8YuVpH0SPbo/pguC8w30cACcRp6QCc=; b=Zt3OH70RWE0jyADbMynM02T1nD Fv6Yjwu20FQ8YvnXtN7M8cBD6NeCnAobGVmipsMOEUvqoThWt75NrIFv92lrB+4t7VR6LGsG8WPiF 1f3y9G/j9TSfZmciODaxs8Ct8GA5+vLzgph74aZPhXJdGxOlXcbqudcihllGxgmpJEjk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/ocaml: Update bindings for CDF_TRAP_UNMAPPED_ACCESSES Message-Id: Date: Wed, 18 Jun 2025 01:11:32 +0000 commit ab02a120c0a546e5aacb9cd8145ee652a9cb6caa Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:53:05 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 tools/ocaml: Update bindings for CDF_TRAP_UNMAPPED_ACCESSES Signed-off-by: Edgar E. Iglesias Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 2690f9a923..7e1aabad6c 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -70,6 +70,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPMU + | CDF_TRAP_UNMAPPED_ACCESSES type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index febbe1f6ae..f44dba61ae 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -63,6 +63,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPMU + | CDF_TRAP_UNMAPPED_ACCESSES type domain_create_iommu_opts = | IOMMU_NO_SHAREPT -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:11:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018692.1395592 (Exim 4.92) (envelope-from ) id 1uRhL6-0003hk-4i; Wed, 18 Jun 2025 01:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018692.1395592; Wed, 18 Jun 2025 01: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 1uRhL6-0003he-2A; Wed, 18 Jun 2025 01:11:44 +0000 Received: by outflank-mailman (input) for mailman id 1018692; Wed, 18 Jun 2025 01:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhL4-0003hR-QD for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhL4-007cxU-2T for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhL4-0094DQ-2O for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=VMT8HD97JLJrm9QDKIDshj1KFez0ikotqM6elGOXewM=; b=B9a7XMnUylUkmZ5h2sYwL6yRLh 0Bv8m6D3rnYgxxM5Vbl6W7y2jud/TlQ7VC3aM3subMbvKCEIvDTtQMYDGhfDvr2B8Xi+qxYbugC9f ognF1cI8tK6iQM53w0/IhEv2ARn8sqY3vRPaEOmxkKOFKw72xlyjzEgHz3wv0AOzUwk8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/golang: Regenerate bindings for trap_unmapped_accesses Message-Id: Date: Wed, 18 Jun 2025 01:11:42 +0000 commit fefc4edfbc2a898904f595004f08ba67df39726f Author: Edgar E. Iglesias AuthorDate: Mon Jun 16 17:53:06 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 tools/golang: Regenerate bindings for trap_unmapped_accesses Signed-off-by: Edgar E. Iglesias Acked-by: Nick Rosbrook --- tools/golang/xenlight/helpers.gen.go | 6 ++++++ tools/golang/xenlight/types.gen.go | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 90846ea8e8..191be87297 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1170,6 +1170,9 @@ x.Altp2M = Altp2MMode(xc.altp2m) x.VmtraceBufKb = int(xc.vmtrace_buf_kb) if err := x.Vpmu.fromC(&xc.vpmu);err != nil { 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) } return nil} @@ -1695,6 +1698,9 @@ xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb) if err := x.Vpmu.toC(&xc.vpmu); err != nil { 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) } return nil diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index e7667f1ce3..656933c6c9 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -606,6 +606,7 @@ MsrRelaxed Defbool Altp2M Altp2MMode VmtraceBufKb int Vpmu Defbool +TrapUnmappedAccesses Defbool } type DomainBuildInfoTypeUnion interface { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:11:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018693.1395597 (Exim 4.92) (envelope-from ) id 1uRhLG-0003jx-6I; Wed, 18 Jun 2025 01:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018693.1395597; Wed, 18 Jun 2025 01: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 1uRhLG-0003jo-3Y; Wed, 18 Jun 2025 01:11:54 +0000 Received: by outflank-mailman (input) for mailman id 1018693; Wed, 18 Jun 2025 01:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhLE-0003je-Sk for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhLE-007cxY-2m for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhLE-0094EC-2e for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=yG1LRh4ZMF+kKaZP4tGBnjYbxqUrYvdM/xcrGn7kTZo=; b=IGqZBmgIA1DsTmi4arY5o8E6Z2 lcIkA5EfobuCz9LpWxLf0MTIqlFCY+y4sD9W8C3A1zgpP9qrF2nknlH/t/pb1dDMwbiShBWjk2oux RGLYiQndnYg0LmzGVvQDtNafQup9dM56/oW+TSKFQbpqWKm3l1FrmgwPg2nqt4ccWYy4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] console: Do not duplicate early printk messages on conring flush Message-Id: Date: Wed, 18 Jun 2025 01:11:52 +0000 commit f6f8fbb25865e2d41b6e91d255ab51a173b432ce Author: Michal Orzel AuthorDate: Tue Jun 17 09:19:40 2025 +0200 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:04 2025 -0700 console: Do not duplicate early printk messages on conring flush Commit f6d1bfa16052 introduced flushing conring in console_init_preirq(). However, when CONFIG_EARLY_PRINTK is enabled, the early boot messages had already been sent to serial before main console initialization. This results in all the early boot messages being duplicated. Change conring_flush() to accept argument listing devices to which to flush conring. We don't want to send to serial at console initialization when using early printk, but we want these messages to be send at conring dump triggered by keyhandler. Fixes: f6d1bfa16052 ("xen/console: introduce conring_flush()") Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 9a9836ba91..5879e31786 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -453,9 +453,9 @@ void console_serial_puts(const char *s, size_t nr) } /* - * Flush contents of the conring to the physical console devices. + * Flush contents of the conring to the selected console devices. */ -static int conring_flush(void) +static int conring_flush(unsigned int flags) { uint32_t idx, len, sofar, c; unsigned int order; @@ -479,7 +479,7 @@ static int conring_flush(void) c += len; } - console_send(buf, sofar, CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); + console_send(buf, sofar, flags); free_xenheap_pages(buf, order); @@ -491,7 +491,7 @@ static void cf_check conring_dump_keyhandler(unsigned char key) int rc; printk("'%c' pressed -> dumping console ring buffer (dmesg)\n", key); - rc = conring_flush(); + rc = conring_flush(CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV); if ( rc ) printk("failed to dump console ring buffer: %d\n", rc); } @@ -1042,6 +1042,7 @@ void __init console_init_preirq(void) { char *p; int sh; + unsigned int flags = CONSOLE_SERIAL | CONSOLE_VIDEO | CONSOLE_PV; serial_init_preirq(); @@ -1084,8 +1085,15 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); pv_console_set_rx_handler(serial_rx); - /* NB: send conring contents to all enabled physical consoles, if any */ - conring_flush(); + /* + * NB: send conring contents to all enabled physical consoles, if any. + * Skip serial if CONFIG_EARLY_PRINTK is enabled, which means the early + * messages have already been sent to serial. + */ + if ( IS_ENABLED(CONFIG_EARLY_PRINTK) ) + flags &= ~CONSOLE_SERIAL; + + conring_flush(flags); /* HELLO WORLD --- start-of-day banner text. */ nrspin_lock(&console_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:12:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018694.1395601 (Exim 4.92) (envelope-from ) id 1uRhLQ-0003mG-7z; Wed, 18 Jun 2025 01:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018694.1395601; Wed, 18 Jun 2025 01: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 1uRhLQ-0003m7-4w; Wed, 18 Jun 2025 01:12:04 +0000 Received: by outflank-mailman (input) for mailman id 1018694; Wed, 18 Jun 2025 01:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhLO-0003lr-VU for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhLO-007cyA-33 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhLO-0094FJ-2x for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=RQtVUmKnqJ/b7s80pXZR93QOUYA/UptRgDbyAg9Mavg=; b=mM0ZBueOKMBn8jmS9MulBujQwg wj38Tprb5RrJti+JzePl/Gu5x2udPF+Mbx/uKnpRUGUQnDJTIFQfLGu5xAGQYYMmxT/G69tFDoBJ1 ZUsyVSZXaOH821JkhH9qXCIms8KX8g9cZvNC6nymhJxGZijCbNUwqmPfxEJdVzysU+cc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: rewrite emulation_flags_ok() Message-Id: Date: Wed, 18 Jun 2025 01:12:02 +0000 commit 337f0ad8d486de8e95c981c695dce7dcb4ea0cbb Author: Denis Mukhin AuthorDate: Tue Jun 17 17:56:51 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:05 2025 -0700 xen/domain: rewrite emulation_flags_ok() Rewrite emulation_flags_ok() to simplify future modifications. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Roger Pau Monné --- xen/arch/x86/domain.c | 79 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fb7aea9168..d025befe3d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -750,32 +750,75 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return 0; } +/* + * Verify that the domain's emulation flags resolve to a supported configuration. + * + * This ensures we only allow a known, safe subset of emulation combinations + * (for both functionality and security). Arbitrary mixes are likely to cause + * errors (e.g. null pointer dereferences). + * + * NB: use the internal X86_EMU_XXX symbols, not the public XEN_X86_EMU_XXX + * symbols, to take build-time config options (e.g. CONFIG_HVM) into account + * for short-circuited emulations. + */ static bool emulation_flags_ok(const struct domain *d, uint32_t emflags) { + enum { + CAP_PV = BIT(0, U), + CAP_HVM = BIT(1, U), + CAP_HWDOM = BIT(2, U), + CAP_DOMU = BIT(3, U), + }; + static const struct { + unsigned int caps; + uint32_t min; + uint32_t opt; + } configs[] = { +#ifdef CONFIG_PV + /* PV dom0 and domU */ + { + .caps = CAP_PV | CAP_HWDOM | CAP_DOMU, + .opt = X86_EMU_PIT, + }, +#endif /* #ifdef CONFIG_PV */ + +#ifdef CONFIG_HVM + /* PVH dom0 */ + { + .caps = CAP_HVM | CAP_HWDOM, + .min = X86_EMU_LAPIC | X86_EMU_IOAPIC | X86_EMU_VPCI, + }, + + /* PVH domU */ + { + .caps = CAP_HVM | CAP_DOMU, + .min = X86_EMU_LAPIC, + }, + + /* HVM domU */ + { + .caps = CAP_HVM | CAP_DOMU, + .min = X86_EMU_ALL & ~(X86_EMU_VPCI | X86_EMU_USE_PIRQ), + /* HVM PIRQ feature is user-selectable. */ + .opt = X86_EMU_USE_PIRQ, + }, +#endif /* #ifdef CONFIG_HVM */ + }; + unsigned int i; + unsigned int caps = (is_pv_domain(d) ? CAP_PV : CAP_HVM) | + (is_hardware_domain(d) ? CAP_HWDOM : CAP_DOMU); + #ifdef CONFIG_HVM /* This doesn't catch !CONFIG_HVM case but it is better than nothing */ BUILD_BUG_ON(X86_EMU_ALL != XEN_X86_EMU_ALL); #endif - if ( is_hvm_domain(d) ) - { - if ( is_hardware_domain(d) && - emflags != (X86_EMU_VPCI | X86_EMU_LAPIC | X86_EMU_IOAPIC) ) - return false; - if ( !is_hardware_domain(d) && - /* HVM PIRQ feature is user-selectable. */ - (emflags & ~X86_EMU_USE_PIRQ) != - (X86_EMU_ALL & ~(X86_EMU_VPCI | X86_EMU_USE_PIRQ)) && - emflags != X86_EMU_LAPIC ) - return false; - } - else if ( emflags != 0 && emflags != X86_EMU_PIT ) - { - /* PV or classic PVH. */ - return false; - } + for ( i = 0; i < ARRAY_SIZE(configs); i++ ) + if ( (caps & configs[i].caps) == caps && + (emflags & ~configs[i].opt) == configs[i].min ) + return true; - return true; + return false; } void __init arch_init_idle_domain(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018695.1395605 (Exim 4.92) (envelope-from ) id 1uRhLa-0003ou-AU; Wed, 18 Jun 2025 01:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018695.1395605; Wed, 18 Jun 2025 01: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 1uRhLa-0003om-7f; Wed, 18 Jun 2025 01:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1018695; Wed, 18 Jun 2025 01:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhLZ-0003oX-1j for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhLZ-007cyE-05 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhLY-0094G1-3D for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=gd7nvSLspNfQqSI6ZUQUSQ4qJitK7UjJDno1ZV5nzms=; b=o6udcHgcqC47DcAat3+pKN1R9g mc6Nk9icU2a2K39x8nzOqLgdEuGzg5gvjkfLCGOk+R1jpFkXZmb383CCU14xYWzp4XjRRha9cEBMK n74NSeGXBoICuROkNuQ1lompUam8LovQ2XimHIQfs6tcHwpndwKbagNHcHarT3pfw4lU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: disable terminal echo in xilinx test scripts Message-Id: Date: Wed, 18 Jun 2025 01:12:12 +0000 commit 2f73ef4bd7222d120e593dccb13b5e79b642af56 Author: Victor Lira AuthorDate: Tue Jun 17 09:44:49 2025 -0700 Commit: Stefano Stabellini CommitDate: Tue Jun 17 10:59:52 2025 -0700 automation: disable terminal echo in xilinx test scripts The default terminal settings in Linux will enable echo which interferes with these tests. Set the value in the script to avoid failure caused by a settings reset. Signed-off-by: Victor Lira Acked-by: Stefano Stabellini --- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 71cdb295b2..6970a8658d 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -165,7 +165,7 @@ sleep 5 sh /scratch/gitlab-runner/${TEST_BOARD}.sh 1 sleep 5 set +e -stty -F ${SERIAL_DEV} 57600 +stty -F ${SERIAL_DEV} 57600 -echo # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 293232eebf..1d7162f1b3 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -128,7 +128,7 @@ cd $START # connect to serial SERIAL_DEV="/dev/serial/zynq" set +e -stty -F ${SERIAL_DEV} 115200 +stty -F ${SERIAL_DEV} 115200 -echo # Capture test result and power off board before exiting. export PASSED="${passed}" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:12:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018696.1395610 (Exim 4.92) (envelope-from ) id 1uRhLk-0003r3-CN; Wed, 18 Jun 2025 01:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018696.1395610; Wed, 18 Jun 2025 01: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 1uRhLk-0003qu-9I; Wed, 18 Jun 2025 01:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1018696; Wed, 18 Jun 2025 01:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhLj-0003qf-6n for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhLj-007cyM-0O for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhLj-0094GZ-0F for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=p8844uXdyq2pn/VrdtFRQfzR30hFZG2749l+CBxROlA=; b=ucMJSinEcFLh+Ycwpu+Uh8HYn3 YwI7INZdRT7uSVfRPXUviecUE29mGJllWmdFkjw3rMB4o2a1nC4B+Bsf+alht55lk6znb8wX+NHry VS9DVSs+gL5+CRvnauhaWBPCQdB8jps1wM2pPqRYa+5i51a3TD+lNUr5T4WSzYfcOuZI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: update my email address Message-Id: Date: Wed, 18 Jun 2025 01:12:23 +0000 commit a5345249c8db83fb3967aaf558f7dbdfc171d1a0 Author: Nick Rosbrook AuthorDate: Tue Jun 17 11:00:02 2025 -0400 Commit: Stefano Stabellini CommitDate: Tue Jun 17 14:02:43 2025 -0700 MAINTAINERS: update my email address Change rosbrookn@gmail.com -> enr0n@ubuntu.com Signed-off-by: Nick Rosbrook Acked-by: Stefano Stabellini --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 13f31b0c1b..9aa7dd2f57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -330,7 +330,7 @@ F: xen/arch/x86/debug.c F: tools/debugger/gdbsx/ GOLANG BINDINGS -M: Nick Rosbrook +M: Nick Rosbrook R: George Dunlap S: Maintained F: tools/golang -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:12:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018697.1395613 (Exim 4.92) (envelope-from ) id 1uRhLu-0003tH-D9; Wed, 18 Jun 2025 01:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018697.1395613; Wed, 18 Jun 2025 01: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 1uRhLu-0003tA-Ad; Wed, 18 Jun 2025 01:12:34 +0000 Received: by outflank-mailman (input) for mailman id 1018697; Wed, 18 Jun 2025 01:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhLt-0003sj-7X for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhLt-007cyW-0f for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhLt-0094H6-0Z for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01: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=9vak+NO6rUNOCY3As3uTvPI1aINYt7h9dp/zA6u/H3g=; b=ew/XGE4JALY87ouQhMgjW32hvX /XgnrWT6Rz03KkFEsvS5uEZTfImobqgpN1+fCYfrysROLh2GA1cyMrQySEBDaBG9kNtY8Ty8ipeKD HUdm+04x72HE330AXRppW1xwm/k/9hhChBVwTzhCCam/+JBd6murwQFTg2DdNTc3p50E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: exclude xen,reg from direct-map domU extended regions Message-Id: Date: Wed, 18 Jun 2025 01:12:33 +0000 commit 3af8a6ed8e1db75bee5c51268507333f9f5772a3 Author: Stewart Hildebrand AuthorDate: Tue Jun 17 13:54:04 2025 -0400 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:30:17 2025 -0700 xen/arm: exclude xen,reg from direct-map domU extended regions Similarly to fba1b0974dd8, when a device is passed through to a direct-map dom0less domU, the xen,reg ranges may overlap with the extended regions. Remove xen,reg from direct-map domU extended regions. Take the opportunity to update the comment ahead of find_memory_holes(). Signed-off-by: Stewart Hildebrand Reviewed-by: Michal Orzel --- xen/arch/arm/domain_build.c | 80 ++++++++++++++++++++++++++++++++--- xen/common/device-tree/domain-build.c | 5 +++ 2 files changed, 80 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 845c92614b..4ff161887e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -792,15 +792,17 @@ static int __init handle_pci_range(const struct dt_device_node *dev, } /* - * Find the holes in the Host DT which can be exposed to Dom0 as extended - * regions for the special memory mappings. In order to calculate regions - * we exclude every addressable memory region described by "reg" and "ranges" - * properties from the maximum possible addressable physical memory range: + * Find the holes in the Host DT which can be exposed to hwdom or a direct-map + * domU as extended regions for the special memory mappings. In order to + * calculate regions we exclude every addressable memory region described by + * "reg" and "ranges" properties from the maximum possible addressable physical + * memory range: * - MMIO * - Host RAM * - PCI aperture * - Static shared memory regions, which are described by special property * "xen,shared-mem" + * - xen,reg mappings */ static int __init find_memory_holes(const struct kernel_info *kinfo, struct membanks *ext_regions) @@ -882,6 +884,13 @@ static int __init find_memory_holes(const struct kernel_info *kinfo, } } + if ( kinfo->xen_reg_assigned ) + { + res = rangeset_subtract(mem_holes, kinfo->xen_reg_assigned); + if ( res ) + goto out; + } + start = 0; end = (1ULL << p2m_ipa_bits) - 1; res = rangeset_report_ranges(mem_holes, PFN_DOWN(start), PFN_DOWN(end), @@ -962,11 +971,51 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, return res; } +static int __init count(unsigned long s_gfn, unsigned long e_gfn, void *data) +{ + unsigned int *cnt = data; + + (*cnt)++; + + return 0; +} + +static unsigned int __init count_ranges(struct rangeset *r) +{ + unsigned int cnt = 0; + + (void) rangeset_report_ranges(r, 0, PFN_DOWN((1ULL << p2m_ipa_bits) - 1), + count, &cnt); + + return cnt; +} + +static int __init rangeset_to_membank(unsigned long s_gfn, unsigned long e_gfn, + void *data) +{ + struct membanks *membank = data; + paddr_t s = pfn_to_paddr(s_gfn); + paddr_t e = pfn_to_paddr(e_gfn + 1); + + if ( membank->nr_banks >= membank->max_banks ) + return 0; + + membank->bank[membank->nr_banks].start = s; + membank->bank[membank->nr_banks].size = e - s; + membank->nr_banks++; + + return 0; +} + static int __init find_host_extended_regions(const struct kernel_info *kinfo, struct membanks *ext_regions) { int res; struct membanks *gnttab = membanks_xzalloc(1, MEMORY); + struct membanks *xen_reg = + kinfo->xen_reg_assigned + ? membanks_xzalloc(count_ranges(kinfo->xen_reg_assigned), MEMORY) + : NULL; /* * Exclude the following regions: @@ -974,6 +1023,7 @@ static int __init find_host_extended_regions(const struct kernel_info *kinfo, * 2) Remove reserved memory * 3) Grant table assigned to domain * 4) Remove static shared memory (when the feature is enabled) + * 5) Remove xen,reg */ const struct membanks *mem_banks[] = { kernel_info_get_mem_const(kinfo), @@ -982,12 +1032,29 @@ static int __init find_host_extended_regions(const struct kernel_info *kinfo, #ifdef CONFIG_STATIC_SHM bootinfo_get_shmem(), #endif + xen_reg, }; dt_dprintk("Find unallocated memory for extended regions\n"); if ( !gnttab ) - return -ENOMEM; + { + res = -ENOMEM; + goto out; + } + + if ( kinfo->xen_reg_assigned ) + { + if ( !xen_reg ) + { + res = -ENOMEM; + goto out; + } + + rangeset_report_ranges(kinfo->xen_reg_assigned, 0, + PFN_DOWN((1ULL << p2m_ipa_bits) - 1), + rangeset_to_membank, xen_reg); + } gnttab->nr_banks = 1; gnttab->bank[0].start = kinfo->gnttab_start; @@ -995,6 +1062,9 @@ static int __init find_host_extended_regions(const struct kernel_info *kinfo, res = find_unallocated_memory(kinfo, mem_banks, ARRAY_SIZE(mem_banks), ext_regions, add_ext_regions); + + out: + xfree(xen_reg); xfree(gnttab); return res; diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 6b8b8d7cac..99ea81198a 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -193,6 +193,10 @@ int __init find_unallocated_memory(const struct kernel_info *kinfo, /* Remove all regions listed in mem_banks */ for ( i = 0; i < nr_mem_banks; i++ ) + { + if ( !mem_banks[i] ) + continue; + for ( j = 0; j < mem_banks[i]->nr_banks; j++ ) { start = mem_banks[i]->bank[j].start; @@ -212,6 +216,7 @@ int __init find_unallocated_memory(const struct kernel_info *kinfo, goto out; } } + } start = 0; end = (1ULL << p2m_ipa_bits) - 1; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:12:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018698.1395617 (Exim 4.92) (envelope-from ) id 1uRhM4-0003vP-Ej; Wed, 18 Jun 2025 01:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018698.1395617; Wed, 18 Jun 2025 01: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 1uRhM4-0003vG-C1; Wed, 18 Jun 2025 01:12:44 +0000 Received: by outflank-mailman (input) for mailman id 1018698; Wed, 18 Jun 2025 01:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhM3-0003vA-Ak for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhM3-007cya-0z for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhM3-0094Hl-0q for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12: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=l4BLTjbolpNp/AHSUjJyddwc7wtMtvJX4tRrZi1DhTA=; b=VayMVuZXtApFzex0CQoktu0lMV 7cgr5PshkSWtZQ1rbv2XmnTfhj1pTdbxev65nMqM2ROPzIlFDYcsoHT3Utr0CIepgYg39+9tG7i/4 hKtcxoAhCXfGbAUKX7+c9hlgBE2+XRN+wjnz42sPiKJpdN3aITu4c4D7F5h2r1KHOaz8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/arm: exclude iomem from domU extended regions Message-Id: Date: Wed, 18 Jun 2025 01:12:43 +0000 commit 108308feeff4df92cec9191884ebb7b155bc8de5 Author: Stewart Hildebrand AuthorDate: Tue Jun 17 13:54:05 2025 -0400 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:30:18 2025 -0700 tools/arm: exclude iomem from domU extended regions When a device is passed through to a xl domU, the iomem ranges may overlap with the extended regions. Remove iomem from extended regions. Signed-off-by: Stewart Hildebrand Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_arm.c | 110 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 91 insertions(+), 19 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index afc62a5299..4a19a8d22b 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -798,6 +798,8 @@ static int make_timer_node(libxl__gc *gc, void *fdt, return 0; } +#define MAX_NR_EXT_REGIONS 256 + static int make_hypervisor_node(libxl__gc *gc, void *fdt, const libxl_version_info *vers) { @@ -821,7 +823,7 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, */ res = fdt_property_reg_placeholder(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, - GUEST_RAM_BANKS + 1); + MAX_NR_EXT_REGIONS + 1); if (res) return res; /* @@ -1517,17 +1519,29 @@ static void finalise_one_node(libxl__gc *gc, void *fdt, const char *uname, #define EXT_REGION_MIN_SIZE xen_mk_ullong(0x0004000000) /* 64MB */ -static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) +static int compare_iomem(const void *a, const void *b) +{ + const libxl_iomem_range *x = a, *y = b; + + if (x->gfn < y->gfn) + return -1; + if (x->gfn > y->gfn) + return 1; + return 0; +} + +static int finalize_hypervisor_node(libxl__gc *gc, + libxl_domain_build_info *b_info, + struct xc_dom_image *dom) { void *fdt = dom->devicetree_blob; - uint64_t region_size[GUEST_RAM_BANKS] = {0}, region_base[GUEST_RAM_BANKS], - bankend[GUEST_RAM_BANKS]; + uint64_t region_base[MAX_NR_EXT_REGIONS], region_size[MAX_NR_EXT_REGIONS]; uint32_t regs[(GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS) * - (GUEST_RAM_BANKS + 1)]; + (MAX_NR_EXT_REGIONS + 1)]; be32 *cells = ®s[0]; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; - unsigned int i, len, nr_regions = 0; + unsigned int i, j, len, nr_regions = 0; libxl_dominfo info; int offset, rc; @@ -1542,20 +1556,82 @@ static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) if (info.gpaddr_bits > 64) return ERROR_INVAL; + qsort(b_info->iomem, b_info->num_iomem, sizeof(libxl_iomem_range), + compare_iomem); + /* * Try to allocate separate 2MB-aligned extended regions from the first * and second RAM banks taking into the account the maximum supported * guest physical address space size and the amount of memory assigned * to the guest. */ - for (i = 0; i < GUEST_RAM_BANKS; i++) { - region_base[i] = bankbase[i] + + for (i = 0; i < GUEST_RAM_BANKS && nr_regions < MAX_NR_EXT_REGIONS; i++) { + struct { + uint64_t start; + uint64_t end; /* inclusive */ + } unallocated; + uint64_t unallocated_size = 0; + + unallocated.start = bankbase[i] + ALIGN_UP_TO_2MB((uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT); - bankend[i] = ~0ULL >> (64 - info.gpaddr_bits); - bankend[i] = min(bankend[i], bankbase[i] + banksize[i] - 1); - if (bankend[i] > region_base[i]) - region_size[i] = bankend[i] - region_base[i] + 1; + unallocated.end = ~0ULL >> (64 - info.gpaddr_bits); + unallocated.end = min(unallocated.end, bankbase[i] + banksize[i] - 1); + + if (unallocated.end >= unallocated.start) + unallocated_size = unallocated.end - unallocated.start + 1; + + if (unallocated_size < EXT_REGION_MIN_SIZE) + continue; + + /* Exclude iomem */ + for (j = 0; j < b_info->num_iomem && nr_regions < MAX_NR_EXT_REGIONS; + j++) { + struct { + uint64_t start; + uint64_t end; /* inclusive */ + } iomem; + + iomem.start = b_info->iomem[j].gfn << XC_PAGE_SHIFT; + iomem.end = ((b_info->iomem[j].gfn + b_info->iomem[j].number) + << XC_PAGE_SHIFT) - 1; + + if (iomem.end >= unallocated.start + && iomem.start <= unallocated.end) { + + if (iomem.start <= unallocated.start) { + unallocated.start = iomem.end + 1; + + if (unallocated.start > unallocated.end) + break; + } else { + uint64_t size = iomem.start - unallocated.start; + + if (size >= EXT_REGION_MIN_SIZE) { + region_base[nr_regions] = unallocated.start; + region_size[nr_regions] = size; + nr_regions++; + } + + unallocated.start = iomem.end + 1; + + if (unallocated.start > unallocated.end) + break; + } + } + } + + if (unallocated.end >= unallocated.start + && nr_regions < MAX_NR_EXT_REGIONS) + { + uint64_t size = unallocated.end - unallocated.start + 1; + + if (size >= EXT_REGION_MIN_SIZE) { + region_base[nr_regions] = unallocated.start; + region_size[nr_regions] = size; + nr_regions++; + } + } } /* @@ -1565,16 +1641,12 @@ static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); - for (i = 0; i < GUEST_RAM_BANKS; i++) { - if (region_size[i] < EXT_REGION_MIN_SIZE) - continue; - + for (i = 0; i < nr_regions; i++) { LOG(DEBUG, "Extended region %u: %#"PRIx64"->%#"PRIx64"", - nr_regions, region_base[i], region_base[i] + region_size[i]); + i, region_base[i], region_base[i] + region_size[i] - 1); set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, region_base[i], region_size[i]); - nr_regions++; } if (!nr_regions) @@ -1626,7 +1698,7 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, } - res = finalize_hypervisor_node(gc, dom); + res = finalize_hypervisor_node(gc, &d_config->b_info, dom); if (res) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:12:55 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:12:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018699.1395620 (Exim 4.92) (envelope-from ) id 1uRhMF-0003xl-G1; Wed, 18 Jun 2025 01:12:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018699.1395620; Wed, 18 Jun 2025 01:12:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMF-0003xe-DO; Wed, 18 Jun 2025 01:12:55 +0000 Received: by outflank-mailman (input) for mailman id 1018699; Wed, 18 Jun 2025 01:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMD-0003xQ-Dn for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhMD-007cyg-1I for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhMD-0094IH-1A for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:12: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=TxMFSQ+o4ilR4QxbSM7Rgm0R3AREssJHonZIy1IYW5Q=; b=jnefW/AX6KE9l7usjKP6xwg+Hg 9KWqOiKsfRNfZY3lq+QyWyRS+DktTPkKShd+vid5r9uMMiu7Va4iaoEom07KrUkVK0h5Bso2CmxH1 NfAe1npMxDO9lBi40CGaa4wQZk8PTIAbrbD/TWoHCq3JQHe25X4vcm+KB9C5XOm82uRo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: allow PCI host bridge to have private data Message-Id: Date: Wed, 18 Jun 2025 01:12:53 +0000 commit 92b72ab868c7fe2eb219e69bb1dfdd5fac9a1cf1 Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:20 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:32:31 2025 -0700 xen/arm: allow PCI host bridge to have private data Some of the PCI host bridges require private data. Add priv field to struct pci_host_bridge, so such bridges may populate it with their private data. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 64f0e6ce7e..dca9fa4e4c 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -68,6 +68,7 @@ struct pci_host_bridge { uint16_t segment; /* Segment number */ struct pci_config_window* cfg; /* Pointer to the bridge config window */ const struct pci_ops *ops; + void *priv; /* Private data of the bridge. */ }; struct pci_ops { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:13:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:13:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018700.1395624 (Exim 4.92) (envelope-from ) id 1uRhMP-0003zk-Hi; Wed, 18 Jun 2025 01:13:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018700.1395624; Wed, 18 Jun 2025 01:13: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 1uRhMP-0003zc-F0; Wed, 18 Jun 2025 01:13:05 +0000 Received: by outflank-mailman (input) for mailman id 1018700; Wed, 18 Jun 2025 01:13:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMN-0003zU-Gf for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhMN-007czB-1Z for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhMN-0094Iy-1S for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13: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=M+ZzFd3uJs22764XexKP+V0x5w/tTfOugpL/EdzHXqw=; b=Mg8RMGTei+VHpsvcLC4ceq6HtR CGoAiaOrfyk2GjgbGsP2aaA+IT7d/F9D9/Ktgj2HIl9yBBQVQkAqzZofN5LLfazD/I+8doBE76WM7 NHpjKz61TNVBMkE+jIwWBhaivNOSD2elBlnc8xquNBMVjSJKVYYldvoiP2VTJyR9ANWM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: make pci_host_common_probe return the bridge Message-Id: Date: Wed, 18 Jun 2025 01:13:03 +0000 commit fdff9cfdda03962591c2fae06e15370db160f139 Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:21 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:32:39 2025 -0700 xen/arm: make pci_host_common_probe return the bridge Some of the PCI host bridges require additional processing during the probe phase. For that they need to access struct bridge of the probed host, so return pointer to the new bridge from pci_host_common_probe. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 5 +++-- xen/arch/arm/pci/pci-host-common.c | 12 ++++++------ xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index dca9fa4e4c..9e8b17c827 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -18,6 +18,7 @@ #ifdef CONFIG_HAS_PCI #include +#include #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) @@ -97,8 +98,8 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -int pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops); +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index c0faf0f436..53953d4895 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -208,8 +208,8 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -int pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops) +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; @@ -217,11 +217,11 @@ int pci_host_common_probe(struct dt_device_node *dev, int domain; if ( dt_device_for_passthrough(dev) ) - return 0; + return NULL; bridge = pci_alloc_host_bridge(); if ( !bridge ) - return -ENOMEM; + return ERR_PTR(-ENOMEM); /* Parse and map our Configuration Space windows */ cfg = gen_pci_init(dev, ops); @@ -244,12 +244,12 @@ int pci_host_common_probe(struct dt_device_node *dev, bridge->segment = domain; pci_add_host_bridge(bridge); - return 0; + return bridge; err_exit: xfree(bridge); - return err; + return ERR_PTR(err); } /* diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index 46de6e43cc..a6ffbda174 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return pci_host_common_probe(dev, &pci_generic_ecam_ops); + return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops)); } DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 101edb8593..a38f2e019e 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -47,7 +47,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return pci_host_common_probe(dev, &nwl_pcie_ops); + return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops)); } DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:13:15 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:13:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018701.1395628 (Exim 4.92) (envelope-from ) id 1uRhMZ-00042O-LD; Wed, 18 Jun 2025 01:13:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018701.1395628; Wed, 18 Jun 2025 01:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMZ-00042H-Ig; Wed, 18 Jun 2025 01:13:15 +0000 Received: by outflank-mailman (input) for mailman id 1018701; Wed, 18 Jun 2025 01:13:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMX-000423-Ke for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhMX-007czF-1w for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhMX-0094Jl-1l for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13: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=9F1x9ap9yt7f+i5AZqGH/0BtGHQJg7QUgiQVtNRuWL4=; b=GRbpPRcq/vxv/L4u6Z6lhz3sNB 1toVL2UfG1Kzt0VGsEWQAUeq5QPcC4F4IaadooCE/AD4ZshFSN7h0OmUpfpGzyjCLQ3yKR9gJQyTq /9s4wEcHpkoPtPBVks3jvrlJLvqPNl5CIqP3VbBVpFbA9woH7Irsyon9tTt0VQdwYpWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add support for PCI child bus Message-Id: Date: Wed, 18 Jun 2025 01:13:13 +0000 commit fe4ca5630b1f2d1c602d47c5182399ead82f9320 Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:21 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:52:06 2025 -0700 xen/arm: add support for PCI child bus PCI host bridges often have different ways to access the root and child bus configuration spaces. One of the examples is Designware's host bridge and its multiple clones [1]. Linux kernel implements this by instantiating a child bus when device drivers provide not only the usual pci_ops to access ECAM space (this is the case for the generic host bridge), but also means to access the child bus which has a dedicated configuration space and own implementation for accessing the bus, e.g. child_ops. For Xen it is not feasible to fully implement PCI bus infrastructure as Linux kernel does, but still child bus can be supported. Add support for the PCI child bus which includes the following changes: - introduce bus mapping functions depending on SBDF - assign bus start and end for the child bus and re-configure the same for the parent (root) bus - make pci_find_host_bridge be aware of multiple busses behind the same bridge - update pci_host_bridge_mappings, so it also doesn't map to guest the memory spaces belonging to the child bus - make pci_host_common_probe accept one more pci_ops structure for the child bus - install MMIO handlers for the child bus for hardware domain - re-work vpci_mmio_{write|read} with parent and child approach in mind [1] https://elixir.bootlin.com/linux/v5.15/source/drivers/pci/controller/dwc Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/pci.h | 20 +++++++- xen/arch/arm/pci/ecam.c | 1 + xen/arch/arm/pci/pci-access.c | 37 ++++++++++++--- xen/arch/arm/pci/pci-host-common.c | 84 +++++++++++++++++++++++++++------- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 3 +- xen/arch/arm/vpci.c | 91 +++++++++++++++++++++++++++++-------- 7 files changed, 194 insertions(+), 44 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 9e8b17c827..37a6f14dd4 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -69,6 +69,9 @@ struct pci_host_bridge { uint16_t segment; /* Segment number */ struct pci_config_window* cfg; /* Pointer to the bridge config window */ const struct pci_ops *ops; + /* Child bus */ + struct pci_config_window *child_cfg; + const struct pci_ops *child_ops; void *priv; /* Private data of the bridge. */ }; @@ -82,6 +85,9 @@ struct pci_ops { bool (*need_p2m_hwdom_mapping)(struct domain *d, struct pci_host_bridge *bridge, uint64_t addr); + void (*init_bus_range)(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg); }; /* @@ -98,8 +104,10 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops); +struct pci_host_bridge * +pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, @@ -135,6 +143,14 @@ bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); static inline int pci_sanitize_bar_memory(struct rangeset *r) { return 0; } +void pci_generic_init_bus_range(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg); + +void pci_generic_init_bus_range_child(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg); + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c index 3987f96b01..c979af7302 100644 --- a/xen/arch/arm/pci/ecam.c +++ b/xen/arch/arm/pci/ecam.c @@ -60,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = { .read = pci_generic_config_read, .write = pci_generic_config_write, .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, } }; diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c index 9f9aac43d7..4a94867501 100644 --- a/xen/arch/arm/pci/pci-access.c +++ b/xen/arch/arm/pci/pci-access.c @@ -18,10 +18,31 @@ #define INVALID_VALUE (~0U) #define PCI_ERR_VALUE(len) GENMASK(0, len * 8) +static const struct pci_ops *get_ops(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf) +{ + if ( bridge->child_ops ) + { + struct pci_config_window *cfg = bridge->child_cfg; + + if ( (sbdf.bus >= cfg->busn_start) && (sbdf.bus <= cfg->busn_end) ) + return bridge->child_ops; + } + return bridge->ops; +} + +static inline void __iomem *map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t reg) +{ + const struct pci_ops *ops = get_ops(bridge, sbdf); + + return ops->map_bus(bridge, sbdf, reg); +} + int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value) { - void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + void __iomem *addr = map_bus(bridge, sbdf, reg); if ( !addr ) { @@ -50,7 +71,7 @@ int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value) { - void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + void __iomem *addr = map_bus(bridge, sbdf, reg); if ( !addr ) return -ENODEV; @@ -78,14 +99,16 @@ static uint32_t pci_config_read(pci_sbdf_t sbdf, unsigned int reg, { uint32_t val = PCI_ERR_VALUE(len); struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + const struct pci_ops *ops; if ( unlikely(!bridge) ) return val; - if ( unlikely(!bridge->ops->read) ) + ops = get_ops(bridge, sbdf); + if ( unlikely(!ops->read) ) return val; - bridge->ops->read(bridge, sbdf, reg, len, &val); + ops->read(bridge, sbdf, reg, len, &val); return val; } @@ -94,14 +117,16 @@ static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, uint32_t val) { struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + const struct pci_ops *ops; if ( unlikely(!bridge) ) return; - if ( unlikely(!bridge->ops->write) ) + ops = get_ops(bridge, sbdf); + if ( unlikely(!ops->write) ) return; - bridge->ops->write(bridge, sbdf, reg, len, val); + ops->write(bridge, sbdf, reg, len, val); } /* diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 53953d4895..487c545f3a 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -57,17 +57,12 @@ static void pci_ecam_free(struct pci_config_window *cfg) xfree(cfg); } -static struct pci_config_window * __init -gen_pci_init(struct dt_device_node *dev, const struct pci_ecam_ops *ops) +void __init pci_generic_init_bus_range(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg) { - int err, cfg_reg_idx; u32 bus_range[2]; - paddr_t addr, size; - struct pci_config_window *cfg; - - cfg = xzalloc(struct pci_config_window); - if ( !cfg ) - return NULL; + int err; err = dt_property_read_u32_array(dev, "bus-range", bus_range, ARRAY_SIZE(bus_range)); @@ -82,6 +77,35 @@ gen_pci_init(struct dt_device_node *dev, const struct pci_ecam_ops *ops) if ( cfg->busn_end > cfg->busn_start + 0xff ) cfg->busn_end = cfg->busn_start + 0xff; } +} + +void __init pci_generic_init_bus_range_child(struct dt_device_node *dev, + struct pci_host_bridge *bridge, + struct pci_config_window *cfg) +{ + cfg->busn_start = bridge->cfg->busn_start + 1; + cfg->busn_end = bridge->cfg->busn_end; + bridge->cfg->busn_end = bridge->cfg->busn_start; + + printk(XENLOG_INFO "Root bus end updated: [bus %x-%x]\n", + bridge->cfg->busn_start, bridge->cfg->busn_end); +} + +static struct pci_config_window *__init +gen_pci_init(struct dt_device_node *dev, struct pci_host_bridge *bridge, + const struct pci_ecam_ops *ops) +{ + int err, cfg_reg_idx; + paddr_t addr, size; + struct pci_config_window *cfg; + + cfg = xzalloc(struct pci_config_window); + if ( !cfg ) + return NULL; + if ( !ops || !ops->pci_ops.init_bus_range ) + goto err_exit; + + ops->pci_ops.init_bus_range(dev, bridge, cfg); if ( ops->cfg_reg_index ) { @@ -208,8 +232,10 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops) +struct pci_host_bridge * +pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; @@ -224,7 +250,7 @@ struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, return ERR_PTR(-ENOMEM); /* Parse and map our Configuration Space windows */ - cfg = gen_pci_init(dev, ops); + cfg = gen_pci_init(dev, bridge, ops); if ( !cfg ) { err = -ENOMEM; @@ -242,10 +268,28 @@ struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, BUG(); } bridge->segment = domain; + + if ( child_ops ) + { + /* Parse and map child's Configuration Space windows */ + cfg = gen_pci_init(dev, bridge, child_ops); + if ( !cfg ) + { + err = -ENOMEM; + goto err_child; + } + + bridge->child_cfg = cfg; + bridge->child_ops = &child_ops->pci_ops; + } + pci_add_host_bridge(bridge); return bridge; +err_child: + xfree(bridge->cfg); + err_exit: xfree(bridge); @@ -280,9 +324,12 @@ struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus) { if ( bridge->segment != segment ) continue; - if ( (bus < bridge->cfg->busn_start) || (bus > bridge->cfg->busn_end) ) - continue; - return bridge; + if ( bridge->child_cfg && (bus >= bridge->child_cfg->busn_start) && + (bus <= bridge->child_cfg->busn_end) ) + return bridge; + if ( (bus >= bridge->cfg->busn_start) && + (bus <= bridge->cfg->busn_end) ) + return bridge; } return NULL; @@ -348,6 +395,7 @@ int __init pci_host_bridge_mappings(struct domain *d) { const struct dt_device_node *dev = bridge->dt_node; unsigned int i; + bool need_mapping; for ( i = 0; i < dt_number_of_address(dev); i++ ) { @@ -363,7 +411,11 @@ int __init pci_host_bridge_mappings(struct domain *d) return err; } - if ( bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr) ) + need_mapping = bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr); + if ( !need_mapping && bridge->child_ops ) + need_mapping = + bridge->child_ops->need_p2m_hwdom_mapping(d, bridge, addr); + if ( need_mapping ) { err = map_range_to_domain(dev, addr, size, &mr_data); if ( err ) diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index a6ffbda174..47cf144831 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops)); + return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops, NULL)); } DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index a38f2e019e..2c4afa7a19 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -35,6 +35,7 @@ const struct pci_ecam_ops nwl_pcie_ops = { .read = pci_generic_config_read, .write = pci_generic_config_write, .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, } }; @@ -47,7 +48,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops)); + return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops, NULL)); } DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 0ce11ffcc5..d41aa383a8 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -8,15 +8,17 @@ #include static pci_sbdf_t vpci_sbdf_from_gpa(const struct pci_host_bridge *bridge, - paddr_t gpa) + paddr_t gpa, bool use_root) { pci_sbdf_t sbdf; if ( bridge ) { - sbdf.sbdf = VPCI_ECAM_BDF(gpa - bridge->cfg->phys_addr); + const struct pci_config_window *cfg = use_root ? bridge->cfg + : bridge->child_cfg; + sbdf.sbdf = VPCI_ECAM_BDF(gpa - cfg->phys_addr); sbdf.seg = bridge->segment; - sbdf.bus += bridge->cfg->busn_start; + sbdf.bus += cfg->busn_start; } else sbdf.sbdf = VPCI_ECAM_BDF(gpa - GUEST_VPCI_ECAM_BASE); @@ -24,18 +26,14 @@ static pci_sbdf_t vpci_sbdf_from_gpa(const struct pci_host_bridge *bridge, return sbdf; } -static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, - register_t *r, void *p) +static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, register_t *r, + pci_sbdf_t sbdf) { - struct pci_host_bridge *bridge = p; - pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); const unsigned int access_size = (1U << info->dabt.size) * 8; const register_t invalid = GENMASK_ULL(access_size - 1, 0); /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; - ASSERT(!bridge == !is_hardware_domain(v->domain)); - if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { @@ -48,33 +46,86 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, return 0; } -static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, - register_t r, void *p) +static int vpci_mmio_read_root(struct vcpu *v, mmio_info_t *info, register_t *r, + void *p) +{ + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, true); + + ASSERT(!bridge == !is_hardware_domain(v->domain)); + + return vpci_mmio_read(v, info, r, sbdf); +} + +static int vpci_mmio_read_child(struct vcpu *v, mmio_info_t *info, + register_t *r, void *p) { struct pci_host_bridge *bridge = p; - pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, false); ASSERT(!bridge == !is_hardware_domain(v->domain)); + return vpci_mmio_read(v, info, r, sbdf); +} + +static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, register_t r, + pci_sbdf_t sbdf) +{ return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, r); } +static int vpci_mmio_write_root(struct vcpu *v, mmio_info_t *info, register_t r, + void *p) +{ + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, true); + + ASSERT(!bridge == !is_hardware_domain(v->domain)); + + return vpci_mmio_write(v, info, r, sbdf); +} + +static int vpci_mmio_write_child(struct vcpu *v, mmio_info_t *info, + register_t r, void *p) +{ + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa, false); + + ASSERT(!bridge == !is_hardware_domain(v->domain)); + + return vpci_mmio_write(v, info, r, sbdf); +} + static const struct mmio_handler_ops vpci_mmio_handler = { - .read = vpci_mmio_read, - .write = vpci_mmio_write, + .read = vpci_mmio_read_root, + .write = vpci_mmio_write_root, +}; + +static const struct mmio_handler_ops vpci_mmio_handler_child = { + .read = vpci_mmio_read_child, + .write = vpci_mmio_write_child, }; static int vpci_setup_mmio_handler_cb(struct domain *d, struct pci_host_bridge *bridge) { struct pci_config_window *cfg = bridge->cfg; + int count = 1; register_mmio_handler(d, &vpci_mmio_handler, cfg->phys_addr, cfg->size, bridge); - /* We have registered a single MMIO handler. */ - return 1; + if ( bridge->child_ops ) + { + struct pci_config_window *child_cfg = bridge->child_cfg; + + register_mmio_handler(d, &vpci_mmio_handler_child, child_cfg->phys_addr, + child_cfg->size, bridge); + count++; + } + + return count; } int domain_vpci_init(struct domain *d) @@ -105,8 +156,12 @@ int domain_vpci_init(struct domain *d) static int vpci_get_num_handlers_cb(struct domain *d, struct pci_host_bridge *bridge) { - /* Each bridge has a single MMIO handler for the configuration space. */ - return 1; + int count = 1; + + if ( bridge->child_cfg ) + count++; + + return count; } unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 01:13:25 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 01:13:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018702.1395632 (Exim 4.92) (envelope-from ) id 1uRhMj-00044Q-Mr; Wed, 18 Jun 2025 01:13:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018702.1395632; Wed, 18 Jun 2025 01:13:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMj-00044I-KE; Wed, 18 Jun 2025 01:13:25 +0000 Received: by outflank-mailman (input) for mailman id 1018702; Wed, 18 Jun 2025 01:13:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRhMh-000447-N8 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRhMh-007czS-2E for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRhMh-0094KN-28 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 01:13: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=kztNeAxCl5BfW5bb4whFvEkFwf9Fb06arjktFDfT8JA=; b=bYgOfuTSSfal/X64m14hBj5qPl WhAwvH/kb77DbW58p2tRtJWn4ENrdii7el3XxRvFnc8BDlKtYSt8bFI9LP+0lAb5h26FqQHSQzl16 DYv0m0lCC+5QMa+FjRt2xr+0EczaM4BAypwUckaZUXaAqy2jJa4Y94v+zRpRu0sDrRsA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add support for R-Car Gen4 PCI host controller Message-Id: Date: Wed, 18 Jun 2025 01:13:23 +0000 commit d3d36bb494a69cb2b60b53cdbabab45c0fafc25c Author: Oleksandr Andrushchenko AuthorDate: Thu Jun 12 11:16:22 2025 +0000 Commit: Stefano Stabellini CommitDate: Tue Jun 17 15:52:13 2025 -0700 xen/arm: add support for R-Car Gen4 PCI host controller Add support for Renesas R-Car Gen4 PCI host controller, specifically targeting the S4 and V4H SoCs. The implementation includes configuration read/write operations for both root and child buses. For accessing the child bus, iATU is used for address translation. The host controller needs to be initialized by Dom0 first to be properly handled by Xen. Xen itself only handles the runtime configuration of the iATU for accessing different child devices. iATU programming is done similarly to Linux, where only window 0 is used for dynamic configuration, and it is reconfigured for every config space read/write. Code common to all DesignWare PCI host controllers is located in a separate file to allow for easy reuse in other DesignWare-based PCI host controllers. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai Acked-by: Stefano Stabellini --- MAINTAINERS | 5 + xen/arch/arm/pci/Makefile | 2 + xen/arch/arm/pci/pci-designware.c | 405 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-designware.h | 90 +++++++++ xen/arch/arm/pci/pci-host-rcar4.c | 94 +++++++++ 5 files changed, 596 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9aa7dd2f57..fcd24b3d58 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -473,6 +473,11 @@ M: Anthony Perard S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git +RCAR PCI +M: Mykyta Poturai +S: Supported +F: xen/arch/arm/pci/pci-host-rcar4.c + REMUS S: Orphan F: docs/README.remus diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile index 1d045ade01..ca6135e282 100644 --- a/xen/arch/arm/pci/Makefile +++ b/xen/arch/arm/pci/Makefile @@ -4,3 +4,5 @@ obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o obj-y += pci-host-zynqmp.o +obj-y += pci-designware.o +obj-y += pci-host-rcar4.o diff --git a/xen/arch/arm/pci/pci-designware.c b/xen/arch/arm/pci/pci-designware.c new file mode 100644 index 0000000000..47dd2dd4c0 --- /dev/null +++ b/xen/arch/arm/pci/pci-designware.c @@ -0,0 +1,405 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on Linux drivers/pci/controller/dwc/pcie-designware.c + * Based on xen/arch/arm/pci/pci-host-generic.c + * + */ + +#include +#include + +#include "pci-designware.h" +/** + * upper_32_bits - return bits 32-63 of a number + * @n: the number we're accessing + * + * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress + * the "right shift count >= width of type" warning when that quantity is + * 32-bits. + */ +#define upper_32_bits(n) ((uint32_t)(((n) >> 16) >> 16)) + +/** + * lower_32_bits - return bits 0-31 of a number + * @n: the number we're accessing + */ +#define lower_32_bits(n) ((uint32_t)((n) & 0xffffffffU)) + +static int dw_pcie_read(void __iomem *addr, unsigned int len, uint32_t *val) +{ + if ( !IS_ALIGNED((uintptr_t)addr, len) ) + { + *val = 0; + return -EFAULT; + } + + switch ( len ) + { + case 1: + *val = readb(addr); + break; + case 2: + *val = readw(addr); + break; + case 4: + *val = readl(addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +static int dw_pcie_write(void __iomem *addr, unsigned int len, uint32_t val) +{ + if ( !IS_ALIGNED((uintptr_t)addr, len) ) + return -EFAULT; + + switch ( len ) + { + case 1: + writeb(val, addr); + break; + case 2: + writew(val, addr); + break; + case 4: + writel(val, addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +static uint32_t dw_pcie_read_dbi(struct pci_host_bridge *bridge, uint32_t reg, + size_t size) +{ + void __iomem *addr = bridge->cfg->win + reg; + uint32_t val; + int ret; + + ret = dw_pcie_read(addr, size, &val); + if ( ret ) + printk(XENLOG_G_ERR "Read DBI address failed\n"); + + return val; +} + +static void dw_pcie_write_dbi(struct pci_host_bridge *bridge, uint32_t reg, + size_t size, uint32_t val) +{ + void __iomem *addr = bridge->cfg->win + reg; + int ret; + + ret = dw_pcie_write(addr, size, val); + if ( ret ) + printk(XENLOG_G_ERR "Write DBI address failed\n"); +} + +static uint32_t dw_pcie_readl_dbi(struct pci_host_bridge *bridge, uint32_t reg) +{ + return dw_pcie_read_dbi(bridge, reg, sizeof(uint32_t)); +} + +static void dw_pcie_writel_dbi(struct pci_host_bridge *pci, uint32_t reg, + uint32_t val) +{ + dw_pcie_write_dbi(pci, reg, sizeof(uint32_t), val); +} + +static void dw_pcie_read_iatu_unroll_enabled(struct pci_host_bridge *bridge) +{ + struct dw_pcie_priv *priv = bridge->priv; + uint32_t val; + + val = dw_pcie_readl_dbi(bridge, PCIE_ATU_VIEWPORT); + if ( val == 0xffffffffU ) + priv->iatu_unroll_enabled = true; + + printk(XENLOG_G_DEBUG "%s iATU unroll: %sabled\n", + dt_node_full_name(bridge->dt_node), + priv->iatu_unroll_enabled ? "en" : "dis"); +} + +static uint32_t dw_pcie_readl_atu(struct pci_host_bridge *pci, uint32_t reg) +{ + struct dw_pcie_priv *priv = pci->priv; + int ret; + uint32_t val; + + ret = dw_pcie_read(priv->atu_base + reg, 4, &val); + if ( ret ) + printk(XENLOG_G_ERR "Read ATU address %x failed\n", reg); + + return val; +} + +static void dw_pcie_writel_atu(struct pci_host_bridge *pci, uint32_t reg, + uint32_t val) +{ + struct dw_pcie_priv *priv = pci->priv; + int ret; + + ret = dw_pcie_write(priv->atu_base + reg, 4, val); + if ( ret ) + printk(XENLOG_G_ERR "Write ATU address %x failed\n", reg); +} + +static uint32_t dw_pcie_readl_ob_unroll(struct pci_host_bridge *pci, + uint32_t index, uint32_t reg) +{ + uint32_t offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); + + return dw_pcie_readl_atu(pci, offset + reg); +} + +static void dw_pcie_writel_ob_unroll(struct pci_host_bridge *pci, + uint32_t index, uint32_t reg, uint32_t val) +{ + uint32_t offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); + + dw_pcie_writel_atu(pci, offset + reg, val); +} + +static int dw_pcie_prog_outbound_atu_unroll(struct pci_host_bridge *pci, + uint8_t func_no, int index, + int type, uint64_t cpu_addr, + uint64_t pci_addr, uint64_t size) +{ + uint32_t retries, val; + uint64_t limit_addr = cpu_addr + size - 1; + + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_LOWER_BASE, + lower_32_bits(cpu_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_UPPER_BASE, + upper_32_bits(cpu_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_LOWER_LIMIT, + lower_32_bits(limit_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_UPPER_LIMIT, + upper_32_bits(limit_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_LOWER_TARGET, + lower_32_bits(pci_addr)); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_UPPER_TARGET, + upper_32_bits(pci_addr)); + val = type | PCIE_ATU_FUNC_NUM(func_no); + val = upper_32_bits(size - 1) ? val | PCIE_ATU_INCREASE_REGION_SIZE : val; + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL1, val); + dw_pcie_writel_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2, + PCIE_ATU_ENABLE); + + /* + * Make sure ATU enable takes effect before any subsequent config + * and I/O accesses. + */ + for ( retries = 0; retries < LINK_WAIT_MAX_IATU_RETRIES; retries++ ) + { + val = dw_pcie_readl_ob_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2); + if ( val & PCIE_ATU_ENABLE ) + return 0; + + mdelay(LINK_WAIT_IATU_DELAY_MS); + } + printk(XENLOG_G_ERR "Outbound iATU is not being enabled\n"); + + return -ENXIO; +} + +static int __dw_pcie_prog_outbound_atu(struct pci_host_bridge *pci, + uint8_t func_no, int index, int type, + uint64_t cpu_addr, uint64_t pci_addr, + uint64_t size) +{ + struct dw_pcie_priv *priv = pci->priv; + uint32_t retries, val; + + if ( priv->iatu_unroll_enabled ) + return dw_pcie_prog_outbound_atu_unroll(pci, func_no, index, type, + cpu_addr, pci_addr, size); + + dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT, + PCIE_ATU_REGION_OUTBOUND | index); + dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_BASE, lower_32_bits(cpu_addr)); + dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_BASE, upper_32_bits(cpu_addr)); + dw_pcie_writel_dbi(pci, PCIE_ATU_LIMIT, lower_32_bits(cpu_addr + size - 1)); + if ( priv->version >= 0x460A ) + dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_LIMIT, + upper_32_bits(cpu_addr + size - 1)); + dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET, lower_32_bits(pci_addr)); + dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_TARGET, upper_32_bits(pci_addr)); + val = type | PCIE_ATU_FUNC_NUM(func_no); + val = ((upper_32_bits(size - 1)) && (priv->version >= 0x460A)) + ? val | PCIE_ATU_INCREASE_REGION_SIZE + : val; + dw_pcie_writel_dbi(pci, PCIE_ATU_CR1, val); + dw_pcie_writel_dbi(pci, PCIE_ATU_CR2, PCIE_ATU_ENABLE); + + /* + * Make sure ATU enable takes effect before any subsequent config + * and I/O accesses. + */ + for ( retries = 0; retries < LINK_WAIT_MAX_IATU_RETRIES; retries++ ) + { + val = dw_pcie_readl_dbi(pci, PCIE_ATU_CR2); + if ( val & PCIE_ATU_ENABLE ) + return 0; + + mdelay(LINK_WAIT_IATU_DELAY_MS); + } + printk(XENLOG_G_ERR "Outbound iATU is not being enabled\n"); + + return -ENXIO; +} + +static int dw_pcie_prog_outbound_atu(struct pci_host_bridge *pci, int index, + int type, uint64_t cpu_addr, + uint64_t pci_addr, uint64_t size) +{ + return __dw_pcie_prog_outbound_atu(pci, 0, index, type, cpu_addr, pci_addr, + size); +} + +void dw_pcie_set_version(struct pci_host_bridge *bridge, unsigned int version) +{ + struct dw_pcie_priv *priv = bridge->priv; + + priv->version = version; +} + +void __iomem *dw_pcie_child_map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t where) +{ + uint32_t busdev; + int ret; + + busdev = PCIE_ATU_BUS(sbdf.bus) | PCIE_ATU_DEV(PCI_SLOT(sbdf.devfn)) | + PCIE_ATU_FUNC(PCI_FUNC(sbdf.devfn)); + + /* FIXME: Parent is the root bus, so use PCIE_ATU_TYPE_CFG0. */ + ret = dw_pcie_prog_outbound_atu(bridge, PCIE_ATU_REGION_INDEX1, + PCIE_ATU_TYPE_CFG0, + bridge->child_cfg->phys_addr, busdev, + bridge->child_cfg->size); + if ( ret ) + return 0; + + return bridge->child_cfg->win + where; +} + +int dw_pcie_child_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value) +{ + struct dw_pcie_priv *priv = bridge->priv; + int ret; + + /* + * FIXME: we cannot read iATU settings at the early initialization + * (probe) as the host's HW is not yet initialized at that phase. + * This read operation is the very first thing Domain-0 will do + * during its initialization, so take this opportunity and read + * iATU setting now. + */ + if ( unlikely(!priv->iatu_unroll_initilized) ) + { + dw_pcie_read_iatu_unroll_enabled(bridge); + priv->iatu_unroll_initilized = true; + } + + ret = pci_generic_config_read(bridge, sbdf, reg, len, value); + if ( !ret && (priv->num_viewport <= 2) ) + ret = dw_pcie_prog_outbound_atu(bridge, PCIE_ATU_REGION_INDEX1, + PCIE_ATU_TYPE_IO, + bridge->child_cfg->phys_addr, 0, + bridge->child_cfg->size); + + return ret; +} + +int dw_pcie_child_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value) +{ + struct dw_pcie_priv *priv = bridge->priv; + int ret; + + ret = pci_generic_config_write(bridge, sbdf, reg, len, value); + if ( !ret && (priv->num_viewport <= 2) ) + ret = dw_pcie_prog_outbound_atu(bridge, PCIE_ATU_REGION_INDEX1, + PCIE_ATU_TYPE_IO, + bridge->child_cfg->phys_addr, 0, + bridge->child_cfg->size); + return ret; +} + +bool __init dw_pcie_child_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr) +{ + struct pci_config_window *cfg = bridge->child_cfg; + + /* + * We do not want ECAM address space to be mapped in Domain-0's p2m, + * so we can trap access to it. + */ + return cfg->phys_addr != addr; +} + +struct pci_host_bridge *__init +dw_pcie_host_probe(struct dt_device_node *dev, const void *data, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops) +{ + struct pci_host_bridge *bridge; + struct dw_pcie_priv *priv; + + paddr_t atu_phys_addr; + paddr_t atu_size; + int atu_idx, ret; + + bridge = pci_host_common_probe(dev, ops, child_ops); + if ( IS_ERR(bridge) ) + return bridge; + + priv = xzalloc(struct dw_pcie_priv); + if ( !priv ) + return ERR_PTR(-ENOMEM); + + bridge->priv = priv; + + atu_idx = dt_property_match_string(dev, "reg-names", "atu"); + if ( atu_idx < 0 ) + { + printk(XENLOG_ERR "Cannot find \"atu\" range index in device tree\n"); + return ERR_PTR(atu_idx); + } + ret = dt_device_get_address(dev, atu_idx, &atu_phys_addr, &atu_size); + if ( ret ) + { + printk(XENLOG_ERR "Cannot find \"atu\" range in device tree\n"); + return ERR_PTR(ret); + } + printk("iATU at [mem 0x%" PRIpaddr "-0x%" PRIpaddr "]\n", atu_phys_addr, + atu_phys_addr + atu_size - 1); + priv->atu_base = ioremap_nocache(atu_phys_addr, atu_size); + if ( !priv->atu_base ) + { + printk(XENLOG_ERR "iATU ioremap failed\n"); + return ERR_PTR(ENXIO); + } + + if ( !dt_property_read_u32(dev, "num-viewport", &priv->num_viewport) ) + priv->num_viewport = 2; + + /* + * FIXME: we cannot read iATU unroll enable now as the host bridge's + * HW is not yet initialized by Domain-0: leave it for later. + */ + + printk(XENLOG_INFO "%s number of view ports: %d\n", dt_node_full_name(dev), + priv->num_viewport); + + return bridge; +} diff --git a/xen/arch/arm/pci/pci-designware.h b/xen/arch/arm/pci/pci-designware.h new file mode 100644 index 0000000000..7efb1dc9a2 --- /dev/null +++ b/xen/arch/arm/pci/pci-designware.h @@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on Linux drivers/pci/controller/dwc/pcie-designware.c + * Based on xen/arch/arm/pci/pci-host-generic.c + */ + +#include +#include + +#ifndef __PCI_DESIGNWARE_H__ +#define __PCI_DESIGNWARE_H__ + + +#define PCIE_ATU_VIEWPORT 0x900 +#define PCIE_ATU_REGION_OUTBOUND 0 +#define PCIE_ATU_CR1 0x904 +#define PCIE_ATU_INCREASE_REGION_SIZE BIT(13, UL) +#define PCIE_ATU_CR2 0x908 +#define PCIE_ATU_ENABLE BIT(31, UL) +#define PCIE_ATU_LOWER_BASE 0x90C +#define PCIE_ATU_UPPER_BASE 0x910 +#define PCIE_ATU_LIMIT 0x914 +#define PCIE_ATU_LOWER_TARGET 0x918 +#define PCIE_ATU_UPPER_TARGET 0x91C +#define PCIE_ATU_UPPER_LIMIT 0x924 + +#define PCIE_ATU_REGION_INDEX1 0x1 +#define PCIE_ATU_TYPE_IO 0x2 +#define PCIE_ATU_TYPE_CFG0 0x4 + +#define FIELD_PREP(_mask, _val) \ + (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) + +#define PCIE_ATU_BUS(x) FIELD_PREP(GENMASK(31, 24), (x)) +#define PCIE_ATU_DEV(x) FIELD_PREP(GENMASK(23, 19), (x)) +#define PCIE_ATU_FUNC(x) FIELD_PREP(GENMASK(18, 16), (x)) + +/* Register address builder */ +#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(region) \ + ((region) << 9) + +/* + * iATU Unroll-specific register definitions + * From 4.80 core version the address translation will be made by unroll + */ +#define PCIE_ATU_UNR_REGION_CTRL1 0x00 +#define PCIE_ATU_UNR_REGION_CTRL2 0x04 +#define PCIE_ATU_UNR_LOWER_BASE 0x08 +#define PCIE_ATU_UNR_UPPER_BASE 0x0C +#define PCIE_ATU_UNR_LOWER_LIMIT 0x10 +#define PCIE_ATU_UNR_LOWER_TARGET 0x14 +#define PCIE_ATU_UNR_UPPER_TARGET 0x18 +#define PCIE_ATU_UNR_UPPER_LIMIT 0x20 + +#define PCIE_ATU_FUNC_NUM(pf) ((pf) << 20) + +/* Parameters for the waiting for iATU enabled routine */ +#define LINK_WAIT_MAX_IATU_RETRIES 5 +#define LINK_WAIT_IATU_DELAY_MS 10 + +struct dw_pcie_priv { + uint32_t num_viewport; + bool iatu_unroll_initilized; + bool iatu_unroll_enabled; + void __iomem *atu_base; + unsigned int version; +}; + +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, + pci_sbdf_t sbdf, uint32_t where); + +int dw_pcie_child_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value); + +int dw_pcie_child_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value); + +bool __init dw_pcie_child_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr); + +struct pci_host_bridge *__init +dw_pcie_host_probe(struct dt_device_node *dev, const void *data, + const struct pci_ecam_ops *ops, + const struct pci_ecam_ops *child_ops); +#endif /* __PCI_DESIGNWARE_H__ */ diff --git a/xen/arch/arm/pci/pci-host-rcar4.c b/xen/arch/arm/pci/pci-host-rcar4.c new file mode 100644 index 0000000000..62d2130a63 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-rcar4.c @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on xen/arch/arm/pci/pci-host-generic.c + */ + +#include +#include + +#include +#include +#include + +#include "pci-designware.h" + +#define RCAR4_DWC_VERSION 0x520A + +/* + * PCI host bridges often have different ways to access the root and child + * bus config spaces: + * "dbi" : the aperture where root port's own configuration registers + * are available. + * "config": child's configuration space + * "atu" : iATU registers for DWC version 4.80 or later + */ +static int __init rcar4_cfg_reg_index(struct dt_device_node *np) +{ + return dt_property_match_string(np, "reg-names", "dbi"); +} + +static int __init rcar4_child_cfg_reg_index(struct dt_device_node *np) +{ + return dt_property_match_string(np, "reg-names", "config"); +} + +/* ECAM ops */ +const struct pci_ecam_ops rcar4_pcie_ops = { + .bus_shift = 20, + .cfg_reg_index = rcar4_cfg_reg_index, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, + } +}; + +const struct pci_ecam_ops rcar4_pcie_child_ops = { + .bus_shift = 20, + .cfg_reg_index = rcar4_child_cfg_reg_index, + .pci_ops = { + .map_bus = dw_pcie_child_map_bus, + .read = dw_pcie_child_config_read, + .write = dw_pcie_child_config_write, + .need_p2m_hwdom_mapping = dw_pcie_child_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range_child, + } +}; + +static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = { + { .compatible = "renesas,r8a779f0-pcie" }, + { .compatible = "renesas,r8a779g0-pcie" }, + {}, +}; + +static int __init pci_host_rcar4_probe(struct dt_device_node *dev, + const void *data) +{ + struct pci_host_bridge *bridge; + + bridge = dw_pcie_host_probe(dev, data, &rcar4_pcie_ops, + &rcar4_pcie_child_ops); + + dw_pcie_set_version(bridge, RCAR4_DWC_VERSION); + + return 0; +} + +DT_DEVICE_START(pci_gen, "PCI HOST R-CAR GEN4", DEVICE_PCI_HOSTBRIDGE) +.dt_match = rcar4_pcie_dt_match, +.init = pci_host_rcar4_probe, +DT_DEVICE_END + +/* + * 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 Wed Jun 18 07:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 07:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018910.1395787 (Exim 4.92) (envelope-from ) id 1uRnI7-0005nK-KX; Wed, 18 Jun 2025 07:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018910.1395787; Wed, 18 Jun 2025 07: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 1uRnI7-0005nD-I4; Wed, 18 Jun 2025 07:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1018910; Wed, 18 Jun 2025 07:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnI6-0005n7-CZ for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnI6-007n9t-19 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnI6-009NKe-14 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07: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=aNPPj/amB0o0QEUsq/mlJj1IbeSrkRfaGDLsfAZLXRI=; b=lE2FNdhRP+FWopEzQK2z5RNDQP ex4dBt8ICl6qxbBd6WQmCy0vKALE4iLHwGN7WguBTJ6V8w2EFytARZSflSNXYP2M+V/MWb/kv7pgx PSXkIwWgFZfDLFEymeJK7nUVIxXtkh2kI/k9wscoq2bdVHbX/Bj0XsR1zwDpxGADWb3k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: move "init" flag into common structure Message-Id: Date: Wed, 18 Jun 2025 07:33:02 +0000 commit c78c1fd879def6eb504a76e2d7a291b1b42f6592 Author: Penny Zheng AuthorDate: Wed Jun 18 09:23:33 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:23:33 2025 +0200 xen/cpufreq: move "init" flag into common structure AMD cpufreq cores will be intialized in two modes, legacy P-state mode, and CPPC mode. So "init" flag shall be extracted from px-specific "struct xen_processor_perf", and placed in the common "struct processor_pminfo". Otherwise, later when introducing a new sub-hypercall to propagate CPPC data, we need to pass irrelevant px-specific "struct xen_processor_perf" to just set init flag. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 4 ++-- xen/drivers/cpufreq/cpufreq.c | 8 ++++---- xen/include/acpi/cpufreq/processor_perf.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 521db7e98e..b4e8514f91 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -237,7 +237,7 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) return -ENODEV; if ( hwp_active() ) return -EOPNOTSUPP; - if ( !pmpt || !(pmpt->perf.init & XEN_PX_INIT) ) + if ( !pmpt || !(pmpt->init & XEN_PX_INIT) ) return -EINVAL; break; default: @@ -635,7 +635,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->perf.init & XEN_PX_INIT) ) + if ( !pmpt || !(pmpt->init & XEN_PX_INIT) ) return -EINVAL; break; } diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index f47aad3f75..564f926341 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -209,7 +209,7 @@ int cpufreq_add_cpu(unsigned int cpu) perf = &processor_pminfo[cpu]->perf; - if ( !(perf->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) return -EINVAL; if (!cpufreq_driver.init) @@ -373,7 +373,7 @@ int cpufreq_del_cpu(unsigned int cpu) perf = &processor_pminfo[cpu]->perf; - if ( !(perf->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) return -EINVAL; if (!per_cpu(cpufreq_cpu_policy, cpu)) @@ -570,7 +570,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) if ( cpufreq_verbose ) print_PPC(pxpt->platform_limit); - if ( pxpt->init == XEN_PX_INIT ) + if ( pmpt->init == XEN_PX_INIT ) { ret = cpufreq_limit_change(cpu); goto out; @@ -579,7 +579,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) if ( perf->flags == ( XEN_PX_PCT | XEN_PX_PSS | XEN_PX_PSD | XEN_PX_PPC ) ) { - pxpt->init = XEN_PX_INIT; + pmpt->init = XEN_PX_INIT; ret = cpufreq_cpu_init(cpu); goto out; diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 6de43f8602..fa28b14faf 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -27,14 +27,14 @@ struct processor_performance { struct xen_processor_px *states; struct xen_psd_package domain_info; uint32_t shared_type; - - uint32_t init; }; struct processor_pminfo { uint32_t acpi_id; uint32_t id; struct processor_performance perf; + + uint32_t init; }; extern struct processor_pminfo *processor_pminfo[NR_CPUS]; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 07:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 07:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018911.1395790 (Exim 4.92) (envelope-from ) id 1uRnIH-0005pB-M9; Wed, 18 Jun 2025 07:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018911.1395790; Wed, 18 Jun 2025 07: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 1uRnIH-0005p1-JR; Wed, 18 Jun 2025 07:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1018911; Wed, 18 Jun 2025 07:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnIG-0005or-FP for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnIG-007nAL-1R for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnIG-009NL8-1K for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07: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=Sbx1ycjXQomlgYUX1NghnO1brtAL2I+WcuBaUXF+r9Q=; b=kcqc7BUpswpX9hlq7SZUsk5Ooe oVBylOCL7qSxlOmfNYAWPDZzbCRw7O/qEyWwq64H+6LCTFdxGDnz9KtMBeHZgUIF56Np6yWue9h5S oHnmB64VomU+bd7Tld4vHYjTXIUBZgyVxlGHbSNNCdc2sCB8jEchKCZtVp1c29Q2SzQw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/AMD: Expand core frequency calculation for family 1Ah CPUs Message-Id: Date: Wed, 18 Jun 2025 07:33:12 +0000 commit 0cdd076d35d349bae8d558dc9e76ce8b1c469330 Author: Penny Zheng AuthorDate: Wed Jun 18 09:24:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:24:00 2025 +0200 x86/AMD: Expand core frequency calculation for family 1Ah CPUs AMD Family 1Ah CPU needs a different COF(Core Operating Frequency) formula, due to a change in the PStateDef MSR layout in AMD Family 1Ah. In AMD Family 1Ah, Core current operating frequency in MHz is calculated as follows: CoreCOF = Core::X86::Msr::PStateDef[CpuFid[11:0]] * 5MHz We introduce a helper amd_parse_freq() to parse COF(Core Operating Frequency) from PstateDef register, to replace the original macro FREQ(v). amd_parse_freq() is declared as const, as it mainly consists of mathematical conputation. Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 27ae167808..f10e762d76 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -587,12 +587,38 @@ static void amd_get_topology(struct cpuinfo_x86 *c) : c->cpu_core_id); } +static unsigned int attr_const amd_parse_freq(unsigned int family, + unsigned int value) +{ + unsigned int freq = 0; + + switch (family) { + case 0x10 ... 0x16: + freq = (((value & 0x3f) + 0x10) * 100) >> ((value >> 6) & 7); + break; + + case 0x17 ... 0x19: + freq = ((value & 0xff) * 25 * 8) / ((value >> 8) & 0x3f); + break; + + case 0x1A: + freq = (value & 0xfff) * 5; + break; + + default: + ASSERT_UNREACHABLE(); + break; + } + + return freq; +} + void amd_log_freq(const struct cpuinfo_x86 *c) { unsigned int idx = 0, h; uint64_t hi, lo, val; - if (c->x86 < 0x10 || c->x86 > 0x19 || + if (c->x86 < 0x10 || c->x86 > 0x1A || (c != &boot_cpu_data && (!opt_cpu_info || (c->apicid & (c->x86_num_siblings - 1))))) return; @@ -673,19 +699,22 @@ void amd_log_freq(const struct cpuinfo_x86 *c) if (!(lo >> 63)) return; -#define FREQ(v) (c->x86 < 0x17 ? ((((v) & 0x3f) + 0x10) * 100) >> (((v) >> 6) & 7) \ - : (((v) & 0xff) * 25 * 8) / (((v) >> 8) & 0x3f)) if (idx && idx < h && !rdmsr_safe(0xC0010064 + idx, val) && (val >> 63) && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) - printk("CPU%u: %lu (%lu ... %lu) MHz\n", - smp_processor_id(), FREQ(val), FREQ(lo), FREQ(hi)); + printk("CPU%u: %u (%u ... %u) MHz\n", + smp_processor_id(), + amd_parse_freq(c->x86, val), + amd_parse_freq(c->x86, lo), + amd_parse_freq(c->x86, hi)); else if (h && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) - printk("CPU%u: %lu ... %lu MHz\n", - smp_processor_id(), FREQ(lo), FREQ(hi)); + printk("CPU%u: %u ... %u MHz\n", + smp_processor_id(), + amd_parse_freq(c->x86, lo), + amd_parse_freq(c->x86, hi)); else - printk("CPU%u: %lu MHz\n", smp_processor_id(), FREQ(lo)); -#undef FREQ + printk("CPU%u: %u MHz\n", smp_processor_id(), + amd_parse_freq(c->x86, lo)); } void cf_check early_init_amd(struct cpuinfo_x86 *c) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 07:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 07:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018912.1395795 (Exim 4.92) (envelope-from ) id 1uRnIR-0005r2-Nb; Wed, 18 Jun 2025 07:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018912.1395795; Wed, 18 Jun 2025 07: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 1uRnIR-0005qu-Kp; Wed, 18 Jun 2025 07:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1018912; Wed, 18 Jun 2025 07:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnIQ-0005qo-I1 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnIQ-007nAT-1h for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnIQ-009NLv-1b for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07: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=pMwX1/mumWBMTno+4UI/5lV4j/jK8UzELL6GxaE47pU=; b=PDau6Md9gIQ7mK7XBGwNy/b+Rt dmfTRyiT4AKjfPFPGXLFNUeuaV1c4dRA32iNN+Tg3dqUPZYIbsskaUksldVXSgJwf1S305c0cvaul isDTUbusbQcmQKo+TarFP9ylL7G64OY4l5WjIx6RYdlA2V+JQWCQJZTxIujzQ4V8aiW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: normalize hwp driver check with hwp_active() Message-Id: Date: Wed, 18 Jun 2025 07:33:22 +0000 commit 25972d5b5c26afbfceb1284cdab0404a46a0baf0 Author: Penny Zheng AuthorDate: Wed Jun 18 09:24:24 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:24:24 2025 +0200 xen/cpufreq: normalize hwp driver check with hwp_active() Instead of using hypercall passing parameter to identify hwp driver, we shall use hwp_active(). Also, we've already used hwp_active() in do_get_pm_info() in the same file to do hwp driver check, it's better syncing with same way. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index b4e8514f91..2a1f5493fa 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -422,9 +422,7 @@ static int get_cpufreq_para(struct xen_sysctl_pm_op *op) else strlcpy(op->u.get_para.scaling_driver, "Unknown", CPUFREQ_NAME_LEN); - if ( IS_ENABLED(CONFIG_INTEL) && - !strncmp(op->u.get_para.scaling_driver, XEN_HWP_DRIVER_NAME, - CPUFREQ_NAME_LEN) ) + if ( hwp_active() ) ret = get_hwp_para(policy->cpu, &op->u.get_para.u.cppc_para); else { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 07:33:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 07:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018913.1395798 (Exim 4.92) (envelope-from ) id 1uRnIb-0005si-Os; Wed, 18 Jun 2025 07:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018913.1395798; Wed, 18 Jun 2025 07: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 1uRnIb-0005sa-MK; Wed, 18 Jun 2025 07:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1018913; Wed, 18 Jun 2025 07:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnIa-0005sU-L5 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnIa-007nAf-20 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnIa-009NMN-1s for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07: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=68xHwUY85FbkL1K875205D/o/yQMQwaf6n9glRt95BQ=; b=eZosfyFYNxxFjNzSUuGAYjYO5v tXEkOUkrzl+oFkFfj0fKx5/oMVwtGOjk3iUJ16/Esby0KnQ7kLKj9JsAIZEj62xs06oxin4VG66TP RxJXwc4DlMfn2AyLF3ruhwY9xcS1io4T3PS0ivb04YcCwBdcFXBn2IIVCaM0Uc8U2gGw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pmstat: correct PMSTAT_get_pxstat buffer size checking Message-Id: Date: Wed, 18 Jun 2025 07:33:32 +0000 commit fb16c7411d6e1278155c144fd3310a12f2efbf5e Author: Jan Beulich AuthorDate: Wed Jun 18 09:25:09 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:25:09 2025 +0200 x86/pmstat: correct PMSTAT_get_pxstat buffer size checking min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall --- xen/drivers/acpi/pmstat.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 2a1f5493fa..80dc121e14 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -272,11 +272,14 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); - ct = min(pmpt->perf.state_count, op->u.getpx.total + 0U); - - /* Avoid partial copying of 2-D array */ - if ( ct == op->u.getpx.total && - copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ + ct = pmpt->perf.state_count; + if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 07:33:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 07:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018914.1395802 (Exim 4.92) (envelope-from ) id 1uRnIl-0005ut-QG; Wed, 18 Jun 2025 07:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018914.1395802; Wed, 18 Jun 2025 07: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 1uRnIl-0005ul-Nk; Wed, 18 Jun 2025 07:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1018914; Wed, 18 Jun 2025 07:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnIk-0005uf-No for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnIk-007nAq-2H for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnIk-009NMn-2B for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 07: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=mW0YBhdUQ4O10nliUUMKSgp4tFqG/H1ZbyYiKoLGo2c=; b=OukRhyKP/oGc5Xxld+XCgng2RE Er2daZsBirHbyf8WjWzm6dsUBFjMN2wnpeV0+F7XdJk0bAEG6qTL9Et/d0GnTZat84K8jfhG+UePb L5k1qgj2oER6OSnSIFAXtASa5kSTKMoK/fdScpmelER99IRG7xmhcJ2n+LsxsnBEHzKI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: restrict use of pinned cache attributes as well as associated flushing Message-Id: Date: Wed, 18 Jun 2025 07:33:42 +0000 commit d63b2c60f7e8fd5801d2557812a81da71f18d490 Author: Jan Beulich AuthorDate: Wed Jun 18 09:25:51 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:25:51 2025 +0200 x86/HVM: restrict use of pinned cache attributes as well as associated flushing We don't permit use of uncachable memory types elsewhere unless a domain meets certain criteria. Enforce this also during registration of pinned cache attribute ranges. Furthermore restrict cache flushing to just - registration of uncachable ranges, - de-registration of cachable ranges. While there, also (mainly by calling memory_type_changed()) - take CPU self-snoop as well as IOMMU snoop into account (albeit the latter still is a global property rather than a per-domain one), - avoid flushes when the domain isn't running yet (which ought to be the common case). Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/mtrr.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 99e3b4062b..e0bef8c82d 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -582,6 +582,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, { struct hvm_mem_pinned_cacheattr_range *range, *newr; unsigned int nr = 0; + bool flush = false; int rc = 1; if ( !is_hvm_domain(d) ) @@ -605,31 +606,34 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, type = range->type; call_rcu(&range->rcu, free_pinned_cacheattr_entry); - p2m_memory_type_changed(d); switch ( type ) { - case X86_MT_UCM: + case X86_MT_WB: + case X86_MT_WP: + case X86_MT_WT: /* - * For EPT we can also avoid the flush in this case; - * see epte_get_entry_emt(). + * Flush since we don't know what the cachability is going + * to be. */ - if ( hap_enabled(d) && cpu_has_vmx ) - case X86_MT_UC: - break; - /* fall through */ - default: - flush_all(FLUSH_CACHE_EVICT); + flush = true; break; } - return 0; + rc = 0; + goto finish; } domain_unlock(d); return -ENOENT; case X86_MT_UCM: case X86_MT_UC: - case X86_MT_WB: case X86_MT_WC: + if ( !is_iommu_enabled(d) && !cache_flush_permitted(d) ) + return -EPERM; + /* Flush since we don't know what the cachability was. */ + flush = true; + break; + + case X86_MT_WB: case X86_MT_WP: case X86_MT_WT: break; @@ -682,9 +686,11 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, xfree(newr); - p2m_memory_type_changed(d); - if ( type != X86_MT_WB ) - flush_all(FLUSH_CACHE_EVICT); + finish: + if ( flush ) + memory_type_changed(d); + else if ( d->vcpu && d->vcpu[0] ) + p2m_memory_type_changed(d); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 08:00:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 08:00:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018949.1395828 (Exim 4.92) (envelope-from ) id 1uRniG-0002Qx-6b; Wed, 18 Jun 2025 08:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018949.1395828; Wed, 18 Jun 2025 08:00: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 1uRniG-0002Qp-35; Wed, 18 Jun 2025 08:00:04 +0000 Received: by outflank-mailman (input) for mailman id 1018949; Wed, 18 Jun 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 1uRniE-000268-Ih for xen-changelog@lists.xenproject.org; Wed, 18 Jun 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 1uRniE-007o7X-1T for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRniE-009Ol9-1M for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00: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=z3k1h/QX5f4otaaGq2es/r4iCaNABgILNBxHLa5Ku+c=; b=hon1to7zgqoS571UKzJr345DVv BmdOLAO7pPjd2XSpJOMlFoLrzsokXT7sj/FiugDmXfpcIuU7ZYcXZ0rttu0qwYVYYgxYDeG2qpMr+ Ps9prWOHXfdRkIoPol7pGsTY4GjBqLZtysKZSuRFyYBCQ2dTOormzLD5843PFRnQkuAs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: move "init" flag into common structure Message-Id: Date: Wed, 18 Jun 2025 08:00:02 +0000 commit c78c1fd879def6eb504a76e2d7a291b1b42f6592 Author: Penny Zheng AuthorDate: Wed Jun 18 09:23:33 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:23:33 2025 +0200 xen/cpufreq: move "init" flag into common structure AMD cpufreq cores will be intialized in two modes, legacy P-state mode, and CPPC mode. So "init" flag shall be extracted from px-specific "struct xen_processor_perf", and placed in the common "struct processor_pminfo". Otherwise, later when introducing a new sub-hypercall to propagate CPPC data, we need to pass irrelevant px-specific "struct xen_processor_perf" to just set init flag. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 4 ++-- xen/drivers/cpufreq/cpufreq.c | 8 ++++---- xen/include/acpi/cpufreq/processor_perf.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 521db7e98e..b4e8514f91 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -237,7 +237,7 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) return -ENODEV; if ( hwp_active() ) return -EOPNOTSUPP; - if ( !pmpt || !(pmpt->perf.init & XEN_PX_INIT) ) + if ( !pmpt || !(pmpt->init & XEN_PX_INIT) ) return -EINVAL; break; default: @@ -635,7 +635,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->perf.init & XEN_PX_INIT) ) + if ( !pmpt || !(pmpt->init & XEN_PX_INIT) ) return -EINVAL; break; } diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index f47aad3f75..564f926341 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -209,7 +209,7 @@ int cpufreq_add_cpu(unsigned int cpu) perf = &processor_pminfo[cpu]->perf; - if ( !(perf->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) return -EINVAL; if (!cpufreq_driver.init) @@ -373,7 +373,7 @@ int cpufreq_del_cpu(unsigned int cpu) perf = &processor_pminfo[cpu]->perf; - if ( !(perf->init & XEN_PX_INIT) ) + if ( !(processor_pminfo[cpu]->init & XEN_PX_INIT) ) return -EINVAL; if (!per_cpu(cpufreq_cpu_policy, cpu)) @@ -570,7 +570,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) if ( cpufreq_verbose ) print_PPC(pxpt->platform_limit); - if ( pxpt->init == XEN_PX_INIT ) + if ( pmpt->init == XEN_PX_INIT ) { ret = cpufreq_limit_change(cpu); goto out; @@ -579,7 +579,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) if ( perf->flags == ( XEN_PX_PCT | XEN_PX_PSS | XEN_PX_PSD | XEN_PX_PPC ) ) { - pxpt->init = XEN_PX_INIT; + pmpt->init = XEN_PX_INIT; ret = cpufreq_cpu_init(cpu); goto out; diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 6de43f8602..fa28b14faf 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -27,14 +27,14 @@ struct processor_performance { struct xen_processor_px *states; struct xen_psd_package domain_info; uint32_t shared_type; - - uint32_t init; }; struct processor_pminfo { uint32_t acpi_id; uint32_t id; struct processor_performance perf; + + uint32_t init; }; extern struct processor_pminfo *processor_pminfo[NR_CPUS]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 08:00:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 08:00:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018950.1395831 (Exim 4.92) (envelope-from ) id 1uRniQ-0002sI-8k; Wed, 18 Jun 2025 08:00:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018950.1395831; Wed, 18 Jun 2025 08:00: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 1uRniQ-0002s8-61; Wed, 18 Jun 2025 08:00:14 +0000 Received: by outflank-mailman (input) for mailman id 1018950; Wed, 18 Jun 2025 08:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRniO-0002ry-KN for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRniO-007oPL-1w for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRniO-009OmJ-1e for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00: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=kvuqvPjiBAsfvcYUU9M+g7X70QScbnVGQhuOxuuQ9HQ=; b=BT9gJ9PsOdDtUcNjAWgaxJR9cq 26MwHc7Z+VOODYDDwtsx749SMJz6Qq4LDLN+Nl/XDDd3cHGCrxaXFLa5/u8T5fWjZvpTyjEEIG2El IxX0uSuHda13CxNlIsRAqsozfjrufgMwUCHgmUHMq2F6gs6bxE3pwLSCGR1YnzncF1aA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/AMD: Expand core frequency calculation for family 1Ah CPUs Message-Id: Date: Wed, 18 Jun 2025 08:00:12 +0000 commit 0cdd076d35d349bae8d558dc9e76ce8b1c469330 Author: Penny Zheng AuthorDate: Wed Jun 18 09:24:00 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:24:00 2025 +0200 x86/AMD: Expand core frequency calculation for family 1Ah CPUs AMD Family 1Ah CPU needs a different COF(Core Operating Frequency) formula, due to a change in the PStateDef MSR layout in AMD Family 1Ah. In AMD Family 1Ah, Core current operating frequency in MHz is calculated as follows: CoreCOF = Core::X86::Msr::PStateDef[CpuFid[11:0]] * 5MHz We introduce a helper amd_parse_freq() to parse COF(Core Operating Frequency) from PstateDef register, to replace the original macro FREQ(v). amd_parse_freq() is declared as const, as it mainly consists of mathematical conputation. Signed-off-by: Penny Zheng Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 27ae167808..f10e762d76 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -587,12 +587,38 @@ static void amd_get_topology(struct cpuinfo_x86 *c) : c->cpu_core_id); } +static unsigned int attr_const amd_parse_freq(unsigned int family, + unsigned int value) +{ + unsigned int freq = 0; + + switch (family) { + case 0x10 ... 0x16: + freq = (((value & 0x3f) + 0x10) * 100) >> ((value >> 6) & 7); + break; + + case 0x17 ... 0x19: + freq = ((value & 0xff) * 25 * 8) / ((value >> 8) & 0x3f); + break; + + case 0x1A: + freq = (value & 0xfff) * 5; + break; + + default: + ASSERT_UNREACHABLE(); + break; + } + + return freq; +} + void amd_log_freq(const struct cpuinfo_x86 *c) { unsigned int idx = 0, h; uint64_t hi, lo, val; - if (c->x86 < 0x10 || c->x86 > 0x19 || + if (c->x86 < 0x10 || c->x86 > 0x1A || (c != &boot_cpu_data && (!opt_cpu_info || (c->apicid & (c->x86_num_siblings - 1))))) return; @@ -673,19 +699,22 @@ void amd_log_freq(const struct cpuinfo_x86 *c) if (!(lo >> 63)) return; -#define FREQ(v) (c->x86 < 0x17 ? ((((v) & 0x3f) + 0x10) * 100) >> (((v) >> 6) & 7) \ - : (((v) & 0xff) * 25 * 8) / (((v) >> 8) & 0x3f)) if (idx && idx < h && !rdmsr_safe(0xC0010064 + idx, val) && (val >> 63) && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) - printk("CPU%u: %lu (%lu ... %lu) MHz\n", - smp_processor_id(), FREQ(val), FREQ(lo), FREQ(hi)); + printk("CPU%u: %u (%u ... %u) MHz\n", + smp_processor_id(), + amd_parse_freq(c->x86, val), + amd_parse_freq(c->x86, lo), + amd_parse_freq(c->x86, hi)); else if (h && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) - printk("CPU%u: %lu ... %lu MHz\n", - smp_processor_id(), FREQ(lo), FREQ(hi)); + printk("CPU%u: %u ... %u MHz\n", + smp_processor_id(), + amd_parse_freq(c->x86, lo), + amd_parse_freq(c->x86, hi)); else - printk("CPU%u: %lu MHz\n", smp_processor_id(), FREQ(lo)); -#undef FREQ + printk("CPU%u: %u MHz\n", smp_processor_id(), + amd_parse_freq(c->x86, lo)); } void cf_check early_init_amd(struct cpuinfo_x86 *c) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 08:00:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 08:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018951.1395834 (Exim 4.92) (envelope-from ) id 1uRnia-00032Z-AO; Wed, 18 Jun 2025 08:00:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018951.1395834; Wed, 18 Jun 2025 08:00: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 1uRnia-00032R-7V; Wed, 18 Jun 2025 08:00:24 +0000 Received: by outflank-mailman (input) for mailman id 1018951; Wed, 18 Jun 2025 08:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRniY-0002xO-NG for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRniY-007oUo-2D for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRniY-009Omh-26 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08: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=ZyWivkZ4xZuLHLCymyAmsIJIDELU4RxiTKYCGd6Yej0=; b=wFPMpJkceDYlJwuLxxJ6B8oKL9 6/FfJFYO98dxPi7mHLgD+Rf+eZK7U3tO9TUPNoUBOtpg2zrzIuvwyKN9ICe7OPTsDKW44NV6lxRql ha0WVuxiGpdpLGIakac6+9uAbZDFsUUvSryDBBaXIAQIAcqTHMMDApX/Fb2RxASUOS0M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: normalize hwp driver check with hwp_active() Message-Id: Date: Wed, 18 Jun 2025 08:00:22 +0000 commit 25972d5b5c26afbfceb1284cdab0404a46a0baf0 Author: Penny Zheng AuthorDate: Wed Jun 18 09:24:24 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:24:24 2025 +0200 xen/cpufreq: normalize hwp driver check with hwp_active() Instead of using hypercall passing parameter to identify hwp driver, we shall use hwp_active(). Also, we've already used hwp_active() in do_get_pm_info() in the same file to do hwp driver check, it's better syncing with same way. Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/drivers/acpi/pmstat.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index b4e8514f91..2a1f5493fa 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -422,9 +422,7 @@ static int get_cpufreq_para(struct xen_sysctl_pm_op *op) else strlcpy(op->u.get_para.scaling_driver, "Unknown", CPUFREQ_NAME_LEN); - if ( IS_ENABLED(CONFIG_INTEL) && - !strncmp(op->u.get_para.scaling_driver, XEN_HWP_DRIVER_NAME, - CPUFREQ_NAME_LEN) ) + if ( hwp_active() ) ret = get_hwp_para(policy->cpu, &op->u.get_para.u.cppc_para); else { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 08:00:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 08:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018952.1395839 (Exim 4.92) (envelope-from ) id 1uRnik-00034O-Bi; Wed, 18 Jun 2025 08:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018952.1395839; Wed, 18 Jun 2025 08:00: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 1uRnik-00034G-8r; Wed, 18 Jun 2025 08:00:34 +0000 Received: by outflank-mailman (input) for mailman id 1018952; Wed, 18 Jun 2025 08:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnii-00034A-Pv for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnii-007oV4-2V for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnii-009On3-2O for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08: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=Ob1NvGPeOjFDaYehrIkfT0kEAMwO3HFhwJ0L+S0RTvg=; b=rLRyI5mFh3ISaQlZQGnocKct4B Osp9ZufJzWRKw/eGiVg+Rn4Xc8zU01AbXTPfjxtDdnDcpHj6ts2xcKg6YVeIicEuerWhVOV0AISLs zjjR3rFcjBWCB1B3ItkFjoxkewc2Gd4ravcEoHtIDyEB9CPfNeXljLZ4e9UDPeJj2iuo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pmstat: correct PMSTAT_get_pxstat buffer size checking Message-Id: Date: Wed, 18 Jun 2025 08:00:32 +0000 commit fb16c7411d6e1278155c144fd3310a12f2efbf5e Author: Jan Beulich AuthorDate: Wed Jun 18 09:25:09 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:25:09 2025 +0200 x86/pmstat: correct PMSTAT_get_pxstat buffer size checking min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall --- xen/drivers/acpi/pmstat.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 2a1f5493fa..80dc121e14 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -272,11 +272,14 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); - ct = min(pmpt->perf.state_count, op->u.getpx.total + 0U); - - /* Avoid partial copying of 2-D array */ - if ( ct == op->u.getpx.total && - copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ + ct = pmpt->perf.state_count; + if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 08:00:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 08:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018953.1395843 (Exim 4.92) (envelope-from ) id 1uRniu-00036s-DP; Wed, 18 Jun 2025 08:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018953.1395843; Wed, 18 Jun 2025 08:00: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 1uRniu-00036k-AK; Wed, 18 Jun 2025 08:00:44 +0000 Received: by outflank-mailman (input) for mailman id 1018953; Wed, 18 Jun 2025 08:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uRnis-00036c-Sh for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uRnis-007oXd-2l for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRnis-009Ond-2g for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08: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=hbsK4VKZAI9YyI0kPViokQd8Onmb8fzesMRWQPAY0rE=; b=G10F2ZwlVwB84CzbzDG9ZyLBHP M9tdKtBQh2r+75R17mQ+0pX4nzzZqbuwqUPDGHnYgPhkw1qaw7NcUpkGORVbAYBIM4z2od5Vo3E9v HfKwi2U/5WHFz4mJvlUgXvroz8wj8PzWYxTZ6DQ3lezdUqaSeRk/1efI9rnw6+jBIqNY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: restrict use of pinned cache attributes as well as associated flushing Message-Id: Date: Wed, 18 Jun 2025 08:00:42 +0000 commit d63b2c60f7e8fd5801d2557812a81da71f18d490 Author: Jan Beulich AuthorDate: Wed Jun 18 09:25:51 2025 +0200 Commit: Jan Beulich CommitDate: Wed Jun 18 09:25:51 2025 +0200 x86/HVM: restrict use of pinned cache attributes as well as associated flushing We don't permit use of uncachable memory types elsewhere unless a domain meets certain criteria. Enforce this also during registration of pinned cache attribute ranges. Furthermore restrict cache flushing to just - registration of uncachable ranges, - de-registration of cachable ranges. While there, also (mainly by calling memory_type_changed()) - take CPU self-snoop as well as IOMMU snoop into account (albeit the latter still is a global property rather than a per-domain one), - avoid flushes when the domain isn't running yet (which ought to be the common case). Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/mtrr.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 99e3b4062b..e0bef8c82d 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -582,6 +582,7 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, { struct hvm_mem_pinned_cacheattr_range *range, *newr; unsigned int nr = 0; + bool flush = false; int rc = 1; if ( !is_hvm_domain(d) ) @@ -605,31 +606,34 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, type = range->type; call_rcu(&range->rcu, free_pinned_cacheattr_entry); - p2m_memory_type_changed(d); switch ( type ) { - case X86_MT_UCM: + case X86_MT_WB: + case X86_MT_WP: + case X86_MT_WT: /* - * For EPT we can also avoid the flush in this case; - * see epte_get_entry_emt(). + * Flush since we don't know what the cachability is going + * to be. */ - if ( hap_enabled(d) && cpu_has_vmx ) - case X86_MT_UC: - break; - /* fall through */ - default: - flush_all(FLUSH_CACHE_EVICT); + flush = true; break; } - return 0; + rc = 0; + goto finish; } domain_unlock(d); return -ENOENT; case X86_MT_UCM: case X86_MT_UC: - case X86_MT_WB: case X86_MT_WC: + if ( !is_iommu_enabled(d) && !cache_flush_permitted(d) ) + return -EPERM; + /* Flush since we don't know what the cachability was. */ + flush = true; + break; + + case X86_MT_WB: case X86_MT_WP: case X86_MT_WT: break; @@ -682,9 +686,11 @@ int hvm_set_mem_pinned_cacheattr(struct domain *d, uint64_t gfn_start, xfree(newr); - p2m_memory_type_changed(d); - if ( type != X86_MT_WB ) - flush_all(FLUSH_CACHE_EVICT); + finish: + if ( flush ) + memory_type_changed(d); + else if ( d->vcpu && d->vcpu[0] ) + p2m_memory_type_changed(d); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 08:44:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 08:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1018979.1395856 (Exim 4.92) (envelope-from ) id 1uRoOp-0000Sf-J2; Wed, 18 Jun 2025 08:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1018979.1395856; Wed, 18 Jun 2025 08: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 1uRoOp-0000SX-Fu; Wed, 18 Jun 2025 08:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1018979; Wed, 18 Jun 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 1uRoOo-0000SR-He for xen-changelog@lists.xenproject.org; Wed, 18 Jun 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 1uRoOo-007ptY-16 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 08:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRoOo-009R4w-0y for xen-changelog@lists.xenproject.org; Wed, 18 Jun 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=VkztIQGFtXE7Y+iqMc5s7ZxPV03TzNrpGkTUo/3BI54=; b=YfU9157ialbD7Wle5rhGbY1tDt ogL0Hg9mBq5EBGGhbUlKKnX81llCVUH4jee9ZVOuahWmmgyXstmCDCbRDnBnW0AUqXNVY96hO9DXq csDx/zb89KvsHRNg8IwD3+SrsIKscmGpmfvZZCjphxb41mb70lyPzK2K3R46zichxgCY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvmloader: select xen platform pci MMIO BAR UC or WB MTRR cache attribute Message-Id: Date: Wed, 18 Jun 2025 08:44:02 +0000 commit 22650d6054625be10172fe0c78b9cadd1a39bd63 Author: Roger Pau Monne AuthorDate: Mon May 26 13:27:45 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Jun 18 09:30:11 2025 +0200 x86/hvmloader: select xen platform pci MMIO BAR UC or WB MTRR cache attribute The Xen platform PCI device (vendor ID 0x5853) exposed to x86 HVM guests doesn't have the functionality of a traditional PCI device. The exposed MMIO BAR is used by some guests (including Linux) as a safe place to map foreign memory, including the grant table itself. Traditionally BARs from devices have the uncacheable (UC) cache attribute from the MTRR, to ensure correct functionality of such devices. hvmloader mimics this behavior and sets the MTRR attributes of both the low and high PCI MMIO windows (where BARs of PCI devices reside) as UC in MTRR. This however causes performance issues for users of the Xen platform PCI device BAR, as for the purposes of mapping remote memory there's no need to use the UC attribute. On Intel systems this is worked around by using iPAT, that allows the hypervisor to force the effective cache attribute of a p2m entry regardless of the guest PAT value. AMD however doesn't have an equivalent of iPAT, and guest PAT values are always considered. Linux commit: 41925b105e34 xen: replace xen_remap() with memremap() Attempted to mitigate this by forcing mappings of the grant-table to use the write-back (WB) cache attribute. However Linux memremap() takes MTRRs into account to calculate which PAT type to use, and seeing the MTRR cache attribute for the region being UC the PAT also ends up as UC, regardless of the caller having requested WB. As a workaround to allow current Linux to map the grant-table as WB using memremap() introduce an xl.cfg option (xen_platform_pci_bar_uc=0) that can be used to select whether the Xen platform PCI device BAR will have the UC attribute in MTRR. Such workaround in hvmloader should also be paired with a fix for Linux so it attempts to change the MTRR of the Xen platform PCI device BAR to WB by itself. Overall, the long term solution would be to provide the guest with a safe range in the guest physical address space where mappings to foreign pages can be created. Some vif throughput performance figures provided by Anthoine from a 8 vCPUs, 4GB of RAM HVM guest(s) running on AMD hardware: Without this patch: vm -> dom0: 1.1Gb/s vm -> vm: 5.0Gb/s With the patch: vm -> dom0: 4.5Gb/s vm -> vm: 7.0Gb/s Reported-by: Anthoine Bourgeois Signed-off-by: Roger Pau Monné Reviewed-by: Oleksii Kurochko Acked-by: Jan Beulich # hvmloader Reviewed-by: Anthony PERARD --- CHANGELOG.md | 3 ++ docs/man/xl.cfg.5.pod.in | 8 +++++ docs/misc/xenstore-paths.pandoc | 5 ++++ tools/firmware/hvmloader/config.h | 2 +- tools/firmware/hvmloader/pci.c | 52 +++++++++++++++++++++++++++++++-- tools/firmware/hvmloader/util.c | 2 +- tools/include/libxl.h | 9 ++++++ tools/libs/light/libxl_create.c | 1 + tools/libs/light/libxl_dom.c | 9 ++++++ tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 2 ++ xen/include/public/hvm/hvm_xs_strings.h | 2 ++ 12 files changed, 92 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ee2f42e74..5f31ca08fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - On x86: - Restrict the cache flushing done as a result of guest physical memory map manipulations and memory type changes. + - Allow controlling the MTRR cache attribute of the Xen platform PCI device + BAR for HVM guests, to improve performance of guests using it to map the + grant table or foreign memory. ### Added - On x86: diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 075e89e6d2..1d122982c6 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2351,6 +2351,14 @@ Windows L. Setting B with the default device_model "qemu-xen" requires at least QEMU 1.6. + +=item B + +B Select whether the memory BAR of the Xen platform PCI device +should have uncacheable (UC) cache attribute set in MTRR. + +Default is B. + =item B or B The groups of Microsoft Hyper-V (AKA viridian) compatible enlightenments diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index 01a340fafc..4994194e2b 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -234,6 +234,11 @@ These xenstore values are used to override some of the default string values in the SMBIOS table constructed in hvmloader. See the SMBIOS table specification at http://www.dmtf.org/standards/smbios/ +#### ~/hvmloader/pci/xen-platform-pci-bar-uc = ("1"|"0") [HVM,INTERNAL] + +Select whether the Xen platform PCI device MMIO BAR will have the uncacheable +cache attribute set in the MTRRs by hvmloader. + #### ~/bios-strings/oem-* = STRING [HVM,INTERNAL] 1 to 99 OEM strings can be set in xenstore using values of the form diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 6e1da137d7..c159db30ee 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -58,7 +58,7 @@ extern uint32_t *cpu_to_apicid; #define ACPI_TIS_HDR_ADDRESS 0xFED40F00UL extern uint32_t pci_mem_start; -extern const uint32_t pci_mem_end; +extern uint32_t pci_mem_end; extern uint64_t pci_hi_mem_start, pci_hi_mem_end; extern bool acpi_enabled; diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index cc67b18c03..c41c8d946a 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -29,8 +29,10 @@ #include #include +#define PCI_VENDOR_ID_XEN 0x5853 + uint32_t pci_mem_start = HVM_BELOW_4G_MMIO_START; -const uint32_t pci_mem_end = RESERVED_MEMBASE; +uint32_t pci_mem_end = RESERVED_MEMBASE; uint64_t pci_hi_mem_start = 0, pci_hi_mem_end = 0; /* @@ -116,6 +118,8 @@ void pci_setup(void) * experience the memory relocation bug described below. */ bool allow_memory_relocate = 1; + /* Select the MTRR cache attribute of the xen platform pci device BAR. */ + bool xenpci_bar_uc = true; BUILD_BUG_ON((typeof(*pci_devfn_decode_type))PCI_COMMAND_IO != PCI_COMMAND_IO); @@ -130,6 +134,12 @@ void pci_setup(void) printf("Relocating guest memory for lowmem MMIO space %s\n", allow_memory_relocate?"enabled":"disabled"); + s = xenstore_read(HVM_XS_XEN_PLATFORM_PCI_BAR_UC, NULL); + if ( s ) + xenpci_bar_uc = strtoll(s, NULL, 0); + printf("Xen platform PCI device BAR MTRR cache attribute set to %s\n", + xenpci_bar_uc ? "UC" : "WB"); + s = xenstore_read("platform/mmio_hole_size", NULL); if ( s ) mmio_hole_size = strtoll(s, NULL, 0); @@ -271,6 +281,44 @@ void pci_setup(void) if ( bar_sz == 0 ) continue; + if ( !xenpci_bar_uc && + ((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) && + vendor_id == PCI_VENDOR_ID_XEN && + (device_id == 0x0001 || device_id == 0x0002) ) + { + if ( is_64bar ) + { + printf("xen platform pci dev %02x:%x unexpected MMIO 64bit BAR%u\n", + devfn >> 3, devfn & 7, bar); + goto skip_xenpci; + } + + if ( bar_sz > pci_mem_end || + ((pci_mem_end - bar_sz) & ~(bar_sz - 1)) < pci_mem_start ) + { + printf("xen platform pci dev %02x:%x BAR%u size %llx overflows low PCI hole\n", + devfn >> 3, devfn & 7, bar, bar_sz); + goto skip_xenpci; + } + + /* Put unconditionally at the end of the low PCI MMIO hole. */ + pci_mem_end -= bar_sz; + pci_mem_end &= ~(bar_sz - 1); + bar_data &= ~PCI_BASE_ADDRESS_MEM_MASK; + bar_data |= pci_mem_end; + pci_writel(devfn, bar_reg, bar_data); + pci_devfn_decode_type[devfn] |= PCI_COMMAND_MEMORY; + + /* Prefix BAR address with a 0 to match format used below. */ + printf("pci dev %02x:%x bar %02x size "PRIllx": 0%08x\n", + devfn >> 3, devfn & 7, bar_reg, + PRIllx_arg(bar_sz), bar_data); + + continue; + } + skip_xenpci: + for ( i = 0; i < nr_bars; i++ ) if ( bars[i].bar_sz < bar_sz ) break; @@ -310,7 +358,7 @@ void pci_setup(void) } /* Enable bus master for this function later */ - pci_devfn_decode_type[devfn] = PCI_COMMAND_MASTER; + pci_devfn_decode_type[devfn] |= PCI_COMMAND_MASTER; } if ( mmio_hole_size ) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 79c0e6bd4a..31b4411db7 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -867,7 +867,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->table_flags |= ACPI_HAS_HPET; config->pci_start = pci_mem_start; - config->pci_len = pci_mem_end - pci_mem_start; + config->pci_len = RESERVED_MEMBASE - pci_mem_start; if ( pci_hi_mem_end > pci_hi_mem_start ) { config->pci_hi_start = pci_hi_mem_start; diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 24c81cf145..a8704e0268 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -1510,6 +1510,15 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, const libxl_mac *src); */ #define LIBXL_HAVE_CREATEINFO_XEND_SUSPEND_EVTCHN_COMPAT +/* + * LIBXL_HAVE_XEN_PLATFORM_PCI_BAR_UC + * + * libxl_domain_build_info contains a boolean 'u.hvm.xen_platform_pci_bar_uc' + * field to signal whether the XenPCI device BAR should have UC cache attribute + * set in MTRR. + */ +#define LIBXL_HAVE_XEN_PLATFORM_PCI_BAR_UC + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 625ce5b040..9525d22312 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -313,6 +313,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.usb, false); libxl_defbool_setdefault(&b_info->u.hvm.vkb_device, true); libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci, true); + libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci_bar_uc, true); libxl_defbool_setdefault(&b_info->u.hvm.pirq, false); libxl_defbool_setdefault(&b_info->u.hvm.spice.enable, false); diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 4d67b0d282..a61085ca3b 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -819,6 +819,15 @@ static int hvm_build_set_xs_values(libxl__gc *gc, goto err; } + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + path = GCSPRINTF("/local/domain/%d/" HVM_XS_XEN_PLATFORM_PCI_BAR_UC, + domid); + ret = libxl__xs_printf(gc, XBT_NULL, path, "%d", + libxl_defbool_val(info->u.hvm.xen_platform_pci_bar_uc)); + if (ret) + goto err; + } + return 0; err: diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 57ae16ae78..a3a79d12b2 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -691,6 +691,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vkb_device", libxl_defbool), ("soundhw", string), ("xen_platform_pci", libxl_defbool), + ("xen_platform_pci_bar_uc", libxl_defbool), ("usbdevice_list", libxl_string_list), ("vendor_device", libxl_vendor_device), # See libxl_ms_vm_genid_generate() diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 98b3612d0f..7e11c62ba0 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2917,6 +2917,8 @@ skip_usbdev: xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0); xlu_cfg_get_defbool(config, "xen_platform_pci", &b_info->u.hvm.xen_platform_pci, 0); + xlu_cfg_get_defbool(config, "xen_platform_pci_bar_uc", + &b_info->u.hvm.xen_platform_pci_bar_uc, 0); if(b_info->u.hvm.vnc.listen && b_info->u.hvm.vnc.display diff --git a/xen/include/public/hvm/hvm_xs_strings.h b/xen/include/public/hvm/hvm_xs_strings.h index e1ed078628..e977d5a8b1 100644 --- a/xen/include/public/hvm/hvm_xs_strings.h +++ b/xen/include/public/hvm/hvm_xs_strings.h @@ -14,6 +14,8 @@ #define HVM_XS_BIOS "hvmloader/bios" #define HVM_XS_GENERATION_ID_ADDRESS "hvmloader/generation-id-address" #define HVM_XS_ALLOW_MEMORY_RELOCATE "hvmloader/allow-memory-relocate" +/* Set Xen platform pci device BAR as UC in MTRR */ +#define HVM_XS_XEN_PLATFORM_PCI_BAR_UC "hvmloader/pci/xen-platform-pci-bar-uc" /* The following values allow additional ACPI tables to be added to the * virtual ACPI BIOS that hvmloader constructs. The values specify the guest -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 18 09:44:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 18 Jun 2025 09:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019012.1395881 (Exim 4.92) (envelope-from ) id 1uRpKt-0008M3-0K; Wed, 18 Jun 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 1019012.1395881; Wed, 18 Jun 2025 09: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 1uRpKs-0008Lv-U0; Wed, 18 Jun 2025 09:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1019012; Wed, 18 Jun 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 1uRpKs-0008Lp-67 for xen-changelog@lists.xenproject.org; Wed, 18 Jun 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 1uRpKr-007rSw-2t for xen-changelog@lists.xenproject.org; Wed, 18 Jun 2025 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uRpKr-009TlX-2a for xen-changelog@lists.xenproject.org; Wed, 18 Jun 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=X3QJIeA4ozPFOhKE79DpSKx5Yy+kNMz1zTxFXVfODIg=; b=Q6M9lTtlwL8ovfyW+ZTVNjCJGH zSS63qXzHfRt+aVFsAJHkXudtk+lmjBEtSNpP7r7B5JLRtphVi6VxnDYVRlYlKnqVXgDqLnnKjvbd sfE3Zplj9aZFyEI9QjvdjEOYgbj5mOt4eo/k3PbFVeN99fhl3rJeIf7pBQfzigupgAww=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvmloader: select xen platform pci MMIO BAR UC or WB MTRR cache attribute Message-Id: Date: Wed, 18 Jun 2025 09:44:01 +0000 commit 22650d6054625be10172fe0c78b9cadd1a39bd63 Author: Roger Pau Monne AuthorDate: Mon May 26 13:27:45 2025 +0200 Commit: Roger Pau Monne CommitDate: Wed Jun 18 09:30:11 2025 +0200 x86/hvmloader: select xen platform pci MMIO BAR UC or WB MTRR cache attribute The Xen platform PCI device (vendor ID 0x5853) exposed to x86 HVM guests doesn't have the functionality of a traditional PCI device. The exposed MMIO BAR is used by some guests (including Linux) as a safe place to map foreign memory, including the grant table itself. Traditionally BARs from devices have the uncacheable (UC) cache attribute from the MTRR, to ensure correct functionality of such devices. hvmloader mimics this behavior and sets the MTRR attributes of both the low and high PCI MMIO windows (where BARs of PCI devices reside) as UC in MTRR. This however causes performance issues for users of the Xen platform PCI device BAR, as for the purposes of mapping remote memory there's no need to use the UC attribute. On Intel systems this is worked around by using iPAT, that allows the hypervisor to force the effective cache attribute of a p2m entry regardless of the guest PAT value. AMD however doesn't have an equivalent of iPAT, and guest PAT values are always considered. Linux commit: 41925b105e34 xen: replace xen_remap() with memremap() Attempted to mitigate this by forcing mappings of the grant-table to use the write-back (WB) cache attribute. However Linux memremap() takes MTRRs into account to calculate which PAT type to use, and seeing the MTRR cache attribute for the region being UC the PAT also ends up as UC, regardless of the caller having requested WB. As a workaround to allow current Linux to map the grant-table as WB using memremap() introduce an xl.cfg option (xen_platform_pci_bar_uc=0) that can be used to select whether the Xen platform PCI device BAR will have the UC attribute in MTRR. Such workaround in hvmloader should also be paired with a fix for Linux so it attempts to change the MTRR of the Xen platform PCI device BAR to WB by itself. Overall, the long term solution would be to provide the guest with a safe range in the guest physical address space where mappings to foreign pages can be created. Some vif throughput performance figures provided by Anthoine from a 8 vCPUs, 4GB of RAM HVM guest(s) running on AMD hardware: Without this patch: vm -> dom0: 1.1Gb/s vm -> vm: 5.0Gb/s With the patch: vm -> dom0: 4.5Gb/s vm -> vm: 7.0Gb/s Reported-by: Anthoine Bourgeois Signed-off-by: Roger Pau Monné Reviewed-by: Oleksii Kurochko Acked-by: Jan Beulich # hvmloader Reviewed-by: Anthony PERARD --- CHANGELOG.md | 3 ++ docs/man/xl.cfg.5.pod.in | 8 +++++ docs/misc/xenstore-paths.pandoc | 5 ++++ tools/firmware/hvmloader/config.h | 2 +- tools/firmware/hvmloader/pci.c | 52 +++++++++++++++++++++++++++++++-- tools/firmware/hvmloader/util.c | 2 +- tools/include/libxl.h | 9 ++++++ tools/libs/light/libxl_create.c | 1 + tools/libs/light/libxl_dom.c | 9 ++++++ tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 2 ++ xen/include/public/hvm/hvm_xs_strings.h | 2 ++ 12 files changed, 92 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ee2f42e74..5f31ca08fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - On x86: - Restrict the cache flushing done as a result of guest physical memory map manipulations and memory type changes. + - Allow controlling the MTRR cache attribute of the Xen platform PCI device + BAR for HVM guests, to improve performance of guests using it to map the + grant table or foreign memory. ### Added - On x86: diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 075e89e6d2..1d122982c6 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2351,6 +2351,14 @@ Windows L. Setting B with the default device_model "qemu-xen" requires at least QEMU 1.6. + +=item B + +B Select whether the memory BAR of the Xen platform PCI device +should have uncacheable (UC) cache attribute set in MTRR. + +Default is B. + =item B or B The groups of Microsoft Hyper-V (AKA viridian) compatible enlightenments diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index 01a340fafc..4994194e2b 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -234,6 +234,11 @@ These xenstore values are used to override some of the default string values in the SMBIOS table constructed in hvmloader. See the SMBIOS table specification at http://www.dmtf.org/standards/smbios/ +#### ~/hvmloader/pci/xen-platform-pci-bar-uc = ("1"|"0") [HVM,INTERNAL] + +Select whether the Xen platform PCI device MMIO BAR will have the uncacheable +cache attribute set in the MTRRs by hvmloader. + #### ~/bios-strings/oem-* = STRING [HVM,INTERNAL] 1 to 99 OEM strings can be set in xenstore using values of the form diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 6e1da137d7..c159db30ee 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -58,7 +58,7 @@ extern uint32_t *cpu_to_apicid; #define ACPI_TIS_HDR_ADDRESS 0xFED40F00UL extern uint32_t pci_mem_start; -extern const uint32_t pci_mem_end; +extern uint32_t pci_mem_end; extern uint64_t pci_hi_mem_start, pci_hi_mem_end; extern bool acpi_enabled; diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index cc67b18c03..c41c8d946a 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -29,8 +29,10 @@ #include #include +#define PCI_VENDOR_ID_XEN 0x5853 + uint32_t pci_mem_start = HVM_BELOW_4G_MMIO_START; -const uint32_t pci_mem_end = RESERVED_MEMBASE; +uint32_t pci_mem_end = RESERVED_MEMBASE; uint64_t pci_hi_mem_start = 0, pci_hi_mem_end = 0; /* @@ -116,6 +118,8 @@ void pci_setup(void) * experience the memory relocation bug described below. */ bool allow_memory_relocate = 1; + /* Select the MTRR cache attribute of the xen platform pci device BAR. */ + bool xenpci_bar_uc = true; BUILD_BUG_ON((typeof(*pci_devfn_decode_type))PCI_COMMAND_IO != PCI_COMMAND_IO); @@ -130,6 +134,12 @@ void pci_setup(void) printf("Relocating guest memory for lowmem MMIO space %s\n", allow_memory_relocate?"enabled":"disabled"); + s = xenstore_read(HVM_XS_XEN_PLATFORM_PCI_BAR_UC, NULL); + if ( s ) + xenpci_bar_uc = strtoll(s, NULL, 0); + printf("Xen platform PCI device BAR MTRR cache attribute set to %s\n", + xenpci_bar_uc ? "UC" : "WB"); + s = xenstore_read("platform/mmio_hole_size", NULL); if ( s ) mmio_hole_size = strtoll(s, NULL, 0); @@ -271,6 +281,44 @@ void pci_setup(void) if ( bar_sz == 0 ) continue; + if ( !xenpci_bar_uc && + ((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) && + vendor_id == PCI_VENDOR_ID_XEN && + (device_id == 0x0001 || device_id == 0x0002) ) + { + if ( is_64bar ) + { + printf("xen platform pci dev %02x:%x unexpected MMIO 64bit BAR%u\n", + devfn >> 3, devfn & 7, bar); + goto skip_xenpci; + } + + if ( bar_sz > pci_mem_end || + ((pci_mem_end - bar_sz) & ~(bar_sz - 1)) < pci_mem_start ) + { + printf("xen platform pci dev %02x:%x BAR%u size %llx overflows low PCI hole\n", + devfn >> 3, devfn & 7, bar, bar_sz); + goto skip_xenpci; + } + + /* Put unconditionally at the end of the low PCI MMIO hole. */ + pci_mem_end -= bar_sz; + pci_mem_end &= ~(bar_sz - 1); + bar_data &= ~PCI_BASE_ADDRESS_MEM_MASK; + bar_data |= pci_mem_end; + pci_writel(devfn, bar_reg, bar_data); + pci_devfn_decode_type[devfn] |= PCI_COMMAND_MEMORY; + + /* Prefix BAR address with a 0 to match format used below. */ + printf("pci dev %02x:%x bar %02x size "PRIllx": 0%08x\n", + devfn >> 3, devfn & 7, bar_reg, + PRIllx_arg(bar_sz), bar_data); + + continue; + } + skip_xenpci: + for ( i = 0; i < nr_bars; i++ ) if ( bars[i].bar_sz < bar_sz ) break; @@ -310,7 +358,7 @@ void pci_setup(void) } /* Enable bus master for this function later */ - pci_devfn_decode_type[devfn] = PCI_COMMAND_MASTER; + pci_devfn_decode_type[devfn] |= PCI_COMMAND_MASTER; } if ( mmio_hole_size ) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 79c0e6bd4a..31b4411db7 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -867,7 +867,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->table_flags |= ACPI_HAS_HPET; config->pci_start = pci_mem_start; - config->pci_len = pci_mem_end - pci_mem_start; + config->pci_len = RESERVED_MEMBASE - pci_mem_start; if ( pci_hi_mem_end > pci_hi_mem_start ) { config->pci_hi_start = pci_hi_mem_start; diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 24c81cf145..a8704e0268 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -1510,6 +1510,15 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, const libxl_mac *src); */ #define LIBXL_HAVE_CREATEINFO_XEND_SUSPEND_EVTCHN_COMPAT +/* + * LIBXL_HAVE_XEN_PLATFORM_PCI_BAR_UC + * + * libxl_domain_build_info contains a boolean 'u.hvm.xen_platform_pci_bar_uc' + * field to signal whether the XenPCI device BAR should have UC cache attribute + * set in MTRR. + */ +#define LIBXL_HAVE_XEN_PLATFORM_PCI_BAR_UC + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 625ce5b040..9525d22312 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -313,6 +313,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.usb, false); libxl_defbool_setdefault(&b_info->u.hvm.vkb_device, true); libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci, true); + libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci_bar_uc, true); libxl_defbool_setdefault(&b_info->u.hvm.pirq, false); libxl_defbool_setdefault(&b_info->u.hvm.spice.enable, false); diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 4d67b0d282..a61085ca3b 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -819,6 +819,15 @@ static int hvm_build_set_xs_values(libxl__gc *gc, goto err; } + if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + path = GCSPRINTF("/local/domain/%d/" HVM_XS_XEN_PLATFORM_PCI_BAR_UC, + domid); + ret = libxl__xs_printf(gc, XBT_NULL, path, "%d", + libxl_defbool_val(info->u.hvm.xen_platform_pci_bar_uc)); + if (ret) + goto err; + } + return 0; err: diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 57ae16ae78..a3a79d12b2 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -691,6 +691,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vkb_device", libxl_defbool), ("soundhw", string), ("xen_platform_pci", libxl_defbool), + ("xen_platform_pci_bar_uc", libxl_defbool), ("usbdevice_list", libxl_string_list), ("vendor_device", libxl_vendor_device), # See libxl_ms_vm_genid_generate() diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 98b3612d0f..7e11c62ba0 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2917,6 +2917,8 @@ skip_usbdev: xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0); xlu_cfg_get_defbool(config, "xen_platform_pci", &b_info->u.hvm.xen_platform_pci, 0); + xlu_cfg_get_defbool(config, "xen_platform_pci_bar_uc", + &b_info->u.hvm.xen_platform_pci_bar_uc, 0); if(b_info->u.hvm.vnc.listen && b_info->u.hvm.vnc.display diff --git a/xen/include/public/hvm/hvm_xs_strings.h b/xen/include/public/hvm/hvm_xs_strings.h index e1ed078628..e977d5a8b1 100644 --- a/xen/include/public/hvm/hvm_xs_strings.h +++ b/xen/include/public/hvm/hvm_xs_strings.h @@ -14,6 +14,8 @@ #define HVM_XS_BIOS "hvmloader/bios" #define HVM_XS_GENERATION_ID_ADDRESS "hvmloader/generation-id-address" #define HVM_XS_ALLOW_MEMORY_RELOCATE "hvmloader/allow-memory-relocate" +/* Set Xen platform pci device BAR as UC in MTRR */ +#define HVM_XS_XEN_PLATFORM_PCI_BAR_UC "hvmloader/pci/xen-platform-pci-bar-uc" /* The following values allow additional ACPI tables to be added to the * virtual ACPI BIOS that hvmloader constructs. The values specify the guest -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 19 00:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jun 2025 00:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019574.1396199 (Exim 4.92) (envelope-from ) id 1uS3YV-0008MZ-HK; Thu, 19 Jun 2025 00:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1019574.1396199; Thu, 19 Jun 2025 00: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 1uS3YV-0008MR-Ee; Thu, 19 Jun 2025 00:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1019574; Thu, 19 Jun 2025 00:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uS3YU-0008ML-4I for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uS3YT-0089zQ-2m for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uS3YT-00AFLk-2d for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00: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=JrBJTOVW9JN/EJmhHjJu9afSJuLuLzRbzY7PhmDGke4=; b=PGKn98Bp8L9p1OC1oSLB0CfNHM VXd/aviiuFgtH02x3z/oCPuEWp63hZdN6jwdv/omHQeCYZD4I8hpdj7LPhF73DES7DD0bqqQWwf7o LNMiUb4v165SKvIcTUQhCKUbhY1a5bB4h0sgf+xKxmFhU+SaLhbsOqfSH44hDqS2Z+rE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/keyhandler: add missing noreturn attribute Message-Id: Date: Thu, 19 Jun 2025 00:55:01 +0000 commit 9ea5d035db82fc6cada253af417440f577ba35cb Author: Nicola Vetrini AuthorDate: Fri Jun 6 14:27:07 2025 -0700 Commit: Stefano Stabellini CommitDate: Wed Jun 18 17:40:41 2025 -0700 xen/keyhandler: add missing noreturn attribute Function `reboot_machine' does not return, but lacks the `noreturn' attribute. Functions that never return should be declared with a `noreturn' attribute. The lack of `noreturn' causes a violation of MISRA C Rule 17.11 (not currently accepted in Xen), and also Rule 2.1: "A project shall not contain unreachable code". Depending on the compiler used and the compiler optimization used, the lack of `noreturn' might lead to the presence of unreachable code. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini --- xen/common/keyhandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 0bb842ec00..b0a2051408 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -251,7 +251,7 @@ static void cf_check dump_hwdom_registers(unsigned char key) } } -static void cf_check reboot_machine(unsigned char key, bool unused) +static void noreturn cf_check reboot_machine(unsigned char key, bool unused) { printk("'%c' pressed -> rebooting machine\n", key); machine_restart(0); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 19 00:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jun 2025 00:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019575.1396203 (Exim 4.92) (envelope-from ) id 1uS3Yf-0008OF-Ic; Thu, 19 Jun 2025 00:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1019575.1396203; Thu, 19 Jun 2025 00: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 1uS3Yf-0008O7-Fz; Thu, 19 Jun 2025 00:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1019575; Thu, 19 Jun 2025 00:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uS3Yd-0008Nt-Vz for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uS3Yd-0089zV-35 for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uS3Yd-00AFMj-2y for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00: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=GhIpk6dE1QvdKcnRmXPTuNVT9Z/U/r3BOq1qaT12u+E=; b=zlpVWbg8xhjjeRTUuV99LYvoRk L5i++rm4qCZr5D7o34c/rmUKFAadCN8K4uGRIIX6aXmtBRJsOAZahp3CzVNF6Mm42ksAldfpCwljX iVENkplWce+nMdI8L4zHXHsCmmRrZvfvZ+EvOXByL50VMLpO8E/ORgxu9Q+tvo4j0FEI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add missing noreturn attributes Message-Id: Date: Thu, 19 Jun 2025 00:55:11 +0000 commit f143ff92e4dc25391fe4718aed5cba7035b9ec40 Author: Nicola Vetrini AuthorDate: Fri Jun 6 14:27:08 2025 -0700 Commit: Stefano Stabellini CommitDate: Wed Jun 18 17:40:42 2025 -0700 xen/arm: add missing noreturn attributes The marked functions never return to their caller, but lack the `noreturn' attribute. Functions that never return should be declared with a `noreturn' attribute. The lack of `noreturn' causes a violation of MISRA C Rule 17.11 (not currently accepted in Xen), and also Rule 2.1: "A project shall not contain unreachable code". Depending on the compiler used and the compiler optimization used, the lack of `noreturn' might lead to the presence of unreachable code. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini --- xen/arch/arm/efi/efi-boot.h | 2 +- xen/arch/arm/include/asm/arm64/traps.h | 2 +- xen/arch/arm/include/asm/processor.h | 2 +- xen/arch/arm/setup.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index d2a09ad3a1..ee80560e13 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -934,7 +934,7 @@ static void __init efi_arch_blexit(void) efi_bs->FreePool(memmap); } -static void __init efi_arch_halt(void) +static void noreturn __init efi_arch_halt(void) { stop_cpu(); } diff --git a/xen/arch/arm/include/asm/arm64/traps.h b/xen/arch/arm/include/asm/arm64/traps.h index 3be2fa69ee..b7435c6e73 100644 --- a/xen/arch/arm/include/asm/arm64/traps.h +++ b/xen/arch/arm/include/asm/arm64/traps.h @@ -6,7 +6,7 @@ void inject_undef64_exception(struct cpu_user_regs *regs); void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr); -void do_bad_mode(struct cpu_user_regs *regs, int reason); +void noreturn do_bad_mode(struct cpu_user_regs *regs, int reason); #endif /* __ASM_ARM64_TRAPS__ */ /* diff --git a/xen/arch/arm/include/asm/processor.h b/xen/arch/arm/include/asm/processor.h index 9cbc4f9110..92c8bc1a31 100644 --- a/xen/arch/arm/include/asm/processor.h +++ b/xen/arch/arm/include/asm/processor.h @@ -571,7 +571,7 @@ extern register_t __cpu_logical_map[]; #endif #ifndef __ASSEMBLY__ -void panic_PAR(uint64_t par); +void noreturn panic_PAR(uint64_t par); /* Debugging functions are declared with external linkage to aid development. */ void show_registers(const struct cpu_user_regs *regs); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 734e23da44..ed72317af3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -63,7 +63,7 @@ bool __read_mostly acpi_disabled; domid_t __read_mostly max_init_domid; -static __used void init_done(void) +static __used void noreturn init_done(void) { int rc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 19 00:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jun 2025 00:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019576.1396207 (Exim 4.92) (envelope-from ) id 1uS3Yp-0008Qq-K5; Thu, 19 Jun 2025 00:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1019576.1396207; Thu, 19 Jun 2025 00: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 1uS3Yp-0008Qj-HQ; Thu, 19 Jun 2025 00:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1019576; Thu, 19 Jun 2025 00:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uS3Yo-0008QV-65 for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uS3Yo-0089zp-0V for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uS3Yo-00AFNI-03 for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 00: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=82Plq603ApOt4ktL8FJN383lt4mn3Qu83ka+OUdXBwM=; b=NtJYXPxU/QR2BRdw7ci9QyYlB6 mZK6pLhBvBY9tkzBzkKLOGULLdzbzM7PlpjwFDrf5BR62fUB+NSIut0gfO99IPEHJNra2z+Qm3kkl 0/8sYWQ+VvvMqk5mkC8Q6CxzuauRmt0kcS/C0QNN2X7l48W6h6w3ebjELmiYnQKC3R1w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: add missing noreturn attributes Message-Id: Date: Thu, 19 Jun 2025 00:55:22 +0000 commit 3c36a5a0df7de7d6998d1a5d038b2a0048b372d4 Author: Nicola Vetrini AuthorDate: Fri Jun 6 14:27:09 2025 -0700 Commit: Stefano Stabellini CommitDate: Wed Jun 18 17:40:42 2025 -0700 xen/x86: add missing noreturn attributes The marked functions never return to their caller, but lack the `noreturn' attribute. Functions that never return should be declared with a `noreturn' attribute. The lack of `noreturn' causes a violation of MISRA C Rule 17.11 (not currently accepted in Xen), and also Rule 2.1: "A project shall not contain unreachable code". Depending on the compiler used and the compiler optimization used, the lack of `noreturn' might lead to the presence of unreachable code. The usage of the noreturn attribute together with asmlinkage is only for the benefit of the static analysis tools. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Victor Lira [stefano: improve commit message] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/mcheck/mce.c | 3 ++- xen/arch/x86/efi/efi-boot.h | 2 +- xen/arch/x86/smp.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 1c348e557d..79214ce56b 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -79,7 +79,8 @@ static int __init cf_check mce_set_verbosity(const char *str) custom_param("mce_verbosity", mce_set_verbosity); /* Handle unconfigured int18 (should never happen) */ -static void cf_check unexpected_machine_check(const struct cpu_user_regs *regs) +static void noreturn cf_check +unexpected_machine_check(const struct cpu_user_regs *regs) { console_force_unlock(); printk("Unexpected Machine Check Exception\n"); diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 0ecf4ca53f..0194720003 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -769,7 +769,7 @@ static void __init efi_arch_blexit(void) efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size)); } -static void __init efi_arch_halt(void) +static void noreturn __init efi_arch_halt(void) { local_irq_disable(); for ( ; ; ) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 516dab5528..7936294f5f 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -343,7 +343,7 @@ void __stop_this_cpu(void) cpumask_clear_cpu(smp_processor_id(), &cpu_online_map); } -static void cf_check stop_this_cpu(void *dummy) +static void noreturn cf_check stop_this_cpu(void *dummy) { const bool *stop_aps = dummy; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 092c7e4197..34dc077cad 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -805,7 +805,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } -void asmlinkage do_unhandled_trap(struct cpu_user_regs *regs) +void asmlinkage noreturn do_unhandled_trap(struct cpu_user_regs *regs) { fatal_trap(regs, false); } diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index c77f304bb0..8460a4a1ae 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -293,7 +293,7 @@ void show_page_walk(unsigned long addr) l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -void asmlinkage do_double_fault(struct cpu_user_regs *regs) +void asmlinkage noreturn do_double_fault(struct cpu_user_regs *regs) { unsigned int cpu; struct extra_state state; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 19 07:33:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jun 2025 07:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019771.1396262 (Exim 4.92) (envelope-from ) id 1uS9lf-0007fX-6i; Thu, 19 Jun 2025 07:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1019771.1396262; Thu, 19 Jun 2025 07: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 1uS9lf-0007fP-3s; Thu, 19 Jun 2025 07:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1019771; Thu, 19 Jun 2025 07:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uS9le-0007fJ-32 for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uS9ld-009T6c-2i for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uS9ld-00AWKj-2Y for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07: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=9g9FIYPdkXceQbgFUTxWbZ6UG1+Zd2X+V5RKMQHD88A=; b=xQU+vwukh3YA8LS7ZYGFfeD2gF 6/DikQZ/XE/WC9NnUJd6TXRTF9EEzNvVrf/yx0sm/gClpDuAQ2srxF/UZEdxuXBZqxcX5ZB1vc2uj iEN4iBOekv/8nlDJlD2NP0vyoOwvqBbvjcaqgwTX9+k4fmX3jED5z6Ezgtk21Qep5aeo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/keyhandler: add missing noreturn attribute Message-Id: Date: Thu, 19 Jun 2025 07:33:01 +0000 commit 9ea5d035db82fc6cada253af417440f577ba35cb Author: Nicola Vetrini AuthorDate: Fri Jun 6 14:27:07 2025 -0700 Commit: Stefano Stabellini CommitDate: Wed Jun 18 17:40:41 2025 -0700 xen/keyhandler: add missing noreturn attribute Function `reboot_machine' does not return, but lacks the `noreturn' attribute. Functions that never return should be declared with a `noreturn' attribute. The lack of `noreturn' causes a violation of MISRA C Rule 17.11 (not currently accepted in Xen), and also Rule 2.1: "A project shall not contain unreachable code". Depending on the compiler used and the compiler optimization used, the lack of `noreturn' might lead to the presence of unreachable code. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini --- xen/common/keyhandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 0bb842ec00..b0a2051408 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -251,7 +251,7 @@ static void cf_check dump_hwdom_registers(unsigned char key) } } -static void cf_check reboot_machine(unsigned char key, bool unused) +static void noreturn cf_check reboot_machine(unsigned char key, bool unused) { printk("'%c' pressed -> rebooting machine\n", key); machine_restart(0); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 19 07:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jun 2025 07:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019772.1396265 (Exim 4.92) (envelope-from ) id 1uS9lp-0007hJ-7r; Thu, 19 Jun 2025 07:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1019772.1396265; Thu, 19 Jun 2025 07: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 1uS9lp-0007hB-5I; Thu, 19 Jun 2025 07:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1019772; Thu, 19 Jun 2025 07:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uS9lo-0007gz-3A for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uS9lo-009T6i-0B for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uS9ln-00AWL6-2u for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07: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=m0xvFd1+HXyyLaAhFX4T3NCeCrMwl8cMP+QTsj6LmEs=; b=AvEtBUrgdtGjBNneQ7y1ipaMiv Xaf4ILWAq5Ifuck2S7lDGBCfl1hvzkqL4L03P8t7yv8uYhbprM3HTxOlhi1BsJdSaoPibdHILCEjl 2h0EWPKVvl3hSEb+0cWP6smiF3cFu6rdp5ZrMVkONoQgsSf9CpxRCWgpcAbo1UgljBQ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add missing noreturn attributes Message-Id: Date: Thu, 19 Jun 2025 07:33:11 +0000 commit f143ff92e4dc25391fe4718aed5cba7035b9ec40 Author: Nicola Vetrini AuthorDate: Fri Jun 6 14:27:08 2025 -0700 Commit: Stefano Stabellini CommitDate: Wed Jun 18 17:40:42 2025 -0700 xen/arm: add missing noreturn attributes The marked functions never return to their caller, but lack the `noreturn' attribute. Functions that never return should be declared with a `noreturn' attribute. The lack of `noreturn' causes a violation of MISRA C Rule 17.11 (not currently accepted in Xen), and also Rule 2.1: "A project shall not contain unreachable code". Depending on the compiler used and the compiler optimization used, the lack of `noreturn' might lead to the presence of unreachable code. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Victor Lira Reviewed-by: Stefano Stabellini --- xen/arch/arm/efi/efi-boot.h | 2 +- xen/arch/arm/include/asm/arm64/traps.h | 2 +- xen/arch/arm/include/asm/processor.h | 2 +- xen/arch/arm/setup.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index d2a09ad3a1..ee80560e13 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -934,7 +934,7 @@ static void __init efi_arch_blexit(void) efi_bs->FreePool(memmap); } -static void __init efi_arch_halt(void) +static void noreturn __init efi_arch_halt(void) { stop_cpu(); } diff --git a/xen/arch/arm/include/asm/arm64/traps.h b/xen/arch/arm/include/asm/arm64/traps.h index 3be2fa69ee..b7435c6e73 100644 --- a/xen/arch/arm/include/asm/arm64/traps.h +++ b/xen/arch/arm/include/asm/arm64/traps.h @@ -6,7 +6,7 @@ void inject_undef64_exception(struct cpu_user_regs *regs); void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr); -void do_bad_mode(struct cpu_user_regs *regs, int reason); +void noreturn do_bad_mode(struct cpu_user_regs *regs, int reason); #endif /* __ASM_ARM64_TRAPS__ */ /* diff --git a/xen/arch/arm/include/asm/processor.h b/xen/arch/arm/include/asm/processor.h index 9cbc4f9110..92c8bc1a31 100644 --- a/xen/arch/arm/include/asm/processor.h +++ b/xen/arch/arm/include/asm/processor.h @@ -571,7 +571,7 @@ extern register_t __cpu_logical_map[]; #endif #ifndef __ASSEMBLY__ -void panic_PAR(uint64_t par); +void noreturn panic_PAR(uint64_t par); /* Debugging functions are declared with external linkage to aid development. */ void show_registers(const struct cpu_user_regs *regs); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 734e23da44..ed72317af3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -63,7 +63,7 @@ bool __read_mostly acpi_disabled; domid_t __read_mostly max_init_domid; -static __used void init_done(void) +static __used void noreturn init_done(void) { int rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 19 07:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 19 Jun 2025 07:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1019773.1396268 (Exim 4.92) (envelope-from ) id 1uS9lz-0007jW-9A; Thu, 19 Jun 2025 07:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1019773.1396268; Thu, 19 Jun 2025 07: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 1uS9lz-0007jO-6g; Thu, 19 Jun 2025 07:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1019773; Thu, 19 Jun 2025 07:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uS9ly-0007jG-82 for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uS9ly-009T6m-0g for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uS9ly-00AWLh-0O for xen-changelog@lists.xenproject.org; Thu, 19 Jun 2025 07: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=tnugPGoobLX6l25hDnoLO7SEqKEIwmT7LSp/JxSKINk=; b=mjFTHSXkaCutDzSNKVYfEmJly/ zUmeNLvlCwjTs19eDyOtzQh5sgNBENLppwpiZz1QK5GMZh8Opv6IHqSUrFbmCEB3QovFl5EImLg04 Ge5BS8ep7Z+VrKaUN0PUsPYbxwWbOnDaNg3B2jyTj4cSx1H5AJQzDQPrkwIRZ8bdGJhw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: add missing noreturn attributes Message-Id: Date: Thu, 19 Jun 2025 07:33:22 +0000 commit 3c36a5a0df7de7d6998d1a5d038b2a0048b372d4 Author: Nicola Vetrini AuthorDate: Fri Jun 6 14:27:09 2025 -0700 Commit: Stefano Stabellini CommitDate: Wed Jun 18 17:40:42 2025 -0700 xen/x86: add missing noreturn attributes The marked functions never return to their caller, but lack the `noreturn' attribute. Functions that never return should be declared with a `noreturn' attribute. The lack of `noreturn' causes a violation of MISRA C Rule 17.11 (not currently accepted in Xen), and also Rule 2.1: "A project shall not contain unreachable code". Depending on the compiler used and the compiler optimization used, the lack of `noreturn' might lead to the presence of unreachable code. The usage of the noreturn attribute together with asmlinkage is only for the benefit of the static analysis tools. No functional change. Signed-off-by: Nicola Vetrini Signed-off-by: Victor Lira [stefano: improve commit message] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/mcheck/mce.c | 3 ++- xen/arch/x86/efi/efi-boot.h | 2 +- xen/arch/x86/smp.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 1c348e557d..79214ce56b 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -79,7 +79,8 @@ static int __init cf_check mce_set_verbosity(const char *str) custom_param("mce_verbosity", mce_set_verbosity); /* Handle unconfigured int18 (should never happen) */ -static void cf_check unexpected_machine_check(const struct cpu_user_regs *regs) +static void noreturn cf_check +unexpected_machine_check(const struct cpu_user_regs *regs) { console_force_unlock(); printk("Unexpected Machine Check Exception\n"); diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 0ecf4ca53f..0194720003 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -769,7 +769,7 @@ static void __init efi_arch_blexit(void) efi_bs->FreePages(ucode.addr, PFN_UP(ucode.size)); } -static void __init efi_arch_halt(void) +static void noreturn __init efi_arch_halt(void) { local_irq_disable(); for ( ; ; ) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 516dab5528..7936294f5f 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -343,7 +343,7 @@ void __stop_this_cpu(void) cpumask_clear_cpu(smp_processor_id(), &cpu_online_map); } -static void cf_check stop_this_cpu(void *dummy) +static void noreturn cf_check stop_this_cpu(void *dummy) { const bool *stop_aps = dummy; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 092c7e4197..34dc077cad 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -805,7 +805,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } -void asmlinkage do_unhandled_trap(struct cpu_user_regs *regs) +void asmlinkage noreturn do_unhandled_trap(struct cpu_user_regs *regs) { fatal_trap(regs, false); } diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index c77f304bb0..8460a4a1ae 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -293,7 +293,7 @@ void show_page_walk(unsigned long addr) l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -void asmlinkage do_double_fault(struct cpu_user_regs *regs) +void asmlinkage noreturn do_double_fault(struct cpu_user_regs *regs) { unsigned int cpu; struct extra_state state; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 20 08:55:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 20 Jun 2025 08:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1020685.1396792 (Exim 4.92) (envelope-from ) id 1uSXWZ-0006DW-G3; Fri, 20 Jun 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 1020685.1396792; Fri, 20 Jun 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 1uSXWZ-0006DO-Cp; Fri, 20 Jun 2025 08:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1020685; Fri, 20 Jun 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 1uSXWY-0006DI-94 for xen-changelog@lists.xenproject.org; Fri, 20 Jun 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 1uSXWY-00BA3r-0A for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 08:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSXWX-00BXzZ-3D for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 08: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=l0FiOH4OJCh5x7CQnNdIwX+0cTVKDDVsUwzhGOC3xcQ=; b=baaAYm6DQVSNOQ9pPvFPhp+PZT fZHkQNMGZLBmMJyFokdWXDATGHImDFJChQg0ZUmkB3B1TYSNU9xHm43jxq2UZCZTiHTzs9KdLLjvA b9Tq8iAjb4FYIUv0kTzICaPNLIgh3Kld4AC/ku7ut/qUS+UeFgji33yC/CujJMH6jOqM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Move the functions to arm64 specific files Message-Id: Date: Fri, 20 Jun 2025 08:55:01 +0000 commit 78afa06cf8f73e1a1da541b86bdf5b4fb969100f Author: Ayan Kumar Halder AuthorDate: Tue Jun 10 11:51:11 2025 +0100 Commit: Ayan Kumar Halder CommitDate: Thu Jun 19 11:59:42 2025 +0100 arm/mpu: Move the functions to arm64 specific files prepare_selector(), read_protection_region() and write_protection_region() differ significantly between arm32 and arm64. Thus, move these functions to their sub-arch specific folder. Also the macro GENERATE_{WRITE/READ}_PR_REG_CASE are moved, in order to keep them in the same file of their usage and improve readability. Signed-off-by: Ayan Kumar Halder Reviewed-by: Luca Fancellu Acked-by: Michal Orzel --- xen/arch/arm/mpu/Makefile | 1 + xen/arch/arm/mpu/arm64/Makefile | 1 + xen/arch/arm/mpu/arm64/mm.c | 130 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 117 ------------------------------------ 4 files changed, 132 insertions(+), 117 deletions(-) diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile index 808e3e2cb3..09326a5248 100644 --- a/xen/arch/arm/mpu/Makefile +++ b/xen/arch/arm/mpu/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o obj-y += p2m.o diff --git a/xen/arch/arm/mpu/arm64/Makefile b/xen/arch/arm/mpu/arm64/Makefile new file mode 100644 index 0000000000..b18cec4836 --- /dev/null +++ b/xen/arch/arm/mpu/arm64/Makefile @@ -0,0 +1 @@ +obj-y += mm.o diff --git a/xen/arch/arm/mpu/arm64/mm.c b/xen/arch/arm/mpu/arm64/mm.c new file mode 100644 index 0000000000..ed643cad40 --- /dev/null +++ b/xen/arch/arm/mpu/arm64/mm.c @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include + +/* + * The following are needed for the cases: GENERATE_WRITE_PR_REG_CASE + * and GENERATE_READ_PR_REG_CASE with num==0 + */ +#define PRBAR0_EL2 PRBAR_EL2 +#define PRLAR0_EL2 PRLAR_EL2 + +#define PRBAR_EL2_(n) PRBAR##n##_EL2 +#define PRLAR_EL2_(n) PRLAR##n##_EL2 + +#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits & ~MPU_REGION_RES0, PRBAR_EL2_(num)); \ + WRITE_SYSREG(pr->prlar.bits & ~MPU_REGION_RES0, PRLAR_EL2_(num)); \ + break; \ + } + +#define GENERATE_READ_PR_REG_CASE(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(PRBAR_EL2_(num)); \ + pr->prlar.bits = READ_SYSREG(PRLAR_EL2_(num)); \ + break; \ + } + +/* + * Armv8-R supports direct access and indirect access to the MPU regions through + * registers: + * - indirect access involves changing the MPU region selector, issuing an isb + * barrier and accessing the selected region through specific registers + * - direct access involves accessing specific registers that point to + * specific MPU regions, without changing the selector, avoiding the use of + * a barrier. + * For Arm64 the PR{B,L}AR_ELx (for n=0) and PR{B,L}AR_ELx (for n=1..15) are + * used for the direct access to the regions selected by + * PRSELR_EL2.REGION<7:4>:n, so 16 regions can be directly accessed when the + * selector is a multiple of 16, giving access to all the supported memory + * regions. + */ +static void prepare_selector(uint8_t *sel) +{ + uint8_t cur_sel = *sel; + + /* + * {read,write}_protection_region works using the direct access to the 0..15 + * regions, so in order to save the isb() overhead, change the PRSELR_EL2 + * only when needed, so when the upper 4 bits of the selector will change. + */ + cur_sel &= 0xF0U; + if ( READ_SYSREG(PRSELR_EL2) != cur_sel ) + { + WRITE_SYSREG(cur_sel, PRSELR_EL2); + isb(); + } + *sel &= 0xFU; +} + +void read_protection_region(pr_t *pr_read, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_READ_PR_REG_CASE(0, pr_read); + GENERATE_READ_PR_REG_CASE(1, pr_read); + GENERATE_READ_PR_REG_CASE(2, pr_read); + GENERATE_READ_PR_REG_CASE(3, pr_read); + GENERATE_READ_PR_REG_CASE(4, pr_read); + GENERATE_READ_PR_REG_CASE(5, pr_read); + GENERATE_READ_PR_REG_CASE(6, pr_read); + GENERATE_READ_PR_REG_CASE(7, pr_read); + GENERATE_READ_PR_REG_CASE(8, pr_read); + GENERATE_READ_PR_REG_CASE(9, pr_read); + GENERATE_READ_PR_REG_CASE(10, pr_read); + GENERATE_READ_PR_REG_CASE(11, pr_read); + GENERATE_READ_PR_REG_CASE(12, pr_read); + GENERATE_READ_PR_REG_CASE(13, pr_read); + GENERATE_READ_PR_REG_CASE(14, pr_read); + GENERATE_READ_PR_REG_CASE(15, pr_read); + default: + BUG(); /* Can't happen */ + break; + } +} + +void write_protection_region(const pr_t *pr_write, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_WRITE_PR_REG_CASE(0, pr_write); + GENERATE_WRITE_PR_REG_CASE(1, pr_write); + GENERATE_WRITE_PR_REG_CASE(2, pr_write); + GENERATE_WRITE_PR_REG_CASE(3, pr_write); + GENERATE_WRITE_PR_REG_CASE(4, pr_write); + GENERATE_WRITE_PR_REG_CASE(5, pr_write); + GENERATE_WRITE_PR_REG_CASE(6, pr_write); + GENERATE_WRITE_PR_REG_CASE(7, pr_write); + GENERATE_WRITE_PR_REG_CASE(8, pr_write); + GENERATE_WRITE_PR_REG_CASE(9, pr_write); + GENERATE_WRITE_PR_REG_CASE(10, pr_write); + GENERATE_WRITE_PR_REG_CASE(11, pr_write); + GENERATE_WRITE_PR_REG_CASE(12, pr_write); + GENERATE_WRITE_PR_REG_CASE(13, pr_write); + GENERATE_WRITE_PR_REG_CASE(14, pr_write); + GENERATE_WRITE_PR_REG_CASE(15, pr_write); + default: + BUG(); /* Can't happen */ + break; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 3d37beab57..7ab68fc8c7 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -29,35 +29,6 @@ DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR) \ /* EL2 Xen MPU memory region mapping table. */ pr_t __cacheline_aligned __section(".data") xen_mpumap[MAX_MPU_REGION_NR]; -#ifdef CONFIG_ARM_64 -/* - * The following are needed for the cases: GENERATE_WRITE_PR_REG_CASE - * and GENERATE_READ_PR_REG_CASE with num==0 - */ -#define PRBAR0_EL2 PRBAR_EL2 -#define PRLAR0_EL2 PRLAR_EL2 - -#define PRBAR_EL2_(n) PRBAR##n##_EL2 -#define PRLAR_EL2_(n) PRLAR##n##_EL2 - -#endif /* CONFIG_ARM_64 */ - -#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ - case num: \ - { \ - WRITE_SYSREG(pr->prbar.bits & ~MPU_REGION_RES0, PRBAR_EL2_(num)); \ - WRITE_SYSREG(pr->prlar.bits & ~MPU_REGION_RES0, PRLAR_EL2_(num)); \ - break; \ - } - -#define GENERATE_READ_PR_REG_CASE(num, pr) \ - case num: \ - { \ - pr->prbar.bits = READ_SYSREG(PRBAR_EL2_(num)); \ - pr->prlar.bits = READ_SYSREG(PRLAR_EL2_(num)); \ - break; \ - } - static void __init __maybe_unused build_assertions(void) { /* @@ -69,94 +40,6 @@ static void __init __maybe_unused build_assertions(void) } #ifdef CONFIG_ARM_64 -/* - * Armv8-R supports direct access and indirect access to the MPU regions through - * registers: - * - indirect access involves changing the MPU region selector, issuing an isb - * barrier and accessing the selected region through specific registers - * - direct access involves accessing specific registers that point to - * specific MPU regions, without changing the selector, avoiding the use of - * a barrier. - * For Arm64 the PR{B,L}AR_ELx (for n=0) and PR{B,L}AR_ELx (for n=1..15) are - * used for the direct access to the regions selected by - * PRSELR_EL2.REGION<7:4>:n, so 16 regions can be directly accessed when the - * selector is a multiple of 16, giving access to all the supported memory - * regions. - */ -static void prepare_selector(uint8_t *sel) -{ - uint8_t cur_sel = *sel; - - /* - * {read,write}_protection_region works using the direct access to the 0..15 - * regions, so in order to save the isb() overhead, change the PRSELR_EL2 - * only when needed, so when the upper 4 bits of the selector will change. - */ - cur_sel &= 0xF0U; - if ( READ_SYSREG(PRSELR_EL2) != cur_sel ) - { - WRITE_SYSREG(cur_sel, PRSELR_EL2); - isb(); - } - *sel &= 0xFU; -} - -void read_protection_region(pr_t *pr_read, uint8_t sel) -{ - prepare_selector(&sel); - - switch ( sel ) - { - GENERATE_READ_PR_REG_CASE(0, pr_read); - GENERATE_READ_PR_REG_CASE(1, pr_read); - GENERATE_READ_PR_REG_CASE(2, pr_read); - GENERATE_READ_PR_REG_CASE(3, pr_read); - GENERATE_READ_PR_REG_CASE(4, pr_read); - GENERATE_READ_PR_REG_CASE(5, pr_read); - GENERATE_READ_PR_REG_CASE(6, pr_read); - GENERATE_READ_PR_REG_CASE(7, pr_read); - GENERATE_READ_PR_REG_CASE(8, pr_read); - GENERATE_READ_PR_REG_CASE(9, pr_read); - GENERATE_READ_PR_REG_CASE(10, pr_read); - GENERATE_READ_PR_REG_CASE(11, pr_read); - GENERATE_READ_PR_REG_CASE(12, pr_read); - GENERATE_READ_PR_REG_CASE(13, pr_read); - GENERATE_READ_PR_REG_CASE(14, pr_read); - GENERATE_READ_PR_REG_CASE(15, pr_read); - default: - BUG(); /* Can't happen */ - break; - } -} - -void write_protection_region(const pr_t *pr_write, uint8_t sel) -{ - prepare_selector(&sel); - - switch ( sel ) - { - GENERATE_WRITE_PR_REG_CASE(0, pr_write); - GENERATE_WRITE_PR_REG_CASE(1, pr_write); - GENERATE_WRITE_PR_REG_CASE(2, pr_write); - GENERATE_WRITE_PR_REG_CASE(3, pr_write); - GENERATE_WRITE_PR_REG_CASE(4, pr_write); - GENERATE_WRITE_PR_REG_CASE(5, pr_write); - GENERATE_WRITE_PR_REG_CASE(6, pr_write); - GENERATE_WRITE_PR_REG_CASE(7, pr_write); - GENERATE_WRITE_PR_REG_CASE(8, pr_write); - GENERATE_WRITE_PR_REG_CASE(9, pr_write); - GENERATE_WRITE_PR_REG_CASE(10, pr_write); - GENERATE_WRITE_PR_REG_CASE(11, pr_write); - GENERATE_WRITE_PR_REG_CASE(12, pr_write); - GENERATE_WRITE_PR_REG_CASE(13, pr_write); - GENERATE_WRITE_PR_REG_CASE(14, pr_write); - GENERATE_WRITE_PR_REG_CASE(15, pr_write); - default: - BUG(); /* Can't happen */ - break; - } -} - pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) { unsigned int attr_idx = PAGE_AI_MASK(flags); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 20 08:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 20 Jun 2025 08:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1020686.1396795 (Exim 4.92) (envelope-from ) id 1uSXWj-0006FJ-H4; Fri, 20 Jun 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 1020686.1396795; Fri, 20 Jun 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 1uSXWj-0006FB-EF; Fri, 20 Jun 2025 08:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1020686; Fri, 20 Jun 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 1uSXWi-0006F3-63 for xen-changelog@lists.xenproject.org; Fri, 20 Jun 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 1uSXWi-00BA3w-0S for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 08:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSXWi-00BXzy-0L for xen-changelog@lists.xenproject.org; Fri, 20 Jun 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=JNPek26b+jWz8+ARlwpGLMSZTF44GNn4G8l7nIxX7S8=; b=kXNGH3ptOo7iW1SRup2nVRyw8m /RvGElixmkn2rP9FEgIHKG2q1kaSc8+XHQojJr3b6wqYqgU3C/iAuc6ZrIY9Q3ksb2aCwrY716FSy zdJbEwnaUL/PXVkaKBiHjf9Avd2vHR/P9MdDUg3lo8NAolVYJfM6IUZneJyXyZcZpS7s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Define arm32 system registers Message-Id: Date: Fri, 20 Jun 2025 08:55:12 +0000 commit 419a1c5e96c4a5cddd39188869a4ccd1eb2f24b4 Author: Ayan Kumar Halder AuthorDate: Tue Jun 17 12:12:50 2025 +0100 Commit: Ayan Kumar Halder CommitDate: Thu Jun 19 12:06:31 2025 +0100 arm/mpu: Define arm32 system registers Fix the definition for HPRLAR. Define the base/limit address registers to access the first 32 protection regions. Signed-off-by: Ayan Kumar Halder Reviewed-by: Hari Limaye Acked-by: Michal Orzel --- xen/arch/arm/include/asm/mpu/cpregs.h | 68 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/mpu/cpregs.h b/xen/arch/arm/include/asm/mpu/cpregs.h index d5cd0e04d5..bb15e02df6 100644 --- a/xen/arch/arm/include/asm/mpu/cpregs.h +++ b/xen/arch/arm/include/asm/mpu/cpregs.h @@ -9,7 +9,73 @@ /* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */ #define HPRSELR p15,4,c6,c2,1 #define HPRBAR p15,4,c6,c3,0 -#define HPRLAR p15,4,c6,c8,1 +#define HPRLAR p15,4,c6,c3,1 + +/* CP15 CR6: MPU Protection Region Base/Limit Address Register */ +#define HPRBAR0 p15,4,c6,c8,0 +#define HPRLAR0 p15,4,c6,c8,1 +#define HPRBAR1 p15,4,c6,c8,4 +#define HPRLAR1 p15,4,c6,c8,5 +#define HPRBAR2 p15,4,c6,c9,0 +#define HPRLAR2 p15,4,c6,c9,1 +#define HPRBAR3 p15,4,c6,c9,4 +#define HPRLAR3 p15,4,c6,c9,5 +#define HPRBAR4 p15,4,c6,c10,0 +#define HPRLAR4 p15,4,c6,c10,1 +#define HPRBAR5 p15,4,c6,c10,4 +#define HPRLAR5 p15,4,c6,c10,5 +#define HPRBAR6 p15,4,c6,c11,0 +#define HPRLAR6 p15,4,c6,c11,1 +#define HPRBAR7 p15,4,c6,c11,4 +#define HPRLAR7 p15,4,c6,c11,5 +#define HPRBAR8 p15,4,c6,c12,0 +#define HPRLAR8 p15,4,c6,c12,1 +#define HPRBAR9 p15,4,c6,c12,4 +#define HPRLAR9 p15,4,c6,c12,5 +#define HPRBAR10 p15,4,c6,c13,0 +#define HPRLAR10 p15,4,c6,c13,1 +#define HPRBAR11 p15,4,c6,c13,4 +#define HPRLAR11 p15,4,c6,c13,5 +#define HPRBAR12 p15,4,c6,c14,0 +#define HPRLAR12 p15,4,c6,c14,1 +#define HPRBAR13 p15,4,c6,c14,4 +#define HPRLAR13 p15,4,c6,c14,5 +#define HPRBAR14 p15,4,c6,c15,0 +#define HPRLAR14 p15,4,c6,c15,1 +#define HPRBAR15 p15,4,c6,c15,4 +#define HPRLAR15 p15,4,c6,c15,5 +#define HPRBAR16 p15,5,c6,c8,0 +#define HPRLAR16 p15,5,c6,c8,1 +#define HPRBAR17 p15,5,c6,c8,4 +#define HPRLAR17 p15,5,c6,c8,5 +#define HPRBAR18 p15,5,c6,c9,0 +#define HPRLAR18 p15,5,c6,c9,1 +#define HPRBAR19 p15,5,c6,c9,4 +#define HPRLAR19 p15,5,c6,c9,5 +#define HPRBAR20 p15,5,c6,c10,0 +#define HPRLAR20 p15,5,c6,c10,1 +#define HPRBAR21 p15,5,c6,c10,4 +#define HPRLAR21 p15,5,c6,c10,5 +#define HPRBAR22 p15,5,c6,c11,0 +#define HPRLAR22 p15,5,c6,c11,1 +#define HPRBAR23 p15,5,c6,c11,4 +#define HPRLAR23 p15,5,c6,c11,5 +#define HPRBAR24 p15,5,c6,c12,0 +#define HPRLAR24 p15,5,c6,c12,1 +#define HPRBAR25 p15,5,c6,c12,4 +#define HPRLAR25 p15,5,c6,c12,5 +#define HPRBAR26 p15,5,c6,c13,0 +#define HPRLAR26 p15,5,c6,c13,1 +#define HPRBAR27 p15,5,c6,c13,4 +#define HPRLAR27 p15,5,c6,c13,5 +#define HPRBAR28 p15,5,c6,c14,0 +#define HPRLAR28 p15,5,c6,c14,1 +#define HPRBAR29 p15,5,c6,c14,4 +#define HPRLAR29 p15,5,c6,c14,5 +#define HPRBAR30 p15,5,c6,c15,0 +#define HPRLAR30 p15,5,c6,c15,1 +#define HPRBAR31 p15,5,c6,c15,4 +#define HPRLAR31 p15,5,c6,c15,5 /* Aliases of AArch64 names for use in common code */ #ifdef CONFIG_ARM_32 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 20 08:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 20 Jun 2025 08:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1020687.1396798 (Exim 4.92) (envelope-from ) id 1uSXWt-0006Hm-IN; Fri, 20 Jun 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 1020687.1396798; Fri, 20 Jun 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 1uSXWt-0006He-Fe; Fri, 20 Jun 2025 08:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1020687; Fri, 20 Jun 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 1uSXWs-0006HO-9b for xen-changelog@lists.xenproject.org; Fri, 20 Jun 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 1uSXWs-00BA40-0n for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 08:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSXWs-00BY0N-0e for xen-changelog@lists.xenproject.org; Fri, 20 Jun 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=p1ELEq++pLWx7PCzB6E1zSqSKPfKQjx6ais+GC7x4Q4=; b=PIFXxBv8i7jlI7/gqQ5lks7xj4 DLtmAlAV4Ic3JjCyuJTdhsm/No/1xnV/MyxUreVy83G8sG+RPbfPFQYjFWwy1te5+N2YdWSKAh/IM cyKsoBVgP/1Gh5JuUiQj7sDS5I5ZklJpgiJiIYUH2ANZK9bocEHstO7baHd43lamzQtY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/mpu: Enable read/write to protection regions for arm32 Message-Id: Date: Fri, 20 Jun 2025 08:55:22 +0000 commit 12d72d032e169082308efb9d44b9964ef9fa4340 Author: Ayan Kumar Halder AuthorDate: Tue Jun 17 12:12:51 2025 +0100 Commit: Ayan Kumar Halder CommitDate: Thu Jun 19 12:23:48 2025 +0100 arm/mpu: Enable read/write to protection regions for arm32 Define prepare_selector(), read_protection_region() and write_protection_region() for arm32. Also, define GENERATE_{READ/WRITE}_PR_REG_OTHERS to access MPU regions from 32 to 254. Enable pr_{get/set}_{base/limit}(), region_is_valid() for arm32. Enable pr_of_addr() for arm32. The maximum number of regions supported is 255 (which corresponds to the maximum value in HMPUIR). Signed-off-by: Ayan Kumar Halder Reviewed-by: Luca Fancellu Reviewed-by: Hari Limaye Tested-by: Hari Limaye Acked-by: Julien Grall --- xen/arch/arm/include/asm/mpu.h | 2 - xen/arch/arm/mpu/Makefile | 1 + xen/arch/arm/mpu/arm32/Makefile | 1 + xen/arch/arm/mpu/arm32/mm.c | 164 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 2 - 5 files changed, 166 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index 8f06ddac0f..63560c613b 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -25,7 +25,6 @@ #ifndef __ASSEMBLY__ -#ifdef CONFIG_ARM_64 /* * Set base address of MPU protection region. * @@ -85,7 +84,6 @@ static inline bool region_is_valid(const pr_t *pr) { return pr->prlar.reg.en; } -#endif /* CONFIG_ARM_64 */ #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile index 09326a5248..50f8fe4326 100644 --- a/xen/arch/arm/mpu/Makefile +++ b/xen/arch/arm/mpu/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o diff --git a/xen/arch/arm/mpu/arm32/Makefile b/xen/arch/arm/mpu/arm32/Makefile new file mode 100644 index 0000000000..b18cec4836 --- /dev/null +++ b/xen/arch/arm/mpu/arm32/Makefile @@ -0,0 +1 @@ +obj-y += mm.o diff --git a/xen/arch/arm/mpu/arm32/mm.c b/xen/arch/arm/mpu/arm32/mm.c new file mode 100644 index 0000000000..a4673c3511 --- /dev/null +++ b/xen/arch/arm/mpu/arm32/mm.c @@ -0,0 +1,164 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include + +#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits, HPRBAR##num); \ + WRITE_SYSREG(pr->prlar.bits, HPRLAR##num); \ + break; \ + } + +#define GENERATE_WRITE_PR_REG_OTHERS(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits, HPRBAR); \ + WRITE_SYSREG(pr->prlar.bits, HPRLAR); \ + break; \ + } + +#define GENERATE_READ_PR_REG_CASE(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(HPRBAR##num); \ + pr->prlar.bits = READ_SYSREG(HPRLAR##num); \ + break; \ + } + +#define GENERATE_READ_PR_REG_OTHERS(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(HPRBAR); \ + pr->prlar.bits = READ_SYSREG(HPRLAR); \ + break; \ + } + +/* + * Armv8-R supports direct access and indirect access to the MPU regions through + * registers: + * - indirect access involves changing the MPU region selector, issuing an isb + * barrier and accessing the selected region through specific registers + * - direct access involves accessing specific registers that point to + * specific MPU regions, without changing the selector, avoiding the use of + * a barrier. + * For Arm32 the HPR{B,L}AR (for n=0..31) are used for direct access to the + * first 32 MPU regions. + * For MPU regions numbered 32..254, one needs to set the region number in + * HPRSELR, followed by configuring HPR{B,L}AR. + */ +static void prepare_selector(uint8_t *sel) +{ + uint8_t cur_sel = *sel; + /* The top 24 bits of HPRSELR are RES0. */ + uint8_t val = READ_SYSREG(HPRSELR) & 0xff; + + if ( (cur_sel > 31) && (cur_sel != val) ) + { + WRITE_SYSREG(cur_sel, HPRSELR); + isb(); + } +} + +void read_protection_region(pr_t *pr_read, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_READ_PR_REG_CASE(0, pr_read); + GENERATE_READ_PR_REG_CASE(1, pr_read); + GENERATE_READ_PR_REG_CASE(2, pr_read); + GENERATE_READ_PR_REG_CASE(3, pr_read); + GENERATE_READ_PR_REG_CASE(4, pr_read); + GENERATE_READ_PR_REG_CASE(5, pr_read); + GENERATE_READ_PR_REG_CASE(6, pr_read); + GENERATE_READ_PR_REG_CASE(7, pr_read); + GENERATE_READ_PR_REG_CASE(8, pr_read); + GENERATE_READ_PR_REG_CASE(9, pr_read); + GENERATE_READ_PR_REG_CASE(10, pr_read); + GENERATE_READ_PR_REG_CASE(11, pr_read); + GENERATE_READ_PR_REG_CASE(12, pr_read); + GENERATE_READ_PR_REG_CASE(13, pr_read); + GENERATE_READ_PR_REG_CASE(14, pr_read); + GENERATE_READ_PR_REG_CASE(15, pr_read); + GENERATE_READ_PR_REG_CASE(16, pr_read); + GENERATE_READ_PR_REG_CASE(17, pr_read); + GENERATE_READ_PR_REG_CASE(18, pr_read); + GENERATE_READ_PR_REG_CASE(19, pr_read); + GENERATE_READ_PR_REG_CASE(20, pr_read); + GENERATE_READ_PR_REG_CASE(21, pr_read); + GENERATE_READ_PR_REG_CASE(22, pr_read); + GENERATE_READ_PR_REG_CASE(23, pr_read); + GENERATE_READ_PR_REG_CASE(24, pr_read); + GENERATE_READ_PR_REG_CASE(25, pr_read); + GENERATE_READ_PR_REG_CASE(26, pr_read); + GENERATE_READ_PR_REG_CASE(27, pr_read); + GENERATE_READ_PR_REG_CASE(28, pr_read); + GENERATE_READ_PR_REG_CASE(29, pr_read); + GENERATE_READ_PR_REG_CASE(30, pr_read); + GENERATE_READ_PR_REG_CASE(31, pr_read); + GENERATE_READ_PR_REG_OTHERS(32 ... 254, pr_read); + default: + BUG(); /* Can't happen */ + break; + } +} + +void write_protection_region(const pr_t *pr_write, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_WRITE_PR_REG_CASE(0, pr_write); + GENERATE_WRITE_PR_REG_CASE(1, pr_write); + GENERATE_WRITE_PR_REG_CASE(2, pr_write); + GENERATE_WRITE_PR_REG_CASE(3, pr_write); + GENERATE_WRITE_PR_REG_CASE(4, pr_write); + GENERATE_WRITE_PR_REG_CASE(5, pr_write); + GENERATE_WRITE_PR_REG_CASE(6, pr_write); + GENERATE_WRITE_PR_REG_CASE(7, pr_write); + GENERATE_WRITE_PR_REG_CASE(8, pr_write); + GENERATE_WRITE_PR_REG_CASE(9, pr_write); + GENERATE_WRITE_PR_REG_CASE(10, pr_write); + GENERATE_WRITE_PR_REG_CASE(11, pr_write); + GENERATE_WRITE_PR_REG_CASE(12, pr_write); + GENERATE_WRITE_PR_REG_CASE(13, pr_write); + GENERATE_WRITE_PR_REG_CASE(14, pr_write); + GENERATE_WRITE_PR_REG_CASE(15, pr_write); + GENERATE_WRITE_PR_REG_CASE(16, pr_write); + GENERATE_WRITE_PR_REG_CASE(17, pr_write); + GENERATE_WRITE_PR_REG_CASE(18, pr_write); + GENERATE_WRITE_PR_REG_CASE(19, pr_write); + GENERATE_WRITE_PR_REG_CASE(20, pr_write); + GENERATE_WRITE_PR_REG_CASE(21, pr_write); + GENERATE_WRITE_PR_REG_CASE(22, pr_write); + GENERATE_WRITE_PR_REG_CASE(23, pr_write); + GENERATE_WRITE_PR_REG_CASE(24, pr_write); + GENERATE_WRITE_PR_REG_CASE(25, pr_write); + GENERATE_WRITE_PR_REG_CASE(26, pr_write); + GENERATE_WRITE_PR_REG_CASE(27, pr_write); + GENERATE_WRITE_PR_REG_CASE(28, pr_write); + GENERATE_WRITE_PR_REG_CASE(29, pr_write); + GENERATE_WRITE_PR_REG_CASE(30, pr_write); + GENERATE_WRITE_PR_REG_CASE(31, pr_write); + GENERATE_WRITE_PR_REG_OTHERS(32 ... 254, pr_write); + default: + BUG(); /* Can't happen */ + break; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 7ab68fc8c7..ccfb37a67b 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -39,7 +39,6 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(PAGE_SIZE != SZ_4K); } -#ifdef CONFIG_ARM_64 pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) { unsigned int attr_idx = PAGE_AI_MASK(flags); @@ -110,7 +109,6 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) return region; } -#endif /* CONFIG_ARM_64 */ void __init setup_mm(void) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Jun 20 09:22:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 20 Jun 2025 09:22:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1020689.1396803 (Exim 4.92) (envelope-from ) id 1uSXwh-0001Cv-Et; Fri, 20 Jun 2025 09:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1020689.1396803; Fri, 20 Jun 2025 09: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 1uSXwh-0001Co-C4; Fri, 20 Jun 2025 09:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1020689; Fri, 20 Jun 2025 09:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uSXwg-0001Ch-CU for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uSXwg-00BAbl-0V for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSXwg-00BYxl-0A for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09: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=zrZASwWOtGRknzgsmakSZz03RWFAF9ZI8Gpe+UpLQO4=; b=TQEDkptzpbeq8DgY8qXreQqrY9 1C1LlqbjwOWpPMh9uQ10nok+995irZ+VeTzU++J1Dx4SIL+KbseEw7LCf5SkeoJOa++G/cwtahf/B ChAZg7Xn8fiIzuJs+fQwZilRY1EkKB0iyN7OGMPrEwphQK720iSx8NOnEIXvFKG39O9I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Move the functions to arm64 specific files Message-Id: Date: Fri, 20 Jun 2025 09:22:02 +0000 commit 78afa06cf8f73e1a1da541b86bdf5b4fb969100f Author: Ayan Kumar Halder AuthorDate: Tue Jun 10 11:51:11 2025 +0100 Commit: Ayan Kumar Halder CommitDate: Thu Jun 19 11:59:42 2025 +0100 arm/mpu: Move the functions to arm64 specific files prepare_selector(), read_protection_region() and write_protection_region() differ significantly between arm32 and arm64. Thus, move these functions to their sub-arch specific folder. Also the macro GENERATE_{WRITE/READ}_PR_REG_CASE are moved, in order to keep them in the same file of their usage and improve readability. Signed-off-by: Ayan Kumar Halder Reviewed-by: Luca Fancellu Acked-by: Michal Orzel --- xen/arch/arm/mpu/Makefile | 1 + xen/arch/arm/mpu/arm64/Makefile | 1 + xen/arch/arm/mpu/arm64/mm.c | 130 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 117 ------------------------------------ 4 files changed, 132 insertions(+), 117 deletions(-) diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile index 808e3e2cb3..09326a5248 100644 --- a/xen/arch/arm/mpu/Makefile +++ b/xen/arch/arm/mpu/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o obj-y += p2m.o diff --git a/xen/arch/arm/mpu/arm64/Makefile b/xen/arch/arm/mpu/arm64/Makefile new file mode 100644 index 0000000000..b18cec4836 --- /dev/null +++ b/xen/arch/arm/mpu/arm64/Makefile @@ -0,0 +1 @@ +obj-y += mm.o diff --git a/xen/arch/arm/mpu/arm64/mm.c b/xen/arch/arm/mpu/arm64/mm.c new file mode 100644 index 0000000000..ed643cad40 --- /dev/null +++ b/xen/arch/arm/mpu/arm64/mm.c @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include + +/* + * The following are needed for the cases: GENERATE_WRITE_PR_REG_CASE + * and GENERATE_READ_PR_REG_CASE with num==0 + */ +#define PRBAR0_EL2 PRBAR_EL2 +#define PRLAR0_EL2 PRLAR_EL2 + +#define PRBAR_EL2_(n) PRBAR##n##_EL2 +#define PRLAR_EL2_(n) PRLAR##n##_EL2 + +#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits & ~MPU_REGION_RES0, PRBAR_EL2_(num)); \ + WRITE_SYSREG(pr->prlar.bits & ~MPU_REGION_RES0, PRLAR_EL2_(num)); \ + break; \ + } + +#define GENERATE_READ_PR_REG_CASE(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(PRBAR_EL2_(num)); \ + pr->prlar.bits = READ_SYSREG(PRLAR_EL2_(num)); \ + break; \ + } + +/* + * Armv8-R supports direct access and indirect access to the MPU regions through + * registers: + * - indirect access involves changing the MPU region selector, issuing an isb + * barrier and accessing the selected region through specific registers + * - direct access involves accessing specific registers that point to + * specific MPU regions, without changing the selector, avoiding the use of + * a barrier. + * For Arm64 the PR{B,L}AR_ELx (for n=0) and PR{B,L}AR_ELx (for n=1..15) are + * used for the direct access to the regions selected by + * PRSELR_EL2.REGION<7:4>:n, so 16 regions can be directly accessed when the + * selector is a multiple of 16, giving access to all the supported memory + * regions. + */ +static void prepare_selector(uint8_t *sel) +{ + uint8_t cur_sel = *sel; + + /* + * {read,write}_protection_region works using the direct access to the 0..15 + * regions, so in order to save the isb() overhead, change the PRSELR_EL2 + * only when needed, so when the upper 4 bits of the selector will change. + */ + cur_sel &= 0xF0U; + if ( READ_SYSREG(PRSELR_EL2) != cur_sel ) + { + WRITE_SYSREG(cur_sel, PRSELR_EL2); + isb(); + } + *sel &= 0xFU; +} + +void read_protection_region(pr_t *pr_read, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_READ_PR_REG_CASE(0, pr_read); + GENERATE_READ_PR_REG_CASE(1, pr_read); + GENERATE_READ_PR_REG_CASE(2, pr_read); + GENERATE_READ_PR_REG_CASE(3, pr_read); + GENERATE_READ_PR_REG_CASE(4, pr_read); + GENERATE_READ_PR_REG_CASE(5, pr_read); + GENERATE_READ_PR_REG_CASE(6, pr_read); + GENERATE_READ_PR_REG_CASE(7, pr_read); + GENERATE_READ_PR_REG_CASE(8, pr_read); + GENERATE_READ_PR_REG_CASE(9, pr_read); + GENERATE_READ_PR_REG_CASE(10, pr_read); + GENERATE_READ_PR_REG_CASE(11, pr_read); + GENERATE_READ_PR_REG_CASE(12, pr_read); + GENERATE_READ_PR_REG_CASE(13, pr_read); + GENERATE_READ_PR_REG_CASE(14, pr_read); + GENERATE_READ_PR_REG_CASE(15, pr_read); + default: + BUG(); /* Can't happen */ + break; + } +} + +void write_protection_region(const pr_t *pr_write, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_WRITE_PR_REG_CASE(0, pr_write); + GENERATE_WRITE_PR_REG_CASE(1, pr_write); + GENERATE_WRITE_PR_REG_CASE(2, pr_write); + GENERATE_WRITE_PR_REG_CASE(3, pr_write); + GENERATE_WRITE_PR_REG_CASE(4, pr_write); + GENERATE_WRITE_PR_REG_CASE(5, pr_write); + GENERATE_WRITE_PR_REG_CASE(6, pr_write); + GENERATE_WRITE_PR_REG_CASE(7, pr_write); + GENERATE_WRITE_PR_REG_CASE(8, pr_write); + GENERATE_WRITE_PR_REG_CASE(9, pr_write); + GENERATE_WRITE_PR_REG_CASE(10, pr_write); + GENERATE_WRITE_PR_REG_CASE(11, pr_write); + GENERATE_WRITE_PR_REG_CASE(12, pr_write); + GENERATE_WRITE_PR_REG_CASE(13, pr_write); + GENERATE_WRITE_PR_REG_CASE(14, pr_write); + GENERATE_WRITE_PR_REG_CASE(15, pr_write); + default: + BUG(); /* Can't happen */ + break; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 3d37beab57..7ab68fc8c7 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -29,35 +29,6 @@ DECLARE_BITMAP(xen_mpumap_mask, MAX_MPU_REGION_NR) \ /* EL2 Xen MPU memory region mapping table. */ pr_t __cacheline_aligned __section(".data") xen_mpumap[MAX_MPU_REGION_NR]; -#ifdef CONFIG_ARM_64 -/* - * The following are needed for the cases: GENERATE_WRITE_PR_REG_CASE - * and GENERATE_READ_PR_REG_CASE with num==0 - */ -#define PRBAR0_EL2 PRBAR_EL2 -#define PRLAR0_EL2 PRLAR_EL2 - -#define PRBAR_EL2_(n) PRBAR##n##_EL2 -#define PRLAR_EL2_(n) PRLAR##n##_EL2 - -#endif /* CONFIG_ARM_64 */ - -#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ - case num: \ - { \ - WRITE_SYSREG(pr->prbar.bits & ~MPU_REGION_RES0, PRBAR_EL2_(num)); \ - WRITE_SYSREG(pr->prlar.bits & ~MPU_REGION_RES0, PRLAR_EL2_(num)); \ - break; \ - } - -#define GENERATE_READ_PR_REG_CASE(num, pr) \ - case num: \ - { \ - pr->prbar.bits = READ_SYSREG(PRBAR_EL2_(num)); \ - pr->prlar.bits = READ_SYSREG(PRLAR_EL2_(num)); \ - break; \ - } - static void __init __maybe_unused build_assertions(void) { /* @@ -69,94 +40,6 @@ static void __init __maybe_unused build_assertions(void) } #ifdef CONFIG_ARM_64 -/* - * Armv8-R supports direct access and indirect access to the MPU regions through - * registers: - * - indirect access involves changing the MPU region selector, issuing an isb - * barrier and accessing the selected region through specific registers - * - direct access involves accessing specific registers that point to - * specific MPU regions, without changing the selector, avoiding the use of - * a barrier. - * For Arm64 the PR{B,L}AR_ELx (for n=0) and PR{B,L}AR_ELx (for n=1..15) are - * used for the direct access to the regions selected by - * PRSELR_EL2.REGION<7:4>:n, so 16 regions can be directly accessed when the - * selector is a multiple of 16, giving access to all the supported memory - * regions. - */ -static void prepare_selector(uint8_t *sel) -{ - uint8_t cur_sel = *sel; - - /* - * {read,write}_protection_region works using the direct access to the 0..15 - * regions, so in order to save the isb() overhead, change the PRSELR_EL2 - * only when needed, so when the upper 4 bits of the selector will change. - */ - cur_sel &= 0xF0U; - if ( READ_SYSREG(PRSELR_EL2) != cur_sel ) - { - WRITE_SYSREG(cur_sel, PRSELR_EL2); - isb(); - } - *sel &= 0xFU; -} - -void read_protection_region(pr_t *pr_read, uint8_t sel) -{ - prepare_selector(&sel); - - switch ( sel ) - { - GENERATE_READ_PR_REG_CASE(0, pr_read); - GENERATE_READ_PR_REG_CASE(1, pr_read); - GENERATE_READ_PR_REG_CASE(2, pr_read); - GENERATE_READ_PR_REG_CASE(3, pr_read); - GENERATE_READ_PR_REG_CASE(4, pr_read); - GENERATE_READ_PR_REG_CASE(5, pr_read); - GENERATE_READ_PR_REG_CASE(6, pr_read); - GENERATE_READ_PR_REG_CASE(7, pr_read); - GENERATE_READ_PR_REG_CASE(8, pr_read); - GENERATE_READ_PR_REG_CASE(9, pr_read); - GENERATE_READ_PR_REG_CASE(10, pr_read); - GENERATE_READ_PR_REG_CASE(11, pr_read); - GENERATE_READ_PR_REG_CASE(12, pr_read); - GENERATE_READ_PR_REG_CASE(13, pr_read); - GENERATE_READ_PR_REG_CASE(14, pr_read); - GENERATE_READ_PR_REG_CASE(15, pr_read); - default: - BUG(); /* Can't happen */ - break; - } -} - -void write_protection_region(const pr_t *pr_write, uint8_t sel) -{ - prepare_selector(&sel); - - switch ( sel ) - { - GENERATE_WRITE_PR_REG_CASE(0, pr_write); - GENERATE_WRITE_PR_REG_CASE(1, pr_write); - GENERATE_WRITE_PR_REG_CASE(2, pr_write); - GENERATE_WRITE_PR_REG_CASE(3, pr_write); - GENERATE_WRITE_PR_REG_CASE(4, pr_write); - GENERATE_WRITE_PR_REG_CASE(5, pr_write); - GENERATE_WRITE_PR_REG_CASE(6, pr_write); - GENERATE_WRITE_PR_REG_CASE(7, pr_write); - GENERATE_WRITE_PR_REG_CASE(8, pr_write); - GENERATE_WRITE_PR_REG_CASE(9, pr_write); - GENERATE_WRITE_PR_REG_CASE(10, pr_write); - GENERATE_WRITE_PR_REG_CASE(11, pr_write); - GENERATE_WRITE_PR_REG_CASE(12, pr_write); - GENERATE_WRITE_PR_REG_CASE(13, pr_write); - GENERATE_WRITE_PR_REG_CASE(14, pr_write); - GENERATE_WRITE_PR_REG_CASE(15, pr_write); - default: - BUG(); /* Can't happen */ - break; - } -} - pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) { unsigned int attr_idx = PAGE_AI_MASK(flags); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 20 09:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 20 Jun 2025 09:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1020690.1396807 (Exim 4.92) (envelope-from ) id 1uSXwr-0001Ex-GM; Fri, 20 Jun 2025 09:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1020690.1396807; Fri, 20 Jun 2025 09: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 1uSXwr-0001Ep-Dd; Fri, 20 Jun 2025 09:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1020690; Fri, 20 Jun 2025 09:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uSXwq-0001Ef-Ao for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uSXwq-00BAc9-0y for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSXwq-00BYyr-0g for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09: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=8Hn6QLQ/ExSKhoKMP4bgtWtPuHeQcCWEAi/SXak+dS0=; b=L+KbW82AVElHj478xTesNZCh1R mYashm8fxdl7bX7QqOLdZkEd6lCWdQsJdyBcHSzyMe1RSC3EKm7tw8iOdmdOx6+V1ORZTv2DJpdgX PtzK2HSUTzFhVsvu7xGxX8ArZIvYvbEjXa3XEIoY0LsXLXI8wq6vPLMRYg5n9Lec3ZvM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Define arm32 system registers Message-Id: Date: Fri, 20 Jun 2025 09:22:12 +0000 commit 419a1c5e96c4a5cddd39188869a4ccd1eb2f24b4 Author: Ayan Kumar Halder AuthorDate: Tue Jun 17 12:12:50 2025 +0100 Commit: Ayan Kumar Halder CommitDate: Thu Jun 19 12:06:31 2025 +0100 arm/mpu: Define arm32 system registers Fix the definition for HPRLAR. Define the base/limit address registers to access the first 32 protection regions. Signed-off-by: Ayan Kumar Halder Reviewed-by: Hari Limaye Acked-by: Michal Orzel --- xen/arch/arm/include/asm/mpu/cpregs.h | 68 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/mpu/cpregs.h b/xen/arch/arm/include/asm/mpu/cpregs.h index d5cd0e04d5..bb15e02df6 100644 --- a/xen/arch/arm/include/asm/mpu/cpregs.h +++ b/xen/arch/arm/include/asm/mpu/cpregs.h @@ -9,7 +9,73 @@ /* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */ #define HPRSELR p15,4,c6,c2,1 #define HPRBAR p15,4,c6,c3,0 -#define HPRLAR p15,4,c6,c8,1 +#define HPRLAR p15,4,c6,c3,1 + +/* CP15 CR6: MPU Protection Region Base/Limit Address Register */ +#define HPRBAR0 p15,4,c6,c8,0 +#define HPRLAR0 p15,4,c6,c8,1 +#define HPRBAR1 p15,4,c6,c8,4 +#define HPRLAR1 p15,4,c6,c8,5 +#define HPRBAR2 p15,4,c6,c9,0 +#define HPRLAR2 p15,4,c6,c9,1 +#define HPRBAR3 p15,4,c6,c9,4 +#define HPRLAR3 p15,4,c6,c9,5 +#define HPRBAR4 p15,4,c6,c10,0 +#define HPRLAR4 p15,4,c6,c10,1 +#define HPRBAR5 p15,4,c6,c10,4 +#define HPRLAR5 p15,4,c6,c10,5 +#define HPRBAR6 p15,4,c6,c11,0 +#define HPRLAR6 p15,4,c6,c11,1 +#define HPRBAR7 p15,4,c6,c11,4 +#define HPRLAR7 p15,4,c6,c11,5 +#define HPRBAR8 p15,4,c6,c12,0 +#define HPRLAR8 p15,4,c6,c12,1 +#define HPRBAR9 p15,4,c6,c12,4 +#define HPRLAR9 p15,4,c6,c12,5 +#define HPRBAR10 p15,4,c6,c13,0 +#define HPRLAR10 p15,4,c6,c13,1 +#define HPRBAR11 p15,4,c6,c13,4 +#define HPRLAR11 p15,4,c6,c13,5 +#define HPRBAR12 p15,4,c6,c14,0 +#define HPRLAR12 p15,4,c6,c14,1 +#define HPRBAR13 p15,4,c6,c14,4 +#define HPRLAR13 p15,4,c6,c14,5 +#define HPRBAR14 p15,4,c6,c15,0 +#define HPRLAR14 p15,4,c6,c15,1 +#define HPRBAR15 p15,4,c6,c15,4 +#define HPRLAR15 p15,4,c6,c15,5 +#define HPRBAR16 p15,5,c6,c8,0 +#define HPRLAR16 p15,5,c6,c8,1 +#define HPRBAR17 p15,5,c6,c8,4 +#define HPRLAR17 p15,5,c6,c8,5 +#define HPRBAR18 p15,5,c6,c9,0 +#define HPRLAR18 p15,5,c6,c9,1 +#define HPRBAR19 p15,5,c6,c9,4 +#define HPRLAR19 p15,5,c6,c9,5 +#define HPRBAR20 p15,5,c6,c10,0 +#define HPRLAR20 p15,5,c6,c10,1 +#define HPRBAR21 p15,5,c6,c10,4 +#define HPRLAR21 p15,5,c6,c10,5 +#define HPRBAR22 p15,5,c6,c11,0 +#define HPRLAR22 p15,5,c6,c11,1 +#define HPRBAR23 p15,5,c6,c11,4 +#define HPRLAR23 p15,5,c6,c11,5 +#define HPRBAR24 p15,5,c6,c12,0 +#define HPRLAR24 p15,5,c6,c12,1 +#define HPRBAR25 p15,5,c6,c12,4 +#define HPRLAR25 p15,5,c6,c12,5 +#define HPRBAR26 p15,5,c6,c13,0 +#define HPRLAR26 p15,5,c6,c13,1 +#define HPRBAR27 p15,5,c6,c13,4 +#define HPRLAR27 p15,5,c6,c13,5 +#define HPRBAR28 p15,5,c6,c14,0 +#define HPRLAR28 p15,5,c6,c14,1 +#define HPRBAR29 p15,5,c6,c14,4 +#define HPRLAR29 p15,5,c6,c14,5 +#define HPRBAR30 p15,5,c6,c15,0 +#define HPRLAR30 p15,5,c6,c15,1 +#define HPRBAR31 p15,5,c6,c15,4 +#define HPRLAR31 p15,5,c6,c15,5 /* Aliases of AArch64 names for use in common code */ #ifdef CONFIG_ARM_32 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 20 09:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 20 Jun 2025 09:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1020691.1396810 (Exim 4.92) (envelope-from ) id 1uSXx1-0001HT-I6; Fri, 20 Jun 2025 09:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1020691.1396810; Fri, 20 Jun 2025 09: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 1uSXx1-0001HL-F4; Fri, 20 Jun 2025 09:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1020691; Fri, 20 Jun 2025 09:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uSXx0-0001H4-Dk for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uSXx0-00BAcI-1F for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSXx0-00BYzW-19 for xen-changelog@lists.xenproject.org; Fri, 20 Jun 2025 09: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=z/0/R3dt3kZ9Wd0UBwsdxunhS+HDI2fzhuUs+hX3CMw=; b=ymJCpVVxTkZYQ75uPLUS2BdceQ aW8nKMX5lcrQmX0QDc274rc8RPLLBesZd9pJQOc/cm7lI8VGzBPD37yv041RT8MBmV0VX+DqZ9+Yx r3b5I/i58qkqGCKuR7UZp8RSyhoESVQrgMw9+3lK/Vtk/PYiUsmcoH+BNpuQ5sGASI/c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/mpu: Enable read/write to protection regions for arm32 Message-Id: Date: Fri, 20 Jun 2025 09:22:22 +0000 commit 12d72d032e169082308efb9d44b9964ef9fa4340 Author: Ayan Kumar Halder AuthorDate: Tue Jun 17 12:12:51 2025 +0100 Commit: Ayan Kumar Halder CommitDate: Thu Jun 19 12:23:48 2025 +0100 arm/mpu: Enable read/write to protection regions for arm32 Define prepare_selector(), read_protection_region() and write_protection_region() for arm32. Also, define GENERATE_{READ/WRITE}_PR_REG_OTHERS to access MPU regions from 32 to 254. Enable pr_{get/set}_{base/limit}(), region_is_valid() for arm32. Enable pr_of_addr() for arm32. The maximum number of regions supported is 255 (which corresponds to the maximum value in HMPUIR). Signed-off-by: Ayan Kumar Halder Reviewed-by: Luca Fancellu Reviewed-by: Hari Limaye Tested-by: Hari Limaye Acked-by: Julien Grall --- xen/arch/arm/include/asm/mpu.h | 2 - xen/arch/arm/mpu/Makefile | 1 + xen/arch/arm/mpu/arm32/Makefile | 1 + xen/arch/arm/mpu/arm32/mm.c | 164 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 2 - 5 files changed, 166 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/mpu.h b/xen/arch/arm/include/asm/mpu.h index 8f06ddac0f..63560c613b 100644 --- a/xen/arch/arm/include/asm/mpu.h +++ b/xen/arch/arm/include/asm/mpu.h @@ -25,7 +25,6 @@ #ifndef __ASSEMBLY__ -#ifdef CONFIG_ARM_64 /* * Set base address of MPU protection region. * @@ -85,7 +84,6 @@ static inline bool region_is_valid(const pr_t *pr) { return pr->prlar.reg.en; } -#endif /* CONFIG_ARM_64 */ #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/arm/mpu/Makefile b/xen/arch/arm/mpu/Makefile index 09326a5248..50f8fe4326 100644 --- a/xen/arch/arm/mpu/Makefile +++ b/xen/arch/arm/mpu/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o diff --git a/xen/arch/arm/mpu/arm32/Makefile b/xen/arch/arm/mpu/arm32/Makefile new file mode 100644 index 0000000000..b18cec4836 --- /dev/null +++ b/xen/arch/arm/mpu/arm32/Makefile @@ -0,0 +1 @@ +obj-y += mm.o diff --git a/xen/arch/arm/mpu/arm32/mm.c b/xen/arch/arm/mpu/arm32/mm.c new file mode 100644 index 0000000000..a4673c3511 --- /dev/null +++ b/xen/arch/arm/mpu/arm32/mm.c @@ -0,0 +1,164 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include +#include + +#define GENERATE_WRITE_PR_REG_CASE(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits, HPRBAR##num); \ + WRITE_SYSREG(pr->prlar.bits, HPRLAR##num); \ + break; \ + } + +#define GENERATE_WRITE_PR_REG_OTHERS(num, pr) \ + case num: \ + { \ + WRITE_SYSREG(pr->prbar.bits, HPRBAR); \ + WRITE_SYSREG(pr->prlar.bits, HPRLAR); \ + break; \ + } + +#define GENERATE_READ_PR_REG_CASE(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(HPRBAR##num); \ + pr->prlar.bits = READ_SYSREG(HPRLAR##num); \ + break; \ + } + +#define GENERATE_READ_PR_REG_OTHERS(num, pr) \ + case num: \ + { \ + pr->prbar.bits = READ_SYSREG(HPRBAR); \ + pr->prlar.bits = READ_SYSREG(HPRLAR); \ + break; \ + } + +/* + * Armv8-R supports direct access and indirect access to the MPU regions through + * registers: + * - indirect access involves changing the MPU region selector, issuing an isb + * barrier and accessing the selected region through specific registers + * - direct access involves accessing specific registers that point to + * specific MPU regions, without changing the selector, avoiding the use of + * a barrier. + * For Arm32 the HPR{B,L}AR (for n=0..31) are used for direct access to the + * first 32 MPU regions. + * For MPU regions numbered 32..254, one needs to set the region number in + * HPRSELR, followed by configuring HPR{B,L}AR. + */ +static void prepare_selector(uint8_t *sel) +{ + uint8_t cur_sel = *sel; + /* The top 24 bits of HPRSELR are RES0. */ + uint8_t val = READ_SYSREG(HPRSELR) & 0xff; + + if ( (cur_sel > 31) && (cur_sel != val) ) + { + WRITE_SYSREG(cur_sel, HPRSELR); + isb(); + } +} + +void read_protection_region(pr_t *pr_read, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_READ_PR_REG_CASE(0, pr_read); + GENERATE_READ_PR_REG_CASE(1, pr_read); + GENERATE_READ_PR_REG_CASE(2, pr_read); + GENERATE_READ_PR_REG_CASE(3, pr_read); + GENERATE_READ_PR_REG_CASE(4, pr_read); + GENERATE_READ_PR_REG_CASE(5, pr_read); + GENERATE_READ_PR_REG_CASE(6, pr_read); + GENERATE_READ_PR_REG_CASE(7, pr_read); + GENERATE_READ_PR_REG_CASE(8, pr_read); + GENERATE_READ_PR_REG_CASE(9, pr_read); + GENERATE_READ_PR_REG_CASE(10, pr_read); + GENERATE_READ_PR_REG_CASE(11, pr_read); + GENERATE_READ_PR_REG_CASE(12, pr_read); + GENERATE_READ_PR_REG_CASE(13, pr_read); + GENERATE_READ_PR_REG_CASE(14, pr_read); + GENERATE_READ_PR_REG_CASE(15, pr_read); + GENERATE_READ_PR_REG_CASE(16, pr_read); + GENERATE_READ_PR_REG_CASE(17, pr_read); + GENERATE_READ_PR_REG_CASE(18, pr_read); + GENERATE_READ_PR_REG_CASE(19, pr_read); + GENERATE_READ_PR_REG_CASE(20, pr_read); + GENERATE_READ_PR_REG_CASE(21, pr_read); + GENERATE_READ_PR_REG_CASE(22, pr_read); + GENERATE_READ_PR_REG_CASE(23, pr_read); + GENERATE_READ_PR_REG_CASE(24, pr_read); + GENERATE_READ_PR_REG_CASE(25, pr_read); + GENERATE_READ_PR_REG_CASE(26, pr_read); + GENERATE_READ_PR_REG_CASE(27, pr_read); + GENERATE_READ_PR_REG_CASE(28, pr_read); + GENERATE_READ_PR_REG_CASE(29, pr_read); + GENERATE_READ_PR_REG_CASE(30, pr_read); + GENERATE_READ_PR_REG_CASE(31, pr_read); + GENERATE_READ_PR_REG_OTHERS(32 ... 254, pr_read); + default: + BUG(); /* Can't happen */ + break; + } +} + +void write_protection_region(const pr_t *pr_write, uint8_t sel) +{ + prepare_selector(&sel); + + switch ( sel ) + { + GENERATE_WRITE_PR_REG_CASE(0, pr_write); + GENERATE_WRITE_PR_REG_CASE(1, pr_write); + GENERATE_WRITE_PR_REG_CASE(2, pr_write); + GENERATE_WRITE_PR_REG_CASE(3, pr_write); + GENERATE_WRITE_PR_REG_CASE(4, pr_write); + GENERATE_WRITE_PR_REG_CASE(5, pr_write); + GENERATE_WRITE_PR_REG_CASE(6, pr_write); + GENERATE_WRITE_PR_REG_CASE(7, pr_write); + GENERATE_WRITE_PR_REG_CASE(8, pr_write); + GENERATE_WRITE_PR_REG_CASE(9, pr_write); + GENERATE_WRITE_PR_REG_CASE(10, pr_write); + GENERATE_WRITE_PR_REG_CASE(11, pr_write); + GENERATE_WRITE_PR_REG_CASE(12, pr_write); + GENERATE_WRITE_PR_REG_CASE(13, pr_write); + GENERATE_WRITE_PR_REG_CASE(14, pr_write); + GENERATE_WRITE_PR_REG_CASE(15, pr_write); + GENERATE_WRITE_PR_REG_CASE(16, pr_write); + GENERATE_WRITE_PR_REG_CASE(17, pr_write); + GENERATE_WRITE_PR_REG_CASE(18, pr_write); + GENERATE_WRITE_PR_REG_CASE(19, pr_write); + GENERATE_WRITE_PR_REG_CASE(20, pr_write); + GENERATE_WRITE_PR_REG_CASE(21, pr_write); + GENERATE_WRITE_PR_REG_CASE(22, pr_write); + GENERATE_WRITE_PR_REG_CASE(23, pr_write); + GENERATE_WRITE_PR_REG_CASE(24, pr_write); + GENERATE_WRITE_PR_REG_CASE(25, pr_write); + GENERATE_WRITE_PR_REG_CASE(26, pr_write); + GENERATE_WRITE_PR_REG_CASE(27, pr_write); + GENERATE_WRITE_PR_REG_CASE(28, pr_write); + GENERATE_WRITE_PR_REG_CASE(29, pr_write); + GENERATE_WRITE_PR_REG_CASE(30, pr_write); + GENERATE_WRITE_PR_REG_CASE(31, pr_write); + GENERATE_WRITE_PR_REG_OTHERS(32 ... 254, pr_write); + default: + BUG(); /* Can't happen */ + break; + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/mpu/mm.c b/xen/arch/arm/mpu/mm.c index 7ab68fc8c7..ccfb37a67b 100644 --- a/xen/arch/arm/mpu/mm.c +++ b/xen/arch/arm/mpu/mm.c @@ -39,7 +39,6 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(PAGE_SIZE != SZ_4K); } -#ifdef CONFIG_ARM_64 pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) { unsigned int attr_idx = PAGE_AI_MASK(flags); @@ -110,7 +109,6 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags) return region; } -#endif /* CONFIG_ARM_64 */ void __init setup_mm(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 21 01:11:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Jun 2025 01:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1021405.1397387 (Exim 4.92) (envelope-from ) id 1uSml4-0000Mo-Ue; Sat, 21 Jun 2025 01:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1021405.1397387; Sat, 21 Jun 2025 01: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 1uSml4-0000Mg-Ry; Sat, 21 Jun 2025 01:11:02 +0000 Received: by outflank-mailman (input) for mailman id 1021405; Sat, 21 Jun 2025 01:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uSml4-0000Ma-4T for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 01:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uSml4-00CfA0-08 for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 01:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSml3-00CFyC-30 for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 01: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=url/DMlQL110dydTlllAwSHSzX1wrBZmbeqBp3DZj3U=; b=3Yzug6g5/DZ5d48FXenTuoZ105 fc1HlqSuFHTziZ8jJJe1MMXuZsDWjTKN909CwE84Mclx9iCq8wBne2iVeSwVxrkQSqMRnz1dmEfIs z9uipoRkK4wPCR6aEJs72lV7UNOCM9XxuVtkBFiAmLslKECuTWX/LXkqNwSbfTuuPul0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/dt: Remove loop in dt_read_number() Message-Id: Date: Sat, 21 Jun 2025 01:11:01 +0000 commit c65ff27d7158ca31cca0bb4b77a515c8a5bddced Author: Alejandro Vallejo AuthorDate: Thu Jun 19 13:42:04 2025 +0200 Commit: Stefano Stabellini CommitDate: Fri Jun 20 17:47:31 2025 -0700 xen/dt: Remove loop in dt_read_number() The DT spec declares only two number types for a property: u32 and u64, as per Table 2.3 in Section 2.2.4. Remove unbounded loop and replace with a switch statement. Default to a size of 1 cell in the nonsensical size case, with a warning printed on the Xen console. Suggested-by: Daniel P. Smith" Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/include/xen/device_tree.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 75017e4266..d2de7c3a13 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -261,10 +261,22 @@ void intc_dt_preinit(void); /* Helper to read a big number; size is in cells (not bytes) */ static inline u64 dt_read_number(const __be32 *cell, int size) { - u64 r = 0; + u64 r = be32_to_cpu(*cell); + + switch ( size ) + { + case 1: + break; + case 2: + r = (r << 32) | be32_to_cpu(cell[1]); + break; + default: + /* Nonsensical size. default to 1 */ + printk(XENLOG_ERR "dt_read_number(,%d) bad size\n", size); + ASSERT_UNREACHABLE(); + break; + }; - while ( size-- ) - r = (r << 32) | be32_to_cpu(*(cell++)); return r; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 21 02:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Jun 2025 02:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1021477.1397471 (Exim 4.92) (envelope-from ) id 1uSo2Q-0006Va-VQ; Sat, 21 Jun 2025 02:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1021477.1397471; Sat, 21 Jun 2025 02: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 1uSo2Q-0006VS-Sv; Sat, 21 Jun 2025 02:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1021477; Sat, 21 Jun 2025 02:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uSo2P-0006VM-W4 for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 02:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uSo2P-00ChAn-2m for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 02:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSo2P-00CJ2E-2d for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 02: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=vLNwk37aHn7CrapmRgmNHXNjIMnUBYUpGbrn3WU3OzE=; b=m3fCiNwxhgIWwdVKmiHMVitYjH oC8qdaHPQUwqjoJCSGpuaWNPR1q3VZIRF5uGpMmMMMfalEWSZAC58ByK6H6tMG4rQ+h3fzIL+9xe6 xRylvbBp//blAV/KSegitAom/JGXSbYt4raQqs20WTTOoMRNstIzEuqRPuBphBctEY04=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/dt: Remove loop in dt_read_number() Message-Id: Date: Sat, 21 Jun 2025 02:33:01 +0000 commit c65ff27d7158ca31cca0bb4b77a515c8a5bddced Author: Alejandro Vallejo AuthorDate: Thu Jun 19 13:42:04 2025 +0200 Commit: Stefano Stabellini CommitDate: Fri Jun 20 17:47:31 2025 -0700 xen/dt: Remove loop in dt_read_number() The DT spec declares only two number types for a property: u32 and u64, as per Table 2.3 in Section 2.2.4. Remove unbounded loop and replace with a switch statement. Default to a size of 1 cell in the nonsensical size case, with a warning printed on the Xen console. Suggested-by: Daniel P. Smith" Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini --- xen/include/xen/device_tree.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 75017e4266..d2de7c3a13 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -261,10 +261,22 @@ void intc_dt_preinit(void); /* Helper to read a big number; size is in cells (not bytes) */ static inline u64 dt_read_number(const __be32 *cell, int size) { - u64 r = 0; + u64 r = be32_to_cpu(*cell); + + switch ( size ) + { + case 1: + break; + case 2: + r = (r << 32) | be32_to_cpu(cell[1]); + break; + default: + /* Nonsensical size. default to 1 */ + printk(XENLOG_ERR "dt_read_number(,%d) bad size\n", size); + ASSERT_UNREACHABLE(); + break; + }; - while ( size-- ) - r = (r << 32) | be32_to_cpu(*(cell++)); return r; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 21 02:33:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Jun 2025 02:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1021478.1397474 (Exim 4.92) (envelope-from ) id 1uSo2c-0006XT-0f; Sat, 21 Jun 2025 02:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1021478.1397474; Sat, 21 Jun 2025 02: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 1uSo2b-0006XL-UI; Sat, 21 Jun 2025 02:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1021478; Sat, 21 Jun 2025 02:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uSo2a-0006X4-93 for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 02:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uSo2a-00ChBQ-0k for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 02:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uSo2a-00CJ3r-0d for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 02: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=ZwNJhApvQVtOG6OIIEQ7lNqdjQ/IgvujvDf0eqsDGWg=; b=gIOdRFyfyUibTQjcCYfLhzJ3Kn WptRqWW+tsYVhO5KurIht6dQA0/azElBOrg06Yj1wFvP0uXBlCrWeMAG2sXWTG78/g2PpkbBaCnV0 AiURPZ4PCgy82e+NmWFSXlEQ3eQopY8c6z7odKQJnu6fVtb1sCJkmDkUjYCX6hM3TlsM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: add header guards to generated asm generic headers Message-Id: Date: Sat, 21 Jun 2025 02:33:12 +0000 commit ee79f378311b8bed0e848e0598190ba70b227fce Author: Stefano Stabellini AuthorDate: Fri Jun 6 13:34:17 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri Jun 20 19:20:05 2025 -0700 xen: add header guards to generated asm generic headers MISRA D4.10 requires to have proper header guards in place in all header files. Add header guards for generated asm generic headers as well. Suggested-by: Jan Beulich Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/scripts/Makefile.asm-generic | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic index b0d356bfa3..b082801808 100644 --- a/xen/scripts/Makefile.asm-generic +++ b/xen/scripts/Makefile.asm-generic @@ -32,7 +32,14 @@ old-headers := $(wildcard $(obj)/*.h) unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) quiet_cmd_wrap = WRAP $@ - cmd_wrap = echo "\#include " > $@ + cmd_wrap = \ + arch=$$(echo $@ | sed -n 's:.*arch/\([^/]*\)/.*:\1:p' | tr a-z A-Z); \ + upper=$$(echo $*.h | tr a-z A-Z | tr '/.' '__'); \ + echo "\#ifndef $${arch}_GENERIC_$${upper}" > $@.new; \ + echo "\#define $${arch}_GENERIC_$${upper}" >> $@.new; \ + echo "\#include " >> $@.new; \ + echo "\#endif /* $${arch}_GENERIC_$${upper} */" >> $@.new; \ + mv -f $@.new $@ quiet_cmd_remove = REMOVE $(unwanted) cmd_remove = rm -f $(unwanted) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Jun 21 18:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 21 Jun 2025 18:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1021676.1397589 (Exim 4.92) (envelope-from ) id 1uT2VX-0008Tx-Nf; Sat, 21 Jun 2025 18:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1021676.1397589; Sat, 21 Jun 2025 18: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 1uT2VX-0008TU-Kl; Sat, 21 Jun 2025 18:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1021676; Sat, 21 Jun 2025 18:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uT2VW-00082Q-ES for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 18:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uT2VV-00D0JD-1U for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 18:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uT2VV-00Cwa2-1M for xen-changelog@lists.xenproject.org; Sat, 21 Jun 2025 18: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=Tx18aWxVG23o/+FyEH6TbPVQ6TQTkogVSGd6xMphfwc=; b=DkF78o847UsWuMojGTHNHItiqt Ax4ATrNs3mwMIJdeGoMrsjNYGcyVSv3bmFJ1tzPoQrsYK5sSPKhQ2r8X9rDtPrK3fXAqhNmZJXkKs xqdxlSkod9R3MQfsoad08y/h3GrecyI2G0NFgwmODp590mzbWAMuc9PHcHqddp7zCEdw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: fix header guard generation for asm-generic headers Message-Id: Date: Sat, 21 Jun 2025 18:00:01 +0000 commit eb61a4fb14d262825d32a2b0eac1f4221144c166 Author: Nicola Vetrini AuthorDate: Sat Jun 21 11:58:08 2025 +0200 Commit: Stefano Stabellini CommitDate: Sat Jun 21 10:54:54 2025 -0700 xen: fix header guard generation for asm-generic headers Dashes were wrongly not translated into underscores, thus generating an unexpected guard identifier. Fixes: ee79f378311b ("xen: add header guards to generated asm generic headers") Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/scripts/Makefile.asm-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic index b082801808..f6850758c5 100644 --- a/xen/scripts/Makefile.asm-generic +++ b/xen/scripts/Makefile.asm-generic @@ -34,7 +34,7 @@ unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) quiet_cmd_wrap = WRAP $@ cmd_wrap = \ arch=$$(echo $@ | sed -n 's:.*arch/\([^/]*\)/.*:\1:p' | tr a-z A-Z); \ - upper=$$(echo $*.h | tr a-z A-Z | tr '/.' '__'); \ + upper=$$(echo $*.h | tr a-z A-Z | tr '/.-' '__'); \ echo "\#ifndef $${arch}_GENERIC_$${upper}" > $@.new; \ echo "\#define $${arch}_GENERIC_$${upper}" >> $@.new; \ echo "\#include " >> $@.new; \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sun Jun 22 19:22:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Jun 2025 19:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1021879.1397603 (Exim 4.92) (envelope-from ) id 1uTQGR-0002Vf-3I; Sun, 22 Jun 2025 19:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1021879.1397603; Sun, 22 Jun 2025 19: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 1uTQGR-0002VW-0C; Sun, 22 Jun 2025 19:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1021879; Sun, 22 Jun 2025 19:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTQGP-0002VQ-OX for xen-changelog@lists.xenproject.org; Sun, 22 Jun 2025 19:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTQGP-00Egyu-1m for xen-changelog@lists.xenproject.org; Sun, 22 Jun 2025 19:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTQGP-00DuGG-1d for xen-changelog@lists.xenproject.org; Sun, 22 Jun 2025 19: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=ujRb6cRfQPH4Y6cz3HrmWjaAgHgXJKUMZM7SHb+mFX4=; b=WZJlOQcLi0wHvkWsIhTa/EshPs ViPNV1Za2Imin5sXFkA333fsF6QahjGVYUx92F7j7s8WhReHSPA0c6xJXAedBoVFWJp+08FmeL6sZ 8g+Ao7ZR6WqQkkMqPL2TUQzOfJQI4yhDRlk/foWgc9dUt6vo9IQ1nvvRY+a3ha1OoFGY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: add header guards to generated asm generic headers Message-Id: Date: Sun, 22 Jun 2025 19:22:01 +0000 commit ee79f378311b8bed0e848e0598190ba70b227fce Author: Stefano Stabellini AuthorDate: Fri Jun 6 13:34:17 2025 -0700 Commit: Stefano Stabellini CommitDate: Fri Jun 20 19:20:05 2025 -0700 xen: add header guards to generated asm generic headers MISRA D4.10 requires to have proper header guards in place in all header files. Add header guards for generated asm generic headers as well. Suggested-by: Jan Beulich Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/scripts/Makefile.asm-generic | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic index b0d356bfa3..b082801808 100644 --- a/xen/scripts/Makefile.asm-generic +++ b/xen/scripts/Makefile.asm-generic @@ -32,7 +32,14 @@ old-headers := $(wildcard $(obj)/*.h) unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) quiet_cmd_wrap = WRAP $@ - cmd_wrap = echo "\#include " > $@ + cmd_wrap = \ + arch=$$(echo $@ | sed -n 's:.*arch/\([^/]*\)/.*:\1:p' | tr a-z A-Z); \ + upper=$$(echo $*.h | tr a-z A-Z | tr '/.' '__'); \ + echo "\#ifndef $${arch}_GENERIC_$${upper}" > $@.new; \ + echo "\#define $${arch}_GENERIC_$${upper}" >> $@.new; \ + echo "\#include " >> $@.new; \ + echo "\#endif /* $${arch}_GENERIC_$${upper} */" >> $@.new; \ + mv -f $@.new $@ quiet_cmd_remove = REMOVE $(unwanted) cmd_remove = rm -f $(unwanted) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jun 22 19:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 22 Jun 2025 19:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1021880.1397607 (Exim 4.92) (envelope-from ) id 1uTQGb-0002X8-4C; Sun, 22 Jun 2025 19:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1021880.1397607; Sun, 22 Jun 2025 19: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 1uTQGb-0002X0-1W; Sun, 22 Jun 2025 19:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1021880; Sun, 22 Jun 2025 19:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTQGZ-0002Wq-Ld for xen-changelog@lists.xenproject.org; Sun, 22 Jun 2025 19:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTQGZ-00Egz8-24 for xen-changelog@lists.xenproject.org; Sun, 22 Jun 2025 19:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTQGZ-00DuIJ-1w for xen-changelog@lists.xenproject.org; Sun, 22 Jun 2025 19: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=OyrEdgkBfQlnx+SkV7Gef47sgzb6taNsnLvWHLh73/Y=; b=tBnxUcojSKG0UgDKxGSD8WDDgw +f1TcbduyhaNuBx/aUlwt+T4i7pU7nUDMw6cXehNPN1ebdhEeN5v1EmjCFzeKtWKXdbaTsw2AbGlO VTxMqf7jHUoR6KcvRQdsORCY7VKhD0NDEIGrsnrlIzKUBQY5/lQPTCco0RITFQWacMD0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: fix header guard generation for asm-generic headers Message-Id: Date: Sun, 22 Jun 2025 19:22:11 +0000 commit eb61a4fb14d262825d32a2b0eac1f4221144c166 Author: Nicola Vetrini AuthorDate: Sat Jun 21 11:58:08 2025 +0200 Commit: Stefano Stabellini CommitDate: Sat Jun 21 10:54:54 2025 -0700 xen: fix header guard generation for asm-generic headers Dashes were wrongly not translated into underscores, thus generating an unexpected guard identifier. Fixes: ee79f378311b ("xen: add header guards to generated asm generic headers") Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/scripts/Makefile.asm-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic index b082801808..f6850758c5 100644 --- a/xen/scripts/Makefile.asm-generic +++ b/xen/scripts/Makefile.asm-generic @@ -34,7 +34,7 @@ unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) quiet_cmd_wrap = WRAP $@ cmd_wrap = \ arch=$$(echo $@ | sed -n 's:.*arch/\([^/]*\)/.*:\1:p' | tr a-z A-Z); \ - upper=$$(echo $*.h | tr a-z A-Z | tr '/.' '__'); \ + upper=$$(echo $*.h | tr a-z A-Z | tr '/.-' '__'); \ echo "\#ifndef $${arch}_GENERIC_$${upper}" > $@.new; \ echo "\#define $${arch}_GENERIC_$${upper}" >> $@.new; \ echo "\#include " >> $@.new; \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022185.1397912 (Exim 4.92) (envelope-from ) id 1uTcmY-00027d-RA; Mon, 23 Jun 2025 08:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022185.1397912; Mon, 23 Jun 2025 08: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 1uTcmY-00027V-Nz; Mon, 23 Jun 2025 08:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1022185; Mon, 23 Jun 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 1uTcmY-00027P-Di for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcmY-00GA68-1F for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcmY-00ERMY-17 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=YohpYP1Xi/NYWmjR19mRtmJG+nkw/DhgCRSbmLPqNS0=; b=tCDpRWJecLkERJXkovG+M2yfk9 QmvNHzEIJ47n9x0dmqIcwzX60EgyTv6Rg1/a4xEYlrHBT2yJOy6ANYpOsA5G5T5/Sq0/43nkqseqz Eyg7np3X2oLjsAMSMB6rVlO+J2N3Ms+S6xTpCAu/y4Ynrf+L215OS/FLjxwxGcb83Qp4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] add kexec framework Message-Id: Date: Mon, 23 Jun 2025 08:44:02 +0000 commit e447eec022ac3f3d2c5181b494c97f8438be4175 Author: Juergen Gross AuthorDate: Mon Jun 23 10:38:57 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:38:57 2025 +0200 add kexec framework Add a new config option CONFIG_KEXEC for support of kexec-ing into a new mini-os kernel. Add a related kexec.c source and a kexec.h header. For now allow CONFIG_KEXEC to be set only for PVH variant of mini-os. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- Config.mk | 1 + Makefile | 1 + arch/x86/testbuild/all-no | 1 + arch/x86/testbuild/all-yes | 2 ++ arch/x86/testbuild/kexec | 4 ++++ include/kexec.h | 7 ++++++ kexec.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+) diff --git a/Config.mk b/Config.mk index e493533..e2afb1b 100644 --- a/Config.mk +++ b/Config.mk @@ -204,6 +204,7 @@ CONFIG-n += CONFIG_LIBXENGUEST CONFIG-n += CONFIG_LIBXENTOOLCORE CONFIG-n += CONFIG_LIBXENTOOLLOG CONFIG-n += CONFIG_LIBXENMANAGE +CONFIG-n += CONFIG_KEXEC # Setting CONFIG_USE_XEN_CONSOLE copies all print output to the Xen emergency # console apart of standard dom0 handled console. CONFIG-n += CONFIG_USE_XEN_CONSOLE diff --git a/Makefile b/Makefile index d094858..a64913a 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ src-y += gntmap.c src-y += gnttab.c src-y += hypervisor.c src-y += kernel.c +src-$(CONFIG_KEXEC) += kexec.c src-y += lock.c src-y += main.c src-y += mm.c diff --git a/arch/x86/testbuild/all-no b/arch/x86/testbuild/all-no index 5b3e99e..b2ee5ce 100644 --- a/arch/x86/testbuild/all-no +++ b/arch/x86/testbuild/all-no @@ -18,3 +18,4 @@ CONFIG_LIBXS = n CONFIG_LWIP = n CONFIG_BALLOON = n CONFIG_USE_XEN_CONSOLE = n +CONFIG_KEXEC = n diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes index 8ae489a..c9a990f 100644 --- a/arch/x86/testbuild/all-yes +++ b/arch/x86/testbuild/all-yes @@ -19,3 +19,5 @@ CONFIG_BALLOON = y CONFIG_USE_XEN_CONSOLE = y # The following are special: they need support from outside CONFIG_LWIP = n +# KEXEC not implemented for PARAVIRT +CONFIG_KEXEC = n diff --git a/arch/x86/testbuild/kexec b/arch/x86/testbuild/kexec new file mode 100644 index 0000000..ea17b4d --- /dev/null +++ b/arch/x86/testbuild/kexec @@ -0,0 +1,4 @@ +CONFIG_PARAVIRT = n +CONFIG_BALLOON = y +CONFIG_USE_XEN_CONSOLE = y +CONFIG_KEXEC = y diff --git a/include/kexec.h b/include/kexec.h new file mode 100644 index 0000000..6fd9677 --- /dev/null +++ b/include/kexec.h @@ -0,0 +1,7 @@ +#ifndef _KEXEC_H +#define _KEXEC_H + +int kexec(void *kernel, unsigned long kernel_size, + const char *cmdline); + +#endif /* _KEXEC_H */ diff --git a/kexec.c b/kexec.c new file mode 100644 index 0000000..7fcc5c6 --- /dev/null +++ b/kexec.c @@ -0,0 +1,60 @@ +/****************************************************************************** + * kexec.c + * + * Support of kexec (reboot locally into new mini-os kernel). + * + * Copyright (c) 2024, Juergen Gross, SUSE Linux GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifdef CONFIG_PARAVIRT +#error "kexec support not implemented in PV variant" +#endif + +#include +#include +#include +#include + +/* + * General approach for kexec support (PVH only) is as follows: + * + * - New kernel needs to be in memory in form of a ELF binary in a virtual + * memory region. + * - A new start_info structure is constructed in memory with the final + * memory locations included. + * - Page tables and memory pages of the new kernel binary conflicting with the + * final memory layout are moved to non-conflicting locations. + * - All memory areas needed for kexec execution are being finalized. + * - The final kexec execution stage is copied to a memory area below 4G which + * doesn't conflict with the target areas of kernel etc. + * - From here on a graceful failure is no longer possible. + * - Grants and event channels are torn down. + * - Execution continues in the final execution stage. + * - All data is copied to its final addresses. + * - CPU is switched to 32-bit mode with paging disabled. + * - The new kernel is activated. + */ + +int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) +{ + return ENOSYS; +} +EXPORT_SYMBOL(kexec); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:44:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022186.1397915 (Exim 4.92) (envelope-from ) id 1uTcmi-00029P-SQ; Mon, 23 Jun 2025 08:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022186.1397915; Mon, 23 Jun 2025 08: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 1uTcmi-00029H-PP; Mon, 23 Jun 2025 08:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1022186; Mon, 23 Jun 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 1uTcmi-00029B-GG for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcmi-00GA6E-1X for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcmi-00ERNt-1P for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=uimflaBx/Bs/SwT7lvCqpZpu3DNLF8xZPfeSHK6+tbo=; b=kkmZAfKwG5pX6Dv3xATr4Yiowf AIQkP/1K9bpEa6fS58QpoNoVxNfFF1Qqw7k1elnMpoJ6k44bNiMaJlBZCbVEfn0cgiLNJCXrGTskC 605jF/NPsAbLBIwDcAPOOQdkU8s87h8ff4EJKih2RqOT0ihsjM1xpYJfZYJ49ChAPRx0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] Mini-OS: add final kexec stage Message-Id: Date: Mon, 23 Jun 2025 08:44:12 +0000 commit b56a4c9029ef02597f9eb41e736433fdf880293e Author: Juergen Gross AuthorDate: Mon Jun 23 10:39:41 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:39:41 2025 +0200 Mini-OS: add final kexec stage Add the code and data definitions of the final kexec stage. Put the code and related data into a dedicated section in order to be able to copy it to another location. For this reason there must be no absolute relocations being used in the code or data. Being functionally related, add a function for adding a final kexec action. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/kexec.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/minios-x86.lds.S | 9 ++++ arch/x86/x86_hvm.S | 46 ++++++++++++++++++++ include/kexec.h | 27 ++++++++++++ include/x86/os.h | 5 +++ kexec.c | 22 ++++++++++ 6 files changed, 216 insertions(+) diff --git a/arch/x86/kexec.c b/arch/x86/kexec.c new file mode 100644 index 0000000..a8a2fa9 --- /dev/null +++ b/arch/x86/kexec.c @@ -0,0 +1,107 @@ +/****************************************************************************** + * kexec.c + * + * Support of kexec (reboot locally into new mini-os kernel). + * + * Copyright (c) 2024, Juergen Gross, SUSE Linux GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifdef CONFIG_KEXEC + +#include +#include +#include + +/* + * Final stage of kexec. Copies all data to the final destinations, zeroes + * .bss and activates new kernel. + * Must be called with interrupts off. Stack, code and data must be + * accessible via identity mapped virtual addresses (virt == phys). Copying + * and zeroing is done using virtual addresses. + * No relocations inside the function are allowed, as it is copied to an + * allocated page before being executed. + */ +static void __attribute__((__section__(".text.kexec"))) + kexec_final(struct kexec_action *actions, unsigned long real) +{ + char *src, *dest; + unsigned int a, cnt; + + for ( a = 0; ; a++ ) + { + switch ( actions[a].action ) + { + case KEXEC_COPY: + dest = actions[a].dest; + src = actions[a].src; + for ( cnt = 0; cnt < actions[a].len; cnt++ ) + *dest++ = *src++; + break; + + case KEXEC_ZERO: + dest = actions[a].dest; + for ( cnt = 0; cnt < actions[a].len; cnt++ ) + *dest++ = 0; + break; + + case KEXEC_CALL: + asm("movl %0, %%ebx\n\t" + "movl %1, %%edi\n\t" + "jmp *%2" + : :"m" (actions[a].src), "m" (actions[a].dest), "m" (real)); + break; + } + } +} + +#define KEXEC_STACK_LONGS 8 +static unsigned long __attribute__((__section__(".data.kexec"))) + kexec_stack[KEXEC_STACK_LONGS]; + +static unsigned long get_kexec_addr(void *kexec_page, void *addr) +{ + unsigned long off = (unsigned long)addr - (unsigned long)_kexec_start; + + return (unsigned long)kexec_page + off; +} + +void do_kexec(void *kexec_page) +{ + unsigned long actions; + unsigned long stack; + unsigned long final; + unsigned long phys; + + actions = get_kexec_addr(kexec_page, kexec_actions); + stack = get_kexec_addr(kexec_page, kexec_stack + KEXEC_STACK_LONGS); + final = get_kexec_addr(kexec_page, kexec_final); + phys = get_kexec_addr(kexec_page, kexec_phys); + + memcpy(kexec_page, _kexec_start, KEXEC_SECSIZE); + asm("cli\n\t" + "mov %0, %%"ASM_SP"\n\t" + "mov %1, %%"ASM_ARG1"\n\t" + "mov %2, %%"ASM_ARG2"\n\t" + "jmp *%3" + : :"m" (stack), "m" (actions), "m" (phys), "m" (final)); +} + +#endif /* CONFIG_KEXEC */ diff --git a/arch/x86/minios-x86.lds.S b/arch/x86/minios-x86.lds.S index 8aae2fd..8a1db7d 100644 --- a/arch/x86/minios-x86.lds.S +++ b/arch/x86/minios-x86.lds.S @@ -87,6 +87,15 @@ SECTIONS _edata = .; /* End of data section */ + . = ALIGN(8); + _kexec_start = .; /* Kexec relocatable code/data */ + .kexec : { + *(.text.kexec) + *(.data.kexec) + } + _kexec_end = .; + ASSERT(_kexec_end - _kexec_start <= 4096, "kexec code/data > 1 page") + __bss_start = .; /* BSS */ .bss : { *(.bss) diff --git a/arch/x86/x86_hvm.S b/arch/x86/x86_hvm.S index 42a5f02..e2f82e9 100644 --- a/arch/x86/x86_hvm.S +++ b/arch/x86/x86_hvm.S @@ -85,4 +85,50 @@ page_table_l2: #endif .align __PAGE_SIZE, 0 +#ifdef CONFIG_KEXEC +.section .text.kexec, "ax", @progbits + +/* + * Switch off paging and call new OS for kexec. + * %ebx holds the physical address of the start_info structure + * %edi holds the physical address of the entry point to call + */ +.globl kexec_phys +kexec_phys: + /* Set DS, ES, SS to 0...ffffffff. */ + mov $(GDTE_DS32_DPL0 * 8), %eax + mov %eax, %ds + mov %eax, %es + mov %eax, %ss + +#ifdef __x86_64__ + /* Switch to 32-bit mode. */ + pushq $(GDTE_CS32_DPL0 * 8) + lea cs32_switch(%rip),%edx + push %rdx + lretq + + .code32 +cs32_switch: +#endif + /* Set %cr0 and %cr4 (disables paging). */ + mov $X86_CR0_PE, %eax + mov %eax, %cr0 + mov $0, %eax + mov %eax, %cr4 +#ifdef __x86_64__ + /* Disable 64-bit mode. */ + mov $MSR_EFER, %ecx + rdmsr + btr $_EFER_LME, %eax + wrmsr +#endif + + jmp *%edi + +#ifdef __x86_64__ + .code64 +#endif +#endif /* CONFIG_KEXEC */ + .text diff --git a/include/kexec.h b/include/kexec.h index 6fd9677..722be45 100644 --- a/include/kexec.h +++ b/include/kexec.h @@ -1,7 +1,34 @@ #ifndef _KEXEC_H #define _KEXEC_H +/* One element of kexec actions (last element must have action KEXEC_CALL): */ +struct kexec_action { + enum { + KEXEC_COPY, /* Copy len bytes from src to dest. */ + KEXEC_ZERO, /* Zero len bytes at dest. */ + KEXEC_CALL /* Call dest with paging turned off, param is src. */ + } action; + unsigned int len; + void *dest; + void *src; +}; + +#define KEXEC_MAX_ACTIONS 16 + +extern char _kexec_start[], _kexec_end[]; +extern struct kexec_action kexec_actions[KEXEC_MAX_ACTIONS]; + +int kexec_add_action(int action, void *dest, void *src, unsigned int len); + +#define KEXEC_SECSIZE ((unsigned long)_kexec_end - (unsigned long)_kexec_start) + int kexec(void *kernel, unsigned long kernel_size, const char *cmdline); +/* Initiate final kexec stage. */ +void do_kexec(void *kexec_page); + +/* Assembler code for switching off paging and passing execution to new OS. */ +void kexec_phys(void); + #endif /* _KEXEC_H */ diff --git a/include/x86/os.h b/include/x86/os.h index 0095be1..8a057d8 100644 --- a/include/x86/os.h +++ b/include/x86/os.h @@ -27,6 +27,7 @@ #define MSR_EFER 0xc0000080 #define _EFER_LME 8 /* Long mode enable */ +#define X86_CR0_PE 0x00000001 /* Protected mode enable */ #define X86_CR0_WP 0x00010000 /* Write protect */ #define X86_CR0_PG 0x80000000 /* Paging */ #define X86_CR4_PAE 0x00000020 /* enable physical address extensions */ @@ -64,9 +65,13 @@ #if defined(__i386__) #define __SZ "l" #define __REG "e" +#define ASM_ARG1 "eax" +#define ASM_ARG2 "edx" #else #define __SZ "q" #define __REG "r" +#define ASM_ARG1 "rdi" +#define ASM_ARG2 "rsi" #endif #define ASM_SP __REG"sp" diff --git a/kexec.c b/kexec.c index 7fcc5c6..b69e145 100644 --- a/kexec.c +++ b/kexec.c @@ -58,3 +58,25 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) return ENOSYS; } EXPORT_SYMBOL(kexec); + +struct kexec_action __attribute__((__section__(".data.kexec"))) + kexec_actions[KEXEC_MAX_ACTIONS]; +static unsigned int act_idx; + +int kexec_add_action(int action, void *dest, void *src, unsigned int len) +{ + struct kexec_action *act; + + if ( act_idx == KEXEC_MAX_ACTIONS ) + return -ENOSPC; + + act = kexec_actions + act_idx; + act_idx++; + + act->action = action; + act->len = len; + act->dest = dest; + act->src = src; + + return 0; +} -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022187.1397919 (Exim 4.92) (envelope-from ) id 1uTcmt-0002Cp-Ty; Mon, 23 Jun 2025 08:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022187.1397919; Mon, 23 Jun 2025 08: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 1uTcmt-0002Cd-R1; Mon, 23 Jun 2025 08:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1022187; Mon, 23 Jun 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 1uTcms-0002Bb-Iz for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcms-00GA6M-1m for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcms-00EROg-1g for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=gnaFjEmDoIRuS4DzT1Wnp8KTq/NzhDg4+WIkHOzeYKI=; b=oGvPoFrJ9uNdOXFDRjG7jX3TV4 EVM833TvRGZ31NXQ4qFna2CCzjjU9liREYy4q5j2ouv7y5gRwvZG8uc6o8cz8Oi9vNybG1Xydqr2O rHfQiu2Av7DDJUW7DL8Q5UnbLdsHVpDYdd85CuRvtrxm3cV1TQYp4VgkTQgiQ3OnIuoo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: add elf.h Message-Id: Date: Mon, 23 Jun 2025 08:44:22 +0000 commit b4e4b5d6deffc29c077c03f6194a2e1f9d28a180 Author: Juergen Gross AuthorDate: Mon Jun 23 10:40:08 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:40:08 2025 +0200 mini-os: add elf.h Add some definitions for accessing an ELF file. Only the file header and the program header are needed. The main source for those are elfstructs.h and libelf.h from the Xen tree. The license boiler plate of those files is being kept in the resulting header file. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- include/elf.h | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 300 insertions(+) diff --git a/include/elf.h b/include/elf.h new file mode 100644 index 0000000..fb3cae0 --- /dev/null +++ b/include/elf.h @@ -0,0 +1,300 @@ +#ifndef __ELF_H__ +#define __ELF_H__ +/* + * Copyright (c) 1995, 1996 Erik Theisen. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +typedef uint32_t Elf32_Addr; /* Unsigned program address */ +typedef uint32_t Elf32_Off; /* Unsigned file offset */ +typedef uint16_t Elf32_Half; /* Unsigned medium integer */ +typedef uint32_t Elf32_Word; /* Unsigned large integer */ + +typedef uint64_t Elf64_Addr; +typedef uint64_t Elf64_Off; +typedef uint16_t Elf64_Half; +typedef uint32_t Elf64_Word; +typedef uint64_t Elf64_Xword; + +/* Unique build id string format when using --build-id. */ +#define NT_GNU_BUILD_ID 3 + +/* + * e_ident[] identification indexes + * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html + */ +#define EI_MAG0 0 /* file ID */ +#define EI_MAG1 1 /* file ID */ +#define EI_MAG2 2 /* file ID */ +#define EI_MAG3 3 /* file ID */ +#define EI_CLASS 4 /* file class */ +#define EI_DATA 5 /* data encoding */ +#define EI_VERSION 6 /* ELF header version */ +#define EI_OSABI 7 /* OS/ABI ID */ +#define EI_ABIVERSION 8 /* ABI version */ +#define EI_PAD 9 /* start of pad bytes */ +#define EI_NIDENT 16 /* Size of e_ident[] */ + +/* e_ident[] magic number */ +#define ELFMAG0 0x7f /* e_ident[EI_MAG0] */ +#define ELFMAG1 'E' /* e_ident[EI_MAG1] */ +#define ELFMAG2 'L' /* e_ident[EI_MAG2] */ +#define ELFMAG3 'F' /* e_ident[EI_MAG3] */ +#define ELFMAG "\177ELF" /* magic */ +#define SELFMAG 4 /* size of magic */ + +/* e_ident[] file class */ +#define ELFCLASSNONE 0 /* invalid */ +#define ELFCLASS32 1 /* 32-bit objs */ +#define ELFCLASS64 2 /* 64-bit objs */ +#define ELFCLASSNUM 3 /* number of classes */ + +/* e_ident[] data encoding */ +#define ELFDATANONE 0 /* invalid */ +#define ELFDATA2LSB 1 /* Little-Endian */ +#define ELFDATA2MSB 2 /* Big-Endian */ +#define ELFDATANUM 3 /* number of data encode defines */ + +/* e_ident */ +#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \ + (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \ + (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \ + (ehdr).e_ident[EI_MAG3] == ELFMAG3) + +/* e_flags */ +#define EF_ARM_EABI_MASK 0xff000000 +#define EF_ARM_EABI_UNKNOWN 0x00000000 +#define EF_ARM_EABI_VER1 0x01000000 +#define EF_ARM_EABI_VER2 0x02000000 +#define EF_ARM_EABI_VER3 0x03000000 +#define EF_ARM_EABI_VER4 0x04000000 +#define EF_ARM_EABI_VER5 0x05000000 + +/* ELF Header */ +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* ELF Identification */ + Elf32_Half e_type; /* object file type */ + Elf32_Half e_machine; /* machine */ + Elf32_Word e_version; /* object file version */ + Elf32_Addr e_entry; /* virtual entry point */ + Elf32_Off e_phoff; /* program header table offset */ + Elf32_Off e_shoff; /* section header table offset */ + Elf32_Word e_flags; /* processor-specific flags */ + Elf32_Half e_ehsize; /* ELF header size */ + Elf32_Half e_phentsize; /* program header entry size */ + Elf32_Half e_phnum; /* number of program header entries */ + Elf32_Half e_shentsize; /* section header entry size */ + Elf32_Half e_shnum; /* number of section header entries */ + Elf32_Half e_shstrndx; /* section header table's "section + header string table" entry offset */ +} Elf32_Ehdr; + +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* Id bytes */ + Elf64_Half e_type; /* file type */ + Elf64_Half e_machine; /* machine type */ + Elf64_Word e_version; /* version number */ + Elf64_Addr e_entry; /* entry point */ + Elf64_Off e_phoff; /* Program hdr offset */ + Elf64_Off e_shoff; /* Section hdr offset */ + Elf64_Word e_flags; /* Processor flags */ + Elf64_Half e_ehsize; /* sizeof ehdr */ + Elf64_Half e_phentsize; /* Program header entry size */ + Elf64_Half e_phnum; /* Number of program headers */ + Elf64_Half e_shentsize; /* Section header entry size */ + Elf64_Half e_shnum; /* Number of section headers */ + Elf64_Half e_shstrndx; /* String table index */ +} Elf64_Ehdr; + +/* e_type */ +#define ET_NONE 0 /* No file type */ +#define ET_REL 1 /* relocatable file */ +#define ET_EXEC 2 /* executable file */ +#define ET_DYN 3 /* shared object file */ +#define ET_CORE 4 /* core file */ +#define ET_NUM 5 /* number of types */ +#define ET_LOPROC 0xff00 /* reserved range for processor */ +#define ET_HIPROC 0xffff /* specific e_type */ + +/* e_machine */ +#define EM_NONE 0 /* No Machine */ +#define EM_386 3 /* Intel 80386 */ +#define EM_PPC64 21 /* PowerPC 64-bit */ +#define EM_ARM 40 /* Advanced RISC Machines ARM */ +#define EM_X86_64 62 /* AMD x86-64 architecture */ +#define EM_AARCH64 183 /* ARM 64-bit */ + +/* Version */ +#define EV_NONE 0 /* Invalid */ +#define EV_CURRENT 1 /* Current */ +#define EV_NUM 2 /* number of versions */ + +/* Program Header */ +typedef struct { + Elf32_Word p_type; /* segment type */ + Elf32_Off p_offset; /* segment offset */ + Elf32_Addr p_vaddr; /* virtual address of segment */ + Elf32_Addr p_paddr; /* physical address - ignored? */ + Elf32_Word p_filesz; /* number of bytes in file for seg. */ + Elf32_Word p_memsz; /* number of bytes in mem. for seg. */ + Elf32_Word p_flags; /* flags */ + Elf32_Word p_align; /* memory alignment */ +} Elf32_Phdr; + +typedef struct { + Elf64_Word p_type; /* entry type */ + Elf64_Word p_flags; /* flags */ + Elf64_Off p_offset; /* offset */ + Elf64_Addr p_vaddr; /* virtual address */ + Elf64_Addr p_paddr; /* physical address */ + Elf64_Xword p_filesz; /* file size */ + Elf64_Xword p_memsz; /* memory size */ + Elf64_Xword p_align; /* memory & file alignment */ +} Elf64_Phdr; + +/* Segment types - p_type */ +#define PT_NULL 0 /* unused */ +#define PT_LOAD 1 /* loadable segment */ +#define PT_DYNAMIC 2 /* dynamic linking section */ +#define PT_INTERP 3 /* the RTLD */ +#define PT_NOTE 4 /* auxiliary information */ +#define PT_SHLIB 5 /* reserved - purpose undefined */ +#define PT_PHDR 6 /* program header */ +#define PT_NUM 7 /* Number of segment types */ +#define PT_LOPROC 0x70000000 /* reserved range for processor */ +#define PT_HIPROC 0x7fffffff /* specific segment types */ + +/* Segment flags - p_flags */ +#define PF_X 0x1 /* Executable */ +#define PF_W 0x2 /* Writable */ +#define PF_R 0x4 /* Readable */ +#define PF_MASKPROC 0xf0000000 /* reserved bits for processor */ + /* specific segment flags */ + +/* Section Header */ +typedef struct { + Elf32_Word sh_name; /* name - index into section header + string table section */ + Elf32_Word sh_type; /* type */ + Elf32_Word sh_flags; /* flags */ + Elf32_Addr sh_addr; /* address */ + Elf32_Off sh_offset; /* file offset */ + Elf32_Word sh_size; /* section size */ + Elf32_Word sh_link; /* section header table index link */ + Elf32_Word sh_info; /* extra information */ + Elf32_Word sh_addralign; /* address alignment */ + Elf32_Word sh_entsize; /* section entry size */ +} Elf32_Shdr; + +typedef struct { + Elf64_Word sh_name; /* section name */ + Elf64_Word sh_type; /* section type */ + Elf64_Xword sh_flags; /* section flags */ + Elf64_Addr sh_addr; /* virtual address */ + Elf64_Off sh_offset; /* file offset */ + Elf64_Xword sh_size; /* section size */ + Elf64_Word sh_link; /* link to another */ + Elf64_Word sh_info; /* misc info */ + Elf64_Xword sh_addralign; /* memory alignment */ + Elf64_Xword sh_entsize; /* table entry size */ +} Elf64_Shdr; + +/* sh_type */ +#define SHT_NULL 0 /* inactive */ +#define SHT_PROGBITS 1 /* program defined information */ +#define SHT_SYMTAB 2 /* symbol table section */ +#define SHT_STRTAB 3 /* string table section */ +#define SHT_RELA 4 /* relocation section with addends*/ +#define SHT_HASH 5 /* symbol hash table section */ +#define SHT_DYNAMIC 6 /* dynamic section */ +#define SHT_NOTE 7 /* note section */ +#define SHT_NOBITS 8 /* no space section */ +#define SHT_REL 9 /* relation section without addends */ +#define SHT_SHLIB 10 /* reserved - purpose unknown */ +#define SHT_DYNSYM 11 /* dynamic symbol table section */ +#define SHT_NUM 12 /* number of section types */ + +/* Note definitions */ +typedef struct { + Elf32_Word namesz; + Elf32_Word descsz; + Elf32_Word type; + char data[]; +} Elf32_Note; + +typedef struct { + Elf64_Word namesz; + Elf64_Word descsz; + Elf64_Word type; + char data[]; +} Elf64_Note; + +/* Abstraction layer for handling 32- and 64-bit ELF files. */ + +typedef union { + Elf32_Ehdr e32; + Elf64_Ehdr e64; +} elf_ehdr; + +static inline bool elf_is_32bit(elf_ehdr *ehdr) +{ + return ehdr->e32.e_ident[EI_CLASS] == ELFCLASS32; +} + +static inline bool elf_is_64bit(elf_ehdr *ehdr) +{ + return ehdr->e32.e_ident[EI_CLASS] == ELFCLASS64; +} + +#define ehdr_val(ehdr, elem) (elf_is_32bit(ehdr) ? (ehdr)->e32.elem : (ehdr)->e64.elem) + +typedef union { + Elf32_Phdr e32; + Elf64_Phdr e64; +} elf_phdr; + +#define phdr_val(ehdr, phdr, elem) (elf_is_32bit(ehdr) ? (phdr)->e32.elem : (phdr)->e64.elem) + +typedef union { + Elf32_Shdr e32; + Elf64_Shdr e64; +} elf_shdr; + +#define shdr_val(ehdr, shdr, elem) (elf_is_32bit(ehdr) ? (shdr)->e32.elem : (shdr)->e64.elem) + +typedef union { + Elf32_Note e32; + Elf64_Note e64; +} elf_note; + +#define note_val(ehdr, note, elem) (elf_is_32bit(ehdr) ? (note)->e32.elem : (note)->e64.elem) + +static inline void *elf_ptr_add(void *ptr, unsigned long add) +{ + return ptr + add; +} +#endif /* __ELF_H__ */ -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:44:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022188.1397923 (Exim 4.92) (envelope-from ) id 1uTcn4-0002GK-0W; Mon, 23 Jun 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 1022188.1397923; Mon, 23 Jun 2025 08: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 1uTcn3-0002GD-UJ; Mon, 23 Jun 2025 08:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1022188; Mon, 23 Jun 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 1uTcn2-0002Fw-Ly for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcn2-00GA6Q-25 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcn2-00ERPK-1x for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=4GVW9XyLCM6jFkR1IcgLxa6hkyiWDLULqtAwwUcJRXc=; b=56xp6nf6/W6ovRjlHxJyYFoXEc adzrog4zQYRui77JIU2ABIZKZ/mqvBtk726Uj7D8HcUPEEB6x1icspy/xqPJVSguhmtGyMxyohzUe bBTHW6Rx/lVtedGnFcjWuuAzdjldl/Oj0zNlnVJvZgr3fP3/uzxE8q3ZPsivdDnJO4Qk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: analyze new kernel for kexec Message-Id: Date: Mon, 23 Jun 2025 08:44:32 +0000 commit 15ed1cc0c1b24f94adc89bb906a651a3623430bb Author: Juergen Gross AuthorDate: Mon Jun 23 10:40:31 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:40:31 2025 +0200 mini-os: analyze new kernel for kexec Analyze the properties of the new kernel to be loaded by kexec. The data needed is: - upper boundary in final location - copy and memory clear operations - entry point and entry parameter Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/kexec.c | 92 +++++++++++++++++++++++++++++++++++++++++++ include/kexec.h | 11 ++++++ kexec.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+) diff --git a/arch/x86/kexec.c b/arch/x86/kexec.c index a8a2fa9..736ca1b 100644 --- a/arch/x86/kexec.c +++ b/arch/x86/kexec.c @@ -28,8 +28,15 @@ #include #include +#include +#include #include +#include +#include + +static unsigned long kernel_phys_entry = ~0UL; + /* * Final stage of kexec. Copies all data to the final destinations, zeroes * .bss and activates new kernel. @@ -104,4 +111,89 @@ void do_kexec(void *kexec_page) : :"m" (stack), "m" (actions), "m" (phys), "m" (final)); } +bool kexec_chk_arch(elf_ehdr *ehdr) +{ + return ehdr->e32.e_machine == EM_386 || ehdr->e32.e_machine == EM_X86_64; +} + +static unsigned int note_data_sz(unsigned int sz) +{ + return (sz + 3) & ~3; +} + +static void read_note_entry(elf_ehdr *ehdr, void *start, unsigned int len) +{ + elf_note *note = start; + unsigned int off, note_len, namesz, descsz; + char *val; + + for ( off = 0; off < len; off += note_len ) + { + namesz = note_data_sz(note_val(ehdr, note, namesz)); + descsz = note_data_sz(note_val(ehdr, note, descsz)); + val = note_val(ehdr, note, data); + note_len = val - (char *)note + namesz + descsz; + + if ( !strncmp(val, "Xen", namesz) && + note_val(ehdr, note, type) == XEN_ELFNOTE_PHYS32_ENTRY ) + { + val += namesz; + switch ( note_val(ehdr, note, descsz) ) + { + case 1: + kernel_phys_entry = *(uint8_t *)val; + return; + case 2: + kernel_phys_entry = *(uint16_t *)val; + return; + case 4: + kernel_phys_entry = *(uint32_t *)val; + return; + case 8: + kernel_phys_entry = *(uint64_t *)val; + return; + default: + break; + } + } + + note = elf_ptr_add(note, note_len); + } +} + +int kexec_arch_analyze_phdr(elf_ehdr *ehdr, elf_phdr *phdr) +{ + void *notes_start; + unsigned int notes_len; + + if ( phdr_val(ehdr, phdr, p_type) != PT_NOTE || kernel_phys_entry != ~0UL ) + return 0; + + notes_start = elf_ptr_add(ehdr, phdr_val(ehdr, phdr, p_offset)); + notes_len = phdr_val(ehdr, phdr, p_filesz); + read_note_entry(ehdr, notes_start, notes_len); + + return 0; +} + +int kexec_arch_analyze_shdr(elf_ehdr *ehdr, elf_shdr *shdr) +{ + void *notes_start; + unsigned int notes_len; + + if ( shdr_val(ehdr, shdr, sh_type) != SHT_NOTE || + kernel_phys_entry != ~0UL ) + return 0; + + notes_start = elf_ptr_add(ehdr, shdr_val(ehdr, shdr, sh_offset)); + notes_len = shdr_val(ehdr, shdr, sh_size); + read_note_entry(ehdr, notes_start, notes_len); + + return 0; +} + +bool kexec_arch_need_analyze_shdrs(void) +{ + return kernel_phys_entry == ~0UL; +} #endif /* CONFIG_KEXEC */ diff --git a/include/kexec.h b/include/kexec.h index 722be45..f54cbb9 100644 --- a/include/kexec.h +++ b/include/kexec.h @@ -1,5 +1,6 @@ #ifndef _KEXEC_H #define _KEXEC_H +#include /* One element of kexec actions (last element must have action KEXEC_CALL): */ struct kexec_action { @@ -18,6 +19,8 @@ struct kexec_action { extern char _kexec_start[], _kexec_end[]; extern struct kexec_action kexec_actions[KEXEC_MAX_ACTIONS]; +extern unsigned long kexec_last_addr; + int kexec_add_action(int action, void *dest, void *src, unsigned int len); #define KEXEC_SECSIZE ((unsigned long)_kexec_end - (unsigned long)_kexec_start) @@ -31,4 +34,12 @@ void do_kexec(void *kexec_page); /* Assembler code for switching off paging and passing execution to new OS. */ void kexec_phys(void); +/* Check kernel to match current architecture. */ +bool kexec_chk_arch(elf_ehdr *ehdr); + +/* Architecture specific ELF handling functions. */ +int kexec_arch_analyze_phdr(elf_ehdr *ehdr, elf_phdr *phdr); +int kexec_arch_analyze_shdr(elf_ehdr *ehdr, elf_shdr *shdr); +bool kexec_arch_need_analyze_shdrs(void); + #endif /* _KEXEC_H */ diff --git a/kexec.c b/kexec.c index b69e145..7c0e637 100644 --- a/kexec.c +++ b/kexec.c @@ -31,6 +31,9 @@ #include #include #include +#include +#include +#include #include /* @@ -53,8 +56,122 @@ * - The new kernel is activated. */ +unsigned long kexec_last_addr; + +static int analyze_phdrs(elf_ehdr *ehdr) +{ + elf_phdr *phdr; + unsigned int n_hdr, i; + unsigned long paddr, offset, filesz, memsz; + int ret; + + phdr = elf_ptr_add(ehdr, ehdr_val(ehdr, e_phoff)); + n_hdr = ehdr_val(ehdr, e_phnum); + for ( i = 0; i < n_hdr; i++ ) + { + ret = kexec_arch_analyze_phdr(ehdr, phdr); + if ( ret ) + return ret; + + if ( phdr_val(ehdr, phdr, p_type) == PT_LOAD && + (phdr_val(ehdr, phdr, p_flags) & (PF_X | PF_W | PF_R)) ) + { + paddr = phdr_val(ehdr, phdr, p_paddr); + offset = phdr_val(ehdr, phdr, p_offset); + filesz = phdr_val(ehdr, phdr, p_filesz); + memsz = phdr_val(ehdr, phdr, p_memsz); + if ( filesz > 0 ) + { + ret = kexec_add_action(KEXEC_COPY, to_virt(paddr), + (char *)ehdr + offset, filesz); + if ( ret ) + return ret; + } + if ( memsz > filesz ) + { + ret = kexec_add_action(KEXEC_ZERO, to_virt(paddr + filesz), + NULL, memsz - filesz); + if ( ret ) + return ret; + } + if ( paddr + memsz > kexec_last_addr ) + kexec_last_addr = paddr + memsz; + } + + phdr = elf_ptr_add(phdr, ehdr_val(ehdr, e_phentsize)); + } + + return 0; +} + +static int analyze_shdrs(elf_ehdr *ehdr) +{ + elf_shdr *shdr; + unsigned int n_hdr, i; + int ret; + + if ( !kexec_arch_need_analyze_shdrs() ) + return 0; + + shdr = elf_ptr_add(ehdr, ehdr_val(ehdr, e_shoff)); + n_hdr = ehdr_val(ehdr, e_shnum); + for ( i = 0; i < n_hdr; i++ ) + { + ret = kexec_arch_analyze_shdr(ehdr, shdr); + if ( ret ) + return ret; + + shdr = elf_ptr_add(shdr, ehdr_val(ehdr, e_shentsize)); + } + + return 0; +} + +static int analyze_kernel(void *kernel, unsigned long size) +{ + elf_ehdr *ehdr = kernel; + int ret; + + if ( !IS_ELF(ehdr->e32) ) + { + printk("kexec: new kernel not an ELF file\n"); + return ENOEXEC; + } + if ( ehdr->e32.e_ident[EI_DATA] != ELFDATA2LSB ) + { + printk("kexec: ELF file of new kernel is big endian\n"); + return ENOEXEC; + } + if ( !elf_is_32bit(ehdr) && !elf_is_64bit(ehdr) ) + { + printk("kexec: ELF file of new kernel is neither 32 nor 64 bit\n"); + return ENOEXEC; + } + if ( !kexec_chk_arch(ehdr) ) + { + printk("kexec: ELF file of new kernel is not compatible with arch\n"); + return ENOEXEC; + } + + ret = analyze_phdrs(ehdr); + if ( ret ) + return ret; + + ret = analyze_shdrs(ehdr); + if ( ret ) + return ret; + + return 0; +} + int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) { + int ret; + + ret = analyze_kernel(kernel, kernel_size); + if ( ret ) + return ret; + return ENOSYS; } EXPORT_SYMBOL(kexec); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022189.1397926 (Exim 4.92) (envelope-from ) id 1uTcnE-0002IY-21; Mon, 23 Jun 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 1022189.1397926; Mon, 23 Jun 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 1uTcnD-0002IQ-Vl; Mon, 23 Jun 2025 08:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1022189; Mon, 23 Jun 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 1uTcnC-0002IG-Oh for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcnC-00GA6U-2N for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcnC-00ERQG-2F for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=T6VQQHJe0hhDKwQ/xDbiFhnuxQtICYRU7VYJtyOr5yc=; b=5roH85nTeFC9Jv94Bp6aNvLvDG 65Ka8x2arQOQII/HuIem5HwzkOeH/xpM9/JnVu8fntb1NiKOUQsFrO9mOR0pcT3oTtX5LEriDqfDB 6/Hj/GzKA+KNBDA+0NOVXA/pkac+VoTfdCncZIImi0yHGCElFDQ4kpAC+46VNkVSAVQM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: kexec: finalize parameter location and size Message-Id: Date: Mon, 23 Jun 2025 08:44:42 +0000 commit e6fcfc1d58a9d2c929da849262409351992c771f Author: Juergen Gross AuthorDate: Mon Jun 23 10:40:52 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:40:52 2025 +0200 mini-os: kexec: finalize parameter location and size Finalize the location and the size of the parameters for the new kernel. This is needed in order to avoid allocating new memory in the area occupied by the new kernel and parameters. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/kexec.c | 15 +++++++++++++++ include/kexec.h | 3 +++ kexec.c | 2 ++ 3 files changed, 20 insertions(+) diff --git a/arch/x86/kexec.c b/arch/x86/kexec.c index 736ca1b..4783090 100644 --- a/arch/x86/kexec.c +++ b/arch/x86/kexec.c @@ -196,4 +196,19 @@ bool kexec_arch_need_analyze_shdrs(void) { return kernel_phys_entry == ~0UL; } + +static unsigned long kexec_param_loc; +static unsigned int kexec_param_size; + +void kexec_set_param_loc(const char *cmdline) +{ + kexec_param_size = sizeof(struct hvm_start_info); + kexec_param_size += e820_entries * sizeof(struct hvm_memmap_table_entry); + kexec_param_size += strlen(cmdline) + 1; + + kexec_last_addr = (kexec_last_addr + 7) & ~7UL; + kexec_param_loc = kexec_last_addr; + kexec_last_addr += kexec_param_size; + kexec_last_addr = round_pgup(kexec_last_addr); +} #endif /* CONFIG_KEXEC */ diff --git a/include/kexec.h b/include/kexec.h index f54cbb9..8a2b552 100644 --- a/include/kexec.h +++ b/include/kexec.h @@ -42,4 +42,7 @@ int kexec_arch_analyze_phdr(elf_ehdr *ehdr, elf_phdr *phdr); int kexec_arch_analyze_shdr(elf_ehdr *ehdr, elf_shdr *shdr); bool kexec_arch_need_analyze_shdrs(void); +/* Finalize parameter location and size. */ +void kexec_set_param_loc(const char *cmdline); + #endif /* _KEXEC_H */ diff --git a/kexec.c b/kexec.c index 7c0e637..3183938 100644 --- a/kexec.c +++ b/kexec.c @@ -172,6 +172,8 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) if ( ret ) return ret; + kexec_set_param_loc(cmdline); + return ENOSYS; } EXPORT_SYMBOL(kexec); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022190.1397930 (Exim 4.92) (envelope-from ) id 1uTcnO-0002Ky-3Z; Mon, 23 Jun 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 1022190.1397930; Mon, 23 Jun 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 1uTcnO-0002Kr-0u; Mon, 23 Jun 2025 08:44:54 +0000 Received: by outflank-mailman (input) for mailman id 1022190; Mon, 23 Jun 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 1uTcnM-0002Kc-RS for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcnM-00GA6o-2f for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcnM-00ERQy-2Y for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=tRm+oQBOBVJbzvmjwVzLUu91oCcEJefTsM2Wba/R44Y=; b=MWee5Oq4RX9ajlnV6+dGWqWRFp X9w8w7pQxYC/P0DNRqvXAiD3gSAPPdjcdt/QNYIfa+uUuR3/mRdwVq5vexxEmgWKhILWGMc5QPKUi NEsYvHnWQro0LVqgaP0OCuuIegEUhvhK7hC8pjTf5Iv209xkoNSsXny/RgY7cPcgyXIY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: reserve memory below boundary Message-Id: Date: Mon, 23 Jun 2025 08:44:52 +0000 commit 7c7682eb2c73449a5bcea85e19144eee8f91c584 Author: Juergen Gross AuthorDate: Mon Jun 23 10:41:11 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:41:11 2025 +0200 mini-os: reserve memory below boundary In order to support kexec any memory used during copying the new kernel to its final destination must not overlap with the destination area. In order to achieve that add a new interface allowing to mark all allocatable memory below a specific physical address as not available. This is done by walking through all chunks of the buddy allocator and removing the chunks (or chunk parts) below the boundary. The removed chunks are put into a list in order to be able to undo the operation in case kexec is failing before doing any unrecoverable system modifications. Any pages freed located below the boundary need to go directly into the list of reserved pages instead of the free pool. Call the new function from kexec code. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- include/mm.h | 5 ++++ kexec.c | 5 ++++ mm.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/include/mm.h b/include/mm.h index 4fc364f..5775c3e 100644 --- a/include/mm.h +++ b/include/mm.h @@ -57,6 +57,11 @@ unsigned long alloc_pages(int order); void free_pages(void *pointer, int order); #define free_page(p) free_pages(p, 0) +#ifdef CONFIG_KEXEC +void reserve_memory_below(unsigned long boundary); +void unreserve_memory_below(void); +#endif + static __inline__ int get_order(unsigned long size) { int order; diff --git a/kexec.c b/kexec.c index 3183938..1a90d8a 100644 --- a/kexec.c +++ b/kexec.c @@ -174,6 +174,11 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) kexec_set_param_loc(cmdline); + reserve_memory_below(kexec_last_addr); + + /* Error exit. */ + unreserve_memory_below(); + return ENOSYS; } EXPORT_SYMBOL(kexec); diff --git a/mm.c b/mm.c index a5d3f5e..9236db5 100644 --- a/mm.c +++ b/mm.c @@ -230,6 +230,84 @@ static void init_page_allocator(unsigned long min, unsigned long max) mm_alloc_bitmap_remap(); } +#ifdef CONFIG_KEXEC +static chunk_head_t *reserved_chunks; +static unsigned long boundary_pfn; + +static void free_pages_below(void *pointer, unsigned int order) +{ + unsigned long pfn_s, pfn; + chunk_head_t *ch = pointer; + + pfn_s = virt_to_pfn(ch); + + if ( pfn_s + (1UL << order) <= boundary_pfn ) + { + /* Put complete chunk into reserved list. */ + ch->level = order; + ch->next = reserved_chunks; + reserved_chunks = ch; + } + else + { + /* Put pages below boundary into reserved list. */ + for ( pfn = pfn_s; pfn < boundary_pfn; pfn++ ) + { + chunk_head_t *ch_res = pfn_to_virt(pfn); + + ch_res->level = 0; + ch_res->next = reserved_chunks; + reserved_chunks = ch_res; + } + + /* Return pages above boundary to free pool again. */ + for ( ; pfn < pfn_s + (1UL << order); pfn++ ) + free_pages(pfn_to_virt(pfn), 0); + } +} + +void reserve_memory_below(unsigned long boundary) +{ + unsigned long pfn; + unsigned int order; + chunk_head_t *ch; + + ASSERT(!boundary_pfn); + boundary_pfn = PHYS_PFN(boundary); + + for ( order = 0; order < FREELIST_SIZE; order++ ) + { + for ( ch = free_list[order].next; !FREELIST_EMPTY(ch); ch = ch->next ) + { + pfn = virt_to_pfn(ch); + if ( pfn >= boundary_pfn ) + continue; + + /* Dequeue from this level, at least parts will be reserved. */ + dequeue_elem(ch); + /* Mark all as allocated, pieces above boundary will be returned. */ + map_alloc(pfn, 1UL << ch->level); + + free_pages_below(ch, ch->level); + } + } +} + +void unreserve_memory_below(void) +{ + chunk_head_t *ch; + + boundary_pfn = 0; + + while ( reserved_chunks ) + { + ch = reserved_chunks; + reserved_chunks = ch->next; + free_pages(ch, ch->level); + } +} +#endif /* CONFIG_KEXEC */ + /* Allocate 2^@order contiguous pages. Returns a VIRTUAL address. */ unsigned long alloc_pages(int order) { @@ -279,10 +357,19 @@ EXPORT_SYMBOL(alloc_pages); void free_pages(void *pointer, int order) { chunk_head_t *freed_ch, *to_merge_ch; + unsigned long pfn = virt_to_pfn(pointer); unsigned long mask; +#ifdef CONFIG_KEXEC + if ( pfn < boundary_pfn ) + { + free_pages_below(pointer, order); + return; + } +#endif + /* First free the chunk */ - map_free(virt_to_pfn(pointer), 1UL << order); + map_free(pfn, 1UL << order); /* Create free chunk */ freed_ch = (chunk_head_t *)pointer; -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:45:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022191.1397935 (Exim 4.92) (envelope-from ) id 1uTcnY-0002Ni-50; Mon, 23 Jun 2025 08:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022191.1397935; Mon, 23 Jun 2025 08: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 1uTcnY-0002Na-2O; Mon, 23 Jun 2025 08:45:04 +0000 Received: by outflank-mailman (input) for mailman id 1022191; Mon, 23 Jun 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 1uTcnW-0002NK-U9 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcnW-00GA7K-2v for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcnW-00ERRd-2p for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=TLAu7lIrTxUg0ZxoR06SPZNmqsOmeMHWwMi6A3jdlcw=; b=VNADZNa0d5LQUlKxLxAWaqsHQq KyG4ngrgwfb9FMOFZxb5oJxru3WBGjs4HeAbj0gVSiOvU2bC3q0Q7AWfVDcNeUiXEmvdz3g3ncRXB JkBPP2riSmpu3KHq8fI5jg8eSVyDxhz5quP1JfQ8W7Y0aGBaYU4AmB9AOS+N6TL3hNYA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: kexec: build parameters for new kernel Message-Id: Date: Mon, 23 Jun 2025 08:45:02 +0000 commit b7994b6409a4d6fb3bff30df1fab28e8173b53de Author: Juergen Gross AuthorDate: Mon Jun 23 10:41:27 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:41:27 2025 +0200 mini-os: kexec: build parameters for new kernel Build the parameters for the new kernel, consisting of the hvm_start_info struct, the memory map and the command line. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/kexec.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/kexec.h | 4 ++++ kexec.c | 13 ++++++++++++- 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/arch/x86/kexec.c b/arch/x86/kexec.c index 4783090..fc58473 100644 --- a/arch/x86/kexec.c +++ b/arch/x86/kexec.c @@ -199,6 +199,7 @@ bool kexec_arch_need_analyze_shdrs(void) static unsigned long kexec_param_loc; static unsigned int kexec_param_size; +static unsigned long kexec_param_mem; void kexec_set_param_loc(const char *cmdline) { @@ -211,4 +212,61 @@ void kexec_set_param_loc(const char *cmdline) kexec_last_addr += kexec_param_size; kexec_last_addr = round_pgup(kexec_last_addr); } + +int kexec_get_entry(const char *cmdline) +{ + struct hvm_start_info *info; + struct hvm_memmap_table_entry *mmap; + unsigned int order; + unsigned int i; + + if ( kernel_phys_entry == ~0UL ) + return ENOEXEC; + + order = get_order(kexec_param_size); + + kexec_param_mem = alloc_pages(order); + if ( !kexec_param_mem ) + return ENOMEM; + + info = (struct hvm_start_info *)kexec_param_mem; + memset(info, 0, sizeof(*info)); + info->magic = XEN_HVM_START_MAGIC_VALUE; + info->version = 1; + info->cmdline_paddr = kexec_param_mem + sizeof(*info) + + e820_entries * sizeof(struct hvm_memmap_table_entry); + info->memmap_paddr = kexec_param_mem + sizeof(*info); + info->memmap_entries = e820_entries; + + mmap = (struct hvm_memmap_table_entry *)(info + 1); + for ( i = 0; i < e820_entries; i++ ) + { + mmap->addr = e820_map[i].addr; + mmap->size = e820_map[i].size; + mmap->type = e820_map[i].type; + mmap++; + } + + strcpy((char *)mmap, cmdline); + + if ( kexec_add_action(KEXEC_COPY, to_virt(kexec_param_loc), info, + kexec_param_size) ) + return ENOSPC; + + /* The call of the new kernel happens via the physical address! */ + if ( kexec_add_action(KEXEC_CALL, (void *)kernel_phys_entry, + (void *)kexec_param_loc, 0) ) + return ENOSPC; + + return 0; +} + +void kexec_get_entry_undo(void) +{ + if ( kexec_param_mem ) + { + free_pages((void *)kexec_param_mem, get_order(kexec_param_size)); + kexec_param_mem = 0; + } +} #endif /* CONFIG_KEXEC */ diff --git a/include/kexec.h b/include/kexec.h index 8a2b552..7b103de 100644 --- a/include/kexec.h +++ b/include/kexec.h @@ -45,4 +45,8 @@ bool kexec_arch_need_analyze_shdrs(void); /* Finalize parameter location and size. */ void kexec_set_param_loc(const char *cmdline); +/* Get entry point and parameter of new kernel. */ +int kexec_get_entry(const char *cmdline); +void kexec_get_entry_undo(void); + #endif /* _KEXEC_H */ diff --git a/kexec.c b/kexec.c index 1a90d8a..e762fbe 100644 --- a/kexec.c +++ b/kexec.c @@ -176,10 +176,21 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) reserve_memory_below(kexec_last_addr); + ret = kexec_get_entry(cmdline); + if ( ret ) + { + printk("kexec: ELF file of new kernel has no valid entry point\n"); + goto err; + } + /* Error exit. */ + ret = ENOSYS; + + err: unreserve_memory_below(); + kexec_get_entry_undo(); - return ENOSYS; + return ret; } EXPORT_SYMBOL(kexec); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:45:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022192.1397939 (Exim 4.92) (envelope-from ) id 1uTcni-0002Q2-6T; Mon, 23 Jun 2025 08:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022192.1397939; Mon, 23 Jun 2025 08: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 1uTcni-0002Pu-3m; Mon, 23 Jun 2025 08:45:14 +0000 Received: by outflank-mailman (input) for mailman id 1022192; Mon, 23 Jun 2025 08:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTcnh-0002Pc-0w for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTcnh-00GA7P-00 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcng-00ERS3-35 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45: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=l6N95wYDPwR8AFfujvwd52vJeyN9xueCes7xLT1HtlA=; b=bjgTVH3RLnJuZ6Pco7gDdz/olm 2i5zPd07Z7/MnPTMUpE3QaMSU2YmWOYd/UmRj+QEb+RCdAdvuhDHu7DlfcOPvUGyH7mgsXxX5ijpV rhTmG9DnsFJfXYu1RFWOTw0/nQ7tGTtjd6ROTBLcVp29JEJN13FKQjGGfCXnHBnI/e8c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: kexec: move used pages away for new kernel Message-Id: Date: Mon, 23 Jun 2025 08:45:12 +0000 commit 3d2ce31143ffda4939938f4254c2ddef94aa6f81 Author: Juergen Gross AuthorDate: Mon Jun 23 10:41:41 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:41:41 2025 +0200 mini-os: kexec: move used pages away for new kernel Copying the new kexec kernel must not overwrite any pages still needed during this process. Those are especially the GDT, IDT and page tables. Move those to new allocated pages and update any related pointers. In case the kexec process is cancelled later, don't undo any page table moves, as the system can just be used with the new layout. By freeing the original pages there is no memory leaking. GDT and IDT should be reverted to their original locations, as their original memory can't be freed due to not being whole pages. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/mm.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/kexec.h | 5 +++ kexec.c | 6 +++ 3 files changed, 137 insertions(+) diff --git a/arch/x86/mm.c b/arch/x86/mm.c index 3ba6d91..a71eb19 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -923,3 +924,128 @@ unsigned long map_frame_virt(unsigned long mfn) return addr; } EXPORT_SYMBOL(map_frame_virt); + +#ifdef CONFIG_KEXEC +static unsigned long kexec_gdt; +static unsigned long kexec_idt; + +static int move_pt(unsigned long va, unsigned int lvl, bool is_leaf, + pgentry_t *pte, void *par) +{ + unsigned long boundary_pfn = *(unsigned long *)par; + unsigned long pfn; + void *old_pg, *new_pg; + + if ( is_leaf ) + return 0; + + pfn = (lvl == PAGETABLE_LEVELS + 1) ? PHYS_PFN(*(unsigned long *)pte) + : pte_to_mfn(*pte); + if ( pfn >= boundary_pfn ) + return 0; + + new_pg = (void *)alloc_page(); + if ( !new_pg ) + return ENOMEM; + old_pg = pfn_to_virt(pfn); + memcpy(new_pg, old_pg, PAGE_SIZE); + if ( lvl == PAGETABLE_LEVELS + 1 ) + *(pgentry_t **)pte = new_pg; + else + *pte = ((unsigned long)new_pg & PAGE_MASK) | ptdata[lvl].prot; + + tlb_flush(); + + free_page(old_pg); + + return 0; +} + +static int move_leaf(unsigned long va, unsigned int lvl, bool is_leaf, + pgentry_t *pte, void *par) +{ + unsigned long boundary_pfn = *(unsigned long *)par; + unsigned long pfn; + void *old_pg, *new_pg; + + if ( !is_leaf ) + return 0; + + /* No large page support, all pages must be valid. */ + if ( (*pte & _PAGE_PSE) || !(*pte & _PAGE_PRESENT) ) + return EINVAL; + + pfn = pte_to_mfn(*pte); + if ( pfn >= boundary_pfn ) + return 0; + + new_pg = (void *)alloc_page(); + if ( !new_pg ) + return ENOMEM; + old_pg = pfn_to_virt(pfn); + memcpy(new_pg, old_pg, PAGE_SIZE); + *pte = ((unsigned long)new_pg & PAGE_MASK) | ptdata[lvl].prot; + + invlpg(va); + + free_page(old_pg); + + return 0; +} + +int kexec_move_used_pages(unsigned long boundary, unsigned long kernel, + unsigned long kernel_size) +{ + int ret; + unsigned long boundary_pfn = PHYS_PFN(boundary); + + kexec_gdt = alloc_page(); + if ( !kexec_gdt ) + return ENOMEM; + memcpy((char *)kexec_gdt, &gdt, sizeof(gdt)); + gdt_ptr.base = kexec_gdt; + asm volatile("lgdt %0" : : "m" (gdt_ptr)); + + kexec_idt = alloc_page(); + if ( !kexec_idt ) + return ENOMEM; + memcpy((char *)kexec_idt, &idt, sizeof(idt)); + idt_ptr.base = kexec_idt; + asm volatile("lidt %0" : : "m" (idt_ptr)); + + /* Top level page table needs special handling. */ + ret = move_pt(0, PAGETABLE_LEVELS + 1, false, (pgentry_t *)(&pt_base), + &boundary_pfn); + if ( ret ) + return ret; + ret = walk_pt(0, ~0UL, move_pt, &boundary_pfn); + if ( ret ) + return ret; + + /* Move new kernel image pages. */ + ret = walk_pt(kernel, kernel + kernel_size - 1, move_leaf, &boundary_pfn); + if ( ret ) + return ret; + + return 0; +} + +void kexec_move_used_pages_undo(void) +{ + if ( kexec_gdt ) + { + gdt_ptr.base = (unsigned long)&gdt; + asm volatile("lgdt %0" : : "m" (gdt_ptr)); + free_page((void *)kexec_gdt); + kexec_gdt = 0; + } + + if ( kexec_idt ) + { + idt_ptr.base = (unsigned long)&idt; + asm volatile("lidt %0" : : "m" (idt_ptr)); + free_page((void *)kexec_idt); + kexec_idt = 0; + } +} +#endif diff --git a/include/kexec.h b/include/kexec.h index 7b103de..411fa01 100644 --- a/include/kexec.h +++ b/include/kexec.h @@ -49,4 +49,9 @@ void kexec_set_param_loc(const char *cmdline); int kexec_get_entry(const char *cmdline); void kexec_get_entry_undo(void); +/* Move used pages away from new kernel area. */ +int kexec_move_used_pages(unsigned long boundary, unsigned long kernel, + unsigned long kernel_size); +void kexec_move_used_pages_undo(void); + #endif /* _KEXEC_H */ diff --git a/kexec.c b/kexec.c index e762fbe..3b11a69 100644 --- a/kexec.c +++ b/kexec.c @@ -183,11 +183,17 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) goto err; } + ret = kexec_move_used_pages(kexec_last_addr, (unsigned long)kernel, + kernel_size); + if ( ret ) + goto err; + /* Error exit. */ ret = ENOSYS; err: unreserve_memory_below(); + kexec_move_used_pages_undo(); kexec_get_entry_undo(); return ret; -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:45:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022195.1397957 (Exim 4.92) (envelope-from ) id 1uTcns-0002m4-HZ; Mon, 23 Jun 2025 08:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022195.1397957; Mon, 23 Jun 2025 08: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 1uTcns-0002lw-Em; Mon, 23 Jun 2025 08:45:24 +0000 Received: by outflank-mailman (input) for mailman id 1022195; Mon, 23 Jun 2025 08:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTcnr-0002l6-3X for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTcnr-00GA7X-0G for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcnr-00ERSP-0B for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08: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=7KVJ7iXEbVRLgvbmkI9/h/63C4TRXjxrCLiVL4N76UE=; b=38XuWtNLIpYhf9IrUc2/W6B0Jv M82CQfkmZzIMHCx9mm+avGAE/N7yK+aEb5+wBbTZPydcKO9k34BOn98E9xIUoZSQA/s5/XQl3Vuye yBZEmaBmIKfXZ13jdVDam76W9LTOf+STdXbFux0rupq4h6SfTxKRsHh7J4RWoFA/D1cA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] Mini-OS: mm: change set_readonly() to change_readonly() Message-Id: Date: Mon, 23 Jun 2025 08:45:23 +0000 commit 243d13e0ec0db7874b5f471ddab8fd5e1697a9db Author: Juergen Gross AuthorDate: Mon Jun 23 10:41:59 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:41:59 2025 +0200 Mini-OS: mm: change set_readonly() to change_readonly() Rename set_readonly() to change_readonly() and add a parameter specifying whether it should set the kernel to readonly or to writable. At the same time move the boundary setting from the only caller into the function itself, avoiding the need to use the same boundaries in future, when it will be called to set the kernel to writable again. Make the function globally visible in order to allow calling it from kexec coding later. Merge clear_bootstrap() into change_readonly() and undo its setting of page 0 to invalid when setting the kernel writable. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/mm.c | 111 ++++++++++++++++++++++++++++++++-------------------------- include/mm.h | 3 ++ 2 files changed, 64 insertions(+), 50 deletions(-) diff --git a/arch/x86/mm.c b/arch/x86/mm.c index a71eb19..f4419d9 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -405,17 +405,19 @@ static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) */ extern struct shared_info shared_info; -struct set_readonly_par { +struct change_readonly_par { unsigned long etext; #ifdef CONFIG_PARAVIRT unsigned int count; #endif + bool readonly; }; -static int set_readonly_func(unsigned long va, unsigned int lvl, bool is_leaf, - pgentry_t *pte, void *par) +static int change_readonly_func(unsigned long va, unsigned int lvl, + bool is_leaf, pgentry_t *pte, void *par) { - struct set_readonly_par *ro = par; + struct change_readonly_par *ro = par; + pgentry_t newval; if ( !is_leaf ) return 0; @@ -429,9 +431,11 @@ static int set_readonly_func(unsigned long va, unsigned int lvl, bool is_leaf, return 0; } + newval = ro->readonly ? (*pte & ~_PAGE_RW) : (*pte | _PAGE_RW); + #ifdef CONFIG_PARAVIRT mmu_updates[ro->count].ptr = virt_to_mach(pte); - mmu_updates[ro->count].val = *pte & ~_PAGE_RW; + mmu_updates[ro->count].val = newval; ro->count++; if ( ro->count == L1_PAGETABLE_ENTRIES ) @@ -442,7 +446,7 @@ static int set_readonly_func(unsigned long va, unsigned int lvl, bool is_leaf, ro->count = 0; } #else - *pte &= ~_PAGE_RW; + *pte = newval; #endif return 0; @@ -463,23 +467,6 @@ static void tlb_flush(void) } #endif -static void set_readonly(void *text, void *etext) -{ - struct set_readonly_par setro = { .etext = (unsigned long)etext }; - unsigned long start_address = PAGE_ALIGN((unsigned long)text); - - printk("setting %p-%p readonly\n", text, etext); - walk_pt(start_address, setro.etext, set_readonly_func, &setro); - -#ifdef CONFIG_PARAVIRT - if ( setro.count && - HYPERVISOR_mmu_update(mmu_updates, setro.count, NULL, DOMID_SELF) < 0) - BUG(); -#endif - - tlb_flush(); -} - /* * get the PTE for virtual address va if it exists. Otherwise NULL. */ @@ -508,6 +495,51 @@ static pgentry_t *get_pgt(unsigned long va) return tab; } +void change_readonly(bool readonly) +{ + struct change_readonly_par ro = { + .etext = (unsigned long)&_erodata, + .readonly = readonly, + }; + unsigned long start_address = PAGE_ALIGN((unsigned long)&_text); +#ifdef CONFIG_PARAVIRT + pte_t nullpte = { }; + int rc; +#else + pgentry_t *pgt = get_pgt((unsigned long)&_text); +#endif + + if ( readonly ) + { +#ifdef CONFIG_PARAVIRT + if ( (rc = HYPERVISOR_update_va_mapping(0, nullpte, UVMF_INVLPG)) ) + printk("Unable to unmap NULL page. rc=%d\n", rc); +#else + *pgt = 0; + invlpg((unsigned long)&_text); +#endif + } + else + { +#ifdef CONFIG_PARAVIRT + /* No kexec support with PARAVIRT. */ + BUG(); +#else + *pgt = L1_PROT; +#endif + } + + printk("setting %p-%p readonly\n", &_text, &_erodata); + walk_pt(start_address, ro.etext, change_readonly_func, &ro); + +#ifdef CONFIG_PARAVIRT + if ( ro.count && + HYPERVISOR_mmu_update(mmu_updates, ro.count, NULL, DOMID_SELF) < 0) + BUG(); +#endif + + tlb_flush(); +} /* * return a valid PTE for a given virtual address. If PTE does not exist, @@ -789,31 +821,6 @@ int unmap_frames(unsigned long va, unsigned long num_frames) } EXPORT_SYMBOL(unmap_frames); -/* - * Clear some of the bootstrap memory - */ -static void clear_bootstrap(void) -{ -#ifdef CONFIG_PARAVIRT - pte_t nullpte = { }; - int rc; -#else - pgentry_t *pgt; -#endif - - /* Use first page as the CoW zero page */ - memset(&_text, 0, PAGE_SIZE); - mfn_zero = virt_to_mfn((unsigned long) &_text); -#ifdef CONFIG_PARAVIRT - if ( (rc = HYPERVISOR_update_va_mapping(0, nullpte, UVMF_INVLPG)) ) - printk("Unable to unmap NULL page. rc=%d\n", rc); -#else - pgt = get_pgt((unsigned long)&_text); - *pgt = 0; - invlpg((unsigned long)&_text); -#endif -} - #ifdef CONFIG_PARAVIRT void p2m_chk_pfn(unsigned long pfn) { @@ -884,8 +891,12 @@ void arch_init_mm(unsigned long* start_pfn_p, unsigned long* max_pfn_p) printk(" max_pfn: %lx\n", max_pfn); build_pagetable(&start_pfn, &max_pfn); - clear_bootstrap(); - set_readonly(&_text, &_erodata); + + /* Prepare page 0 as CoW page. */ + memset(&_text, 0, PAGE_SIZE); + mfn_zero = virt_to_mfn((unsigned long)&_text); + + change_readonly(true); *start_pfn_p = start_pfn; *max_pfn_p = max_pfn; diff --git a/include/mm.h b/include/mm.h index 5775c3e..0a16d56 100644 --- a/include/mm.h +++ b/include/mm.h @@ -25,6 +25,7 @@ #ifndef _MM_H_ #define _MM_H_ +#include #if defined(__i386__) #include #elif defined(__x86_64__) @@ -92,4 +93,6 @@ extern unsigned long heap, brk, heap_mapped, heap_end; int free_physical_pages(xen_pfn_t *mfns, int n); void fini_mm(void); +void change_readonly(bool readonly); + #endif /* _MM_H_ */ -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:45:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022198.1397961 (Exim 4.92) (envelope-from ) id 1uTco2-0002wZ-If; Mon, 23 Jun 2025 08:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022198.1397961; Mon, 23 Jun 2025 08: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 1uTco2-0002wR-G8; Mon, 23 Jun 2025 08:45:34 +0000 Received: by outflank-mailman (input) for mailman id 1022198; Mon, 23 Jun 2025 08:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTco1-0002uj-5t for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTco1-00GA7p-0V for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTco1-00ERSl-0R for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08: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=tLNyREqTSpIAGGqtktaT/9vOaDa2X42k1DFUQ1FcOhs=; b=6fPtQ/LX0icesFQN7LHmZ/p6Cl jXbwHyI5GFxu0QS4EDh+Oiiy+TARTBVTzP38ohZ7l11uZvIEeULclASjiQNxyJmBVBFKVxHqTbtLw 233sGBICN+AxIvYLDX4svJ9g1001jSmaoSl2/ikc+ZB/3sLkpNkwmNet+KRXtD2VSFhg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] Mini-OS: kexec: switch read-only area to be writable again Message-Id: Date: Mon, 23 Jun 2025 08:45:33 +0000 commit 3a86d33e78cfb49d7aad11e53c3c4c86260db539 Author: Juergen Gross AuthorDate: Mon Jun 23 10:42:17 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:42:17 2025 +0200 Mini-OS: kexec: switch read-only area to be writable again In order to allow writing the new kernel, make the readonly area covering current kernel text writable again. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/mm.c | 3 ++- kexec.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm.c b/arch/x86/mm.c index f4419d9..26ede6f 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -529,7 +529,8 @@ void change_readonly(bool readonly) #endif } - printk("setting %p-%p readonly\n", &_text, &_erodata); + printk("setting %p-%p %s\n", &_text, &_erodata, + readonly ? "readonly" : "writable"); walk_pt(start_address, ro.etext, change_readonly_func, &ro); #ifdef CONFIG_PARAVIRT diff --git a/kexec.c b/kexec.c index 3b11a69..1ef7ce8 100644 --- a/kexec.c +++ b/kexec.c @@ -183,6 +183,8 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) goto err; } + change_readonly(false); + ret = kexec_move_used_pages(kexec_last_addr, (unsigned long)kernel, kernel_size); if ( ret ) @@ -192,6 +194,7 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) ret = ENOSYS; err: + change_readonly(true); unreserve_memory_below(); kexec_move_used_pages_undo(); kexec_get_entry_undo(); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:45:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022204.1397965 (Exim 4.92) (envelope-from ) id 1uTcoC-00033e-KM; Mon, 23 Jun 2025 08:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022204.1397965; Mon, 23 Jun 2025 08:45: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 1uTcoC-00033W-Hc; Mon, 23 Jun 2025 08:45:44 +0000 Received: by outflank-mailman (input) for mailman id 1022204; Mon, 23 Jun 2025 08:45:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTcoB-00031x-8U for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTcoB-00GAAG-0k for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcoB-00ERTI-0f for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45: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=TMiNuK/ZCnnE4ss5D/q17GrLV7zbQnjPNE6VHAmrE3E=; b=sunjOGtKDPfFxCZ+kP5R6lI13o 05e49uS8W5PZQOBI7CuDRHUp0ssgYdGTeGBdZZKynv5wdfEZYRzSFx0WpXY5hNQHtVRoNB/gVcH5I B1b7DTU7C+BFYXhQDvzmb5PyHyqe7rn6H7qGK9uebrSJUbGhBYoc+iHSsRJGlLQGyOEU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: kexec: add kexec callback functionality Message-Id: Date: Mon, 23 Jun 2025 08:45:43 +0000 commit 7ca1510e894622aaf0065ad90344ff20e775e45f Author: Juergen Gross AuthorDate: Mon Jun 23 10:42:38 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:42:38 2025 +0200 mini-os: kexec: add kexec callback functionality Add a kexec_call() macro which will provide the capability to register a function for being called when doing a kexec() call. The called functions will be called with a boolean parameter "undo" indicating whether a previous call needs to be undone due to a failure during kexec(). The related loop to call all callbacks is added to kexec(). Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/minios-x86.lds.S | 8 ++++++++ include/kexec.h | 6 ++++++ kexec.c | 13 +++++++++++++ 3 files changed, 27 insertions(+) diff --git a/arch/x86/minios-x86.lds.S b/arch/x86/minios-x86.lds.S index 8a1db7d..8c6e0a6 100644 --- a/arch/x86/minios-x86.lds.S +++ b/arch/x86/minios-x86.lds.S @@ -58,6 +58,14 @@ SECTIONS } PROVIDE (__fini_array_end = .); +#if defined(CONFIG_KEXEC) + PROVIDE (__kexec_array_start = .); + .kexec_array : { + *(.kexec_array) + } + PROVIDE (__kexec_array_end = .); +#endif + .ctors : { __CTOR_LIST__ = .; *(.ctors) diff --git a/include/kexec.h b/include/kexec.h index 411fa01..b89c300 100644 --- a/include/kexec.h +++ b/include/kexec.h @@ -18,6 +18,12 @@ struct kexec_action { extern char _kexec_start[], _kexec_end[]; extern struct kexec_action kexec_actions[KEXEC_MAX_ACTIONS]; +extern unsigned long __kexec_array_start[], __kexec_array_end[]; + +typedef int(*kexeccall_t)(bool undo); +#define kexec_call(func) \ + static kexeccall_t __kexeccall_##func __attribute__((__used__)) \ + __attribute__((__section__(".kexec_array"))) = func extern unsigned long kexec_last_addr; diff --git a/kexec.c b/kexec.c index 1ef7ce8..f42aa8a 100644 --- a/kexec.c +++ b/kexec.c @@ -167,6 +167,7 @@ static int analyze_kernel(void *kernel, unsigned long size) int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) { int ret; + unsigned long *func; ret = analyze_kernel(kernel, kernel_size); if ( ret ) @@ -190,6 +191,18 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) if ( ret ) goto err; + for ( func = __kexec_array_start; func < __kexec_array_end; func++ ) + { + ret = ((kexeccall_t)(*func))(false); + if ( ret ) + { + for ( func--; func >= __kexec_array_start; func-- ) + ((kexeccall_t)(*func))(true); + + goto err; + } + } + /* Error exit. */ ret = ENOSYS; -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:45:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022208.1397968 (Exim 4.92) (envelope-from ) id 1uTcoM-00036l-LZ; Mon, 23 Jun 2025 08:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022208.1397968; Mon, 23 Jun 2025 08:45: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 1uTcoM-00036d-Iw; Mon, 23 Jun 2025 08:45:54 +0000 Received: by outflank-mailman (input) for mailman id 1022208; Mon, 23 Jun 2025 08:45:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTcoL-00036H-Ax for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTcoL-00GAAf-10 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcoL-00ERTi-0u for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:45: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=AG1ANKqC6romizDYxirUo9dIMdxXbweJbM+UILVjElw=; b=csZnCJBeM2YDV3ItDTOK02DEGY C7x/xnfJaFVyc1dbsF0wT/rCWM0XkIImikh/AqjxUyXwbQ+D8IfvBhaxDc9W4z0vdg4a4a1R2Z2Pj Ij9ZJMmSa8jqy+h8sQPCx1vWK1xP1ytfAwLr/IbZTQ8BteGCnQJ0IPDHrTaxObhQuSSY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: kexec: do the final kexec step Message-Id: Date: Mon, 23 Jun 2025 08:45:53 +0000 commit 560c2a5584c4ae031277e06c745ad07a444e9f54 Author: Juergen Gross AuthorDate: Mon Jun 23 10:42:53 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:42:53 2025 +0200 mini-os: kexec: do the final kexec step With all kexec preparations done, activate the new kernel. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- kexec.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/kexec.c b/kexec.c index f42aa8a..2607c81 100644 --- a/kexec.c +++ b/kexec.c @@ -168,6 +168,7 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) { int ret; unsigned long *func; + void *kexec_page; ret = analyze_kernel(kernel, kernel_size); if ( ret ) @@ -191,6 +192,13 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) if ( ret ) goto err; + kexec_page = (void *)alloc_page(); + if ( !kexec_page ) + { + ret = ENOMEM; + goto err; + } + for ( func = __kexec_array_start; func < __kexec_array_end; func++ ) { ret = ((kexeccall_t)(*func))(false); @@ -203,10 +211,15 @@ int kexec(void *kernel, unsigned long kernel_size, const char *cmdline) } } - /* Error exit. */ - ret = ENOSYS; + /* Activate the new kernel. */ + do_kexec(kexec_page); + + /* do_kexec() shouldn't return, crash. */ + BUG(); err: + if ( kexec_page ) + free_page(kexec_page); change_readonly(true); unreserve_memory_below(); kexec_move_used_pages_undo(); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022222.1397987 (Exim 4.92) (envelope-from ) id 1uTcxD-00056U-IC; Mon, 23 Jun 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 1022222.1397987; Mon, 23 Jun 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 1uTcxD-00056N-FU; Mon, 23 Jun 2025 08:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1022222; Mon, 23 Jun 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 1uTcxC-00056H-9v for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcxC-00GAK0-0X for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcxC-00ERrF-0P for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=4SJarEIkqg5Xs/bRjZMUwFYxrtMQqXX3SGLCdZgvASc=; b=UEXbLWgRcMoaBZq22h05WCThws dho956NDbMCi0JlMUV9DHZCioMv/abgvtjmhsKCvUy+XYfWGaJJ8tOsMCJFG++ZfrNkMbjw7WZiaA qVYHJuhIR8NLpotWvbkKU3uflCPN2bQlgC2Z8vWOcON8CDXEg4b7iLNSIqgVdiA/mZGY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pmstat: restore changes lost by "consolidation" Message-Id: Date: Mon, 23 Jun 2025 08:55:02 +0000 commit e98ec009cdbef2124610dc8afe1c7f73ef6e77eb Author: Jan Beulich AuthorDate: Mon Jun 23 10:49:26 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:49:26 2025 +0200 x86/pmstat: restore changes lost by "consolidation" Both c6e0a5539623 ("cpufreq: use existing local var in cpufreq_statistic_init()") and a1ce987411f6 ("cpufreq: don't leave stale statistics pointer") were lost in the course of "moving" the code, presumably due to overly lax re-basing. Fixes: bf0cd071db2a ("xen/pmstat: consolidate code into pmstat.c") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/drivers/acpi/pmstat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 80dc121e14..e276d55c97 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -124,7 +124,6 @@ int cpufreq_statistic_init(unsigned int cpu) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if ( !pxpt->u.trans_pt ) @@ -143,15 +142,17 @@ int cpufreq_statistic_init(unsigned int cpu) return -ENOMEM; } - pxpt->u.total = pmpt->perf.state_count; - pxpt->u.usable = pmpt->perf.state_count - pmpt->perf.platform_limit; + pxpt->u.total = count; + pxpt->u.usable = count - pmpt->perf.platform_limit; - for ( i = 0; i < pmpt->perf.state_count; i++ ) + for ( i = 0; i < count; i++ ) pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022223.1397991 (Exim 4.92) (envelope-from ) id 1uTcxN-00058M-Js; Mon, 23 Jun 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 1022223.1397991; Mon, 23 Jun 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 1uTcxN-00058E-HA; Mon, 23 Jun 2025 08:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1022223; Mon, 23 Jun 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 1uTcxM-000583-9H for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcxM-00GAKC-0p for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcxM-00ERrm-0h for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=bSKjSW/1Oi7cReowLVAD5q8EoQTss4Z494z2MumY4l8=; b=x+fe5N7zpxWFBNNLekBy84yzCG Qjqajobb2S72bIKpDS3FB/2PH7TVzJaHbXqmyz52w421ojBPWIPQtrKmF7l2uVEv/EJ8MiAY+0pYf y7VJj0eO0GZc8z0W87jtRto5KRN30uYoJMOd4uBSaZg9oywy0HlyLbzbsD71aiAMFqrY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/efi: Do not check kernel signature if it was embedded Message-Id: Date: Mon, 23 Jun 2025 08:55:12 +0000 commit 623c365951f991e57395e0fb9b0ce1f8847d2583 Author: Frediano Ziglio AuthorDate: Mon Jun 23 10:50:13 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:50:13 2025 +0200 xen/efi: Do not check kernel signature if it was embedded Using UKI it's possible to embed Linux kernel into xen.efi file. In this case the signature for Secure Boot is applied to the whole xen.efi, including the kernel. So checking for specific signature for the kernel is not needed. Signed-off-by: Frediano Ziglio Reviewed-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index e39fbc3529..fb3b120982 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1291,6 +1291,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, bool base_video = false; const char *option_str; bool use_cfg_file; + bool kernel_verified = false; int dt_modules_found; __set_bit(EFI_BOOT, &efi_flags); @@ -1461,6 +1462,11 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); } + else + { + /* Kernel was embedded so Xen signature includes it. */ + kernel_verified = true; + } if ( !read_section(loaded_image, L"ramdisk", &ramdisk, NULL) ) { @@ -1534,6 +1540,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, * verify it. */ if ( kernel.ptr && + !kernel_verified && !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, (void **)&shim_lock)) && (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 08:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 08:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022224.1397995 (Exim 4.92) (envelope-from ) id 1uTcxX-0005Af-LJ; Mon, 23 Jun 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 1022224.1397995; Mon, 23 Jun 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 1uTcxX-0005AY-IZ; Mon, 23 Jun 2025 08:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1022224; Mon, 23 Jun 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 1uTcxW-0005AO-CD for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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 1uTcxW-00GAKG-17 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 08:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTcxW-00ERsN-0z for xen-changelog@lists.xenproject.org; Mon, 23 Jun 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=3g6SX5S4zi7cUDI19JfgYWiFjYaJtAeCCsrPr5zZb5g=; b=oiCXyTrEmd03vqpKVl3mtrZyrM BiBhxPcAek9aRVMZ8ilZyPH9T/m93POPiMbrcK/S78SETFbO8jzKTdNQhfJrAJPNP9ABZBicXKKWa i+Xwvah2VO7QoZ42JR2m5ErAlSq17ENZLW+jXod7ZkBzLl1PSFVf/b9YwSU/fHdfCC1k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: fix memory leak in domain_create() Message-Id: Date: Mon, 23 Jun 2025 08:55:22 +0000 commit 3491e85a15058e87f0166c179282954c434e9acf Author: Denis Mukhin AuthorDate: Mon Jun 23 10:50:33 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:50:33 2025 +0200 xen/domain: fix memory leak in domain_create() Fix potential memory leak in domain_create() in late hardware domain case. Fixes: b959f3b820f5 ("xen: introduce hardware domain create flag") Signed-off-by: Denis Mukhin --- xen/common/domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/common/domain.c b/xen/common/domain.c index 434d32901b..8c8f70347a 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -825,7 +825,10 @@ struct domain *domain_create(domid_t domid, /* late_hwdom is only allowed for dom0. */ if ( hardware_domain && hardware_domain->domain_id ) + { + free_domain_struct(d); return ERR_PTR(-EINVAL); + } old_hwdom = hardware_domain; hardware_domain = d; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 09:55:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 09:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022243.1398014 (Exim 4.92) (envelope-from ) id 1uTdtH-0004k6-1W; Mon, 23 Jun 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 1022243.1398014; Mon, 23 Jun 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 1uTdtG-0004jv-V7; Mon, 23 Jun 2025 09:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1022243; Mon, 23 Jun 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 1uTdtF-0004jp-VO for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTdtF-00GBUF-1o for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTdtF-00EUmb-1e for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09: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=GqZ5/eL06DerBDYHDNBmwfIJxi02l5gaGQnFjPKgHrw=; b=sb7bfanmtPyDV4ggQgkzneVbtp Te51TMDB7GzT9uH2jRDCPsPX0C6Qone+DicyC0rrQebBtsTHATUcOCHZP6foibdUE/diTYIng1/TC 3KkWTLatZqEOvsYwLOfAuK8/TWM6LcO1uB7wKbaaaF8BUuiixRUYpKSH9s/TPSr7k+J8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pmstat: restore changes lost by "consolidation" Message-Id: Date: Mon, 23 Jun 2025 09:55:01 +0000 commit e98ec009cdbef2124610dc8afe1c7f73ef6e77eb Author: Jan Beulich AuthorDate: Mon Jun 23 10:49:26 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:49:26 2025 +0200 x86/pmstat: restore changes lost by "consolidation" Both c6e0a5539623 ("cpufreq: use existing local var in cpufreq_statistic_init()") and a1ce987411f6 ("cpufreq: don't leave stale statistics pointer") were lost in the course of "moving" the code, presumably due to overly lax re-basing. Fixes: bf0cd071db2a ("xen/pmstat: consolidate code into pmstat.c") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/drivers/acpi/pmstat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 80dc121e14..e276d55c97 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -124,7 +124,6 @@ int cpufreq_statistic_init(unsigned int cpu) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if ( !pxpt->u.trans_pt ) @@ -143,15 +142,17 @@ int cpufreq_statistic_init(unsigned int cpu) return -ENOMEM; } - pxpt->u.total = pmpt->perf.state_count; - pxpt->u.usable = pmpt->perf.state_count - pmpt->perf.platform_limit; + pxpt->u.total = count; + pxpt->u.usable = count - pmpt->perf.platform_limit; - for ( i = 0; i < pmpt->perf.state_count; i++ ) + for ( i = 0; i < count; i++ ) pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; pxpt->prev_state_wall = NOW(); pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + spin_unlock(cpufreq_statistic_lock); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 09:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 09:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022244.1398018 (Exim 4.92) (envelope-from ) id 1uTdtR-0004lc-2r; Mon, 23 Jun 2025 09:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022244.1398018; Mon, 23 Jun 2025 09: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 1uTdtR-0004lU-0I; Mon, 23 Jun 2025 09:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1022244; Mon, 23 Jun 2025 09:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTdtP-0004lK-OP for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTdtP-00GBUX-2I for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTdtP-00EUnY-1y for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09: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=2u+rb2wHk3kmzyhBrQb2qLO/oNgmduq6mPt7bB9p4+o=; b=kLVS8ygwP/KViRotZGTCkl+dyS nTTD4MIFrA5CPBCt+z1K8laZ2Bw8Jm5XH+exk/o3Bx9qEnxlPL7gvT5VkoS4oNdigSFXIa3TqSE9Z MoyR/KfwWjY1Rlcscjntw/N4ohbwBgyKicGyIJ2jVFI/3ymMJfAZJG3KcDVp1h3yA5uA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/efi: Do not check kernel signature if it was embedded Message-Id: Date: Mon, 23 Jun 2025 09:55:11 +0000 commit 623c365951f991e57395e0fb9b0ce1f8847d2583 Author: Frediano Ziglio AuthorDate: Mon Jun 23 10:50:13 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:50:13 2025 +0200 xen/efi: Do not check kernel signature if it was embedded Using UKI it's possible to embed Linux kernel into xen.efi file. In this case the signature for Secure Boot is applied to the whole xen.efi, including the kernel. So checking for specific signature for the kernel is not needed. Signed-off-by: Frediano Ziglio Reviewed-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index e39fbc3529..fb3b120982 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1291,6 +1291,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, bool base_video = false; const char *option_str; bool use_cfg_file; + bool kernel_verified = false; int dt_modules_found; __set_bit(EFI_BOOT, &efi_flags); @@ -1461,6 +1462,11 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); } + else + { + /* Kernel was embedded so Xen signature includes it. */ + kernel_verified = true; + } if ( !read_section(loaded_image, L"ramdisk", &ramdisk, NULL) ) { @@ -1534,6 +1540,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, * verify it. */ if ( kernel.ptr && + !kernel_verified && !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, (void **)&shim_lock)) && (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 09:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 09:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022245.1398022 (Exim 4.92) (envelope-from ) id 1uTdtb-0004oA-4B; Mon, 23 Jun 2025 09:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022245.1398022; Mon, 23 Jun 2025 09: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 1uTdtb-0004o2-1f; Mon, 23 Jun 2025 09:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1022245; Mon, 23 Jun 2025 09:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTdtZ-0004np-RY for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTdtZ-00GBUe-2c for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTdtZ-00EUoY-2T for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09: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=lLtiC0PGrz0dpHax5PNqCut9tJwhKn6eJ6SL5YJUpCw=; b=qIl+hHBxsv2aG0BJeHGrdjw9YH 3pWk/izUtJsGEW/cDfcMhlEOcyc/QZj0l7M+W4zZU6yLCNBeSNTzn0qxS0mhmm/kVoKgLrxRLc7HL 1Ckh8/Ap9rwfVoxQi67HyjXjquKdtUiqiB6INlX+og8bYdoB5Aq/bw6fCy4bQVxC4+g4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: fix memory leak in domain_create() Message-Id: Date: Mon, 23 Jun 2025 09:55:21 +0000 commit 3491e85a15058e87f0166c179282954c434e9acf Author: Denis Mukhin AuthorDate: Mon Jun 23 10:50:33 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 23 10:50:33 2025 +0200 xen/domain: fix memory leak in domain_create() Fix potential memory leak in domain_create() in late hardware domain case. Fixes: b959f3b820f5 ("xen: introduce hardware domain create flag") Signed-off-by: Denis Mukhin --- xen/common/domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/common/domain.c b/xen/common/domain.c index 434d32901b..8c8f70347a 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -825,7 +825,10 @@ struct domain *domain_create(domid_t domid, /* late_hwdom is only allowed for dom0. */ if ( hardware_domain && hardware_domain->domain_id ) + { + free_domain_struct(d); return ERR_PTR(-EINVAL); + } old_hwdom = hardware_domain; hardware_domain = d; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 09:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 09:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022246.1398025 (Exim 4.92) (envelope-from ) id 1uTdtl-0004qF-5a; Mon, 23 Jun 2025 09:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022246.1398025; Mon, 23 Jun 2025 09: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 1uTdtl-0004q8-33; Mon, 23 Jun 2025 09:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1022246; Mon, 23 Jun 2025 09:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTdtk-0004q2-92 for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTdtk-00GBUn-0c for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTdtk-00EUq5-0U for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 09: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=n1fh+g9LfZSD1xaO3jBYWMbK+5HC+k//+QhrSDd5zCk=; b=eWzIjVhwa6Nr6XakZZr3vTpO3V R5s4Y8DOGDo53crsBTJZwBvtqK5UqmB+81AUxqPyhcJrIUWQ8yXK1D0MVOXov1FrTFELiiBTqntuW tdFhTxnN+M+beOgL94973TFTx8DKZOCB+Qr0ktWZ92S6VEG+jjsPLp5qn3NHpCSObnUE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: Introduce a default .readthedocs.yaml Message-Id: Date: Mon, 23 Jun 2025 09:55:32 +0000 commit cc7394164633e75fb61d52565f75271e0b7f1236 Author: Andrew Cooper AuthorDate: Mon Oct 16 16:56:43 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 23 10:35:57 2025 +0100 docs: Introduce a default .readthedocs.yaml Read The Docs now requires a configuration file, which is awkward when using RTD to render proposed changes on the list. Provide the minimal configuration file possible, sacrificing all reproducibility in order to hopefully not need to touch it moving forwards. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- .readthedocs.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000000..d3aff7662e --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,18 @@ +# Read the Docs configuration file for Sphinx projects +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +build: + os: ubuntu-lts-latest + + tools: + python: "latest" + + jobs: + post_install: + # Instead of needing a separate requirements.txt + - python -m pip install --upgrade --no-cache-dir sphinx-rtd-theme + +sphinx: + configuration: docs/conf.py -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 23 10:44:11 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 23 Jun 2025 10:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1022256.1398029 (Exim 4.92) (envelope-from ) id 1uTeeh-0001zt-Eu; Mon, 23 Jun 2025 10:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1022256.1398029; Mon, 23 Jun 2025 10: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 1uTeeh-0001zl-CC; Mon, 23 Jun 2025 10:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1022256; Mon, 23 Jun 2025 10:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTeef-0001zd-RC for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 10:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uTeef-00GCUs-1o for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 10:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uTeef-00EX5K-1f for xen-changelog@lists.xenproject.org; Mon, 23 Jun 2025 10: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=ieJs534E9hRlPxw3+DBVzYPiyVAckcy61qGiBdofyJI=; b=cGUEIyG1cdxgPYIjgLJtk/gMhg vsiMvTlQD6NZZVFgOG9M9ZAjJOFAZHL24jnAD+84vSGQgDyxwILg4SQ+D55OmkVGasvbilvXdU5eq TzQUL2uimUTXUC+5lSA1yXIIgfK/vrgKku6aiNa3VOofhrsZDV124zNnJCIJTPw7R1f0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: Introduce a default .readthedocs.yaml Message-Id: Date: Mon, 23 Jun 2025 10:44:01 +0000 commit cc7394164633e75fb61d52565f75271e0b7f1236 Author: Andrew Cooper AuthorDate: Mon Oct 16 16:56:43 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 23 10:35:57 2025 +0100 docs: Introduce a default .readthedocs.yaml Read The Docs now requires a configuration file, which is awkward when using RTD to render proposed changes on the list. Provide the minimal configuration file possible, sacrificing all reproducibility in order to hopefully not need to touch it moving forwards. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- .readthedocs.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000000..d3aff7662e --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,18 @@ +# Read the Docs configuration file for Sphinx projects +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +build: + os: ubuntu-lts-latest + + tools: + python: "latest" + + jobs: + post_install: + # Instead of needing a separate requirements.txt + - python -m pip install --upgrade --no-cache-dir sphinx-rtd-theme + +sphinx: + configuration: docs/conf.py -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 12:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 12:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023644.1399644 (Exim 4.92) (envelope-from ) id 1uU30N-0003pF-Eo; Tue, 24 Jun 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 1023644.1399644; Tue, 24 Jun 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 1uU30N-0003p7-C5; Tue, 24 Jun 2025 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1023644; Tue, 24 Jun 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 1uU30M-0003p1-NZ for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU30M-000JoH-1b for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 12:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU30M-00Gz8o-1S for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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=7gzLtmCP1cPLZrMQ8UEO7u6qfOV/LW1x3icwoAa4mmU=; b=b1PchpkasQzU73cYINatrUtVgF bnm7EnmXBUpy18NlZinGuTEGUsocEeGBGj620dhEtbDp0XIUBkN1l+wHL81QAZowUwqUDUeISw2n2 gAkgAoxdJKxcMJx6FSOZiYKXaC647fVTd5vZNmmk8bEnDoe6BINnQDAjJAeTiQmx2ADk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] suspend: drop crazy pfn handling for PVH Message-Id: Date: Tue, 24 Jun 2025 12:44:02 +0000 commit 98ccf2e05d28d56f8d0bb4f97c3bdfa313bb5cde Author: Juergen Gross AuthorDate: Tue Jun 24 14:31:45 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:31:45 2025 +0200 suspend: drop crazy pfn handling for PVH Suspend for PVH is doing some crazy stuff with the Xenstore and console PFNs: - In arch_pre_suspend() the PFNs are "translated" to MFNs, even if that translation is a nop. - The result is stored via start_info_ptr, which points to a struct start_info only in case of PV mode. - After resuming or a cancelled suspend, the PFNs are retrieved again and "translated". - The "MFNs" are stored again via start_info_ptr, which is still not pointing at a struct start_info, and from where the data is never read again after that. Drop all of that completely. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/setup.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/arch/x86/setup.c b/arch/x86/setup.c index b613083..e30eb06 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -227,17 +227,6 @@ void arch_pre_suspend(void) virt_to_pfn(mfn_to_virt(start_info_ptr->store_mfn)); start_info_ptr->console.domU.mfn = virt_to_pfn(mfn_to_virt(start_info_ptr->console.domU.mfn)); -#else - uint64_t store_v; - uint64_t console_v; - - if( hvm_get_parameter(HVM_PARAM_STORE_PFN, &store_v) ) - BUG(); - start_info_ptr->store_mfn = store_v; - - if( hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &console_v) ) - BUG(); - start_info_ptr->console.domU.mfn = console_v; #endif unmap_shared_info(); @@ -262,17 +251,6 @@ void arch_post_suspend(int canceled) } else { memcpy(&start_info, start_info_ptr, sizeof(start_info_t)); } -#else - uint64_t store_v; - uint64_t console_v; - - if (hvm_get_parameter(HVM_PARAM_STORE_PFN, &store_v)) - BUG(); - start_info_ptr->store_mfn = pfn_to_mfn(store_v); - - if (hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &console_v)) - BUG(); - start_info_ptr->console.domU.mfn = pfn_to_mfn(console_v); #endif HYPERVISOR_shared_info = map_shared_info((void*) start_info_ptr); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 12:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 12:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023645.1399648 (Exim 4.92) (envelope-from ) id 1uU30X-0003r0-GP; Tue, 24 Jun 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 1023645.1399648; Tue, 24 Jun 2025 12: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 1uU30X-0003qs-DY; Tue, 24 Jun 2025 12:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1023645; Tue, 24 Jun 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 1uU30W-0003qd-Ki for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU30W-000JoO-1y for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 12:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU30W-00GzBH-1m for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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=vt8+ahsWRySkeCsXKwjSv/cHOFTB6zfMXG03ZrzmHWo=; b=EocRvAqRhUkjZ0AGNF1uPZ+o3B l09juk2KlIz+/5zJuLneli4/E6dWiv5HD23vwf6YY0qxmAo8XoWWEpaBw7Bx4vrqm6JZci41FeFRo ABWJjWc7r5QS4HeN68gYby/qBRoMYZ8eeaC8f1k5UbRdku144uxzvTZ1R4LNIfr2TUqw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] setup: drop parameter from map_shared_info() Message-Id: Date: Tue, 24 Jun 2025 12:44:12 +0000 commit d329a273ec55ed1294c0fde00ad5c95ddc3eff04 Author: Juergen Gross AuthorDate: Tue Jun 24 14:32:04 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:32:04 2025 +0200 setup: drop parameter from map_shared_info() The parameter of map_shared_info() is evaluated in PV mode only, and it is always the pointer to the initial struct start_info from boot time. By setting start_info_ptr a little bit earlier the PV variant of map_shared_info() can just use start_info_ptr instead of a parameter. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/arm/setup.c | 2 +- arch/x86/setup.c | 12 ++++++------ hypervisor.c | 2 +- include/hypervisor.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/setup.c b/arch/arm/setup.c index 3d112fa..1bcfa68 100644 --- a/arch/arm/setup.c +++ b/arch/arm/setup.c @@ -38,7 +38,7 @@ void arch_init(void *dtb_pointer, uint32_t physical_offset) device_tree = dtb_pointer; /* Map shared_info page */ - HYPERVISOR_shared_info = map_shared_info(NULL); + HYPERVISOR_shared_info = map_shared_info(); get_console(NULL); get_xenbus(NULL); diff --git a/arch/x86/setup.c b/arch/x86/setup.c index e30eb06..1bdf950 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -79,11 +79,10 @@ static inline void sse_init(void) { #ifdef CONFIG_PARAVIRT #define hpc_init() -shared_info_t *map_shared_info(void *p) +shared_info_t *map_shared_info(void) { int rc; - start_info_t *si = p; - unsigned long pa = si->shared_info; + unsigned long pa = start_info_ptr->shared_info; if ( (rc = HYPERVISOR_update_va_mapping((unsigned long)shared_info, __pte(pa | 7), UVMF_INVLPG)) ) @@ -185,6 +184,8 @@ arch_init(void *par) { static char hello[] = "Bootstrapping...\n"; + start_info_ptr = par; + hpc_init(); (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); @@ -206,7 +207,7 @@ arch_init(void *par) get_cmdline(par); /* Grab the shared_info pointer and put it in a safe place. */ - HYPERVISOR_shared_info = map_shared_info(par); + HYPERVISOR_shared_info = map_shared_info(); /* print out some useful information */ print_start_of_day(par); @@ -214,7 +215,6 @@ arch_init(void *par) #ifdef CONFIG_PARAVIRT memcpy(&start_info, par, sizeof(start_info)); #endif - start_info_ptr = (start_info_t *)par; start_kernel(); } @@ -253,7 +253,7 @@ void arch_post_suspend(int canceled) } #endif - HYPERVISOR_shared_info = map_shared_info((void*) start_info_ptr); + HYPERVISOR_shared_info = map_shared_info(); #ifndef CONFIG_PARAVIRT xen_callback_vector(); #endif diff --git a/hypervisor.c b/hypervisor.c index ba53555..6476d65 100644 --- a/hypervisor.c +++ b/hypervisor.c @@ -65,7 +65,7 @@ int hvm_set_parameter(int idx, uint64_t value) return HYPERVISOR_hvm_op(HVMOP_set_param, &xhv); } -shared_info_t *map_shared_info(void *p) +shared_info_t *map_shared_info(void) { struct xen_add_to_physmap xatp; diff --git a/include/hypervisor.h b/include/hypervisor.h index b852a42..aef142d 100644 --- a/include/hypervisor.h +++ b/include/hypervisor.h @@ -42,7 +42,7 @@ extern union start_info_union start_info_union; int hvm_get_parameter(int idx, uint64_t *value); int hvm_set_parameter(int idx, uint64_t value); #endif -shared_info_t *map_shared_info(void *p); +shared_info_t *map_shared_info(void); void unmap_shared_info(void); void force_evtchn_callback(void); void do_hypervisor_callback(struct pt_regs *regs); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 12:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 12:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023646.1399651 (Exim 4.92) (envelope-from ) id 1uU30h-0003uW-Ht; Tue, 24 Jun 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 1023646.1399651; Tue, 24 Jun 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 1uU30h-0003uQ-F1; Tue, 24 Jun 2025 12:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1023646; Tue, 24 Jun 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 1uU30g-0003tX-PR for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU30g-000Jop-2R for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 12:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU30g-00GzDS-2A for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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=kjLhkEBu29Iu0WTv+mVYVt8x2DY4/CWBbN9ZwaZZQOE=; b=LYs8IqxONbcqm30dhhVoCZllAk s3uYqyD3KaWECJY19ryfqiCMic4OOH23/94GPK1rtpiHk6o1OXAxS5RVZGwv6IX1R57wZVEuGe8Os Yt9OnwLOa/+Wc6SKni6rDDwnqxw9aSltENg6+Z90uXio5Auaj4PAzy51yqvmAKMvC+sk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] x86/pv: remove global start_info Message-Id: Date: Tue, 24 Jun 2025 12:44:22 +0000 commit d669a312b2b2813ed3418901b36a86967adf7296 Author: Juergen Gross AuthorDate: Tue Jun 24 14:32:38 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:32:38 2025 +0200 x86/pv: remove global start_info Add an extern declaration for start_info_ptr when running in PV mode and use that instead of the copy held in start_info. This allows to drop start_info. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/setup.c | 17 +---------------- console.c | 2 +- include/hypervisor.h | 12 ++---------- xenbus.c | 2 +- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 1bdf950..4e2f074 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -35,17 +35,8 @@ #include #include -#ifdef CONFIG_PARAVIRT -/* - * This structure contains start-of-day info, such as pagetable base pointer, - * address of the shared_info structure, and things like that. - */ -union start_info_union start_info_union; -EXPORT_SYMBOL(start_info_union); -#endif - /* - * This pointer holds a reference to the copy of the start_info struct. + * This pointer holds a reference to the start_info struct. */ start_info_t *start_info_ptr; @@ -212,10 +203,6 @@ arch_init(void *par) /* print out some useful information */ print_start_of_day(par); -#ifdef CONFIG_PARAVIRT - memcpy(&start_info, par, sizeof(start_info)); -#endif - start_kernel(); } @@ -248,8 +235,6 @@ void arch_post_suspend(int canceled) if (canceled) { start_info_ptr->store_mfn = pfn_to_mfn(start_info_ptr->store_mfn); start_info_ptr->console.domU.mfn = pfn_to_mfn(start_info_ptr->console.domU.mfn); - } else { - memcpy(&start_info, start_info_ptr, sizeof(start_info_t)); } #endif diff --git a/console.c b/console.c index 0107b68..a4c5037 100644 --- a/console.c +++ b/console.c @@ -411,7 +411,7 @@ void xencons_ring_resume(struct consfront_dev *dev) if ( dev ) { #if CONFIG_PARAVIRT - get_console(&start_info); + get_console(start_info_ptr); #else get_console(0); #endif diff --git a/include/hypervisor.h b/include/hypervisor.h index aef142d..f40bc8c 100644 --- a/include/hypervisor.h +++ b/include/hypervisor.h @@ -28,16 +28,8 @@ /* hypervisor.c */ #ifdef CONFIG_PARAVIRT -/* - * a placeholder for the start of day information passed up from the hypervisor - */ -union start_info_union -{ - start_info_t start_info; - char padding[512]; -}; -extern union start_info_union start_info_union; -#define start_info (start_info_union.start_info) +/* A pointer to the start of day information passed up from the hypervisor. */ +extern start_info_t *start_info_ptr; #else int hvm_get_parameter(int idx, uint64_t *value); int hvm_set_parameter(int idx, uint64_t value); diff --git a/xenbus.c b/xenbus.c index 686428a..43fdebd 100644 --- a/xenbus.c +++ b/xenbus.c @@ -469,7 +469,7 @@ void resume_xenbus(int canceled) struct xsd_sockmsg *rep; #ifdef CONFIG_PARAVIRT - get_xenbus(&start_info); + get_xenbus(start_info_ptr); #else get_xenbus(0); #endif -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 12:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 12:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023647.1399656 (Exim 4.92) (envelope-from ) id 1uU30r-0003xY-J3; Tue, 24 Jun 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 1023647.1399656; Tue, 24 Jun 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 1uU30r-0003xR-GN; Tue, 24 Jun 2025 12:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1023647; Tue, 24 Jun 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 1uU30q-0003xJ-Sh for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU30q-000Jp6-2m for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 12:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU30q-00GzED-2d for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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=TC/RxBHvSeiXkU9VNj/obju8Uxiq6hKzLxCfhEBIfv0=; b=G5manonXu0whnM4VXiDc1vEUOg GbDnlxNsKM9Ket9qyIFZZSnhDUeLyj+gXiB7SMr/ZsJJJinYtm/oeRePELz0KaQ65GBXNKs+nTx0s ZZQlxcvaZBT9q6qJN0gIaI7BtOFq4GdFKcQnXe4h4Ybl5kWkjZNrZcOIrU51LFWaN1QM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] console: drop parameter from get_console() Message-Id: Date: Tue, 24 Jun 2025 12:44:32 +0000 commit 78fb0be0852598532ae75f60acb4ce5b11657462 Author: Juergen Gross AuthorDate: Tue Jun 24 14:32:56 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:32:56 2025 +0200 console: drop parameter from get_console() The parameter of get_console() is used only when running in PV mode, and it always has the same value. Drop the parameter and use start_info_ptr directly in the PV variant of get_console(). Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/arm/setup.c | 2 +- arch/x86/setup.c | 2 +- console.c | 10 +++++----- include/console.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/setup.c b/arch/arm/setup.c index 1bcfa68..161d137 100644 --- a/arch/arm/setup.c +++ b/arch/arm/setup.c @@ -40,7 +40,7 @@ void arch_init(void *dtb_pointer, uint32_t physical_offset) /* Map shared_info page */ HYPERVISOR_shared_info = map_shared_info(); - get_console(NULL); + get_console(); get_xenbus(NULL); gic_init(); diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 4e2f074..2b314aa 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -193,7 +193,7 @@ arch_init(void *par) /* WARN: don't do printk before here, it uses information from shared_info. Use xprintk instead. */ - get_console(par); + get_console(); get_xenbus(par); get_cmdline(par); diff --git a/console.c b/console.c index a4c5037..48c5be4 100644 --- a/console.c +++ b/console.c @@ -197,15 +197,15 @@ uint32_t console_evtchn; static struct consfront_dev* resume_xen_console(struct consfront_dev *dev); #ifdef CONFIG_PARAVIRT -void get_console(void *p) +void get_console(void) { - start_info_t *si = p; + start_info_t *si = start_info_ptr; console_ring = mfn_to_virt(si->console.domU.mfn); console_evtchn = si->console.domU.evtchn; } #else -void get_console(void *p) +void get_console(void) { uint64_t v = -1; @@ -411,9 +411,9 @@ void xencons_ring_resume(struct consfront_dev *dev) if ( dev ) { #if CONFIG_PARAVIRT - get_console(start_info_ptr); + get_console(); #else - get_console(0); + get_console(); #endif resume_xen_console(dev); } diff --git a/include/console.h b/include/console.h index d216d24..326e993 100644 --- a/include/console.h +++ b/include/console.h @@ -76,7 +76,7 @@ void xprintk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); void xencons_rx(char *buf, unsigned len, struct pt_regs *regs); void xencons_tx(void); -void get_console(void *p); +void get_console(void); void init_console(void); void console_print(struct consfront_dev *dev, const char *data, int length); void fini_consfront(struct consfront_dev *dev); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 12:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 12:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023648.1399660 (Exim 4.92) (envelope-from ) id 1uU311-0003zu-Ka; Tue, 24 Jun 2025 12:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023648.1399660; Tue, 24 Jun 2025 12:44: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 1uU311-0003zm-Hx; Tue, 24 Jun 2025 12:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1023648; Tue, 24 Jun 2025 12:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU310-0003zg-VX for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU310-000JpN-33 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 12:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU310-00GzEt-2x for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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=8jlwveNm8be2OkmCNsWGOmxhzH9aZahA/ax7OjgAWtw=; b=7HlJsg2BuF3qtR64ADlhA0sDmM IoqfP5mgcOnHhKL/DQCxgkY/xRMSLMRzL5v3SUohF6DMUecLrVIeHUdXNwTA1kK/t5c3e6xzlXZ9L OETR4x2UX8QlIaPMSjreA+HzxjI0EVRlBBFY+xOGKNu260KIrFSAVE/M606CpHZrm8GU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] xenbus: drop parameter from get_xenbus() Message-Id: Date: Tue, 24 Jun 2025 12:44:42 +0000 commit 57031ca91df010375f263638e035e57c81b75f1c Author: Juergen Gross AuthorDate: Tue Jun 24 14:33:11 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:33:11 2025 +0200 xenbus: drop parameter from get_xenbus() The parameter of get_xenbus() is used only when running in PV mode, and it always has the same value. Drop the parameter and use start_info_ptr directly in the PV variant of get_xenbus(). Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/arm/setup.c | 2 +- arch/x86/setup.c | 2 +- include/xenbus.h | 4 ++-- xenbus.c | 13 +++++-------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/arch/arm/setup.c b/arch/arm/setup.c index 161d137..e918a06 100644 --- a/arch/arm/setup.c +++ b/arch/arm/setup.c @@ -41,7 +41,7 @@ void arch_init(void *dtb_pointer, uint32_t physical_offset) HYPERVISOR_shared_info = map_shared_info(); get_console(); - get_xenbus(NULL); + get_xenbus(); gic_init(); diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 2b314aa..590f51a 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -194,7 +194,7 @@ arch_init(void *par) /* WARN: don't do printk before here, it uses information from shared_info. Use xprintk instead. */ get_console(); - get_xenbus(par); + get_xenbus(); get_cmdline(par); /* Grab the shared_info pointer and put it in a safe place. */ diff --git a/include/xenbus.h b/include/xenbus.h index 542ee45..21da05e 100644 --- a/include/xenbus.h +++ b/include/xenbus.h @@ -12,7 +12,7 @@ extern struct xenstore_domain_interface *xenstore_buf; /* Initialize the XenBus system. */ void init_xenbus(void); -void get_xenbus(void *p); +void get_xenbus(void); #else #define xenbus_evtchn ~0 #define xenstore_buf NULL @@ -20,7 +20,7 @@ void get_xenbus(void *p); static inline void init_xenbus(void) { } -static inline void get_xenbus(void *p) +static inline void get_xenbus(void) { } #endif diff --git a/xenbus.c b/xenbus.c index 43fdebd..8225ed4 100644 --- a/xenbus.c +++ b/xenbus.c @@ -74,15 +74,15 @@ uint32_t xenbus_evtchn; EXPORT_SYMBOL(xenbus_evtchn); #ifdef CONFIG_PARAVIRT -void get_xenbus(void *p) +void get_xenbus(void) { - start_info_t *si = p; + start_info_t *si = start_info_ptr; xenbus_evtchn = si->store_evtchn; xenstore_buf = mfn_to_virt(si->store_mfn); } #else -void get_xenbus(void *p) +void get_xenbus(void) { uint64_t v; @@ -468,11 +468,8 @@ void resume_xenbus(int canceled) struct write_req req[2]; struct xsd_sockmsg *rep; -#ifdef CONFIG_PARAVIRT - get_xenbus(start_info_ptr); -#else - get_xenbus(0); -#endif + get_xenbus(); + unmask_evtchn(xenbus_evtchn); if ( !canceled ) -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 12:44:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 12:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023649.1399664 (Exim 4.92) (envelope-from ) id 1uU31B-00042H-MF; Tue, 24 Jun 2025 12:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023649.1399664; Tue, 24 Jun 2025 12:44: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 1uU31B-000427-JR; Tue, 24 Jun 2025 12:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1023649; Tue, 24 Jun 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 1uU31B-00041z-1o for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU31B-000JpR-04 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 12:44:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU31A-00GzFZ-3D for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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=mENQ43rOioBeudLB4+UvEG2A1zQsTONnOTJi7VT4HDw=; b=dyXGpkgE7Uo90SCsv/13FnvunA EIgWsOpZIdFVgjt2ha6lfawlf1IHQ4dYhVupS+oBWP/0bkUVkvkAxwHlyF98DKs5r8r45FJKbcv88 wmLjEn9tyLHLcwVEYqMa3NMXbc73iaumIud433GdH6QHZSA6RhSNJgAq6NxVcoZ4fEOQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] x86/pv: make start_info_ptr PV-only Message-Id: Date: Tue, 24 Jun 2025 12:44:52 +0000 commit 8174d3144bf02d5affbeb75c2a23b07523954ab9 Author: Juergen Gross AuthorDate: Tue Jun 24 14:33:29 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:33:29 2025 +0200 x86/pv: make start_info_ptr PV-only Hide start_info_ptr via CONFIG_PARAVIRT in order to avoid accesses to it form not PV specific code. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/setup.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 590f51a..b3fc835 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -35,11 +35,6 @@ #include #include -/* - * This pointer holds a reference to the start_info struct. - */ -start_info_t *start_info_ptr; - /* * Shared page for communicating with the hypervisor. * Events flags go here, for example. @@ -68,6 +63,11 @@ static inline void sse_init(void) { #endif #ifdef CONFIG_PARAVIRT +/* + * This pointer holds a reference to the start_info struct. + */ +start_info_t *start_info_ptr; + #define hpc_init() shared_info_t *map_shared_info(void) @@ -175,7 +175,9 @@ arch_init(void *par) { static char hello[] = "Bootstrapping...\n"; +#ifdef CONFIG_PARAVIRT start_info_ptr = par; +#endif hpc_init(); (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); @@ -226,7 +228,11 @@ int arch_suspend(void) * This hypercall returns 1 if the suspend * was cancelled and 0 if resuming in a new domain */ +#ifdef CONFIG_PARAVIRT return HYPERVISOR_suspend(virt_to_mfn(start_info_ptr)); +#else + return HYPERVISOR_suspend(0); +#endif } void arch_post_suspend(int canceled) -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023667.1399688 (Exim 4.92) (envelope-from ) id 1uU3Fs-0006yt-74; Tue, 24 Jun 2025 13:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023667.1399688; Tue, 24 Jun 2025 13:00: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 1uU3Fs-0006yU-3w; Tue, 24 Jun 2025 13:00:04 +0000 Received: by outflank-mailman (input) for mailman id 1023667; Tue, 24 Jun 2025 13:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3Fq-0006bb-E2 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3Fp-000K9j-3B for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3Fp-00H0yC-34 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=uKI8awR9kLKciK1jS6xeZPkdQhErP26nNzI37/5GyFA=; b=bod6+ZjCh/swS74dWGrJk/bl5L tDB35Rep3AOcqQJ8LCyq9sd9wZscQC+eZXhHqORQjQO30XbKaD50xSCSGrfg0OjZ/s6VbeLbrbt7K N2bFYs+alUqITxc0UI//tUvO2Wdtanxgla6xriRWcgZWl09Mp1h3VjnLvEHXYE/Bi6Os=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CODING_STYLE: Custom type names must be snake-cased by word Message-Id: Date: Tue, 24 Jun 2025 13:00:01 +0000 commit eea7d98d1c653f35b40f5fd4d38a19ae8e21e8bd Author: Alejandro Vallejo AuthorDate: Tue Jun 24 14:54:34 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:54:34 2025 +0200 CODING_STYLE: Custom type names must be snake-cased by word There's the unwritten convention of splitting type names using underscores. Add such convention to the CODINNG_STYLE to make it common and less unwritten. Signed-off-by: Alejandro Vallejo Acked-by: Stefano Stabellini --- CODING_STYLE | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CODING_STYLE b/CODING_STYLE index 5644f1697f..7bf3848444 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -113,6 +113,12 @@ Braces should be omitted for blocks with a single statement. e.g., if ( condition ) single_statement(); +Identifiers +----------- + +When giving names to identifiers (variables, functions, constants...), separate +words using underscores (for example, use "my_foo" instead of "myfoo"). + Types ----- -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:00:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023668.1399692 (Exim 4.92) (envelope-from ) id 1uU3G1-0007Uv-9D; Tue, 24 Jun 2025 13:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023668.1399692; Tue, 24 Jun 2025 13: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 1uU3G1-0007Un-6U; Tue, 24 Jun 2025 13:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1023668; Tue, 24 Jun 2025 13:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3G0-0007Ud-46 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3G0-000K9o-0I for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3G0-00H0zw-0B for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00: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=DjN1gt4qpWg6dnQQP+whrmxhnNrjFs1LjTy6LMqsp0k=; b=hCwl3EgsFSt+/R1P0SmFW7Tz/m vZi9iBzfjW6mb7+8nchtzu7D15wAyqQLjNXww5bNeZKm3uTNunDfHSptqWZ/Q93c/kX0IHwTAAhbA fyHpMspLp2Fdwooa2soNF+yhfmKeDpIX94eJU7SLNzE1KCrq6tP2S5dNTzdRMzuhjSvM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Rename bootmodule{,s} to boot_module{,s} Message-Id: Date: Tue, 24 Jun 2025 13:00:12 +0000 commit 1671619181ba424aeadf5072bc2130baf7be26f4 Author: Alejandro Vallejo AuthorDate: Tue Jun 24 14:54:58 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:54:58 2025 +0200 xen: Rename bootmodule{,s} to boot_module{,s} ... in alignment with the new coding style on word splitting for type names. This aligns its name with the largely duplicate boot_module struct in x86. While there's no equivalent to "struct bootmodules" in x86, changing one and not the other is just confusing. Same with various comments and function names. Rather than making a long subfield name even longer, remove the _bootmodule suffix in the kernel, initrd and dtb subfields. Not a functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini Acked-By: Daniel P. Smith --- xen/arch/arm/domain_build.c | 4 +-- xen/arch/arm/efi/efi-boot.h | 6 ++-- xen/arch/arm/kernel.c | 4 +-- xen/arch/arm/llc-coloring.c | 8 ++--- xen/arch/arm/mmu/setup.c | 10 +++---- xen/arch/arm/setup.c | 10 +++---- xen/common/device-tree/bootfdt.c | 4 +-- xen/common/device-tree/bootinfo.c | 52 ++++++++++++++++----------------- xen/common/device-tree/dom0less-build.c | 25 ++++++++-------- xen/common/device-tree/domain-build.c | 2 +- xen/common/device-tree/kernel.c | 22 +++++++------- xen/include/xen/bootfdt.h | 26 ++++++++--------- xen/include/xen/fdt-kernel.h | 7 ++--- xen/xsm/xsm_policy.c | 2 +- 14 files changed, 90 insertions(+), 92 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4ff161887e..3f5c7c2e5a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -579,7 +579,7 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_node_path_is_equal(node, "/chosen") ) { - const struct bootmodule *initrd = kinfo->initrd_bootmodule; + const struct boot_module *initrd = kinfo->initrd; if ( bootargs ) { @@ -1517,7 +1517,7 @@ int __init make_chosen_node(const struct kernel_info *kinfo) { int res; const char *bootargs = NULL; - const struct bootmodule *initrd = kinfo->initrd_bootmodule; + const struct boot_module *initrd = kinfo->initrd; void *fdt = kinfo->fdt; dt_dprintk("Create chosen node\n"); diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index ee80560e13..faabe5a6a8 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -20,7 +20,7 @@ typedef struct { } module_info; /* - * Binaries will be translated into bootmodules, the maximum number for them is + * Binaries will be translated into boot_modules, the maximum number for them is * MAX_MODULES where we should remove a unit for Xen and one for Xen DTB */ #define MAX_UEFI_MODULES (MAX_MODULES - 2) @@ -602,9 +602,9 @@ static void __init efi_arch_handle_module(const struct file *file, /* * modules_available is decremented here because for each dom0 file added - * from the configuration file, there will be an additional bootmodule, + * from the configuration file, there will be an additional boot_module, * so the number of available slots will be decremented because there is a - * maximum amount of bootmodules that can be loaded. + * maximum amount of boot_modules that can be loaded. */ modules_available--; } diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index cb1efb19e7..e734ec5c1e 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -46,7 +46,7 @@ static void __init place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - const struct bootmodule *mod = info->initrd_bootmodule; + const struct boot_module *mod = info->initrd; const struct membanks *mem = kernel_info_get_mem(info); const paddr_t initrd_len = ROUNDUP(mod ? mod->size : 0, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); @@ -175,7 +175,7 @@ static void __init kernel_zimage_load(struct kernel_info *info) * Check if the image is a uImage and setup kernel_info */ int __init kernel_uimage_probe(struct kernel_info *info, - struct bootmodule *mod) + struct boot_module *mod) { struct { __be32 magic; /* Image Header Magic Number */ diff --git a/xen/arch/arm/llc-coloring.c b/xen/arch/arm/llc-coloring.c index 99ac10b610..6f78817c57 100644 --- a/xen/arch/arm/llc-coloring.c +++ b/xen/arch/arm/llc-coloring.c @@ -123,12 +123,12 @@ static paddr_t __init xen_colored_map_size(void) void __init arch_llc_coloring_init(void) { - struct bootmodule *xen_bootmodule = boot_module_find_by_kind(BOOTMOD_XEN); + struct boot_module *xen_boot_module = boot_module_find_by_kind(BOOTMOD_XEN); - BUG_ON(!xen_bootmodule); + BUG_ON(!xen_boot_module); - xen_bootmodule->size = xen_colored_map_size(); - xen_bootmodule->start = get_xen_paddr(xen_bootmodule->size); + xen_boot_module->size = xen_colored_map_size(); + xen_boot_module->start = get_xen_paddr(xen_boot_module->size); } /* diff --git a/xen/arch/arm/mmu/setup.c b/xen/arch/arm/mmu/setup.c index 30afe97781..eb8ed19ca1 100644 --- a/xen/arch/arm/mmu/setup.c +++ b/xen/arch/arm/mmu/setup.c @@ -246,7 +246,7 @@ paddr_t __init consider_modules(paddr_t s, paddr_t e, #ifdef CONFIG_STATIC_SHM const struct membanks *shmem = bootinfo_get_shmem(); #endif - const struct bootmodules *mi = &bootinfo.modules; + const struct boot_modules *mi = &bootinfo.modules; int i; int nr; @@ -273,8 +273,8 @@ paddr_t __init consider_modules(paddr_t s, paddr_t e, } /* - * i is the current bootmodule we are evaluating, across all - * possible kinds of bootmodules. + * i is the current boot_module we are evaluating, across all + * possible kinds of boot_modules. * * When retrieving the corresponding reserved-memory addresses, we * need to index the reserved_mem bank starting from 0, and only counting @@ -328,8 +328,8 @@ static void __init create_llc_coloring_mappings(void) { lpae_t pte; unsigned int i; - struct bootmodule *xen_bootmodule = boot_module_find_by_kind(BOOTMOD_XEN); - mfn_t start_mfn = maddr_to_mfn(xen_bootmodule->start), mfn; + struct boot_module *xen_boot_module = boot_module_find_by_kind(BOOTMOD_XEN); + mfn_t start_mfn = maddr_to_mfn(xen_boot_module->start), mfn; for_each_xen_colored_mfn ( start_mfn, mfn, i ) { diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index ed72317af3..58acc2d0d4 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -206,11 +206,11 @@ static void __init processor_id(void) void __init discard_initial_modules(void) { - struct bootmodules *mi = &bootinfo.modules; + struct boot_modules *mi = &bootinfo.modules; int i; /* - * When using static heap feature, don't give bootmodules memory back to + * When using static heap feature, don't give boot_modules memory back to * the heap allocator */ if ( using_static_heap ) @@ -303,7 +303,7 @@ void asmlinkage __init start_xen(unsigned long fdt_paddr) { size_t fdt_size; const char *cmdline; - struct bootmodule *xen_bootmodule; + struct boot_module *xen_boot_module; struct domain *d; int rc, i; @@ -327,10 +327,10 @@ void asmlinkage __init start_xen(unsigned long fdt_paddr) fdt_paddr); /* Register Xen's load address as a boot module. */ - xen_bootmodule = add_boot_module(BOOTMOD_XEN, + xen_boot_module = add_boot_module(BOOTMOD_XEN, virt_to_maddr(_start), (paddr_t)(uintptr_t)(_end - _start), false); - BUG_ON(!xen_bootmodule); + BUG_ON(!xen_boot_module); fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index 9daea06e57..39334d6205 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -314,7 +314,7 @@ static void __init process_multiboot_node(const void *fdt, int node, static int __initdata kind_guess = 0; const struct fdt_property *prop; const __be32 *cell; - bootmodule_kind kind; + boot_module_kind kind; paddr_t start, size; int len; /* sizeof("/chosen/") + DT_MAX_NAME + '/' + DT_MAX_NAME + '/0' => 92 */ @@ -518,7 +518,7 @@ static void __init early_print_info(void) { const struct membanks *mi = bootinfo_get_mem(); const struct membanks *mem_resv = bootinfo_get_reserved_mem(); - struct bootmodules *mods = &bootinfo.modules; + struct boot_modules *mods = &bootinfo.modules; struct bootcmdlines *cmds = &bootinfo.cmdlines; unsigned int i; diff --git a/xen/common/device-tree/bootinfo.c b/xen/common/device-tree/bootinfo.c index 717cfa0962..2a27d1318b 100644 --- a/xen/common/device-tree/bootinfo.c +++ b/xen/common/device-tree/bootinfo.c @@ -21,7 +21,7 @@ struct bootinfo __initdata bootinfo = BOOTINFO_INIT; -const char * __init boot_module_kind_as_string(bootmodule_kind kind) +const char * __init boot_module_kind_as_string(boot_module_kind kind) { switch ( kind ) { @@ -49,7 +49,7 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, unsigned int i; /* - * i is the current bootmodule we are evaluating across all possible + * i is the current boot_module we are evaluating across all possible * kinds. */ for ( i = first; i < reserved_mem->nr_banks; i++ ) @@ -143,18 +143,18 @@ static bool __init meminfo_overlap_check(const struct membanks *mem, * TODO: '*_end' could be 0 if the module/region is at the end of the physical * address space. This is for now not handled as it requires more rework. */ -static bool __init bootmodules_overlap_check(struct bootmodules *bootmodules, - paddr_t region_start, - paddr_t region_size) +static bool __init boot_modules_overlap_check(struct boot_modules *boot_modules, + paddr_t region_start, + paddr_t region_size) { paddr_t mod_start = INVALID_PADDR, mod_end = 0; paddr_t region_end = region_start + region_size; - unsigned int i, mod_num = bootmodules->nr_mods; + unsigned int i, mod_num = boot_modules->nr_mods; for ( i = 0; i < mod_num; i++ ) { - mod_start = bootmodules->module[i].start; - mod_end = mod_start + bootmodules->module[i].size; + mod_start = boot_modules->module[i].start; + mod_end = mod_start + boot_modules->module[i].size; if ( region_end <= mod_start || region_start >= mod_end ) continue; @@ -210,20 +210,20 @@ bool __init check_reserved_regions_overlap(paddr_t region_start, allow_memreserve_overlap) ) return true; - /* Check if input region is overlapping with bootmodules */ - if ( bootmodules_overlap_check(&bootinfo.modules, - region_start, region_size) ) + /* Check if input region is overlapping with boot_modules */ + if ( boot_modules_overlap_check(&bootinfo.modules, + region_start, region_size) ) return true; return false; } -struct bootmodule __init *add_boot_module(bootmodule_kind kind, - paddr_t start, paddr_t size, - bool domU) +struct boot_module __init *add_boot_module(boot_module_kind kind, + paddr_t start, paddr_t size, + bool domU) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; unsigned int i; if ( mods->nr_mods == MAX_MODULES ) @@ -266,10 +266,10 @@ struct bootmodule __init *add_boot_module(bootmodule_kind kind, * XSM, DTB) or Dom0 modules. This is not suitable for looking up guest * modules. */ -struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) +struct boot_module * __init boot_module_find_by_kind(boot_module_kind kind) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; int i; for (i = 0 ; i < mods->nr_mods ; i++ ) { @@ -281,7 +281,7 @@ struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) } void __init add_boot_cmdline(const char *name, const char *cmdline, - bootmodule_kind kind, paddr_t start, bool domU) + boot_module_kind kind, paddr_t start, bool domU) { struct bootcmdlines *cmds = &bootinfo.cmdlines; struct bootcmdline *cmd; @@ -310,7 +310,7 @@ void __init add_boot_cmdline(const char *name, const char *cmdline, * XSM, DTB) or Dom0 modules. This is not suitable for looking up guest * modules. */ -struct bootcmdline * __init boot_cmdline_find_by_kind(bootmodule_kind kind) +struct bootcmdline * __init boot_cmdline_find_by_kind(boot_module_kind kind) { struct bootcmdlines *cmds = &bootinfo.cmdlines; struct bootcmdline *cmd; @@ -340,11 +340,11 @@ struct bootcmdline * __init boot_cmdline_find_by_name(const char *name) return NULL; } -struct bootmodule * __init boot_module_find_by_addr_and_kind(bootmodule_kind kind, - paddr_t start) +struct boot_module * __init boot_module_find_by_addr_and_kind( + boot_module_kind kind, paddr_t start) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; unsigned int i; for (i = 0 ; i < mods->nr_mods ; i++ ) @@ -366,7 +366,7 @@ struct bootmodule * __init boot_module_find_by_addr_and_kind(bootmodule_kind kin */ static paddr_t __init next_module(paddr_t s, paddr_t *end) { - struct bootmodules *mi = &bootinfo.modules; + struct boot_modules *mi = &bootinfo.modules; paddr_t lowest = ~(paddr_t)0; int i; diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 3d503c6973..221b875a2f 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -44,13 +44,13 @@ void __init set_xs_domain(struct domain *d) bool __init is_dom0less_mode(void) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; unsigned int i; bool dom0found = false; bool domUfound = false; - /* Look into the bootmodules */ + /* Look into the boot_modules */ for ( i = 0 ; i < mods->nr_mods ; i++ ) { mod = &mods->module[i]; @@ -374,18 +374,17 @@ static int __init check_partial_fdt(void *pfdt, size_t size) return 0; } -static int __init domain_handle_dtb_bootmodule(struct domain *d, - struct kernel_info *kinfo) +static int __init domain_handle_dtb_boot_module(struct domain *d, + struct kernel_info *kinfo) { void *pfdt; int res, node_next; - pfdt = ioremap_cache(kinfo->dtb_bootmodule->start, - kinfo->dtb_bootmodule->size); + pfdt = ioremap_cache(kinfo->dtb->start, kinfo->dtb->size); if ( pfdt == NULL ) return -EFAULT; - res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); + res = check_partial_fdt(pfdt, kinfo->dtb->size); if ( res < 0 ) goto out; @@ -459,8 +458,8 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) sizecells = GUEST_ROOT_SIZE_CELLS; /* Account for domU passthrough DT size */ - if ( kinfo->dtb_bootmodule ) - fdt_size += kinfo->dtb_bootmodule->size; + if ( kinfo->dtb ) + fdt_size += kinfo->dtb->size; /* Cap to max DT size if needed */ fdt_size = min(fdt_size, SZ_2M); @@ -507,13 +506,13 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) goto err; /* - * domain_handle_dtb_bootmodule has to be called before the rest of + * domain_handle_dtb_boot_module has to be called before the rest of * the device tree is generated because it depends on the value of * the field phandle_intc. */ - if ( kinfo->dtb_bootmodule ) + if ( kinfo->dtb ) { - ret = domain_handle_dtb_bootmodule(d, kinfo); + ret = domain_handle_dtb_boot_module(d, kinfo); if ( ret ) goto err; } diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 99ea81198a..cd01a8b4bc 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -352,7 +352,7 @@ void __init dtb_load(struct kernel_info *kinfo, void __init initrd_load(struct kernel_info *kinfo, copy_to_guest_phys_cb copy_to_guest) { - const struct bootmodule *mod = kinfo->initrd_bootmodule; + const struct boot_module *mod = kinfo->initrd; paddr_t load_addr = kinfo->initrd_paddr; paddr_t paddr, len; int node; diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kernel.c index cb04cd9d50..e1b22dc1c7 100644 --- a/xen/common/device-tree/kernel.c +++ b/xen/common/device-tree/kernel.c @@ -21,7 +21,7 @@ static uint32_t __init output_length(char *image, unsigned long image_len) return *(uint32_t *)&image[image_len - 4]; } -int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) +int __init kernel_decompress(struct boot_module *mod, uint32_t offset) { char *output, *input; char magic[2]; @@ -92,7 +92,7 @@ int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) free_domheap_page(pages + i); /* - * When using static heap feature, don't give bootmodules memory back to + * When using static heap feature, don't give boot_modules memory back to * the heap allocator */ if ( using_static_heap ) @@ -118,7 +118,7 @@ int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) int __init kernel_probe(struct kernel_info *info, const struct dt_device_node *domain) { - struct bootmodule *mod = NULL; + struct boot_module *mod = NULL; struct bootcmdline *cmd = NULL; struct dt_device_node *node; u64 kernel_addr, initrd_addr, dtb_addr, size; @@ -140,8 +140,8 @@ int __init kernel_probe(struct kernel_info *info, mod = boot_module_find_by_kind(BOOTMOD_KERNEL); - info->kernel_bootmodule = mod; - info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); + info->kernel = mod; + info->initrd = boot_module_find_by_kind(BOOTMOD_RAMDISK); cmd = boot_cmdline_find_by_kind(BOOTMOD_KERNEL); if ( cmd ) @@ -162,7 +162,7 @@ int __init kernel_probe(struct kernel_info *info, dt_get_range(&val, node, &kernel_addr, &size); mod = boot_module_find_by_addr_and_kind( BOOTMOD_KERNEL, kernel_addr); - info->kernel_bootmodule = mod; + info->kernel = mod; } else if ( dt_device_is_compatible(node, "multiboot,ramdisk") ) { @@ -171,7 +171,7 @@ int __init kernel_probe(struct kernel_info *info, val = dt_get_property(node, "reg", &len); dt_get_range(&val, node, &initrd_addr, &size); - info->initrd_bootmodule = boot_module_find_by_addr_and_kind( + info->initrd = boot_module_find_by_addr_and_kind( BOOTMOD_RAMDISK, initrd_addr); } else if ( dt_device_is_compatible(node, "multiboot,device-tree") ) @@ -183,7 +183,7 @@ int __init kernel_probe(struct kernel_info *info, if ( val == NULL ) continue; dt_get_range(&val, node, &dtb_addr, &size); - info->dtb_bootmodule = boot_module_find_by_addr_and_kind( + info->dtb = boot_module_find_by_addr_and_kind( BOOTMOD_GUEST_DTB, dtb_addr); } else @@ -201,10 +201,10 @@ int __init kernel_probe(struct kernel_info *info, } printk("Loading %pd kernel from boot module @ %"PRIpaddr"\n", - info->d, info->kernel_bootmodule->start); - if ( info->initrd_bootmodule ) + info->d, info->kernel->start); + if ( info->initrd ) printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", - info->initrd_bootmodule->start); + info->initrd->start); /* * uImage isn't really used nowadays thereby leave kernel_uimage_probe() diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index ff40f3078e..236b456dd2 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -23,7 +23,7 @@ typedef enum { BOOTMOD_GUEST_DTB, BOOTMOD_MICROCODE, BOOTMOD_UNKNOWN -} bootmodule_kind; +} boot_module_kind; enum membank_type { /* @@ -103,8 +103,8 @@ struct shared_meminfo { * initrd to be compatible with all versions of the multiboot spec. */ #define BOOTMOD_MAX_CMDLINE 1024 -struct bootmodule { - bootmodule_kind kind; +struct boot_module { + boot_module_kind kind; bool domU; paddr_t start; paddr_t size; @@ -113,16 +113,16 @@ struct bootmodule { /* DT_MAX_NAME is the node name max length according the DT spec */ #define DT_MAX_NAME 41 struct bootcmdline { - bootmodule_kind kind; + boot_module_kind kind; bool domU; paddr_t start; char dt_name[DT_MAX_NAME]; char cmdline[BOOTMOD_MAX_CMDLINE]; }; -struct bootmodules { +struct boot_modules { int nr_mods; - struct bootmodule module[MAX_MODULES]; + struct boot_module module[MAX_MODULES]; }; struct bootcmdlines { @@ -134,7 +134,7 @@ struct bootinfo { struct meminfo mem; /* The reserved regions are only used when booting using Device-Tree */ struct meminfo reserved_mem; - struct bootmodules modules; + struct boot_modules modules; struct bootcmdlines cmdlines; #ifdef CONFIG_ACPI struct meminfo acpi; @@ -176,16 +176,16 @@ bool check_reserved_regions_overlap(paddr_t region_start, paddr_t region_size, bool allow_memreserve_overlap); -struct bootmodule *add_boot_module(bootmodule_kind kind, +struct boot_module *add_boot_module(boot_module_kind kind, paddr_t start, paddr_t size, bool domU); -struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); -struct bootmodule * boot_module_find_by_addr_and_kind(bootmodule_kind kind, +struct boot_module *boot_module_find_by_kind(boot_module_kind kind); +struct boot_module * boot_module_find_by_addr_and_kind(boot_module_kind kind, paddr_t start); void add_boot_cmdline(const char *name, const char *cmdline, - bootmodule_kind kind, paddr_t start, bool domU); -struct bootcmdline *boot_cmdline_find_by_kind(bootmodule_kind kind); + boot_module_kind kind, paddr_t start, bool domU); +struct bootcmdline *boot_cmdline_find_by_kind(boot_module_kind kind); struct bootcmdline * boot_cmdline_find_by_name(const char *name); -const char *boot_module_kind_as_string(bootmodule_kind kind); +const char *boot_module_kind_as_string(boot_module_kind kind); void populate_boot_allocator(void); diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 1939c3ebf7..12a0b42d17 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -34,7 +34,7 @@ struct kernel_info { paddr_t gnttab_size; /* boot blob load addresses */ - const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; + const struct boot_module *kernel, *initrd, *dtb; const char* cmdline; paddr_t dtb_paddr; paddr_t initrd_paddr; @@ -121,7 +121,7 @@ int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); */ void kernel_load(struct kernel_info *info); -int kernel_decompress(struct bootmodule *mod, uint32_t offset); +int kernel_decompress(struct boot_module *mod, uint32_t offset); int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size); @@ -130,8 +130,7 @@ int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size); * call here just for compatability with Arm code. */ #ifdef CONFIG_ARM -struct bootmodule; -int kernel_uimage_probe(struct kernel_info *info, struct bootmodule *mod); +int kernel_uimage_probe(struct kernel_info *info, struct boot_module *mod); #endif #endif /* __XEN_FDT_KERNEL_H__ */ diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 7f70d860bd..1f88b4fc5a 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -68,7 +68,7 @@ int __init xsm_multiboot_policy_init( #ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_policy_init(void **policy_buffer, size_t *policy_size) { - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_XSM); + struct boot_module *mod = boot_module_find_by_kind(BOOTMOD_XSM); paddr_t paddr, len; if ( !mod || !mod->size ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:00:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023669.1399695 (Exim 4.92) (envelope-from ) id 1uU3GB-0007XP-Ar; Tue, 24 Jun 2025 13:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023669.1399695; Tue, 24 Jun 2025 13: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 1uU3GB-0007XH-82; Tue, 24 Jun 2025 13:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1023669; Tue, 24 Jun 2025 13:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3GA-0007X5-7T for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3GA-000KAB-0c for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3GA-00H11Y-0T for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=PE4FZWpirBIWXEsbbw0fWsPMjH/4+2Q7sPZrEh/xS4k=; b=4wV03oDyQgK15r7yqJVc9XSDuZ nVwVw8I1AasjBrB1z2qPujz9jSczVW+kyZC4ozIZE1sFfmKVS9UxY72b4GgNkmA1dhtToebl4j5vB kgQTRyhAoiy0o0Ga4VdeawY5kyDOLoP+vs3zvxgE6m5xxgyPNqgVaZin0uxHwBon4KHY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/efi: Show error message for EFI_INVALID_PARAMETER error Message-Id: Date: Tue, 24 Jun 2025 13:00:22 +0000 commit e83364bc514777a6005d4b22c969b07005c2c931 Author: Frediano Ziglio AuthorDate: Tue Jun 24 14:55:29 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:55:29 2025 +0200 xen/efi: Show error message for EFI_INVALID_PARAMETER error Show string message instead of code. This happened trying some different ways to boot Xen, specifically trying loading xen.efi using GRUB2 "linux" command. Signed-off-by: Frediano Ziglio Acked-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index fb3b120982..ded7cc129d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -329,6 +329,9 @@ static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) case EFI_BUFFER_TOO_SMALL: mesg = L"Buffer too small"; break; + case EFI_INVALID_PARAMETER: + mesg = L"Invalid parameter"; + break; default: PrintErr(L"ErrCode: "); DisplayUint(ErrCode, 0); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:00:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023670.1399700 (Exim 4.92) (envelope-from ) id 1uU3GL-0007aa-DI; Tue, 24 Jun 2025 13:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023670.1399700; Tue, 24 Jun 2025 13: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 1uU3GL-0007aS-Ai; Tue, 24 Jun 2025 13:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1023670; Tue, 24 Jun 2025 13:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3GK-0007aK-9s for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3GK-000KAI-0t for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3GK-00H12k-0n for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=HKxFvt9s18eb09VMrlW9FJN+I4bI9rBYhgssu7SV7q0=; b=ZvL2X78WynL58yfOyKi6zLDOZD wujL3NhDg0307HeeZ0c2sUjEocgZMPUhIps7I1H2McNQt+pNj4kHI4mrbfXQyr7Ev4Xxsu8kjFXYb KApsqdaJCn6ZjvlvmZZwkOHQJh4w7b3GzZqhJcHcSu1RjrHjzny9rhOjIvuPjy+Tl66U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/common: Guard freeze/thaw_domains functions with CONFIG_SYSTEM_SUSPEND Message-Id: Date: Tue, 24 Jun 2025 13:00:32 +0000 commit bee20891d31f1fc5f81a8f0b31f73c8e6d51b5a3 Author: Mykola Kvach AuthorDate: Tue Jun 24 14:56:02 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:56:02 2025 +0200 xen/common: Guard freeze/thaw_domains functions with CONFIG_SYSTEM_SUSPEND This patch adds CONFIG_SYSTEM_SUSPEND guards around freeze_domains and thaw_domains functions. This ensures they are only compiled into the hypervisor when the system suspend functionality is enabled, aligning their inclusion with their specific use case. This addresses two Misra Rule 2.1 violations. Signed-off-by: Mykola Kvach Reviewed-by: Jan Beulich --- xen/common/domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/common/domain.c b/xen/common/domain.c index 8c8f70347a..303c338ef2 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -2411,6 +2411,8 @@ domid_t get_initial_domain_id(void) return 0; } +#ifdef CONFIG_SYSTEM_SUSPEND + void freeze_domains(void) { struct domain *d; @@ -2436,6 +2438,8 @@ void thaw_domains(void) rcu_read_unlock(&domlist_read_lock); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:00:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023671.1399704 (Exim 4.92) (envelope-from ) id 1uU3GV-0007dB-Ed; Tue, 24 Jun 2025 13:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023671.1399704; Tue, 24 Jun 2025 13: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 1uU3GV-0007d3-C5; Tue, 24 Jun 2025 13:00:43 +0000 Received: by outflank-mailman (input) for mailman id 1023671; Tue, 24 Jun 2025 13:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3GU-0007cv-CY for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3GU-000KCj-19 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3GU-00H14B-14 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=QyyXBtyJH6hRVypgohZi6PCAP6azdQERBaMODWtgJJ4=; b=HXs9OkWENVaqFFaCmWyzUga8mL xID24nT0LOwrLajE+gizPPkFt9qio/5mx6Ryg+fi/vE/6hY26c7alBGY2jg5N0kfRFQGXVW3Ia/9Q +j8mObM2N4y6ojJLKPAfSTvwFEaD8Dcei+7xq/tRFaTEhyk2pABkV5/SH8QKwOAEYj/4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/efi: Drop stale #undef buffer Message-Id: Date: Tue, 24 Jun 2025 13:00:42 +0000 commit 136387f70f6ffc9e0abad8a97fcfd2322be15791 Author: Frediano Ziglio AuthorDate: Tue Jun 24 14:56:58 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:56:58 2025 +0200 xen/efi: Drop stale #undef buffer The "buffer" macro was removed when keyhandler_scratch was removed. Fixes: 59e087bf6a9c ("xen/keyhandler: Drop keyhandler_scratch") Signed-off-by: Frediano Ziglio Acked-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 ded7cc129d..1a9b4e7dae 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -513,7 +513,6 @@ static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_i else *leaf = buffer; #undef BUFFERSIZE -#undef buffer return dir_handle; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023720.1399758 (Exim 4.92) (envelope-from ) id 1uU3wS-0006nH-Ip; Tue, 24 Jun 2025 13:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023720.1399758; Tue, 24 Jun 2025 13: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 1uU3wS-0006n8-Fe; Tue, 24 Jun 2025 13:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1023720; Tue, 24 Jun 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 1uU3wQ-0006n2-F8 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 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 1uU3wQ-000KyT-0V for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3wQ-00H75u-0L for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=cswCjTNAtDhasC27LJsHuZlEE62jGEUDTV4b1/XSR8g=; b=OhZvsALP8JXPg+uoYqqjtatvre bKraH8wOXJ/KdEfkcyi81uR21+UH2c6Ou7gvJeBc5UYyeJ7HidvPnQxwnaIWtFffhblttGa7Y978O UHfV7IjUuYabqRxRDCrJBEo/AhPpiGT/EI1uhxrfK/Fat9Vst7ZLlr4ENRr9bHmCmDqg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CODING_STYLE: Custom type names must be snake-cased by word Message-Id: Date: Tue, 24 Jun 2025 13:44:02 +0000 commit eea7d98d1c653f35b40f5fd4d38a19ae8e21e8bd Author: Alejandro Vallejo AuthorDate: Tue Jun 24 14:54:34 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:54:34 2025 +0200 CODING_STYLE: Custom type names must be snake-cased by word There's the unwritten convention of splitting type names using underscores. Add such convention to the CODINNG_STYLE to make it common and less unwritten. Signed-off-by: Alejandro Vallejo Acked-by: Stefano Stabellini --- CODING_STYLE | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CODING_STYLE b/CODING_STYLE index 5644f1697f..7bf3848444 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -113,6 +113,12 @@ Braces should be omitted for blocks with a single statement. e.g., if ( condition ) single_statement(); +Identifiers +----------- + +When giving names to identifiers (variables, functions, constants...), separate +words using underscores (for example, use "my_foo" instead of "myfoo"). + Types ----- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:44:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023721.1399762 (Exim 4.92) (envelope-from ) id 1uU3wb-0006oz-KE; Tue, 24 Jun 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 1023721.1399762; Tue, 24 Jun 2025 13: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 1uU3wb-0006os-H2; Tue, 24 Jun 2025 13:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1023721; Tue, 24 Jun 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 1uU3wa-0006og-9e for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3wa-000KyX-0p for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3wa-00H78k-0i for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=v6qTqinq3Scy1ydYhbXPFjrBSO85HWcAUju40ngAHLM=; b=LoJMg8NbvMphgA8Tl/2gZwsyxJ 1A7sMQ1M4C8MS2qhyYfLJcmRByeVUcLpfXNgi5lqb5+tWzBzJAy1UQsLMA+wsDsENBRZUKrULCj4Y /zLcdpBvVV8wM9SU/QM3eWtdr7I5D2+bEEoHNfMaNYr+y4ZIjQHUMrvw+MQXCXoEvKrk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Rename bootmodule{,s} to boot_module{,s} Message-Id: Date: Tue, 24 Jun 2025 13:44:12 +0000 commit 1671619181ba424aeadf5072bc2130baf7be26f4 Author: Alejandro Vallejo AuthorDate: Tue Jun 24 14:54:58 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:54:58 2025 +0200 xen: Rename bootmodule{,s} to boot_module{,s} ... in alignment with the new coding style on word splitting for type names. This aligns its name with the largely duplicate boot_module struct in x86. While there's no equivalent to "struct bootmodules" in x86, changing one and not the other is just confusing. Same with various comments and function names. Rather than making a long subfield name even longer, remove the _bootmodule suffix in the kernel, initrd and dtb subfields. Not a functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Stefano Stabellini Acked-By: Daniel P. Smith --- xen/arch/arm/domain_build.c | 4 +-- xen/arch/arm/efi/efi-boot.h | 6 ++-- xen/arch/arm/kernel.c | 4 +-- xen/arch/arm/llc-coloring.c | 8 ++--- xen/arch/arm/mmu/setup.c | 10 +++---- xen/arch/arm/setup.c | 10 +++---- xen/common/device-tree/bootfdt.c | 4 +-- xen/common/device-tree/bootinfo.c | 52 ++++++++++++++++----------------- xen/common/device-tree/dom0less-build.c | 25 ++++++++-------- xen/common/device-tree/domain-build.c | 2 +- xen/common/device-tree/kernel.c | 22 +++++++------- xen/include/xen/bootfdt.h | 26 ++++++++--------- xen/include/xen/fdt-kernel.h | 7 ++--- xen/xsm/xsm_policy.c | 2 +- 14 files changed, 90 insertions(+), 92 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4ff161887e..3f5c7c2e5a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -579,7 +579,7 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, if ( dt_node_path_is_equal(node, "/chosen") ) { - const struct bootmodule *initrd = kinfo->initrd_bootmodule; + const struct boot_module *initrd = kinfo->initrd; if ( bootargs ) { @@ -1517,7 +1517,7 @@ int __init make_chosen_node(const struct kernel_info *kinfo) { int res; const char *bootargs = NULL; - const struct bootmodule *initrd = kinfo->initrd_bootmodule; + const struct boot_module *initrd = kinfo->initrd; void *fdt = kinfo->fdt; dt_dprintk("Create chosen node\n"); diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index ee80560e13..faabe5a6a8 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -20,7 +20,7 @@ typedef struct { } module_info; /* - * Binaries will be translated into bootmodules, the maximum number for them is + * Binaries will be translated into boot_modules, the maximum number for them is * MAX_MODULES where we should remove a unit for Xen and one for Xen DTB */ #define MAX_UEFI_MODULES (MAX_MODULES - 2) @@ -602,9 +602,9 @@ static void __init efi_arch_handle_module(const struct file *file, /* * modules_available is decremented here because for each dom0 file added - * from the configuration file, there will be an additional bootmodule, + * from the configuration file, there will be an additional boot_module, * so the number of available slots will be decremented because there is a - * maximum amount of bootmodules that can be loaded. + * maximum amount of boot_modules that can be loaded. */ modules_available--; } diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index cb1efb19e7..e734ec5c1e 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -46,7 +46,7 @@ static void __init place_modules(struct kernel_info *info, paddr_t kernbase, paddr_t kernend) { /* Align DTB and initrd size to 2Mb. Linux only requires 4 byte alignment */ - const struct bootmodule *mod = info->initrd_bootmodule; + const struct boot_module *mod = info->initrd; const struct membanks *mem = kernel_info_get_mem(info); const paddr_t initrd_len = ROUNDUP(mod ? mod->size : 0, MB(2)); const paddr_t dtb_len = ROUNDUP(fdt_totalsize(info->fdt), MB(2)); @@ -175,7 +175,7 @@ static void __init kernel_zimage_load(struct kernel_info *info) * Check if the image is a uImage and setup kernel_info */ int __init kernel_uimage_probe(struct kernel_info *info, - struct bootmodule *mod) + struct boot_module *mod) { struct { __be32 magic; /* Image Header Magic Number */ diff --git a/xen/arch/arm/llc-coloring.c b/xen/arch/arm/llc-coloring.c index 99ac10b610..6f78817c57 100644 --- a/xen/arch/arm/llc-coloring.c +++ b/xen/arch/arm/llc-coloring.c @@ -123,12 +123,12 @@ static paddr_t __init xen_colored_map_size(void) void __init arch_llc_coloring_init(void) { - struct bootmodule *xen_bootmodule = boot_module_find_by_kind(BOOTMOD_XEN); + struct boot_module *xen_boot_module = boot_module_find_by_kind(BOOTMOD_XEN); - BUG_ON(!xen_bootmodule); + BUG_ON(!xen_boot_module); - xen_bootmodule->size = xen_colored_map_size(); - xen_bootmodule->start = get_xen_paddr(xen_bootmodule->size); + xen_boot_module->size = xen_colored_map_size(); + xen_boot_module->start = get_xen_paddr(xen_boot_module->size); } /* diff --git a/xen/arch/arm/mmu/setup.c b/xen/arch/arm/mmu/setup.c index 30afe97781..eb8ed19ca1 100644 --- a/xen/arch/arm/mmu/setup.c +++ b/xen/arch/arm/mmu/setup.c @@ -246,7 +246,7 @@ paddr_t __init consider_modules(paddr_t s, paddr_t e, #ifdef CONFIG_STATIC_SHM const struct membanks *shmem = bootinfo_get_shmem(); #endif - const struct bootmodules *mi = &bootinfo.modules; + const struct boot_modules *mi = &bootinfo.modules; int i; int nr; @@ -273,8 +273,8 @@ paddr_t __init consider_modules(paddr_t s, paddr_t e, } /* - * i is the current bootmodule we are evaluating, across all - * possible kinds of bootmodules. + * i is the current boot_module we are evaluating, across all + * possible kinds of boot_modules. * * When retrieving the corresponding reserved-memory addresses, we * need to index the reserved_mem bank starting from 0, and only counting @@ -328,8 +328,8 @@ static void __init create_llc_coloring_mappings(void) { lpae_t pte; unsigned int i; - struct bootmodule *xen_bootmodule = boot_module_find_by_kind(BOOTMOD_XEN); - mfn_t start_mfn = maddr_to_mfn(xen_bootmodule->start), mfn; + struct boot_module *xen_boot_module = boot_module_find_by_kind(BOOTMOD_XEN); + mfn_t start_mfn = maddr_to_mfn(xen_boot_module->start), mfn; for_each_xen_colored_mfn ( start_mfn, mfn, i ) { diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index ed72317af3..58acc2d0d4 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -206,11 +206,11 @@ static void __init processor_id(void) void __init discard_initial_modules(void) { - struct bootmodules *mi = &bootinfo.modules; + struct boot_modules *mi = &bootinfo.modules; int i; /* - * When using static heap feature, don't give bootmodules memory back to + * When using static heap feature, don't give boot_modules memory back to * the heap allocator */ if ( using_static_heap ) @@ -303,7 +303,7 @@ void asmlinkage __init start_xen(unsigned long fdt_paddr) { size_t fdt_size; const char *cmdline; - struct bootmodule *xen_bootmodule; + struct boot_module *xen_boot_module; struct domain *d; int rc, i; @@ -327,10 +327,10 @@ void asmlinkage __init start_xen(unsigned long fdt_paddr) fdt_paddr); /* Register Xen's load address as a boot module. */ - xen_bootmodule = add_boot_module(BOOTMOD_XEN, + xen_boot_module = add_boot_module(BOOTMOD_XEN, virt_to_maddr(_start), (paddr_t)(uintptr_t)(_end - _start), false); - BUG_ON(!xen_bootmodule); + BUG_ON(!xen_boot_module); fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); diff --git a/xen/common/device-tree/bootfdt.c b/xen/common/device-tree/bootfdt.c index 9daea06e57..39334d6205 100644 --- a/xen/common/device-tree/bootfdt.c +++ b/xen/common/device-tree/bootfdt.c @@ -314,7 +314,7 @@ static void __init process_multiboot_node(const void *fdt, int node, static int __initdata kind_guess = 0; const struct fdt_property *prop; const __be32 *cell; - bootmodule_kind kind; + boot_module_kind kind; paddr_t start, size; int len; /* sizeof("/chosen/") + DT_MAX_NAME + '/' + DT_MAX_NAME + '/0' => 92 */ @@ -518,7 +518,7 @@ static void __init early_print_info(void) { const struct membanks *mi = bootinfo_get_mem(); const struct membanks *mem_resv = bootinfo_get_reserved_mem(); - struct bootmodules *mods = &bootinfo.modules; + struct boot_modules *mods = &bootinfo.modules; struct bootcmdlines *cmds = &bootinfo.cmdlines; unsigned int i; diff --git a/xen/common/device-tree/bootinfo.c b/xen/common/device-tree/bootinfo.c index 717cfa0962..2a27d1318b 100644 --- a/xen/common/device-tree/bootinfo.c +++ b/xen/common/device-tree/bootinfo.c @@ -21,7 +21,7 @@ struct bootinfo __initdata bootinfo = BOOTINFO_INIT; -const char * __init boot_module_kind_as_string(bootmodule_kind kind) +const char * __init boot_module_kind_as_string(boot_module_kind kind) { switch ( kind ) { @@ -49,7 +49,7 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, unsigned int i; /* - * i is the current bootmodule we are evaluating across all possible + * i is the current boot_module we are evaluating across all possible * kinds. */ for ( i = first; i < reserved_mem->nr_banks; i++ ) @@ -143,18 +143,18 @@ static bool __init meminfo_overlap_check(const struct membanks *mem, * TODO: '*_end' could be 0 if the module/region is at the end of the physical * address space. This is for now not handled as it requires more rework. */ -static bool __init bootmodules_overlap_check(struct bootmodules *bootmodules, - paddr_t region_start, - paddr_t region_size) +static bool __init boot_modules_overlap_check(struct boot_modules *boot_modules, + paddr_t region_start, + paddr_t region_size) { paddr_t mod_start = INVALID_PADDR, mod_end = 0; paddr_t region_end = region_start + region_size; - unsigned int i, mod_num = bootmodules->nr_mods; + unsigned int i, mod_num = boot_modules->nr_mods; for ( i = 0; i < mod_num; i++ ) { - mod_start = bootmodules->module[i].start; - mod_end = mod_start + bootmodules->module[i].size; + mod_start = boot_modules->module[i].start; + mod_end = mod_start + boot_modules->module[i].size; if ( region_end <= mod_start || region_start >= mod_end ) continue; @@ -210,20 +210,20 @@ bool __init check_reserved_regions_overlap(paddr_t region_start, allow_memreserve_overlap) ) return true; - /* Check if input region is overlapping with bootmodules */ - if ( bootmodules_overlap_check(&bootinfo.modules, - region_start, region_size) ) + /* Check if input region is overlapping with boot_modules */ + if ( boot_modules_overlap_check(&bootinfo.modules, + region_start, region_size) ) return true; return false; } -struct bootmodule __init *add_boot_module(bootmodule_kind kind, - paddr_t start, paddr_t size, - bool domU) +struct boot_module __init *add_boot_module(boot_module_kind kind, + paddr_t start, paddr_t size, + bool domU) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; unsigned int i; if ( mods->nr_mods == MAX_MODULES ) @@ -266,10 +266,10 @@ struct bootmodule __init *add_boot_module(bootmodule_kind kind, * XSM, DTB) or Dom0 modules. This is not suitable for looking up guest * modules. */ -struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) +struct boot_module * __init boot_module_find_by_kind(boot_module_kind kind) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; int i; for (i = 0 ; i < mods->nr_mods ; i++ ) { @@ -281,7 +281,7 @@ struct bootmodule * __init boot_module_find_by_kind(bootmodule_kind kind) } void __init add_boot_cmdline(const char *name, const char *cmdline, - bootmodule_kind kind, paddr_t start, bool domU) + boot_module_kind kind, paddr_t start, bool domU) { struct bootcmdlines *cmds = &bootinfo.cmdlines; struct bootcmdline *cmd; @@ -310,7 +310,7 @@ void __init add_boot_cmdline(const char *name, const char *cmdline, * XSM, DTB) or Dom0 modules. This is not suitable for looking up guest * modules. */ -struct bootcmdline * __init boot_cmdline_find_by_kind(bootmodule_kind kind) +struct bootcmdline * __init boot_cmdline_find_by_kind(boot_module_kind kind) { struct bootcmdlines *cmds = &bootinfo.cmdlines; struct bootcmdline *cmd; @@ -340,11 +340,11 @@ struct bootcmdline * __init boot_cmdline_find_by_name(const char *name) return NULL; } -struct bootmodule * __init boot_module_find_by_addr_and_kind(bootmodule_kind kind, - paddr_t start) +struct boot_module * __init boot_module_find_by_addr_and_kind( + boot_module_kind kind, paddr_t start) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; unsigned int i; for (i = 0 ; i < mods->nr_mods ; i++ ) @@ -366,7 +366,7 @@ struct bootmodule * __init boot_module_find_by_addr_and_kind(bootmodule_kind kin */ static paddr_t __init next_module(paddr_t s, paddr_t *end) { - struct bootmodules *mi = &bootinfo.modules; + struct boot_modules *mi = &bootinfo.modules; paddr_t lowest = ~(paddr_t)0; int i; diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 3d503c6973..221b875a2f 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -44,13 +44,13 @@ void __init set_xs_domain(struct domain *d) bool __init is_dom0less_mode(void) { - struct bootmodules *mods = &bootinfo.modules; - struct bootmodule *mod; + struct boot_modules *mods = &bootinfo.modules; + struct boot_module *mod; unsigned int i; bool dom0found = false; bool domUfound = false; - /* Look into the bootmodules */ + /* Look into the boot_modules */ for ( i = 0 ; i < mods->nr_mods ; i++ ) { mod = &mods->module[i]; @@ -374,18 +374,17 @@ static int __init check_partial_fdt(void *pfdt, size_t size) return 0; } -static int __init domain_handle_dtb_bootmodule(struct domain *d, - struct kernel_info *kinfo) +static int __init domain_handle_dtb_boot_module(struct domain *d, + struct kernel_info *kinfo) { void *pfdt; int res, node_next; - pfdt = ioremap_cache(kinfo->dtb_bootmodule->start, - kinfo->dtb_bootmodule->size); + pfdt = ioremap_cache(kinfo->dtb->start, kinfo->dtb->size); if ( pfdt == NULL ) return -EFAULT; - res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); + res = check_partial_fdt(pfdt, kinfo->dtb->size); if ( res < 0 ) goto out; @@ -459,8 +458,8 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) sizecells = GUEST_ROOT_SIZE_CELLS; /* Account for domU passthrough DT size */ - if ( kinfo->dtb_bootmodule ) - fdt_size += kinfo->dtb_bootmodule->size; + if ( kinfo->dtb ) + fdt_size += kinfo->dtb->size; /* Cap to max DT size if needed */ fdt_size = min(fdt_size, SZ_2M); @@ -507,13 +506,13 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) goto err; /* - * domain_handle_dtb_bootmodule has to be called before the rest of + * domain_handle_dtb_boot_module has to be called before the rest of * the device tree is generated because it depends on the value of * the field phandle_intc. */ - if ( kinfo->dtb_bootmodule ) + if ( kinfo->dtb ) { - ret = domain_handle_dtb_bootmodule(d, kinfo); + ret = domain_handle_dtb_boot_module(d, kinfo); if ( ret ) goto err; } diff --git a/xen/common/device-tree/domain-build.c b/xen/common/device-tree/domain-build.c index 99ea81198a..cd01a8b4bc 100644 --- a/xen/common/device-tree/domain-build.c +++ b/xen/common/device-tree/domain-build.c @@ -352,7 +352,7 @@ void __init dtb_load(struct kernel_info *kinfo, void __init initrd_load(struct kernel_info *kinfo, copy_to_guest_phys_cb copy_to_guest) { - const struct bootmodule *mod = kinfo->initrd_bootmodule; + const struct boot_module *mod = kinfo->initrd; paddr_t load_addr = kinfo->initrd_paddr; paddr_t paddr, len; int node; diff --git a/xen/common/device-tree/kernel.c b/xen/common/device-tree/kernel.c index cb04cd9d50..e1b22dc1c7 100644 --- a/xen/common/device-tree/kernel.c +++ b/xen/common/device-tree/kernel.c @@ -21,7 +21,7 @@ static uint32_t __init output_length(char *image, unsigned long image_len) return *(uint32_t *)&image[image_len - 4]; } -int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) +int __init kernel_decompress(struct boot_module *mod, uint32_t offset) { char *output, *input; char magic[2]; @@ -92,7 +92,7 @@ int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) free_domheap_page(pages + i); /* - * When using static heap feature, don't give bootmodules memory back to + * When using static heap feature, don't give boot_modules memory back to * the heap allocator */ if ( using_static_heap ) @@ -118,7 +118,7 @@ int __init kernel_decompress(struct bootmodule *mod, uint32_t offset) int __init kernel_probe(struct kernel_info *info, const struct dt_device_node *domain) { - struct bootmodule *mod = NULL; + struct boot_module *mod = NULL; struct bootcmdline *cmd = NULL; struct dt_device_node *node; u64 kernel_addr, initrd_addr, dtb_addr, size; @@ -140,8 +140,8 @@ int __init kernel_probe(struct kernel_info *info, mod = boot_module_find_by_kind(BOOTMOD_KERNEL); - info->kernel_bootmodule = mod; - info->initrd_bootmodule = boot_module_find_by_kind(BOOTMOD_RAMDISK); + info->kernel = mod; + info->initrd = boot_module_find_by_kind(BOOTMOD_RAMDISK); cmd = boot_cmdline_find_by_kind(BOOTMOD_KERNEL); if ( cmd ) @@ -162,7 +162,7 @@ int __init kernel_probe(struct kernel_info *info, dt_get_range(&val, node, &kernel_addr, &size); mod = boot_module_find_by_addr_and_kind( BOOTMOD_KERNEL, kernel_addr); - info->kernel_bootmodule = mod; + info->kernel = mod; } else if ( dt_device_is_compatible(node, "multiboot,ramdisk") ) { @@ -171,7 +171,7 @@ int __init kernel_probe(struct kernel_info *info, val = dt_get_property(node, "reg", &len); dt_get_range(&val, node, &initrd_addr, &size); - info->initrd_bootmodule = boot_module_find_by_addr_and_kind( + info->initrd = boot_module_find_by_addr_and_kind( BOOTMOD_RAMDISK, initrd_addr); } else if ( dt_device_is_compatible(node, "multiboot,device-tree") ) @@ -183,7 +183,7 @@ int __init kernel_probe(struct kernel_info *info, if ( val == NULL ) continue; dt_get_range(&val, node, &dtb_addr, &size); - info->dtb_bootmodule = boot_module_find_by_addr_and_kind( + info->dtb = boot_module_find_by_addr_and_kind( BOOTMOD_GUEST_DTB, dtb_addr); } else @@ -201,10 +201,10 @@ int __init kernel_probe(struct kernel_info *info, } printk("Loading %pd kernel from boot module @ %"PRIpaddr"\n", - info->d, info->kernel_bootmodule->start); - if ( info->initrd_bootmodule ) + info->d, info->kernel->start); + if ( info->initrd ) printk("Loading ramdisk from boot module @ %"PRIpaddr"\n", - info->initrd_bootmodule->start); + info->initrd->start); /* * uImage isn't really used nowadays thereby leave kernel_uimage_probe() diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h index ff40f3078e..236b456dd2 100644 --- a/xen/include/xen/bootfdt.h +++ b/xen/include/xen/bootfdt.h @@ -23,7 +23,7 @@ typedef enum { BOOTMOD_GUEST_DTB, BOOTMOD_MICROCODE, BOOTMOD_UNKNOWN -} bootmodule_kind; +} boot_module_kind; enum membank_type { /* @@ -103,8 +103,8 @@ struct shared_meminfo { * initrd to be compatible with all versions of the multiboot spec. */ #define BOOTMOD_MAX_CMDLINE 1024 -struct bootmodule { - bootmodule_kind kind; +struct boot_module { + boot_module_kind kind; bool domU; paddr_t start; paddr_t size; @@ -113,16 +113,16 @@ struct bootmodule { /* DT_MAX_NAME is the node name max length according the DT spec */ #define DT_MAX_NAME 41 struct bootcmdline { - bootmodule_kind kind; + boot_module_kind kind; bool domU; paddr_t start; char dt_name[DT_MAX_NAME]; char cmdline[BOOTMOD_MAX_CMDLINE]; }; -struct bootmodules { +struct boot_modules { int nr_mods; - struct bootmodule module[MAX_MODULES]; + struct boot_module module[MAX_MODULES]; }; struct bootcmdlines { @@ -134,7 +134,7 @@ struct bootinfo { struct meminfo mem; /* The reserved regions are only used when booting using Device-Tree */ struct meminfo reserved_mem; - struct bootmodules modules; + struct boot_modules modules; struct bootcmdlines cmdlines; #ifdef CONFIG_ACPI struct meminfo acpi; @@ -176,16 +176,16 @@ bool check_reserved_regions_overlap(paddr_t region_start, paddr_t region_size, bool allow_memreserve_overlap); -struct bootmodule *add_boot_module(bootmodule_kind kind, +struct boot_module *add_boot_module(boot_module_kind kind, paddr_t start, paddr_t size, bool domU); -struct bootmodule *boot_module_find_by_kind(bootmodule_kind kind); -struct bootmodule * boot_module_find_by_addr_and_kind(bootmodule_kind kind, +struct boot_module *boot_module_find_by_kind(boot_module_kind kind); +struct boot_module * boot_module_find_by_addr_and_kind(boot_module_kind kind, paddr_t start); void add_boot_cmdline(const char *name, const char *cmdline, - bootmodule_kind kind, paddr_t start, bool domU); -struct bootcmdline *boot_cmdline_find_by_kind(bootmodule_kind kind); + boot_module_kind kind, paddr_t start, bool domU); +struct bootcmdline *boot_cmdline_find_by_kind(boot_module_kind kind); struct bootcmdline * boot_cmdline_find_by_name(const char *name); -const char *boot_module_kind_as_string(bootmodule_kind kind); +const char *boot_module_kind_as_string(boot_module_kind kind); void populate_boot_allocator(void); diff --git a/xen/include/xen/fdt-kernel.h b/xen/include/xen/fdt-kernel.h index 1939c3ebf7..12a0b42d17 100644 --- a/xen/include/xen/fdt-kernel.h +++ b/xen/include/xen/fdt-kernel.h @@ -34,7 +34,7 @@ struct kernel_info { paddr_t gnttab_size; /* boot blob load addresses */ - const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_bootmodule; + const struct boot_module *kernel, *initrd, *dtb; const char* cmdline; paddr_t dtb_paddr; paddr_t initrd_paddr; @@ -121,7 +121,7 @@ int kernel_probe(struct kernel_info *info, const struct dt_device_node *domain); */ void kernel_load(struct kernel_info *info); -int kernel_decompress(struct bootmodule *mod, uint32_t offset); +int kernel_decompress(struct boot_module *mod, uint32_t offset); int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size); @@ -130,8 +130,7 @@ int kernel_zimage_probe(struct kernel_info *info, paddr_t addr, paddr_t size); * call here just for compatability with Arm code. */ #ifdef CONFIG_ARM -struct bootmodule; -int kernel_uimage_probe(struct kernel_info *info, struct bootmodule *mod); +int kernel_uimage_probe(struct kernel_info *info, struct boot_module *mod); #endif #endif /* __XEN_FDT_KERNEL_H__ */ diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 7f70d860bd..1f88b4fc5a 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -68,7 +68,7 @@ int __init xsm_multiboot_policy_init( #ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_policy_init(void **policy_buffer, size_t *policy_size) { - struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_XSM); + struct boot_module *mod = boot_module_find_by_kind(BOOTMOD_XSM); paddr_t paddr, len; if ( !mod || !mod->size ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023722.1399766 (Exim 4.92) (envelope-from ) id 1uU3wl-0006sw-NT; Tue, 24 Jun 2025 13:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023722.1399766; Tue, 24 Jun 2025 13: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 1uU3wl-0006so-KO; Tue, 24 Jun 2025 13:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1023722; Tue, 24 Jun 2025 13:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3wk-0006rt-CY for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3wk-000Kyy-19 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3wk-00H7Av-10 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=yaQKSmCtzPBmgiunVX+G9a2Ntr/hlMZ6iqSpP7O69R4=; b=scEW0DYaSRN1ydgiaqi42rCNxW WitiUvgGPbCfh2NwuBgb6xalOISNLUTkfRHf1T60jM+34euBlg1JztfHjn7pYlbAt9ZEMH/hK+f6z LUdkHvpFbgAr7cIK8l1EuVDN8/VZxr90E2LtY4qnurmQDebGkvQG8JV4mzySWQmlf0L8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/efi: Show error message for EFI_INVALID_PARAMETER error Message-Id: Date: Tue, 24 Jun 2025 13:44:22 +0000 commit e83364bc514777a6005d4b22c969b07005c2c931 Author: Frediano Ziglio AuthorDate: Tue Jun 24 14:55:29 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:55:29 2025 +0200 xen/efi: Show error message for EFI_INVALID_PARAMETER error Show string message instead of code. This happened trying some different ways to boot Xen, specifically trying loading xen.efi using GRUB2 "linux" command. Signed-off-by: Frediano Ziglio Acked-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index fb3b120982..ded7cc129d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -329,6 +329,9 @@ static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) case EFI_BUFFER_TOO_SMALL: mesg = L"Buffer too small"; break; + case EFI_INVALID_PARAMETER: + mesg = L"Invalid parameter"; + break; default: PrintErr(L"ErrCode: "); DisplayUint(ErrCode, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023723.1399770 (Exim 4.92) (envelope-from ) id 1uU3wv-0006w8-OJ; Tue, 24 Jun 2025 13:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023723.1399770; Tue, 24 Jun 2025 13: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 1uU3wv-0006w0-Lk; Tue, 24 Jun 2025 13:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1023723; Tue, 24 Jun 2025 13:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3wu-0006vl-F6 for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3wu-000Kz4-1P for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3wu-00H7Cn-1K for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=SZ5n+0VZzeWSQ0bMYAaL9IfK7CP3RJA8EMBe9/k51dY=; b=i8ksd8QA7Pj4ngGeNivusvPEYY v26D0qbuYkUMskm3TzJnaEd3ycztx1UtpsAtyw/fcBRy5TbOH1hZQXTq4zKy2R/2tp7LMKwctDwo9 +Lyo+tKMBTMWNjGrtkEZgIlQOwFI/Ne0wjQQN5b0KPuKQGNyE+GY+3qPTI/tHcmQtWtg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: Guard freeze/thaw_domains functions with CONFIG_SYSTEM_SUSPEND Message-Id: Date: Tue, 24 Jun 2025 13:44:32 +0000 commit bee20891d31f1fc5f81a8f0b31f73c8e6d51b5a3 Author: Mykola Kvach AuthorDate: Tue Jun 24 14:56:02 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:56:02 2025 +0200 xen/common: Guard freeze/thaw_domains functions with CONFIG_SYSTEM_SUSPEND This patch adds CONFIG_SYSTEM_SUSPEND guards around freeze_domains and thaw_domains functions. This ensures they are only compiled into the hypervisor when the system suspend functionality is enabled, aligning their inclusion with their specific use case. This addresses two Misra Rule 2.1 violations. Signed-off-by: Mykola Kvach Reviewed-by: Jan Beulich --- xen/common/domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/common/domain.c b/xen/common/domain.c index 8c8f70347a..303c338ef2 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -2411,6 +2411,8 @@ domid_t get_initial_domain_id(void) return 0; } +#ifdef CONFIG_SYSTEM_SUSPEND + void freeze_domains(void) { struct domain *d; @@ -2436,6 +2438,8 @@ void thaw_domains(void) rcu_read_unlock(&domlist_read_lock); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 24 13:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 24 Jun 2025 13:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1023724.1399774 (Exim 4.92) (envelope-from ) id 1uU3x5-0006yJ-Q6; Tue, 24 Jun 2025 13:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1023724.1399774; Tue, 24 Jun 2025 13:44: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 1uU3x5-0006yA-NH; Tue, 24 Jun 2025 13:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1023724; Tue, 24 Jun 2025 13:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uU3x4-0006y2-Jr for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uU3x4-000Kz8-1i for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uU3x4-00H7Dt-1a for xen-changelog@lists.xenproject.org; Tue, 24 Jun 2025 13: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=jg9iYwrSHFONY9HSALzAjEdHSrXF01pTW549QPn/Djc=; b=hgEjMiE5HcusxTvs00W/TX8AQd 0ubz3Wk1lSWViNfycmCP/sJe+mg/0iHo8C4BCdtETQyHpDqdV50S1SM0joBG5smP42PAmE18yARDm dYEw9k0txnAdQf/mTj4uSWvvrxn5IFXJCIYgBFgFKRRcEiAfmKVHHrrx6IfsYEQukmoE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/efi: Drop stale #undef buffer Message-Id: Date: Tue, 24 Jun 2025 13:44:42 +0000 commit 136387f70f6ffc9e0abad8a97fcfd2322be15791 Author: Frediano Ziglio AuthorDate: Tue Jun 24 14:56:58 2025 +0200 Commit: Jan Beulich CommitDate: Tue Jun 24 14:56:58 2025 +0200 xen/efi: Drop stale #undef buffer The "buffer" macro was removed when keyhandler_scratch was removed. Fixes: 59e087bf6a9c ("xen/keyhandler: Drop keyhandler_scratch") Signed-off-by: Frediano Ziglio Acked-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 ded7cc129d..1a9b4e7dae 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -513,7 +513,6 @@ static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_i else *leaf = buffer; #undef BUFFERSIZE -#undef buffer return dir_handle; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 17:00:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 17:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025370.1400971 (Exim 4.92) (envelope-from ) id 1uUTTf-0003pI-Ke; Wed, 25 Jun 2025 17:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025370.1400971; Wed, 25 Jun 2025 17: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 1uUTTf-0003p0-I6; Wed, 25 Jun 2025 17:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1025370; Wed, 25 Jun 2025 17:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUTTe-0003eZ-SE for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUTTe-0023yW-1e for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUTTe-002frm-1W for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00: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=sbe5qEVJld3fa5bWFxXApEC8AAFOe4YdrwtbkdXRGoI=; b=bZWXs1FQ0ApehearFy1+yY9C+3 w+bkIEKvo3RMjfj2r3fkfVjO5cNpB676fcW/wEQ/VwiHgJPOmos+pD1YRvuNscWEDdbmCs9EGNFFO 55YnGHDSYn7L78BvBHtO93Zys3bd7DpXTG/KiopwIq5NGGnes6zYq8vbHULDE7RoHovk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/svm: Revert 1->true conversion in svm_asid_handle_vmrun() Message-Id: Date: Wed, 25 Jun 2025 17:00:02 +0000 commit 5ede8c92616d2bdf39916e7f6fd754821d4c5e6d Author: Andrew Cooper AuthorDate: Mon Jun 23 11:41:39 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/svm: Revert 1->true conversion in svm_asid_handle_vmrun() This is literally ASID 1 (of 2^16), not a boolean. Fixes: 2f09f797ba43 ("x86/svm: Drop the suffix _guest from vmcb bit") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/asid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 7977a8e86b..d5f70f8848 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -37,7 +37,7 @@ void svm_asid_handle_vmrun(void) /* ASID 0 indicates that ASIDs are disabled. */ if ( p_asid->asid == 0 ) { - vmcb_set_asid(vmcb, true); + vmcb_set_asid(vmcb, 1); vmcb->tlb_control = cpu_has_svm_flushbyasid ? TLB_CTRL_FLUSH_ASID : TLB_CTRL_FLUSH_ALL; return; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 17:00:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 17:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025371.1400976 (Exim 4.92) (envelope-from ) id 1uUTTp-0004T7-M8; Wed, 25 Jun 2025 17:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025371.1400976; Wed, 25 Jun 2025 17: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 1uUTTp-0004Sz-JX; Wed, 25 Jun 2025 17:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1025371; Wed, 25 Jun 2025 17:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUTTo-0004Sn-LX for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUTTo-0023yb-23 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUTTo-002ftR-1p for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00: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=lIcdmZkdydVWEQGalA4Qrfa/J9CKfVqyy7B7uguSmfU=; b=lOdNgd/54GMrLQ5Lhe4bM+jtHa mJiZfIbVLXoEzv+URbA3lb/CMsjCb3oUDdemfST1xiiQWzmlqC5Xi2l2o7HzmQ4sYaNuqDGVY5KxY e1LrwU+zNOVzCJnqKvcqJuyDT1phH5/a4F5Tp5RByrayyMWiHIPeY2H5g//IF5dVwwEY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/idle: Move monitor()/mwait() wrappers into cpu-idle.c Message-Id: Date: Wed, 25 Jun 2025 17:00:12 +0000 commit 61e10fc28ccddff7c72c14acec56dc7ef2b155d1 Author: Andrew Cooper AuthorDate: Tue Apr 1 14:59:01 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/idle: Move monitor()/mwait() wrappers into cpu-idle.c They're not used by any other translation unit, so shouldn't live in asm/processor.h, which is included almost everywhere. Our new toolchain baseline knows the MONITOR/MWAIT instructions, so use them directly rather than using raw hex. Change the hint/extention parameters from long to int. They're specified to remain 32bit operands even 64-bit mode. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 21 +++++++++++++++++---- xen/arch/x86/include/asm/processor.h | 17 ----------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 1dbf15b01e..40af42a18f 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -60,6 +60,19 @@ /*#define DEBUG_PM_CX*/ +static always_inline void monitor( + const void *addr, unsigned int ecx, unsigned int edx) +{ + asm volatile ( "monitor" + :: "a" (addr), "c" (ecx), "d" (edx) ); +} + +static always_inline void mwait(unsigned int eax, unsigned int ecx) +{ + asm volatile ( "mwait" + :: "a" (eax), "c" (ecx) ); +} + #define GET_HW_RES_IN_NS(msr, val) \ do { rdmsrl(msr, val); val = tsc_ticks2ns(val); } while( 0 ) #define GET_MC6_RES(val) GET_HW_RES_IN_NS(0x664, val) @@ -470,7 +483,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) mb(); } - __monitor(monitor_addr, 0, 0); + monitor(monitor_addr, 0, 0); smp_mb(); /* @@ -484,7 +497,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) cpumask_set_cpu(cpu, &cpuidle_mwait_flags); spec_ctrl_enter_idle(info); - __mwait(eax, ecx); + mwait(eax, ecx); spec_ctrl_exit_idle(info); cpumask_clear_cpu(cpu, &cpuidle_mwait_flags); @@ -915,9 +928,9 @@ void cf_check acpi_dead_idle(void) */ mb(); clflush(mwait_ptr); - __monitor(mwait_ptr, 0, 0); + monitor(mwait_ptr, 0, 0); mb(); - __mwait(cx->address, 0); + mwait(cx->address, 0); } } else if ( (current_cpu_data.x86_vendor & diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 96b9bf5f5e..04824c3633 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -315,23 +315,6 @@ static always_inline void set_in_cr4 (unsigned long mask) cr4_pv32_mask |= (mask & XEN_CR4_PV32_BITS); } -static always_inline void __monitor(const void *eax, unsigned long ecx, - unsigned long edx) -{ - /* "monitor %eax,%ecx,%edx;" */ - asm volatile ( - ".byte 0x0f,0x01,0xc8;" - : : "a" (eax), "c" (ecx), "d"(edx) ); -} - -static always_inline void __mwait(unsigned long eax, unsigned long ecx) -{ - /* "mwait %eax,%ecx;" */ - asm volatile ( - ".byte 0x0f,0x01,0xc9;" - : : "a" (eax), "c" (ecx) ); -} - #define IOBMP_BYTES 8192 #define IOBMP_INVALID_OFFSET 0x8000 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 17:00:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 17:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025372.1400979 (Exim 4.92) (envelope-from ) id 1uUTTz-0004VV-NP; Wed, 25 Jun 2025 17:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025372.1400979; Wed, 25 Jun 2025 17: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 1uUTTz-0004VO-Kx; Wed, 25 Jun 2025 17:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1025372; Wed, 25 Jun 2025 17:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUTTy-0004VE-Pf for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUTTy-0023yf-2Q for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUTTy-002fum-2E for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17: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=9uEIVvcQ3dwMJh0YVtMDJhhIZq0FOrqOYseeCW8+2Ao=; b=Cju9DbtFb2pk6aU2NLXjf46rWF i/O+UEm5kHFRWU0dLSwRmooOEWDmcXwpUIawSx6NqN4nliEagGQAJ6Fbk1RIWvaoo/PENUiIYIhNp PFDyFXJz/TeWBxRe0+EvavmN6h5IIP/bU1rnASjBFGzwya4go/s5pL+ASluAg72ZrxEQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/idle: Remove MFENCEs for CLFLUSH_MONITOR Message-Id: Date: Wed, 25 Jun 2025 17:00:22 +0000 commit f77ef3443542a2c2bbd59ee66178287d4fa5b43f Author: Andrew Cooper AuthorDate: Tue Apr 1 15:55:29 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/idle: Remove MFENCEs for CLFLUSH_MONITOR Commit 48d32458bcd4 ("x86, idle: add barriers to CLFLUSH workaround") was inherited from Linux and added MFENCEs around the AAI65 errata fix. The SDM now states: Executions of the CLFLUSH instruction are ordered with respect to each other and with respect to writes, locked read-modify-write instructions, and fence instructions[1]. with footnote 1 reading: Earlier versions of this manual specified that executions of the CLFLUSH instruction were ordered only by the MFENCE instruction. All processors implementing the CLFLUSH instruction also order it relative to the other operations enumerated above. I.e. the MFENCEs came about because of an incorrect statement in the SDM. The Spec Update (no longer available on Intel's website) simply says "issue a CLFLUSH", with no mention of MFENCEs. As this erratum is specific to Intel, it's fine to remove the the MFENCEs; AMD CPUs of a similar vintage do sport otherwise-unordered CLFLUSHs. Move the feature bit into the BUG range (rather than FEATURE), and move the workaround into monitor() itself. The erratum check itself must use setup_force_cpu_cap(). It needs activating if any CPU needs it, not if all of them need it. Fixes: 48d32458bcd4 ("x86, idle: add barriers to CLFLUSH workaround") Fixes: 96d1b237ae9b ("x86/Intel: work around Xeon 7400 series erratum AAI65") Link: https://web.archive.org/web/20090219054841/http://download.intel.com/design/xeon/specupdt/32033601.pdf Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 22 +++------------------- xen/arch/x86/cpu/intel.c | 3 ++- xen/arch/x86/include/asm/cpufeatures.h | 3 ++- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 40af42a18f..e9493f7f57 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -63,6 +63,9 @@ static always_inline void monitor( const void *addr, unsigned int ecx, unsigned int edx) { + alternative_input("", "clflush (%[addr])", X86_BUG_CLFLUSH_MONITOR, + [addr] "a" (addr)); + asm volatile ( "monitor" :: "a" (addr), "c" (ecx), "d" (edx) ); } @@ -476,13 +479,6 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) s_time_t expires = per_cpu(timer_deadline, cpu); const void *monitor_addr = &mwait_wakeup(cpu); - if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) - { - mb(); - clflush(monitor_addr); - mb(); - } - monitor(monitor_addr, 0, 0); smp_mb(); @@ -917,19 +913,7 @@ void cf_check acpi_dead_idle(void) while ( 1 ) { - /* - * 1. The CLFLUSH is a workaround for erratum AAI65 for - * the Xeon 7400 series. - * 2. The WBINVD is insufficient due to the spurious-wakeup - * case where we return around the loop. - * 3. Unlike wbinvd, clflush is a light weight but not serializing - * instruction, hence memory fence is necessary to make sure all - * load/store visible before flush cache line. - */ - mb(); - clflush(mwait_ptr); monitor(mwait_ptr, 0, 0); - mb(); mwait(cx->address, 0); } } diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index ef9368167a..5215b5405c 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -446,6 +446,7 @@ static void __init probe_mwait_errata(void) * * Xeon 7400 erratum AAI65 (and further newer Xeons) * MONITOR/MWAIT may have excessive false wakeups + * https://web.archive.org/web/20090219054841/http://download.intel.com/design/xeon/specupdt/32033601.pdf */ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) { @@ -463,7 +464,7 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) if (c->x86 == 6 && cpu_has_clflush && (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) - __set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); + setup_force_cpu_cap(X86_BUG_CLFLUSH_MONITOR); probe_c3_errata(c); if (system_state < SYS_STATE_smp_boot) diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index 9e3ed21c02..84c93292c8 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -19,7 +19,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 */ -XEN_CPUFEATURE(CLFLUSH_MONITOR, X86_SYNTH( 7)) /* clflush reqd with monitor */ +/* Bit 7 unused */ 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 */ @@ -52,6 +52,7 @@ XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCAL #define X86_BUG_NULL_SEG X86_BUG( 1) /* NULL-ing a selector preserves the base and limit. */ #define X86_BUG_CLFLUSH_MFENCE X86_BUG( 2) /* MFENCE needed to serialise CLFLUSH */ #define X86_BUG_IBPB_NO_RET X86_BUG( 3) /* IBPB doesn't flush the RSB/RAS */ +#define X86_BUG_CLFLUSH_MONITOR X86_BUG( 4) /* MONITOR requires CLFLUSH */ #define X86_SPEC_NO_LFENCE_ENTRY_PV X86_BUG(16) /* (No) safety LFENCE for SPEC_CTRL_ENTRY_PV. */ #define X86_SPEC_NO_LFENCE_ENTRY_INTR X86_BUG(17) /* (No) safety LFENCE for SPEC_CTRL_ENTRY_INTR. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 17:00:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 17:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025373.1400984 (Exim 4.92) (envelope-from ) id 1uUTU9-0004Xp-PL; Wed, 25 Jun 2025 17:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025373.1400984; Wed, 25 Jun 2025 17: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 1uUTU9-0004Xg-MV; Wed, 25 Jun 2025 17:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1025373; Wed, 25 Jun 2025 17:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUTU8-0004Xa-Tf for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUTU8-0023ym-2s for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUTU8-002fw4-2b for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17: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=Vrb7kSmvHsEkRcFomHzdIVjH/igOOQ7ZzAwf42ydRzQ=; b=RZhpvHfxZ6eG17FxYEe/V22Nzd 5hsdLu8g9Ir6tObiFSXyh8uqngECjyc6K42RqaLXH0yUcJPFCWJfJ4E28hebvRqExuHwtHrocFPMy VoaIqViGgCTc8F3ebMKYGjwhAAuD9o1I1LoY+Pv+oRXf157NI1/mJtVzMt0UzC/Pb9wc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert part of "x86/mwait-idle: disable IBRS during long idle" Message-Id: Date: Wed, 25 Jun 2025 17:00:32 +0000 commit 07d7163334a7507d329958b19d976be769580999 Author: Andrew Cooper AuthorDate: Tue Jun 24 15:20:52 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 Revert part of "x86/mwait-idle: disable IBRS during long idle" Most of the patch (handling of CPUIDLE_FLAG_IBRS) is fine, but the adjustements to mwait_idle() are not; spec_ctrl_enter_idle() does more than just alter MSR_SPEC_CTRL.IBRS. The only reason this doesn't need an XSA is because the unconditional spec_ctrl_{enter,exit}_idle() in mwait_idle_with_hints() were left unaltered, and thus the MWAIT remained properly protected. There (would have been) two problems. In the ibrs_disable (== deep C) case: * On entry, VERW and RSB-stuffing are architecturally skipped. * On exit, there's a branch crossing the WRMSR which reinstates the speculative safety for indirect branches. All this change did was double up the expensive operations in the deep C case, and fail to optimise the intended case. I have an idea of how to plumb this more nicely, but it requires larger changes to legacy IBRS handling to not make spec_ctrl_enter_idle() vulnerable in other ways. In the short term, simply take out the perf hit. Fixes: 08acdf9a2615 ("x86/mwait-idle: disable IBRS during long idle") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 9c16cc166a..5c16f5ad3a 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -875,7 +875,6 @@ static const struct cpuidle_state snr_cstates[] = { static void cf_check mwait_idle(void) { unsigned int cpu = smp_processor_id(); - struct cpu_info *info = get_cpu_info(); struct acpi_processor_power *power = processor_powers[cpu]; struct acpi_processor_cx *cx = NULL; unsigned int next_state; @@ -902,6 +901,8 @@ static void cf_check mwait_idle(void) pm_idle_save(); else { + struct cpu_info *info = get_cpu_info(); + spec_ctrl_enter_idle(info); safe_halt(); spec_ctrl_exit_idle(info); @@ -928,11 +929,6 @@ static void cf_check mwait_idle(void) if ((cx->type >= 3) && errata_c6_workaround()) cx = power->safe_state; - if (cx->ibrs_disable) { - ASSERT(!cx->irq_enable_early); - spec_ctrl_enter_idle(info); - } - #if 0 /* XXX Can we/do we need to do something similar on Xen? */ /* * leave_mm() to avoid costly and often unnecessary wakeups @@ -964,10 +960,6 @@ static void cf_check mwait_idle(void) /* Now back in C0. */ update_idle_stats(power, cx, before, after); - - if (cx->ibrs_disable) - spec_ctrl_exit_idle(info); - local_irq_enable(); TRACE_TIME(TRC_PM_IDLE_EXIT, cx->type, after, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 17:00:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 17:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025374.1400990 (Exim 4.92) (envelope-from ) id 1uUTUJ-0004ak-RR; Wed, 25 Jun 2025 17:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025374.1400990; Wed, 25 Jun 2025 17: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 1uUTUJ-0004ab-Ns; Wed, 25 Jun 2025 17:00:43 +0000 Received: by outflank-mailman (input) for mailman id 1025374; Wed, 25 Jun 2025 17:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUTUJ-0004aT-23 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUTUI-00241W-39 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUTUI-002fxp-33 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17: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=91f+EzIGb75WuINp5FZgbwx//Dx5XO2EFTXwQQYSD2g=; b=nRn0hPW1feoxsYyH4qjhXb+qC4 td9PIbXrsJEFHmglEtIXlAUm/VpDqdA3dkZFVypSq0beQ/WiBxkj/iIVcLMbGRTuwQc+dCSH7BlMk 6rkrX/2/1Buk4pUOXFWUBMBGiyqD11LPPraCuiyceG633bFdftYLhQAAzIC8l2mfx+pE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/idle: Misc cleanup Message-Id: Date: Wed, 25 Jun 2025 17:00:42 +0000 commit da21488aed9bf055f24610aa46787a490d44bb98 Author: Andrew Cooper AuthorDate: Tue Apr 1 14:55:13 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/idle: Misc cleanup Sort includes, and drop trailing whitespace. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 51 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index e9493f7f57..6c3a10e6fb 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1,6 +1,6 @@ /* - * cpu_idle - xen idle state module derived from Linux - * drivers/acpi/processor_idle.c & + * cpu_idle - xen idle state module derived from Linux + * drivers/acpi/processor_idle.c & * arch/x86/kernel/acpi/cstate.c * * Copyright (C) 2001, 2002 Andy Grover @@ -30,34 +30,34 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include -#include -#include #include -#include +#include +#include #include +#include #include +#include +#include #include -#include -#include -#include - -#include -#include -#include -#include #include +#include +#include #include -#include -#include +#include + #include #include #include +#include +#include +#include #include -#include -#include +#include #include +#include +#include + /*#define DEBUG_PM_CX*/ static always_inline void monitor( @@ -791,7 +791,7 @@ static void cf_check acpi_processor_idle(void) case ACPI_STATE_C3: /* - * Before invoking C3, be aware that TSC/APIC timer may be + * Before invoking C3, be aware that TSC/APIC timer may be * stopped by H/W. Without carefully handling of TSC/APIC stop issues, * deep C state can't work correctly. */ @@ -1082,7 +1082,7 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) break; case ACPI_ADR_SPACE_FIXED_HARDWARE: - if ( cx->reg.bit_width != VENDOR_INTEL || + if ( cx->reg.bit_width != VENDOR_INTEL || cx->reg.bit_offset != NATIVE_CSTATE_BEYOND_HALT ) return -EINVAL; @@ -1269,14 +1269,14 @@ static void print_cx_pminfo(uint32_t cpu, struct xen_processor_power *power) "\t pwr_setup_done[%d], bm_rld_set[%d]\n", power->flags.bm_control, power->flags.bm_check, power->flags.has_cst, power->flags.power_setup_done, power->flags.bm_rld_set); - + states = power->states; - + for ( i = 0; i < power->count; i++ ) { if ( unlikely(copy_from_guest_offset(&state, states, i, 1)) ) return; - + printk("\tstates[%d]:\n", i); printk("\t\treg.space_id = %#x\n", state.reg.space_id); printk("\t\treg.bit_width = %#x\n", state.reg.bit_width); @@ -1289,7 +1289,7 @@ static void print_cx_pminfo(uint32_t cpu, struct xen_processor_power *power) csd = state.dp; printk("\t\tdp(@0x%p)\n", csd.p); - + if ( csd.p != NULL ) { if ( unlikely(copy_from_guest(&dp, csd, 1)) ) @@ -1388,7 +1388,7 @@ long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power) dead_idle = acpi_dead_idle; } - + return 0; } @@ -1676,4 +1676,3 @@ static int __init cf_check cpuidle_presmp_init(void) return 0; } presmp_initcall(cpuidle_presmp_init); - -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 17:00:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 17:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025375.1400991 (Exim 4.92) (envelope-from ) id 1uUTUT-0004eO-Rs; Wed, 25 Jun 2025 17:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025375.1400991; Wed, 25 Jun 2025 17:00: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 1uUTUT-0004eH-PF; Wed, 25 Jun 2025 17:00:53 +0000 Received: by outflank-mailman (input) for mailman id 1025375; Wed, 25 Jun 2025 17:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUTUT-0004eB-3t for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUTUT-00241a-0H for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUTUT-002fzz-06 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 17:00: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=+lhdIlrmFIBLZJvJ8kPQORtnvAf3Lior2N3LPyGiJg0=; b=bZxlnPLGhuGRH2zUALm4A3boi+ D29uaUT4FQ03A2hTXI45R9YWav3Gv4QsRMm7cwFe7QNoIJJfaFApNA4g8RzZpN6ZbZT/5p+ZvSh1Z tv+pk0+30xkYpRWBj7zCnc9Lxqog3Q6psPuos1msEOgd3AmVV7P/DouBB2jCYxY2z8Hc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Improve paging mode diagnostics in create_dom0() Message-Id: Date: Wed, 25 Jun 2025 17:00:53 +0000 commit 2654ff974a43c16f677dcd63303b09f527285fbf Author: Andrew Cooper AuthorDate: Wed Jun 25 10:00:25 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/boot: Improve paging mode diagnostics in create_dom0() I was presented with this: (XEN) NX (Execute Disable) protection active (XEN) d0 has maximum 416 PIRQs (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Error creating d0: -95 (XEN) **************************************** which is less than helpful. It turns out to be the -EOPNOTSUPP from shadow_domain_init(). The real bug here is create_dom0() unconditionally assuming the presence of SHADOW_PAGING. Rework it to panic() rather than choosing a dom0_cfg which is guaranteed to fail. This results in: (XEN) NX (Execute Disable) protection active (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Neither HAP nor Shadow available for PVH domain (XEN) **************************************** which is rather more helpful. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f32efa7c60..24e4f5ac7f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1033,9 +1033,12 @@ static struct domain *__init create_dom0(struct boot_info *bi) if ( opt_dom0_pvh ) { - dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | - ((hvm_hap_supported() && !opt_dom0_shadow) ? - XEN_DOMCTL_CDF_hap : 0)); + dom0_cfg.flags |= XEN_DOMCTL_CDF_hvm; + + if ( hvm_hap_supported() && !opt_dom0_shadow ) + dom0_cfg.flags |= XEN_DOMCTL_CDF_hap; + else if ( !IS_ENABLED(CONFIG_SHADOW_PAGING) ) + panic("Neither HAP nor Shadow available for PVH domain\n"); dom0_cfg.arch.emulation_flags |= XEN_X86_EMU_LAPIC | XEN_X86_EMU_IOAPIC | XEN_X86_EMU_VPCI; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 23:33:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 23:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025667.1401086 (Exim 4.92) (envelope-from ) id 1uUZbz-0004A5-RK; Wed, 25 Jun 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 1025667.1401086; Wed, 25 Jun 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 1uUZbz-00049x-OZ; Wed, 25 Jun 2025 23:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1025667; Wed, 25 Jun 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 1uUZby-00049r-34 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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 1uUZbx-002BZk-33 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUZbx-003Kag-2v for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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=yIDrZRXjWCHFC9t8q3LSg7m1X8hj3ooVXF8xDvLbfm0=; b=wbcMoz9O5JpHXh/ylGQIKaYdtI Fvti1iEWtP0u23KjS13PQ3mmbz8x+6gBdRWFvKH1lclsZrqlXbTazMx0HMVo+asKy78yMqT9KVL7x 6IgOKhDMbh8D9A6k+6MwrSDceTIB4ZEfULzoLlCzcePTTWBbHWdX9aDP/1abqKH7Ewbg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/svm: Revert 1->true conversion in svm_asid_handle_vmrun() Message-Id: Date: Wed, 25 Jun 2025 23:33:01 +0000 commit 5ede8c92616d2bdf39916e7f6fd754821d4c5e6d Author: Andrew Cooper AuthorDate: Mon Jun 23 11:41:39 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/svm: Revert 1->true conversion in svm_asid_handle_vmrun() This is literally ASID 1 (of 2^16), not a boolean. Fixes: 2f09f797ba43 ("x86/svm: Drop the suffix _guest from vmcb bit") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/asid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 7977a8e86b..d5f70f8848 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -37,7 +37,7 @@ void svm_asid_handle_vmrun(void) /* ASID 0 indicates that ASIDs are disabled. */ if ( p_asid->asid == 0 ) { - vmcb_set_asid(vmcb, true); + vmcb_set_asid(vmcb, 1); vmcb->tlb_control = cpu_has_svm_flushbyasid ? TLB_CTRL_FLUSH_ASID : TLB_CTRL_FLUSH_ALL; return; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 23:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 23:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025668.1401090 (Exim 4.92) (envelope-from ) id 1uUZc9-0004BX-Sq; Wed, 25 Jun 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 1025668.1401090; Wed, 25 Jun 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 1uUZc9-0004BP-Q6; Wed, 25 Jun 2025 23:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1025668; Wed, 25 Jun 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 1uUZc8-0004BF-2z for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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 1uUZc8-002BZo-0A for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUZc8-003KbS-01 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23: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=BGrueBkcacTFXctN6u13gClT4r3zIDp2hEdqJcx0IIw=; b=AB+NIXgec6thaxJuN86+3NS5Au 5vCZA+6wm+3600jgtreSx2pogEJ/VQbpuyAzT5Gh/gL6DwV7PIKC61RAgcNmhWivvpepX5DiMepTx WEca6VdSpnS6Yy4J+MyOW0EEEmfKvqEcloOBcJ38LHbSmFHCzJqpJffQAUaL9BqRkXiY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/idle: Move monitor()/mwait() wrappers into cpu-idle.c Message-Id: Date: Wed, 25 Jun 2025 23:33:12 +0000 commit 61e10fc28ccddff7c72c14acec56dc7ef2b155d1 Author: Andrew Cooper AuthorDate: Tue Apr 1 14:59:01 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/idle: Move monitor()/mwait() wrappers into cpu-idle.c They're not used by any other translation unit, so shouldn't live in asm/processor.h, which is included almost everywhere. Our new toolchain baseline knows the MONITOR/MWAIT instructions, so use them directly rather than using raw hex. Change the hint/extention parameters from long to int. They're specified to remain 32bit operands even 64-bit mode. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 21 +++++++++++++++++---- xen/arch/x86/include/asm/processor.h | 17 ----------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 1dbf15b01e..40af42a18f 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -60,6 +60,19 @@ /*#define DEBUG_PM_CX*/ +static always_inline void monitor( + const void *addr, unsigned int ecx, unsigned int edx) +{ + asm volatile ( "monitor" + :: "a" (addr), "c" (ecx), "d" (edx) ); +} + +static always_inline void mwait(unsigned int eax, unsigned int ecx) +{ + asm volatile ( "mwait" + :: "a" (eax), "c" (ecx) ); +} + #define GET_HW_RES_IN_NS(msr, val) \ do { rdmsrl(msr, val); val = tsc_ticks2ns(val); } while( 0 ) #define GET_MC6_RES(val) GET_HW_RES_IN_NS(0x664, val) @@ -470,7 +483,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) mb(); } - __monitor(monitor_addr, 0, 0); + monitor(monitor_addr, 0, 0); smp_mb(); /* @@ -484,7 +497,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) cpumask_set_cpu(cpu, &cpuidle_mwait_flags); spec_ctrl_enter_idle(info); - __mwait(eax, ecx); + mwait(eax, ecx); spec_ctrl_exit_idle(info); cpumask_clear_cpu(cpu, &cpuidle_mwait_flags); @@ -915,9 +928,9 @@ void cf_check acpi_dead_idle(void) */ mb(); clflush(mwait_ptr); - __monitor(mwait_ptr, 0, 0); + monitor(mwait_ptr, 0, 0); mb(); - __mwait(cx->address, 0); + mwait(cx->address, 0); } } else if ( (current_cpu_data.x86_vendor & diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 96b9bf5f5e..04824c3633 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -315,23 +315,6 @@ static always_inline void set_in_cr4 (unsigned long mask) cr4_pv32_mask |= (mask & XEN_CR4_PV32_BITS); } -static always_inline void __monitor(const void *eax, unsigned long ecx, - unsigned long edx) -{ - /* "monitor %eax,%ecx,%edx;" */ - asm volatile ( - ".byte 0x0f,0x01,0xc8;" - : : "a" (eax), "c" (ecx), "d"(edx) ); -} - -static always_inline void __mwait(unsigned long eax, unsigned long ecx) -{ - /* "mwait %eax,%ecx;" */ - asm volatile ( - ".byte 0x0f,0x01,0xc9;" - : : "a" (eax), "c" (ecx) ); -} - #define IOBMP_BYTES 8192 #define IOBMP_INVALID_OFFSET 0x8000 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 23:33:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 23:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025669.1401093 (Exim 4.92) (envelope-from ) id 1uUZcJ-0004E3-U1; Wed, 25 Jun 2025 23:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025669.1401093; Wed, 25 Jun 2025 23: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 1uUZcJ-0004Dw-RY; Wed, 25 Jun 2025 23:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1025669; Wed, 25 Jun 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 1uUZcI-0004Di-6P for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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 1uUZcI-002BZv-0V for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUZcI-003KcA-0L for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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=xS0tCRd+eLq+WwoictBdjeC45Xn6z3pOpDSET2dCJH8=; b=EGTq0zmGX6xbmxBZjYHC3gr92m PU7Iu6Wx9EpQE5aw9178TRhio3F2ijM/W1avNbokeGNeQ/Lt1GvLhGsuiwmNEMYU8MjwXeXrG4Qdf AAJdCEFy/UW0EWPtlTt83CIPlGEU4Waw5M3CWuNYaoGKJZoCLNB8Q+Q2lxDO4o0wdNW4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/idle: Remove MFENCEs for CLFLUSH_MONITOR Message-Id: Date: Wed, 25 Jun 2025 23:33:22 +0000 commit f77ef3443542a2c2bbd59ee66178287d4fa5b43f Author: Andrew Cooper AuthorDate: Tue Apr 1 15:55:29 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/idle: Remove MFENCEs for CLFLUSH_MONITOR Commit 48d32458bcd4 ("x86, idle: add barriers to CLFLUSH workaround") was inherited from Linux and added MFENCEs around the AAI65 errata fix. The SDM now states: Executions of the CLFLUSH instruction are ordered with respect to each other and with respect to writes, locked read-modify-write instructions, and fence instructions[1]. with footnote 1 reading: Earlier versions of this manual specified that executions of the CLFLUSH instruction were ordered only by the MFENCE instruction. All processors implementing the CLFLUSH instruction also order it relative to the other operations enumerated above. I.e. the MFENCEs came about because of an incorrect statement in the SDM. The Spec Update (no longer available on Intel's website) simply says "issue a CLFLUSH", with no mention of MFENCEs. As this erratum is specific to Intel, it's fine to remove the the MFENCEs; AMD CPUs of a similar vintage do sport otherwise-unordered CLFLUSHs. Move the feature bit into the BUG range (rather than FEATURE), and move the workaround into monitor() itself. The erratum check itself must use setup_force_cpu_cap(). It needs activating if any CPU needs it, not if all of them need it. Fixes: 48d32458bcd4 ("x86, idle: add barriers to CLFLUSH workaround") Fixes: 96d1b237ae9b ("x86/Intel: work around Xeon 7400 series erratum AAI65") Link: https://web.archive.org/web/20090219054841/http://download.intel.com/design/xeon/specupdt/32033601.pdf Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 22 +++------------------- xen/arch/x86/cpu/intel.c | 3 ++- xen/arch/x86/include/asm/cpufeatures.h | 3 ++- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 40af42a18f..e9493f7f57 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -63,6 +63,9 @@ static always_inline void monitor( const void *addr, unsigned int ecx, unsigned int edx) { + alternative_input("", "clflush (%[addr])", X86_BUG_CLFLUSH_MONITOR, + [addr] "a" (addr)); + asm volatile ( "monitor" :: "a" (addr), "c" (ecx), "d" (edx) ); } @@ -476,13 +479,6 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) s_time_t expires = per_cpu(timer_deadline, cpu); const void *monitor_addr = &mwait_wakeup(cpu); - if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) - { - mb(); - clflush(monitor_addr); - mb(); - } - monitor(monitor_addr, 0, 0); smp_mb(); @@ -917,19 +913,7 @@ void cf_check acpi_dead_idle(void) while ( 1 ) { - /* - * 1. The CLFLUSH is a workaround for erratum AAI65 for - * the Xeon 7400 series. - * 2. The WBINVD is insufficient due to the spurious-wakeup - * case where we return around the loop. - * 3. Unlike wbinvd, clflush is a light weight but not serializing - * instruction, hence memory fence is necessary to make sure all - * load/store visible before flush cache line. - */ - mb(); - clflush(mwait_ptr); monitor(mwait_ptr, 0, 0); - mb(); mwait(cx->address, 0); } } diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index ef9368167a..5215b5405c 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -446,6 +446,7 @@ static void __init probe_mwait_errata(void) * * Xeon 7400 erratum AAI65 (and further newer Xeons) * MONITOR/MWAIT may have excessive false wakeups + * https://web.archive.org/web/20090219054841/http://download.intel.com/design/xeon/specupdt/32033601.pdf */ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) { @@ -463,7 +464,7 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) if (c->x86 == 6 && cpu_has_clflush && (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) - __set_bit(X86_FEATURE_CLFLUSH_MONITOR, c->x86_capability); + setup_force_cpu_cap(X86_BUG_CLFLUSH_MONITOR); probe_c3_errata(c); if (system_state < SYS_STATE_smp_boot) diff --git a/xen/arch/x86/include/asm/cpufeatures.h b/xen/arch/x86/include/asm/cpufeatures.h index 9e3ed21c02..84c93292c8 100644 --- a/xen/arch/x86/include/asm/cpufeatures.h +++ b/xen/arch/x86/include/asm/cpufeatures.h @@ -19,7 +19,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 */ -XEN_CPUFEATURE(CLFLUSH_MONITOR, X86_SYNTH( 7)) /* clflush reqd with monitor */ +/* Bit 7 unused */ 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 */ @@ -52,6 +52,7 @@ XEN_CPUFEATURE(USE_VMCALL, X86_SYNTH(30)) /* Use VMCALL instead of VMMCAL #define X86_BUG_NULL_SEG X86_BUG( 1) /* NULL-ing a selector preserves the base and limit. */ #define X86_BUG_CLFLUSH_MFENCE X86_BUG( 2) /* MFENCE needed to serialise CLFLUSH */ #define X86_BUG_IBPB_NO_RET X86_BUG( 3) /* IBPB doesn't flush the RSB/RAS */ +#define X86_BUG_CLFLUSH_MONITOR X86_BUG( 4) /* MONITOR requires CLFLUSH */ #define X86_SPEC_NO_LFENCE_ENTRY_PV X86_BUG(16) /* (No) safety LFENCE for SPEC_CTRL_ENTRY_PV. */ #define X86_SPEC_NO_LFENCE_ENTRY_INTR X86_BUG(17) /* (No) safety LFENCE for SPEC_CTRL_ENTRY_INTR. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 23:33:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 23:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025670.1401098 (Exim 4.92) (envelope-from ) id 1uUZcT-0004GY-Vo; Wed, 25 Jun 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 1025670.1401098; Wed, 25 Jun 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 1uUZcT-0004GP-TB; Wed, 25 Jun 2025 23:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1025670; Wed, 25 Jun 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 1uUZcS-0004G8-8Q for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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 1uUZcS-002Ba3-0l for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUZcS-003Kcy-0g for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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=4l8y/u5Hvywh1cKytj2yCo3VJeSavMq8vkrZ9h/onpY=; b=oYGME1+Fg+j4MwxtH5AIuwlXuD 7J6Fh0J11doUWzHauHUzFNJ0FLpDLjW8oN51ERJxCJrLQ0i6/ImhCPNazHoJCUcCP/Rz6BkvZpjqD 5krHDtLnIrNBrS6R9C0Fxs3/nwhrCuEYDsrXalMD5iVJz8cOA2mVLsa7FGb7kdwP4gKI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert part of "x86/mwait-idle: disable IBRS during long idle" Message-Id: Date: Wed, 25 Jun 2025 23:33:32 +0000 commit 07d7163334a7507d329958b19d976be769580999 Author: Andrew Cooper AuthorDate: Tue Jun 24 15:20:52 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 Revert part of "x86/mwait-idle: disable IBRS during long idle" Most of the patch (handling of CPUIDLE_FLAG_IBRS) is fine, but the adjustements to mwait_idle() are not; spec_ctrl_enter_idle() does more than just alter MSR_SPEC_CTRL.IBRS. The only reason this doesn't need an XSA is because the unconditional spec_ctrl_{enter,exit}_idle() in mwait_idle_with_hints() were left unaltered, and thus the MWAIT remained properly protected. There (would have been) two problems. In the ibrs_disable (== deep C) case: * On entry, VERW and RSB-stuffing are architecturally skipped. * On exit, there's a branch crossing the WRMSR which reinstates the speculative safety for indirect branches. All this change did was double up the expensive operations in the deep C case, and fail to optimise the intended case. I have an idea of how to plumb this more nicely, but it requires larger changes to legacy IBRS handling to not make spec_ctrl_enter_idle() vulnerable in other ways. In the short term, simply take out the perf hit. Fixes: 08acdf9a2615 ("x86/mwait-idle: disable IBRS during long idle") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 9c16cc166a..5c16f5ad3a 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -875,7 +875,6 @@ static const struct cpuidle_state snr_cstates[] = { static void cf_check mwait_idle(void) { unsigned int cpu = smp_processor_id(); - struct cpu_info *info = get_cpu_info(); struct acpi_processor_power *power = processor_powers[cpu]; struct acpi_processor_cx *cx = NULL; unsigned int next_state; @@ -902,6 +901,8 @@ static void cf_check mwait_idle(void) pm_idle_save(); else { + struct cpu_info *info = get_cpu_info(); + spec_ctrl_enter_idle(info); safe_halt(); spec_ctrl_exit_idle(info); @@ -928,11 +929,6 @@ static void cf_check mwait_idle(void) if ((cx->type >= 3) && errata_c6_workaround()) cx = power->safe_state; - if (cx->ibrs_disable) { - ASSERT(!cx->irq_enable_early); - spec_ctrl_enter_idle(info); - } - #if 0 /* XXX Can we/do we need to do something similar on Xen? */ /* * leave_mm() to avoid costly and often unnecessary wakeups @@ -964,10 +960,6 @@ static void cf_check mwait_idle(void) /* Now back in C0. */ update_idle_stats(power, cx, before, after); - - if (cx->ibrs_disable) - spec_ctrl_exit_idle(info); - local_irq_enable(); TRACE_TIME(TRC_PM_IDLE_EXIT, cx->type, after, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 23:33:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 23:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025671.1401102 (Exim 4.92) (envelope-from ) id 1uUZce-0004JC-0t; Wed, 25 Jun 2025 23:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025671.1401102; Wed, 25 Jun 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 1uUZcd-0004J4-UV; Wed, 25 Jun 2025 23:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1025671; Wed, 25 Jun 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 1uUZcc-0004Is-Bq for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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 1uUZcc-002BaB-12 for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUZcc-003Kdp-0w for xen-changelog@lists.xenproject.org; Wed, 25 Jun 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=caMfnhm5T9Max01x3CE8wkPj+P27Sg4yjjC/aUR5IQo=; b=qS60yCiJ2e4+S9fdBh6+2qthbH DTJJ8Vkfs62hD/hdFCjqN0FzFd8eIPTj+rLFkm+SdzdvapMeadYWDnEoay739gWTJeJwF1yFRwBR2 T+QIMW2R9F4WPeMWFReV+M6/RASMRE6ncqpZUGS4LjqedgaXLq6wvJbxA7iY8F27PIu0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/idle: Misc cleanup Message-Id: Date: Wed, 25 Jun 2025 23:33:42 +0000 commit da21488aed9bf055f24610aa46787a490d44bb98 Author: Andrew Cooper AuthorDate: Tue Apr 1 14:55:13 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/idle: Misc cleanup Sort includes, and drop trailing whitespace. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 51 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index e9493f7f57..6c3a10e6fb 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1,6 +1,6 @@ /* - * cpu_idle - xen idle state module derived from Linux - * drivers/acpi/processor_idle.c & + * cpu_idle - xen idle state module derived from Linux + * drivers/acpi/processor_idle.c & * arch/x86/kernel/acpi/cstate.c * * Copyright (C) 2001, 2002 Andy Grover @@ -30,34 +30,34 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include -#include -#include #include -#include +#include +#include #include +#include #include +#include +#include #include -#include -#include -#include - -#include -#include -#include -#include #include +#include +#include #include -#include -#include +#include + #include #include #include +#include +#include +#include #include -#include -#include +#include #include +#include +#include + /*#define DEBUG_PM_CX*/ static always_inline void monitor( @@ -791,7 +791,7 @@ static void cf_check acpi_processor_idle(void) case ACPI_STATE_C3: /* - * Before invoking C3, be aware that TSC/APIC timer may be + * Before invoking C3, be aware that TSC/APIC timer may be * stopped by H/W. Without carefully handling of TSC/APIC stop issues, * deep C state can't work correctly. */ @@ -1082,7 +1082,7 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) break; case ACPI_ADR_SPACE_FIXED_HARDWARE: - if ( cx->reg.bit_width != VENDOR_INTEL || + if ( cx->reg.bit_width != VENDOR_INTEL || cx->reg.bit_offset != NATIVE_CSTATE_BEYOND_HALT ) return -EINVAL; @@ -1269,14 +1269,14 @@ static void print_cx_pminfo(uint32_t cpu, struct xen_processor_power *power) "\t pwr_setup_done[%d], bm_rld_set[%d]\n", power->flags.bm_control, power->flags.bm_check, power->flags.has_cst, power->flags.power_setup_done, power->flags.bm_rld_set); - + states = power->states; - + for ( i = 0; i < power->count; i++ ) { if ( unlikely(copy_from_guest_offset(&state, states, i, 1)) ) return; - + printk("\tstates[%d]:\n", i); printk("\t\treg.space_id = %#x\n", state.reg.space_id); printk("\t\treg.bit_width = %#x\n", state.reg.bit_width); @@ -1289,7 +1289,7 @@ static void print_cx_pminfo(uint32_t cpu, struct xen_processor_power *power) csd = state.dp; printk("\t\tdp(@0x%p)\n", csd.p); - + if ( csd.p != NULL ) { if ( unlikely(copy_from_guest(&dp, csd, 1)) ) @@ -1388,7 +1388,7 @@ long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power) dead_idle = acpi_dead_idle; } - + return 0; } @@ -1676,4 +1676,3 @@ static int __init cf_check cpuidle_presmp_init(void) return 0; } presmp_initcall(cpuidle_presmp_init); - -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 25 23:33:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 25 Jun 2025 23:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025672.1401105 (Exim 4.92) (envelope-from ) id 1uUZco-0004LV-2T; Wed, 25 Jun 2025 23:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025672.1401105; Wed, 25 Jun 2025 23: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 1uUZcn-0004LN-Vv; Wed, 25 Jun 2025 23:33:53 +0000 Received: by outflank-mailman (input) for mailman id 1025672; Wed, 25 Jun 2025 23:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUZcm-0004L8-Es for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUZcm-002BaV-1M for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUZcm-003KeY-1D for xen-changelog@lists.xenproject.org; Wed, 25 Jun 2025 23: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=QTgpWot3pbaLwLNGo7UBDwsj7I1NwXhA65WzGvNODc0=; b=2aJvEz5PW7pLQwHwNQR3rvHLs7 aO+f4JR+kmxIWTJFcrUwRxruZOkIF/MrczHZzEheceKzMFQctsvoIXDuvKwd2EMlgLu7bCdiPRDmu qSMmDdKtUQduVKWZ46SAkL1K4b4xTGldFc5FlPDnJlXItIXj5s8HrB5a+ws+d5CpDsbw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Improve paging mode diagnostics in create_dom0() Message-Id: Date: Wed, 25 Jun 2025 23:33:52 +0000 commit 2654ff974a43c16f677dcd63303b09f527285fbf Author: Andrew Cooper AuthorDate: Wed Jun 25 10:00:25 2025 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 25 17:54:41 2025 +0100 x86/boot: Improve paging mode diagnostics in create_dom0() I was presented with this: (XEN) NX (Execute Disable) protection active (XEN) d0 has maximum 416 PIRQs (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Error creating d0: -95 (XEN) **************************************** which is less than helpful. It turns out to be the -EOPNOTSUPP from shadow_domain_init(). The real bug here is create_dom0() unconditionally assuming the presence of SHADOW_PAGING. Rework it to panic() rather than choosing a dom0_cfg which is guaranteed to fail. This results in: (XEN) NX (Execute Disable) protection active (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Neither HAP nor Shadow available for PVH domain (XEN) **************************************** which is rather more helpful. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f32efa7c60..24e4f5ac7f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1033,9 +1033,12 @@ static struct domain *__init create_dom0(struct boot_info *bi) if ( opt_dom0_pvh ) { - dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | - ((hvm_hap_supported() && !opt_dom0_shadow) ? - XEN_DOMCTL_CDF_hap : 0)); + dom0_cfg.flags |= XEN_DOMCTL_CDF_hvm; + + if ( hvm_hap_supported() && !opt_dom0_shadow ) + dom0_cfg.flags |= XEN_DOMCTL_CDF_hap; + else if ( !IS_ENABLED(CONFIG_SHADOW_PAGING) ) + panic("Neither HAP nor Shadow available for PVH domain\n"); dom0_cfg.arch.emulation_flags |= XEN_X86_EMU_LAPIC | XEN_X86_EMU_IOAPIC | XEN_X86_EMU_VPCI; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:44:07 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025916.1401160 (Exim 4.92) (envelope-from ) id 1uUgL5-0004Ry-2t; Thu, 26 Jun 2025 06:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025916.1401160; Thu, 26 Jun 2025 06: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 1uUgL4-0004Rq-W5; Thu, 26 Jun 2025 06:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1025916; Thu, 26 Jun 2025 06:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgL4-0004Rk-7T for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgL3-003VnX-2y for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgL3-004kdi-2o for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=BXkaguKke7y+TdAs/Km1wjl0QrdGbNMvmZt3pjEDUZc=; b=TCeHal7hg3DM+/CK9YLOevEf24 CNTZz47efGp1YTDW4dua6NxNrVKwHuie7FATpOQuq2PSwWwtLwjCr/gNPZMPEsyx4wi9fQS21fbiP zrhEI6d5mNx7DuZdNraLlc5RplSAsGk2yHQKp/z4i2Tqqmq8ioFwqCRwt1/C8dtVlwDE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches Message-Id: Date: Thu, 26 Jun 2025 06:44:01 +0000 commit a60e95308072355dbe966c2129c0315f8222da30 Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:34:24 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:34:24 2025 +0200 x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches The current emulation of wb{,no}invd is bogus for PV guests: it will only flush the current pCPU cache, without taking into account pCPUs where the vCPU had run previously. Resort to flushing the cache on all host pCPUs to make it correct. Fixes: 799fed0a7cc5 ("Priv-op emulation in Xen, for RDMSR/WRMSR/WBINVD") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich [backport: no FLUSH_CACHE_WRITEBACK] master commit: b0f8bf86057b8f01fb4e48b506805d3818600f76 master date: 2025-05-20 16:35:52 +0200 --- xen/arch/x86/pv/emul-priv-op.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 295d847ea2..a21d499519 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1198,13 +1198,11 @@ static int cf_check cache_op( if ( !cache_flush_permitted(current->domain) ) /* * Non-physdev domain attempted WBINVD; ignore for now since - * newer linux uses this in some start-of-day timing loops. + * Linux uses this in some start-of-day code. */ ; - else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); else - wbinvd(); + flush_all(FLUSH_CACHE); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025917.1401163 (Exim 4.92) (envelope-from ) id 1uUgLF-0004Tj-3d; Thu, 26 Jun 2025 06:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025917.1401163; Thu, 26 Jun 2025 06: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 1uUgLF-0004Tb-18; Thu, 26 Jun 2025 06:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1025917; Thu, 26 Jun 2025 06:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgLE-0004TP-1M for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgLE-003Vnd-02 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgLD-004kiF-39 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=Id7sfp98rWTQwVJq4WV8c9EUbwT8HxANzzLvWsrUmyY=; b=W3YaXnY9m2A9otBQxiia+qLaOw 0ZiQaUPrXn6cpNU+d+R3tLn49U4xhMswCOxAi37O2cj2Tyu2Wf7cYzFzm6Gyi6dmFRauW4REfhCc4 0EJPhPZGoRWX+J4UmcnGa7vt72vfJ0XSjsqgMc+tMoVA35/lvrv9o4NrmibtEYc6NKe4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/vpci: fix handling of BAR overlaps with non-hole regions Message-Id: Date: Thu, 26 Jun 2025 06:44:11 +0000 commit 59199179214ad64ba8ab8ad054735b2db3f3aad7 Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:35:12 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:35:12 2025 +0200 x86/vpci: fix handling of BAR overlaps with non-hole regions For once the message printed when a BAR overlaps with a non-hole regions is not accurate on x86. While the BAR won't be mapped by the vPCI logic, it is quite likely overlapping with a reserved region in the memory map, and already mapped as by default all reserved regions are identity mapped in the p2m. Avoid printing the warning message in modify_bars(), and instead print a more lax message in the x86 implementation of pci_check_bar() to note the current BAR position overlaps with non-hole region(s). Secondly, when an overlap is detected the BAR 'enabled' field is not set, hence other vPCI code that depends on it like vPCI MSI-X handling won't function properly, as it sees the BAR as disabled, even when memory decoding is enabled for the device and the BAR is likely mapped in the p2m. Change the handling of BARs that overlap non-hole regions to instead remove any overlapped regions from the rangeset, so the resulting ranges to map just contain the hole regions. This requires introducing a new pci_sanitize_bar_memory() that's implemented per-arch and sanitizes the address range to add to the p2m. For x86 pci_sanitize_bar_memory() removes any regions present in the host memory map, for ARM this is currently left as a dummy handler to not change existing behavior. Ultimately the above changes should fix the vPCI MSI-X handlers not working correctly when the BAR that contains the MSI-X table overlaps with a non-hole region, as then the 'enabled' BAR bit won't be set and the MSI-X traps won't handle accesses as expected. Reported-by: Stefano Stabellini Fixes: 53d9133638c3 ('pci: do not disable memory decoding for devices') Signed-off-by: Roger Pau Monné Tested-by: Victor M Lira Reviewed-by: Jan Beulich Acked-by: Julien Grall x86/vpci: fix off-by-one in pci_sanitize_bar_memory() rangeset_remove_range() uses inclusive ranges, and hence the end of the range should be calculated using PFN_DOWN(), not PFN_UP(). Fixes: 4acab25a9300 ('x86/vpci: fix handling of BAR overlaps with non-hole regions') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 4acab25a9300ba69a3c1441491470bd65af52d0f master date: 2025-05-21 18:29:55 +0200 master commit: 7ab4b392b78b5ac1c7a1fb1d085637526e67521a master date: 2025-05-22 16:17:12 +0200 --- xen/arch/arm/include/asm/pci.h | 3 +++ xen/arch/x86/include/asm/pci.h | 13 ++++------- xen/arch/x86/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/header.c | 9 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7f77226c9b..1605ec660d 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -128,6 +128,9 @@ int pci_host_bridge_mappings(struct domain *d); bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); +static inline int pci_sanitize_bar_memory(struct rangeset *r) +{ return 0; } + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..bed99437cc 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,14 +57,9 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); -static inline bool pci_check_bar(const struct pci_dev *pdev, - mfn_t start, mfn_t end) -{ - /* - * Check if BAR is not overlapping with any memory region defined - * in the memory map. - */ - return is_memory_hole(start, end); -} +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); #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 97b792e578..26bb7f6a3c 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -98,3 +98,53 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, return rc; } + +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + if ( !is_memory_hole(start, end) ) + gdprintk(XENLOG_WARNING, + "%pp: BAR at [%"PRI_mfn", %"PRI_mfn"] not in memory map hole\n", + &pdev->sbdf, mfn_x(start), mfn_x(end)); + + /* + * Unconditionally return true, pci_sanitize_bar_memory() will remove any + * non-hole regions. + */ + return true; +} + +/* Remove overlaps with any ranges defined in the host memory map. */ +int pci_sanitize_bar_memory(struct rangeset *r) +{ + unsigned int i; + + for ( i = 0; i < e820.nr_map; i++ ) + { + const struct e820entry *entry = &e820.map[i]; + int rc; + + if ( !entry->size ) + continue; + + rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), + PFN_DOWN(entry->addr + entry->size - 1)); + if ( rc ) + return rc; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ef6c965c08..1f48f2aac6 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -394,6 +394,15 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) return rc; } } + + rc = pci_sanitize_bar_memory(bar->mem); + if ( rc ) + { + gprintk(XENLOG_WARNING, + "%pp: failed to sanitize BAR#%u memory: %d\n", + &pdev->sbdf, i, rc); + return rc; + } } /* Remove any MSIX regions if present. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025918.1401168 (Exim 4.92) (envelope-from ) id 1uUgLP-0004WT-5L; Thu, 26 Jun 2025 06:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025918.1401168; Thu, 26 Jun 2025 06: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 1uUgLP-0004W0-2U; Thu, 26 Jun 2025 06:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1025918; Thu, 26 Jun 2025 06:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgLO-0004Vp-4E for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgLO-003Vnl-0K for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgLO-004kl6-0D for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=SU8WU/gBiZUkmoVqPoIQpo9kS5xzR0nPu0FfRkkXjOY=; b=Xj3aCvE5VOah1+KQbe1Mnt8HYb mpy/EJQCrFkDqyOITaYB92ucn3qcsYr6GKFoy2u/TlJVM5qg02pVcnxB4PNKIoCo/heb8U7O8i9Pr v9MidRt7Z3AhkF16aiheB0w0Jf0acCce9JhYahBh00evifG3YJOeA0Ij4fvwy/6bBXbk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Message-Id: Date: Thu, 26 Jun 2025 06:44:22 +0000 commit ed3bf0a89bd0f80e23bb68e9587ae8d88c6e4672 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:35:42 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:35:42 2025 +0200 x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Paging Writeable depends on EPT so must be disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: d779e3f98c2a765aae57f6ab4b0257413c12ac97 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 8c0ea789c1..f9538063da 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1150,9 +1150,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &= - ~(SECONDARY_EXEC_ENABLE_EPT | + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &= + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025919.1401172 (Exim 4.92) (envelope-from ) id 1uUgLZ-0004a2-6R; Thu, 26 Jun 2025 06:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025919.1401172; Thu, 26 Jun 2025 06: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 1uUgLZ-0004Zu-3q; Thu, 26 Jun 2025 06:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1025919; Thu, 26 Jun 2025 06:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgLY-0004Zl-71 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgLY-003Vnp-0b for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgLY-004knS-0V for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=B4fG8h244vqsQln1pXugrq/8RoQBHnuqio8zvZYCVxc=; b=hIvs+JQBL8Wewyfey1ug5cm1m6 n9h94diklBfZkJxg5iWepnTBNAeb8ELJYK8hd0ONJ6ytlTMjaaMVqiXulKV+3y7tfySFU4XyAicLj cxrNQQgL3mfB/qQlU51hhTTPwmToywm4I5JKONSzw8507h4fTrYef50pgbJfNA9/5TfI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/pv: Fix breakpoint reporting Message-Id: Date: Thu, 26 Jun 2025 06:44:32 +0000 commit 60f61371906ed00d86577da686760d9009e969df Author: Andrew Cooper AuthorDate: Thu Jun 26 08:36:08 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:36:08 2025 +0200 x86/pv: Fix breakpoint reporting x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the previously latched breakpoint bits. The combination of do_debug()'s manual call to x86_merge_dr6() for external debuggers, and pv_inject_DB() calling pv_inject_event(), results in two x86_merge_dr6() calls. Feed the same pending_dbg in the second time. This makes pv_inject_event()'s update of dr6 effectively a no-op, retaining the correct breakpoint bits. Fixes: db39fa4b27ea ("x86/pv: Fix merging of new status bits into %dr6") Reported-by: Manuel Bouyer Signed-off-by: Andrew Cooper Tested-by: Manuel Bouyer Acked-by: Roger Pau Monné master commit: d965e2ee07c56c341d8896852550914d87ea5374 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index dca11a613d..9eb7bd2e07 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2040,7 +2040,7 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } - pv_inject_DB(0 /* N/A, already merged */); + pv_inject_DB(dr6 ^ X86_DR6_DEFAULT); } void asmlinkage do_entry_CP(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025920.1401177 (Exim 4.92) (envelope-from ) id 1uUgLj-0004cH-87; Thu, 26 Jun 2025 06:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025920.1401177; Thu, 26 Jun 2025 06:44: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 1uUgLj-0004c8-57; Thu, 26 Jun 2025 06:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1025920; Thu, 26 Jun 2025 06:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgLi-0004c0-9n for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgLi-003Vnt-0s for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgLi-004kqF-0l for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=Twh+gg+UcLEtA3AXBJqlGe8b/onxz1X8pqynIjpa/Lk=; b=XhhKGT+fuu3akXL0D14VXRypGG V9kvTCOK6bXYpz3MzYlJAYVnJqfArmrDrnJ0q8atddfnX9NXlwPiisToxJeV+6QoXvXKKL+ABvKpH Taz9yqmjK9hlHgFuCoUu3zBfanRa4hVUnOj1rDyYVJPxVQpi9Rxx/+Ngt/JHpxyuaMSk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] tools/libxl: Only access legacy altp2m on HVM Message-Id: Date: Thu, 26 Jun 2025 06:44:42 +0000 commit 0cd774e8c27218af88ec6f80dfac377277631b2c Author: Jason Andryuk AuthorDate: Thu Jun 26 08:36:29 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:36:29 2025 +0200 tools/libxl: Only access legacy altp2m on HVM Only access the HVM union b_info->u.hvm on HVM guests. The union access is not guarded, so this reads and sets the default even on non-HVM guests. Usually this doesn't matter as PV and PVH unions are smaller and zero-initialized, but the zero default will be re-written as a -1 boolean. Generally, it could incorrectly set b_info->altp2m through aliased data. Fixes: 0291089f6ea8 ("xen: enable altp2m at create domain domctl") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD master commit: 01dfd25509cc44011e83677e989dc7f55e2657d5 master date: 2025-06-02 10:31:21 +0200 --- tools/libs/light/libxl_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 0a7f64ad46..786d946188 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -804,17 +804,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); - /* - * The config parameter "altp2m" replaces the parameter "altp2mhvm". - * For legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. - */ - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); - if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(b_info->u.hvm.altp2m)) - b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:44:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025921.1401180 (Exim 4.92) (envelope-from ) id 1uUgLt-0004eu-94; Thu, 26 Jun 2025 06:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025921.1401180; Thu, 26 Jun 2025 06:44: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 1uUgLt-0004em-6Q; Thu, 26 Jun 2025 06:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1025921; Thu, 26 Jun 2025 06:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgLs-0004eg-Cl for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgLs-003VoG-1B for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgLs-004ksL-13 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=fTEgDEwZrm9JJleLAgOv8AkongeHGDJBkGNxP8ceLsI=; b=erIa+U/Eul7rctCOGZi3Xr+FaU sSjQmiDPXg9VoSZxBc7ImY70nj3RfaneDxvQUgR5fw4u0RAz1cwTALxOgFt8RX1abOeLqtfmTJTS4 Z/duFNgi46JQZipHyC+RmrwsTpbtx7drbm70T1lvhmcVZgnMpZtLMt5UkZKoimQI2iXI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/pmstat: Check size of PMSTAT_get_pxstat buffers Message-Id: Date: Thu, 26 Jun 2025 06:44:52 +0000 commit 110bc6ef1a4e81f52c5740293edd852caf15902b Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:37:15 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:37:15 2025 +0200 x86/pmstat: Check size of PMSTAT_get_pxstat buffers Check that the total number of states passed in and hence the size of buffers is sufficient to avoid writing more than the caller has allocated. The interface is not explicit about whether getpx.total is expected to be set by the caller in this case but since it is always set in libxenctrl it seems reasonable to check it and make it explicit. Fixes: c06a7db0c547 ("X86 and IA64: Update cpufreq statistic logic for supporting both x86 and ia64") Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich x86/pmstat: correct PMSTAT_get_pxstat buffer size checking min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall master commit: aa70996a6896dfc9de60f60540098b7d3ac3fb4f master date: 2025-06-11 11:05:42 +0200 master commit: fb16c7411d6e1278155c144fd3310a12f2efbf5e master date: 2025-06-18 09:25:09 +0200 --- xen/drivers/acpi/pmstat.c | 8 +++++++- xen/include/public/sysctl.h | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index b6ea19d103..74b3b7d71c 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -103,8 +103,14 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ ct = pmpt->perf.state_count; - if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct*ct) ) + if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b0fec271d3..a164fe2bc9 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -215,11 +215,22 @@ typedef struct pm_px_val pm_px_val_t; DEFINE_XEN_GUEST_HANDLE(pm_px_val_t); struct pm_px_stat { - uint8_t total; /* total Px states */ + /* + * IN: Number of elements in pt, number of rows/columns in trans_pt + * (PMSTAT_get_pxstat) + * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) + */ + uint8_t total; uint8_t usable; /* usable Px states */ uint8_t last; /* last Px state */ uint8_t cur; /* current Px state */ - XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ + /* + * OUT: Px transition table. This should have total * total elements. + * As it is a 2-D array, this will not be copied if input total is + * less than output total. (PMSTAT_get_pxstat) + */ + XEN_GUEST_HANDLE_64(uint64) trans_pt; + /* OUT: This should have total elements (PMSTAT_get_pxstat) */ XEN_GUEST_HANDLE_64(pm_px_val_t) pt; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:45:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025922.1401184 (Exim 4.92) (envelope-from ) id 1uUgM3-0004hu-CO; Thu, 26 Jun 2025 06:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025922.1401184; Thu, 26 Jun 2025 06: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 1uUgM3-0004hj-9P; Thu, 26 Jun 2025 06:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1025922; Thu, 26 Jun 2025 06:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgM2-0004hZ-GF for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgM2-003Voi-1W for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgM2-004kvY-1M for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=FR62WMIEd8Myy/yzD7NDwsukYSS54ZikJIp1OATxrtg=; b=nk+HVh1ZsNaUrg8RgJrCG/PKDG 2RexXSrawbuuIbFxClJ6+kA0q6vl7Re3oi7+6fSfhF/bVOKn8TN+Z9Or0zOa33kZwwrjq8vMeMXPr YIjzC54oUj6jwgESEqTSD/lPqrRcQNaJ9xn4BEmxPfo3qQtn+N+mfjh4WPdQkZgbIuUY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] cpufreq: Avoid potential buffer overrun and leak Message-Id: Date: Thu, 26 Jun 2025 06:45:02 +0000 commit fd64f59cc74e2e072240154429103e38c9a7fcf4 Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:37:38 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:37:38 2025 +0200 cpufreq: Avoid potential buffer overrun and leak If set_px_pminfo is called a second time with a larger state_count than the first call, calls to PMSTAT_get_pxstat will read beyond the end of the pt and trans_pt buffers allocated in cpufreq_statistic_init() since they would have been allocated with the original state_count. Secondly, the states array leaks on each subsequent call of set_px_pminfo. Fix both these issues by ignoring subsequent calls to set_px_pminfo if it completed successfully previously. Return success rather than an error to avoid errors in the dom0 kernel log when reloading the xen_acpi_processor module. At the same time, fix a leak of the states array on error. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: 2f36bef3d8478f304f262fffeca543de480872a4 master date: 2025-06-11 11:06:24 +0200 --- xen/drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 4a103c6de9..5cb8339536 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -511,7 +511,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } } - if ( perf->flags & XEN_PX_PSS ) + if ( perf->flags & XEN_PX_PSS && !pxpt->states ) { /* capability check */ if ( perf->state_count <= 1 ) @@ -528,6 +528,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) { + XFREE(pxpt->states); ret = -EFAULT; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:45:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025923.1401188 (Exim 4.92) (envelope-from ) id 1uUgMD-0004k5-DB; Thu, 26 Jun 2025 06:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025923.1401188; Thu, 26 Jun 2025 06:45: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 1uUgMD-0004jx-Ah; Thu, 26 Jun 2025 06:45:13 +0000 Received: by outflank-mailman (input) for mailman id 1025923; Thu, 26 Jun 2025 06:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgMC-0004jj-Jk for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgMC-003Vop-1r for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgMC-004kxE-1j for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:45: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=KiCn+NCV7EAA/tfHAAFEnV/2O5DTRwaqZzUAlCVakaY=; b=KV3l4Zfl/05Q2PH59xX9Zz8cUP qCPwWmIDP0lxobw+kFX2JTQ+fq+YEdESD+z3m/TTLsA8QAE6qBESZjuMfFrDs5vxOYJ2fVOZUHiGt N0EbKa1tX7j+HIjz/7/aovWTMBAOV7YrY42bbdfsEBLtAD0KrU7KO32uGQn0gJMn/3xw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xenalyze: Add 2 missed VCPUOPs in vcpu_op_str Message-Id: Date: Thu, 26 Jun 2025 06:45:12 +0000 commit 2f80f3071a87706f97d404fa785b518a0cdadb92 Author: Gang Ji AuthorDate: Thu Jun 26 08:37:53 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:37:53 2025 +0200 xenalyze: Add 2 missed VCPUOPs in vcpu_op_str The 2 missed ones are: register_runstate_phys_area and register_vcpu_time_phys_area. Fixes: d5df44275e7a ("domain: introduce GADDR based runstate area registration alternative") Fixes: 60e544a8c58f ("x86: introduce GADDR based secondary time area registration alternative") Signed-off-by: Gang Ji Reviewed-by: Andrew Cooper master commit: ed939591e4c6ccf794395fc78cd358aa24a94ed8 master date: 2025-06-11 11:08:11 +0200 --- tools/xentrace/xenalyze.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index adc96dd7e4..1c13682aaa 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6513,7 +6513,8 @@ static const char *vcpu_op_str[] = { "register_runstate_memory_area", "set_periodic_timer", "stop_periodic_timer", "set_singleshot_timer", "stop_singleshot_timer", "register_vcpu_info", "send_nmi", "get_physid", - "register_vcpu_time_memory_area", + "register_vcpu_time_memory_area", "register_runstate_phys_area", + "register_vcpu_time_phys_area", }; static const char *sched_op_str[] = { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:55:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:55:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025924.1401192 (Exim 4.92) (envelope-from ) id 1uUgVj-0005xZ-34; Thu, 26 Jun 2025 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025924.1401192; Thu, 26 Jun 2025 06: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 1uUgVj-0005xR-0L; Thu, 26 Jun 2025 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1025924; Thu, 26 Jun 2025 06:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgVi-0005xL-6V for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgVh-003Vzt-2d for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgVh-004mwB-2V for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=taxc0YlZPGfOhOe3VzGEu109dAekIpmtm77SWU/nhYg=; b=UxtfPrv76av46Fxv7/uveXQ8w/ lgUBtJryGROqDqcHbYlOKhd32cXFOmUMQzUS4w64UulgieEb2/PSBqNNUg5p9zR7IhY55ZcsMMGa1 t3G41VTFzASzF//pUHjLMJTUYlVOU7PbHvqkEAGAaLhQNx5/H5XFkM9fbxBiuzWAetpM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/emul: Fix emulation of RDSEED with older toolchains Message-Id: Date: Thu, 26 Jun 2025 06:55:01 +0000 commit bcdb61a2462e9546df194269ae4b0854b9af8885 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:46:14 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:46:14 2025 +0200 x86/emul: Fix emulation of RDSEED with older toolchains This is reported as a MISRA R16.3 (missing break) violation, but turns out to be substantially more complicated than expected. In commit a8fe4ec5320a ("x86emul: support RDRAND/RDSEED"), the switch() statement had a default case going to cannot_emulate, with both the case 6 and case 7 labels being fully within #ifdef HAVE_GAS_RD{RAND,SEED}. Therefore, when the toolchain didn't understand the RDRAND/RDSEED instructions, attempts to emulate them suffered #UD. (In principle, this is a problem as there's no interlock to prevent RDRAND/RDSEED being advertised to the guest, but as instructions with only register encodings, they can only legitimately be emulated when VM Introspection is in use.) In commit 58f1bba44033 ("x86emul: support RDPID"), case 7 was taken outside of HAVE_GAS_RDSEED, meaning that emulating an RDSEED instruction no longer hit the default case when the toolchain was too old. Instead, it would fall out of the switch statement and be completed normally, behaving as a NOP to the guest. Retrofit a "return X86EMUL_UNIMPLEMENTED" in the case that the toolchain doesn't know the RDRAND instruction, matching how RDRAND work. Note that this has been fixed differently in Xen 4.21. Commit 05bf9f1f0f52 ("x86/emulate: Remove HAVE_AS_RDRAND and HAVE_AS_RDSEED") has removed the problematic condition due to the toolchain baseline upgrade. Fixes: 58f1bba44033 ("x86emul: support RDPID") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: ddec00769cd80a44b412281d8b52482e4e20c2e5 master date: 2025-05-16 21:34:19 +0100 --- xen/arch/x86/x86_emulate/0fc7.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/x86_emulate/0fc7.c b/xen/arch/x86/x86_emulate/0fc7.c index 5268d5cafd..2b6b444bab 100644 --- a/xen/arch/x86/x86_emulate/0fc7.c +++ b/xen/arch/x86/x86_emulate/0fc7.c @@ -102,6 +102,8 @@ int x86emul_0fc7(struct x86_emulate_state *s, if ( carry ) regs->eflags |= X86_EFLAGS_CF; break; +#else + return X86EMUL_UNIMPLEMENTED; #endif } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025925.1401196 (Exim 4.92) (envelope-from ) id 1uUgVt-0005zD-4M; Thu, 26 Jun 2025 06:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025925.1401196; Thu, 26 Jun 2025 06: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 1uUgVt-0005z5-1h; Thu, 26 Jun 2025 06:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1025925; Thu, 26 Jun 2025 06:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgVr-0005yx-VT for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgVr-003Vzy-33 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgVr-004mxz-2o for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=RGBpYpwtj25gur2TKd8iEU/0GX89f2Ry8HhYwqybX+M=; b=rNeX4QVO9MzU6XvAQTTRbPpsw4 XELQd4gLDF4tLJsF9sVsglAvWSV7wV49CK2n4RGpw34z1JsADzXHUEruT0keVr/+waWr7yE6rKAqy 4anFRLvmfJudp0RevbODV/a6wiSv2R1P96M3vFYJSpKtIqkJF3wqGEfY88GkHLowiS7U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches Message-Id: Date: Thu, 26 Jun 2025 06:55:11 +0000 commit a71c40d335d4b4d1f8c294b3a6ed66f7c887560a Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:46:34 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:46:34 2025 +0200 x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches The current emulation of wb{,no}invd is bogus for PV guests: it will only flush the current pCPU cache, without taking into account pCPUs where the vCPU had run previously. Resort to flushing the cache on all host pCPUs to make it correct. Fixes: 799fed0a7cc5 ("Priv-op emulation in Xen, for RDMSR/WRMSR/WBINVD") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich [backport: no FLUSH_CACHE_WRITEBACK] master commit: b0f8bf86057b8f01fb4e48b506805d3818600f76 master date: 2025-05-20 16:35:52 +0200 --- xen/arch/x86/pv/emul-priv-op.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 295d847ea2..a21d499519 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1198,13 +1198,11 @@ static int cf_check cache_op( if ( !cache_flush_permitted(current->domain) ) /* * Non-physdev domain attempted WBINVD; ignore for now since - * newer linux uses this in some start-of-day timing loops. + * Linux uses this in some start-of-day code. */ ; - else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); else - wbinvd(); + flush_all(FLUSH_CACHE); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:55:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025926.1401201 (Exim 4.92) (envelope-from ) id 1uUgW3-00061k-5m; Thu, 26 Jun 2025 06:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025926.1401201; Thu, 26 Jun 2025 06: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 1uUgW3-00061c-2z; Thu, 26 Jun 2025 06:55:23 +0000 Received: by outflank-mailman (input) for mailman id 1025926; Thu, 26 Jun 2025 06:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgW2-00061L-28 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgW2-003W02-07 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgW2-004mzW-00 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=EhnVN8/Zt2+mu+eBmaWXlM/1YmW2USuIF+WcKEGgQvI=; b=2nLA5NCBUPD8jRVosOEeigq5v3 2l/sSfT4epYAj4kIXfvhcRRUVuwSA/7/xOrDQmrjx3k3OhQuDijI/YEAvVNUz2zeQ71BojKTkMgI9 ASrOKNCs66AiE+MUJ9yv2DQtjq5xknjMqPt4ovcLw2Y/UZIcTR4cKWBLEwtoDqRG8gCs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/vpci: fix handling of BAR overlaps with non-hole regions Message-Id: Date: Thu, 26 Jun 2025 06:55:22 +0000 commit ded45876e4ab3d873139b36782ed7321b64cd08b Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:46:48 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:46:48 2025 +0200 x86/vpci: fix handling of BAR overlaps with non-hole regions For once the message printed when a BAR overlaps with a non-hole regions is not accurate on x86. While the BAR won't be mapped by the vPCI logic, it is quite likely overlapping with a reserved region in the memory map, and already mapped as by default all reserved regions are identity mapped in the p2m. Avoid printing the warning message in modify_bars(), and instead print a more lax message in the x86 implementation of pci_check_bar() to note the current BAR position overlaps with non-hole region(s). Secondly, when an overlap is detected the BAR 'enabled' field is not set, hence other vPCI code that depends on it like vPCI MSI-X handling won't function properly, as it sees the BAR as disabled, even when memory decoding is enabled for the device and the BAR is likely mapped in the p2m. Change the handling of BARs that overlap non-hole regions to instead remove any overlapped regions from the rangeset, so the resulting ranges to map just contain the hole regions. This requires introducing a new pci_sanitize_bar_memory() that's implemented per-arch and sanitizes the address range to add to the p2m. For x86 pci_sanitize_bar_memory() removes any regions present in the host memory map, for ARM this is currently left as a dummy handler to not change existing behavior. Ultimately the above changes should fix the vPCI MSI-X handlers not working correctly when the BAR that contains the MSI-X table overlaps with a non-hole region, as then the 'enabled' BAR bit won't be set and the MSI-X traps won't handle accesses as expected. Reported-by: Stefano Stabellini Fixes: 53d9133638c3 ('pci: do not disable memory decoding for devices') Signed-off-by: Roger Pau Monné Tested-by: Victor M Lira Reviewed-by: Jan Beulich Acked-by: Julien Grall x86/vpci: fix off-by-one in pci_sanitize_bar_memory() rangeset_remove_range() uses inclusive ranges, and hence the end of the range should be calculated using PFN_DOWN(), not PFN_UP(). Fixes: 4acab25a9300 ('x86/vpci: fix handling of BAR overlaps with non-hole regions') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 4acab25a9300ba69a3c1441491470bd65af52d0f master date: 2025-05-21 18:29:55 +0200 master commit: 7ab4b392b78b5ac1c7a1fb1d085637526e67521a master date: 2025-05-22 16:17:12 +0200 --- xen/arch/arm/include/asm/pci.h | 3 +++ xen/arch/x86/include/asm/pci.h | 13 ++++------- xen/arch/x86/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/header.c | 9 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7f77226c9b..1605ec660d 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -128,6 +128,9 @@ int pci_host_bridge_mappings(struct domain *d); bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); +static inline int pci_sanitize_bar_memory(struct rangeset *r) +{ return 0; } + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..bed99437cc 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,14 +57,9 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); -static inline bool pci_check_bar(const struct pci_dev *pdev, - mfn_t start, mfn_t end) -{ - /* - * Check if BAR is not overlapping with any memory region defined - * in the memory map. - */ - return is_memory_hole(start, end); -} +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); #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 97b792e578..26bb7f6a3c 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -98,3 +98,53 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, return rc; } + +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + if ( !is_memory_hole(start, end) ) + gdprintk(XENLOG_WARNING, + "%pp: BAR at [%"PRI_mfn", %"PRI_mfn"] not in memory map hole\n", + &pdev->sbdf, mfn_x(start), mfn_x(end)); + + /* + * Unconditionally return true, pci_sanitize_bar_memory() will remove any + * non-hole regions. + */ + return true; +} + +/* Remove overlaps with any ranges defined in the host memory map. */ +int pci_sanitize_bar_memory(struct rangeset *r) +{ + unsigned int i; + + for ( i = 0; i < e820.nr_map; i++ ) + { + const struct e820entry *entry = &e820.map[i]; + int rc; + + if ( !entry->size ) + continue; + + rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), + PFN_DOWN(entry->addr + entry->size - 1)); + if ( rc ) + return rc; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ef6c965c08..1f48f2aac6 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -394,6 +394,15 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) return rc; } } + + rc = pci_sanitize_bar_memory(bar->mem); + if ( rc ) + { + gprintk(XENLOG_WARNING, + "%pp: failed to sanitize BAR#%u memory: %d\n", + &pdev->sbdf, i, rc); + return rc; + } } /* Remove any MSIX regions if present. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:55:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025927.1401205 (Exim 4.92) (envelope-from ) id 1uUgWD-000643-77; Thu, 26 Jun 2025 06:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025927.1401205; Thu, 26 Jun 2025 06: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 1uUgWD-00063v-4K; Thu, 26 Jun 2025 06:55:33 +0000 Received: by outflank-mailman (input) for mailman id 1025927; Thu, 26 Jun 2025 06:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgWC-00063n-6g for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgWC-003W09-0Z for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgWC-004n1I-0I for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=EQBeYR8aaZeJIiQUyu5O+FRhMknvSv4eI58QWQogcZI=; b=LlVeMEflG67UxqY0NXymHg3TWm kgWHy+ke6/fsLU0SrOzU31N8YuZTzqEfVP02R3XkGVFuKanKLi3Yr8get89wjHKA8uujmbF06k2fe MhrxR8FulT1jC7ecsoAFpey4UWZ8AolBzwkc7/3OteGgnzlNGAFJ0tJUx32B5PD38H14=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Message-Id: Date: Thu, 26 Jun 2025 06:55:32 +0000 commit a24e1cda35deb36be8efae49058d50d2840384b8 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:47:29 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:47:29 2025 +0200 x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Paging Writeable depends on EPT so must be disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: d779e3f98c2a765aae57f6ab4b0257413c12ac97 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 9b6dc51f36..aa7911089a 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1148,9 +1148,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &= - ~(SECONDARY_EXEC_ENABLE_EPT | + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &= + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:55:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025929.1401208 (Exim 4.92) (envelope-from ) id 1uUgWN-00066K-8K; Thu, 26 Jun 2025 06:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025929.1401208; Thu, 26 Jun 2025 06: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 1uUgWN-00066C-5e; Thu, 26 Jun 2025 06:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1025929; Thu, 26 Jun 2025 06:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgWM-000666-9f for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgWM-003W2a-0s for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgWM-004n37-0k for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=nwp8IeJa8Yto5QAUDLpCfpbXqejhx2OFqq/4rljJOY4=; b=G3CEgUAMcNWWRBHwZ772yBnO5X 2EN3c3Kuz/WuIogiu57YTkf6KVJWCWx0vJEtcxbn3RoPZZMlKmBxwD+wZwYdQlcn08G8sHMfNpihR gna2StZ/HjfCoYPGB9EU7ZYdfac1UbV3lHiLESDKT896qG5bqSq0MsBYChVpQrIjbVsc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/pv: Fix breakpoint reporting Message-Id: Date: Thu, 26 Jun 2025 06:55:42 +0000 commit ee8ae3a2802a1a5d69ccc1ffe223c98dc09a9361 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:47:41 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:47:41 2025 +0200 x86/pv: Fix breakpoint reporting x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the previously latched breakpoint bits. The combination of do_debug()'s manual call to x86_merge_dr6() for external debuggers, and pv_inject_DB() calling pv_inject_event(), results in two x86_merge_dr6() calls. Feed the same pending_dbg in the second time. This makes pv_inject_event()'s update of dr6 effectively a no-op, retaining the correct breakpoint bits. Fixes: db39fa4b27ea ("x86/pv: Fix merging of new status bits into %dr6") Reported-by: Manuel Bouyer Signed-off-by: Andrew Cooper Tested-by: Manuel Bouyer Acked-by: Roger Pau Monné master commit: d965e2ee07c56c341d8896852550914d87ea5374 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index ae573ee4c0..af90d8b27d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2040,7 +2040,7 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } - pv_inject_DB(0 /* N/A, already merged */); + pv_inject_DB(dr6 ^ X86_DR6_DEFAULT); } void asmlinkage do_entry_CP(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:55:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025930.1401212 (Exim 4.92) (envelope-from ) id 1uUgWX-00069G-BB; Thu, 26 Jun 2025 06:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025930.1401212; Thu, 26 Jun 2025 06: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 1uUgWX-000696-8H; Thu, 26 Jun 2025 06:55:53 +0000 Received: by outflank-mailman (input) for mailman id 1025930; Thu, 26 Jun 2025 06:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgWW-000690-CO for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgWW-003W2u-18 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgWW-004n4a-12 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=aMR5rWffxCbBkP0DmnxTpor0bDYk2QPl33dbwVXwUfc=; b=jgif7aN84Qq5TMq7ev16OYTrLm +6mXu7YXVbda8CPHb/KSFZ6CRzIT8jn2gtErpUchfbl3ZZ0CCK+CAPYr95Yf9uMv4lmEtTab+AREW MOHxxvrOSlyH3pUG00+shmz2xZGGbRW1ylcNd9zKLhEJqb0y9tSXRguMb+oUPSRU4yqs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] tools/libxl: Only access legacy altp2m on HVM Message-Id: Date: Thu, 26 Jun 2025 06:55:52 +0000 commit e02b039b64738f04ec9283b5840f5b004026c782 Author: Jason Andryuk AuthorDate: Thu Jun 26 08:47:53 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:47:53 2025 +0200 tools/libxl: Only access legacy altp2m on HVM Only access the HVM union b_info->u.hvm on HVM guests. The union access is not guarded, so this reads and sets the default even on non-HVM guests. Usually this doesn't matter as PV and PVH unions are smaller and zero-initialized, but the zero default will be re-written as a -1 boolean. Generally, it could incorrectly set b_info->altp2m through aliased data. Fixes: 0291089f6ea8 ("xen: enable altp2m at create domain domctl") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD master commit: 01dfd25509cc44011e83677e989dc7f55e2657d5 master date: 2025-06-02 10:31:21 +0200 --- tools/libs/light/libxl_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 60643d6f53..872b39739d 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -804,17 +804,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); - /* - * The config parameter "altp2m" replaces the parameter "altp2mhvm". - * For legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. - */ - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); - if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(b_info->u.hvm.altp2m)) - b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:56:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025931.1401218 (Exim 4.92) (envelope-from ) id 1uUgWh-0006BS-D6; Thu, 26 Jun 2025 06:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025931.1401218; Thu, 26 Jun 2025 06: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 1uUgWh-0006BD-9c; Thu, 26 Jun 2025 06:56:03 +0000 Received: by outflank-mailman (input) for mailman id 1025931; Thu, 26 Jun 2025 06:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgWg-0006B5-FD for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgWg-003W3C-1P for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgWg-004n8L-1J for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=gSQRl2Pj0iO5zZvhuF/WmLJtQaOMcyVwbC9055Pi0Ls=; b=iQ3KZUX174WaJk8f5u5pmR3sRm wnvTkCvmJfoS8OBKvTyKVOpNB9HiyvqYqF1BocCsusUKAOHSS6ZVM+U5x7N9dkPnrGTW3Rf7bIoF3 FoGZES+ejjCKEORWsEUAMj5UZ7YSaoXoZavXr6mwkDKCeEEbR2Wq10zi9lXdRxfWTNIc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/pmstat: Check size of PMSTAT_get_pxstat buffers Message-Id: Date: Thu, 26 Jun 2025 06:56:02 +0000 commit 81ffb56a23c66f323e062c417dedfd66bb0aa4fd Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:48:35 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:48:35 2025 +0200 x86/pmstat: Check size of PMSTAT_get_pxstat buffers Check that the total number of states passed in and hence the size of buffers is sufficient to avoid writing more than the caller has allocated. The interface is not explicit about whether getpx.total is expected to be set by the caller in this case but since it is always set in libxenctrl it seems reasonable to check it and make it explicit. Fixes: c06a7db0c547 ("X86 and IA64: Update cpufreq statistic logic for supporting both x86 and ia64") Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich # Commit fb16c7411d6e1278155c144fd3310a12f2efbf5e # Date 2025-06-18 09:25:09 +0200 # Author Jan Beulich # Committer Jan Beulich x86/pmstat: correct PMSTAT_get_pxstat buffer size checking min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall master commit: aa70996a6896dfc9de60f60540098b7d3ac3fb4f master date: 2025-06-11 11:05:42 +0200 master commit: fb16c7411d6e1278155c144fd3310a12f2efbf5e master date: 2025-06-18 09:25:09 +0200 --- xen/drivers/acpi/pmstat.c | 8 +++++++- xen/include/public/sysctl.h | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index f607bc110f..1b18ee378d 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -103,8 +103,14 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ ct = pmpt->perf.state_count; - if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct*ct) ) + if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3a6e7d48f0..a0ddd1dbf5 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -205,11 +205,22 @@ typedef struct pm_px_val pm_px_val_t; DEFINE_XEN_GUEST_HANDLE(pm_px_val_t); struct pm_px_stat { - uint8_t total; /* total Px states */ + /* + * IN: Number of elements in pt, number of rows/columns in trans_pt + * (PMSTAT_get_pxstat) + * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) + */ + uint8_t total; uint8_t usable; /* usable Px states */ uint8_t last; /* last Px state */ uint8_t cur; /* current Px state */ - XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ + /* + * OUT: Px transition table. This should have total * total elements. + * As it is a 2-D array, this will not be copied if input total is + * less than output total. (PMSTAT_get_pxstat) + */ + XEN_GUEST_HANDLE_64(uint64) trans_pt; + /* OUT: This should have total elements (PMSTAT_get_pxstat) */ XEN_GUEST_HANDLE_64(pm_px_val_t) pt; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:56:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:56:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025932.1401220 (Exim 4.92) (envelope-from ) id 1uUgWr-0006E1-DU; Thu, 26 Jun 2025 06:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025932.1401220; Thu, 26 Jun 2025 06:56: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 1uUgWr-0006Dt-Ax; Thu, 26 Jun 2025 06:56:13 +0000 Received: by outflank-mailman (input) for mailman id 1025932; Thu, 26 Jun 2025 06:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgWq-0006Dn-Hg for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgWq-003W3G-1g for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgWq-004nAD-1a for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=kXbYtzjNXyXKLA0Y5NOiDfBF5fsa1+P3yRlcm3ltTiI=; b=J3v5DJ+vHhL2jieta830j/6cgE O8imH+vMsw8X7UUOQKoyT962roK3K6IIc/H28JzRNujNIoCAeF9r/HdsfXi6hWqkxTcebO8ZS6JdT 0knwMpxuGf3ytq/j3OrLdN7F3SSKd2OZ8sB55yL25hPKwW7HouOdDf47hSQ56EcbbicQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] cpufreq: Avoid potential buffer overrun and leak Message-Id: Date: Thu, 26 Jun 2025 06:56:12 +0000 commit 2b82a9d8819accb0c50953176e8a4153acaf0980 Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:49:06 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:49:06 2025 +0200 cpufreq: Avoid potential buffer overrun and leak If set_px_pminfo is called a second time with a larger state_count than the first call, calls to PMSTAT_get_pxstat will read beyond the end of the pt and trans_pt buffers allocated in cpufreq_statistic_init() since they would have been allocated with the original state_count. Secondly, the states array leaks on each subsequent call of set_px_pminfo. Fix both these issues by ignoring subsequent calls to set_px_pminfo if it completed successfully previously. Return success rather than an error to avoid errors in the dom0 kernel log when reloading the xen_acpi_processor module. At the same time, fix a leak of the states array on error. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: 2f36bef3d8478f304f262fffeca543de480872a4 master date: 2025-06-11 11:06:24 +0200 --- xen/drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 8659ad3aee..3bdf86a52a 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -510,7 +510,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } } - if ( perf->flags & XEN_PX_PSS ) + if ( perf->flags & XEN_PX_PSS && !pxpt->states ) { /* capability check */ if ( perf->state_count <= 1 ) @@ -527,6 +527,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) { + XFREE(pxpt->states); ret = -EFAULT; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 06:56:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 06:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1025933.1401224 (Exim 4.92) (envelope-from ) id 1uUgX2-0006GD-Ew; Thu, 26 Jun 2025 06:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1025933.1401224; Thu, 26 Jun 2025 06: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 1uUgX2-0006G5-CM; Thu, 26 Jun 2025 06:56:24 +0000 Received: by outflank-mailman (input) for mailman id 1025933; Thu, 26 Jun 2025 06:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUgX0-0006Fo-Km for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUgX0-003W3K-1z for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUgX0-004nBk-1s for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 06: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=EO3VSY0UsPtwN8bYTFjs9d/Iw3orI1+T+CV6+EyTfDY=; b=rN0h++KODAtRiBTDjF6HegC6yH 4QCgrotOf2p3wRCgwHWQeV8WCn5SYZArwFybHjdZgk+FkGSSrjeRxUqvXC5yk4xUU8Y57uuPiGUti JNBlQottVAMsLuBX1SPkAv6/IUZX4rePH1YN5lpCdMP/EHa2wnUywJWAnRgDC3DJLt0A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xenalyze: Add 2 missed VCPUOPs in vcpu_op_str Message-Id: Date: Thu, 26 Jun 2025 06:56:22 +0000 commit 4d6ddd30eed61a8c27f9f7d91d3a3b341640e498 Author: Gang Ji AuthorDate: Thu Jun 26 08:49:19 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:49:19 2025 +0200 xenalyze: Add 2 missed VCPUOPs in vcpu_op_str The 2 missed ones are: register_runstate_phys_area and register_vcpu_time_phys_area. Fixes: d5df44275e7a ("domain: introduce GADDR based runstate area registration alternative") Fixes: 60e544a8c58f ("x86: introduce GADDR based secondary time area registration alternative") Signed-off-by: Gang Ji Reviewed-by: Andrew Cooper master commit: ed939591e4c6ccf794395fc78cd358aa24a94ed8 master date: 2025-06-11 11:08:11 +0200 --- tools/xentrace/xenalyze.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index adc96dd7e4..1c13682aaa 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6513,7 +6513,8 @@ static const char *vcpu_op_str[] = { "register_runstate_memory_area", "set_periodic_timer", "stop_periodic_timer", "set_singleshot_timer", "stop_singleshot_timer", "register_vcpu_info", "send_nmi", "get_physid", - "register_vcpu_time_memory_area", + "register_vcpu_time_memory_area", "register_runstate_phys_area", + "register_vcpu_time_phys_area", }; static const char *sched_op_str[] = { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:22:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026018.1401277 (Exim 4.92) (envelope-from ) id 1uUhrv-00034s-Er; Thu, 26 Jun 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 1026018.1401277; Thu, 26 Jun 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 1uUhrv-00034k-CN; Thu, 26 Jun 2025 08:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1026018; Thu, 26 Jun 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 1uUhrt-00034Y-Tu for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUhrt-003Y8s-2E for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhrt-0055tR-1t for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=UiKDJjnz/ZWyvNnQcBza5vtGBUpqnokWAO5s4PkaRc8=; b=j6O7uU4PAkRfuLBuSfDVyyrbmX MX51nj3sUThSwFSdCIuJtd241gL6tTZivJ052yzVDmRH1QnEAa4WOhmEteP7VI2T9xhdh/NxfNzE+ 7WKr2M7chHDnXzFvCDl+25XC6wVru9wDnnO8wX5+H+RTqdisPmrrady+q7wIktRH6m1s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/emul: Fix emulation of RDSEED with older toolchains Message-Id: Date: Thu, 26 Jun 2025 08:22:01 +0000 commit bcdb61a2462e9546df194269ae4b0854b9af8885 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:46:14 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:46:14 2025 +0200 x86/emul: Fix emulation of RDSEED with older toolchains This is reported as a MISRA R16.3 (missing break) violation, but turns out to be substantially more complicated than expected. In commit a8fe4ec5320a ("x86emul: support RDRAND/RDSEED"), the switch() statement had a default case going to cannot_emulate, with both the case 6 and case 7 labels being fully within #ifdef HAVE_GAS_RD{RAND,SEED}. Therefore, when the toolchain didn't understand the RDRAND/RDSEED instructions, attempts to emulate them suffered #UD. (In principle, this is a problem as there's no interlock to prevent RDRAND/RDSEED being advertised to the guest, but as instructions with only register encodings, they can only legitimately be emulated when VM Introspection is in use.) In commit 58f1bba44033 ("x86emul: support RDPID"), case 7 was taken outside of HAVE_GAS_RDSEED, meaning that emulating an RDSEED instruction no longer hit the default case when the toolchain was too old. Instead, it would fall out of the switch statement and be completed normally, behaving as a NOP to the guest. Retrofit a "return X86EMUL_UNIMPLEMENTED" in the case that the toolchain doesn't know the RDRAND instruction, matching how RDRAND work. Note that this has been fixed differently in Xen 4.21. Commit 05bf9f1f0f52 ("x86/emulate: Remove HAVE_AS_RDRAND and HAVE_AS_RDSEED") has removed the problematic condition due to the toolchain baseline upgrade. Fixes: 58f1bba44033 ("x86emul: support RDPID") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: ddec00769cd80a44b412281d8b52482e4e20c2e5 master date: 2025-05-16 21:34:19 +0100 --- xen/arch/x86/x86_emulate/0fc7.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/x86_emulate/0fc7.c b/xen/arch/x86/x86_emulate/0fc7.c index 5268d5cafd..2b6b444bab 100644 --- a/xen/arch/x86/x86_emulate/0fc7.c +++ b/xen/arch/x86/x86_emulate/0fc7.c @@ -102,6 +102,8 @@ int x86emul_0fc7(struct x86_emulate_state *s, if ( carry ) regs->eflags |= X86_EFLAGS_CF; break; +#else + return X86EMUL_UNIMPLEMENTED; #endif } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:22:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026019.1401282 (Exim 4.92) (envelope-from ) id 1uUhs5-000376-GX; Thu, 26 Jun 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 1026019.1401282; Thu, 26 Jun 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 1uUhs5-00036u-Dk; Thu, 26 Jun 2025 08:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1026019; Thu, 26 Jun 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 1uUhs3-00036e-QK for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUhs3-003Y97-2X for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhs3-0055wh-2P for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=CFpCRIjYGTjT9TOvb1BRJWMj0PWJH1W/KKGnG/v56vY=; b=eIV4fjWgtbNvgfrGIJ+8j0QwYx cOdEDdnA2huwtGVW+N/mWcL+53vuqiRMc/wz37zDp97FrMCh9QEmXSpxdmH1PDTYkGxy7HG6oVI8w ZiLxgpIuRQY+kloUfBH0VKNIDYKuXk3TCehyR/0gCuaJofzGDAxZVnoSVuP1I9R84p8g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches Message-Id: Date: Thu, 26 Jun 2025 08:22:11 +0000 commit a71c40d335d4b4d1f8c294b3a6ed66f7c887560a Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:46:34 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:46:34 2025 +0200 x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches The current emulation of wb{,no}invd is bogus for PV guests: it will only flush the current pCPU cache, without taking into account pCPUs where the vCPU had run previously. Resort to flushing the cache on all host pCPUs to make it correct. Fixes: 799fed0a7cc5 ("Priv-op emulation in Xen, for RDMSR/WRMSR/WBINVD") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich [backport: no FLUSH_CACHE_WRITEBACK] master commit: b0f8bf86057b8f01fb4e48b506805d3818600f76 master date: 2025-05-20 16:35:52 +0200 --- xen/arch/x86/pv/emul-priv-op.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 295d847ea2..a21d499519 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1198,13 +1198,11 @@ static int cf_check cache_op( if ( !cache_flush_permitted(current->domain) ) /* * Non-physdev domain attempted WBINVD; ignore for now since - * newer linux uses this in some start-of-day timing loops. + * Linux uses this in some start-of-day code. */ ; - else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); else - wbinvd(); + flush_all(FLUSH_CACHE); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:22:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026020.1401286 (Exim 4.92) (envelope-from ) id 1uUhsF-00039y-IN; Thu, 26 Jun 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 1026020.1401286; Thu, 26 Jun 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 1uUhsF-00039q-FA; Thu, 26 Jun 2025 08:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1026020; Thu, 26 Jun 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 1uUhsD-00039c-TJ for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUhsD-003Y9F-2p for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhsD-0055zD-2h for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=KBJcZJkbokCOvLnp0Yx9asDIjquxeb51dW/cuJzlOn0=; b=hZXb+oy3jfSTcXLUNTdLXiFdBb xgABwtZ4f1wb0I27KbRp+O+ZvzjYuWu2a6cFeoyM1nvA8Pbp+p7LvQQgNShF5pG6/8DrRiaq5suPL sCnyI/9uaJwZMkLCWnMHzrMS0e0upVJY4/XU5HOXIMOlICnkQt47qhcGQYKk+bRQY6uA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/vpci: fix handling of BAR overlaps with non-hole regions Message-Id: Date: Thu, 26 Jun 2025 08:22:21 +0000 commit ded45876e4ab3d873139b36782ed7321b64cd08b Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:46:48 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:46:48 2025 +0200 x86/vpci: fix handling of BAR overlaps with non-hole regions For once the message printed when a BAR overlaps with a non-hole regions is not accurate on x86. While the BAR won't be mapped by the vPCI logic, it is quite likely overlapping with a reserved region in the memory map, and already mapped as by default all reserved regions are identity mapped in the p2m. Avoid printing the warning message in modify_bars(), and instead print a more lax message in the x86 implementation of pci_check_bar() to note the current BAR position overlaps with non-hole region(s). Secondly, when an overlap is detected the BAR 'enabled' field is not set, hence other vPCI code that depends on it like vPCI MSI-X handling won't function properly, as it sees the BAR as disabled, even when memory decoding is enabled for the device and the BAR is likely mapped in the p2m. Change the handling of BARs that overlap non-hole regions to instead remove any overlapped regions from the rangeset, so the resulting ranges to map just contain the hole regions. This requires introducing a new pci_sanitize_bar_memory() that's implemented per-arch and sanitizes the address range to add to the p2m. For x86 pci_sanitize_bar_memory() removes any regions present in the host memory map, for ARM this is currently left as a dummy handler to not change existing behavior. Ultimately the above changes should fix the vPCI MSI-X handlers not working correctly when the BAR that contains the MSI-X table overlaps with a non-hole region, as then the 'enabled' BAR bit won't be set and the MSI-X traps won't handle accesses as expected. Reported-by: Stefano Stabellini Fixes: 53d9133638c3 ('pci: do not disable memory decoding for devices') Signed-off-by: Roger Pau Monné Tested-by: Victor M Lira Reviewed-by: Jan Beulich Acked-by: Julien Grall x86/vpci: fix off-by-one in pci_sanitize_bar_memory() rangeset_remove_range() uses inclusive ranges, and hence the end of the range should be calculated using PFN_DOWN(), not PFN_UP(). Fixes: 4acab25a9300 ('x86/vpci: fix handling of BAR overlaps with non-hole regions') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 4acab25a9300ba69a3c1441491470bd65af52d0f master date: 2025-05-21 18:29:55 +0200 master commit: 7ab4b392b78b5ac1c7a1fb1d085637526e67521a master date: 2025-05-22 16:17:12 +0200 --- xen/arch/arm/include/asm/pci.h | 3 +++ xen/arch/x86/include/asm/pci.h | 13 ++++------- xen/arch/x86/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/header.c | 9 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7f77226c9b..1605ec660d 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -128,6 +128,9 @@ int pci_host_bridge_mappings(struct domain *d); bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); +static inline int pci_sanitize_bar_memory(struct rangeset *r) +{ return 0; } + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..bed99437cc 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,14 +57,9 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); -static inline bool pci_check_bar(const struct pci_dev *pdev, - mfn_t start, mfn_t end) -{ - /* - * Check if BAR is not overlapping with any memory region defined - * in the memory map. - */ - return is_memory_hole(start, end); -} +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); #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 97b792e578..26bb7f6a3c 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -98,3 +98,53 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, return rc; } + +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + if ( !is_memory_hole(start, end) ) + gdprintk(XENLOG_WARNING, + "%pp: BAR at [%"PRI_mfn", %"PRI_mfn"] not in memory map hole\n", + &pdev->sbdf, mfn_x(start), mfn_x(end)); + + /* + * Unconditionally return true, pci_sanitize_bar_memory() will remove any + * non-hole regions. + */ + return true; +} + +/* Remove overlaps with any ranges defined in the host memory map. */ +int pci_sanitize_bar_memory(struct rangeset *r) +{ + unsigned int i; + + for ( i = 0; i < e820.nr_map; i++ ) + { + const struct e820entry *entry = &e820.map[i]; + int rc; + + if ( !entry->size ) + continue; + + rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), + PFN_DOWN(entry->addr + entry->size - 1)); + if ( rc ) + return rc; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ef6c965c08..1f48f2aac6 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -394,6 +394,15 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) return rc; } } + + rc = pci_sanitize_bar_memory(bar->mem); + if ( rc ) + { + gprintk(XENLOG_WARNING, + "%pp: failed to sanitize BAR#%u memory: %d\n", + &pdev->sbdf, i, rc); + return rc; + } } /* Remove any MSIX regions if present. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:22:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026021.1401289 (Exim 4.92) (envelope-from ) id 1uUhsP-0003DB-KY; Thu, 26 Jun 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 1026021.1401289; Thu, 26 Jun 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 1uUhsP-0003D3-I0; Thu, 26 Jun 2025 08:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1026021; Thu, 26 Jun 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 1uUhsN-0003Cl-WE for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUhsN-003Y9P-35 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhsN-005623-30 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=7Q77xAPHbG1gUK+5l0Bw8HAeNkmgnUse4YoKXLOsoS8=; b=iIW0RS9Wm7o3pSfhKhrkc0R0wt l2ffj4UociQDklQw+KOPrE0E/960zpCd306xxgaD0VemI6nFzq9NIdQhj6uj44fgnogGaWKT+Z5wS oDIZF6iWlxyge/D2jaaSNYAYn1NQeUaolxtKUkLfzBSs8ckZ+O29dKiWAI6KT1RdfJqY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Message-Id: Date: Thu, 26 Jun 2025 08:22:31 +0000 commit a24e1cda35deb36be8efae49058d50d2840384b8 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:47:29 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:47:29 2025 +0200 x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Paging Writeable depends on EPT so must be disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: d779e3f98c2a765aae57f6ab4b0257413c12ac97 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 9b6dc51f36..aa7911089a 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1148,9 +1148,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &= - ~(SECONDARY_EXEC_ENABLE_EPT | + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &= + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:22:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026022.1401294 (Exim 4.92) (envelope-from ) id 1uUhsZ-0003Fi-M5; Thu, 26 Jun 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 1026022.1401294; Thu, 26 Jun 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 1uUhsZ-0003Fb-JO; Thu, 26 Jun 2025 08:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1026022; Thu, 26 Jun 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 1uUhsY-0003FI-2F for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUhsY-003Y9T-08 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhsY-005645-02 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=fSz3IuzGZUsNq2pic3HiAxbydCxFBlSOJdDlF7eHLF8=; b=Zi8cH6t0RWreRWhhD3cn1dBAQ5 94vs3aPrWYj3bwuiGXRi8S9x2qSk2Z80oK4AB0gYlpbMPVIyyEj8JSSbgz6PThwwec+Yjq56B+hCM uzXn6KYDsrDFhcx4crtwUF0joKWEsO9RTJIcTmvZ//XtGO5FudCPsetBb3d0T0MGnwJI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/pv: Fix breakpoint reporting Message-Id: Date: Thu, 26 Jun 2025 08:22:42 +0000 commit ee8ae3a2802a1a5d69ccc1ffe223c98dc09a9361 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:47:41 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:47:41 2025 +0200 x86/pv: Fix breakpoint reporting x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the previously latched breakpoint bits. The combination of do_debug()'s manual call to x86_merge_dr6() for external debuggers, and pv_inject_DB() calling pv_inject_event(), results in two x86_merge_dr6() calls. Feed the same pending_dbg in the second time. This makes pv_inject_event()'s update of dr6 effectively a no-op, retaining the correct breakpoint bits. Fixes: db39fa4b27ea ("x86/pv: Fix merging of new status bits into %dr6") Reported-by: Manuel Bouyer Signed-off-by: Andrew Cooper Tested-by: Manuel Bouyer Acked-by: Roger Pau Monné master commit: d965e2ee07c56c341d8896852550914d87ea5374 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index ae573ee4c0..af90d8b27d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2040,7 +2040,7 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } - pv_inject_DB(0 /* N/A, already merged */); + pv_inject_DB(dr6 ^ X86_DR6_DEFAULT); } void asmlinkage do_entry_CP(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:22:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026023.1401298 (Exim 4.92) (envelope-from ) id 1uUhsj-0003IH-Np; Thu, 26 Jun 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 1026023.1401298; Thu, 26 Jun 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 1uUhsj-0003I9-L1; Thu, 26 Jun 2025 08:22:53 +0000 Received: by outflank-mailman (input) for mailman id 1026023; Thu, 26 Jun 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 1uUhsi-0003I1-6g for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUhsi-003Y9q-0P for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhsi-00567R-0J for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=JCTYgTg8DFgln89Wggvy1GVasEKsyXUNFstjaKXtFj4=; b=stQg0LZIZAmSsyE9oJKOH0GaRu T5TO3qi6ZynGcco2Cz9yZ+9GSwRLf+jk4r3wkFGOgYM25Yk+S83B5hFGX6qx0qUUhhZYFAq3/ywuQ mBbi+PN7pHNHvS7FrkoB6bYi2qrPmial/2jX0uAgHFh6St1Y5hCdA0Q1hijSq0V1McPg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] tools/libxl: Only access legacy altp2m on HVM Message-Id: Date: Thu, 26 Jun 2025 08:22:52 +0000 commit e02b039b64738f04ec9283b5840f5b004026c782 Author: Jason Andryuk AuthorDate: Thu Jun 26 08:47:53 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:47:53 2025 +0200 tools/libxl: Only access legacy altp2m on HVM Only access the HVM union b_info->u.hvm on HVM guests. The union access is not guarded, so this reads and sets the default even on non-HVM guests. Usually this doesn't matter as PV and PVH unions are smaller and zero-initialized, but the zero default will be re-written as a -1 boolean. Generally, it could incorrectly set b_info->altp2m through aliased data. Fixes: 0291089f6ea8 ("xen: enable altp2m at create domain domctl") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD master commit: 01dfd25509cc44011e83677e989dc7f55e2657d5 master date: 2025-06-02 10:31:21 +0200 --- tools/libs/light/libxl_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 60643d6f53..872b39739d 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -804,17 +804,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); - /* - * The config parameter "altp2m" replaces the parameter "altp2mhvm". - * For legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. - */ - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); - if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(b_info->u.hvm.altp2m)) - b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:23:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026024.1401301 (Exim 4.92) (envelope-from ) id 1uUhst-0003Kg-Or; Thu, 26 Jun 2025 08:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026024.1401301; Thu, 26 Jun 2025 08:23: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 1uUhst-0003KZ-MR; Thu, 26 Jun 2025 08:23:03 +0000 Received: by outflank-mailman (input) for mailman id 1026024; Thu, 26 Jun 2025 08:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUhss-0003KJ-7v for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUhss-003YA8-0h for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhss-0056Aj-0a for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23: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=rmGc7L8aK1JUeqzDoJpKonLoswOGVi/lL49/QY0pF5w=; b=nnt102Upy5kuCdmfRF0sszBLMD oFz4MygzdRN3Mtit3qQF0jFWEqWr9oLg8T/mwjJUYSo698Sj0x+gHfrojbKQahZjJdbpDYVX3KsUk lchxB7qT55z1+T/UDSFRHDGF3tMbhwhHSGJAldxICvQ6bUk8OMQ95wzR1/qLPFoTzM3I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/pmstat: Check size of PMSTAT_get_pxstat buffers Message-Id: Date: Thu, 26 Jun 2025 08:23:02 +0000 commit 81ffb56a23c66f323e062c417dedfd66bb0aa4fd Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:48:35 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:48:35 2025 +0200 x86/pmstat: Check size of PMSTAT_get_pxstat buffers Check that the total number of states passed in and hence the size of buffers is sufficient to avoid writing more than the caller has allocated. The interface is not explicit about whether getpx.total is expected to be set by the caller in this case but since it is always set in libxenctrl it seems reasonable to check it and make it explicit. Fixes: c06a7db0c547 ("X86 and IA64: Update cpufreq statistic logic for supporting both x86 and ia64") Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich # Commit fb16c7411d6e1278155c144fd3310a12f2efbf5e # Date 2025-06-18 09:25:09 +0200 # Author Jan Beulich # Committer Jan Beulich x86/pmstat: correct PMSTAT_get_pxstat buffer size checking min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall master commit: aa70996a6896dfc9de60f60540098b7d3ac3fb4f master date: 2025-06-11 11:05:42 +0200 master commit: fb16c7411d6e1278155c144fd3310a12f2efbf5e master date: 2025-06-18 09:25:09 +0200 --- xen/drivers/acpi/pmstat.c | 8 +++++++- xen/include/public/sysctl.h | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index f607bc110f..1b18ee378d 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -103,8 +103,14 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ ct = pmpt->perf.state_count; - if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct*ct) ) + if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3a6e7d48f0..a0ddd1dbf5 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -205,11 +205,22 @@ typedef struct pm_px_val pm_px_val_t; DEFINE_XEN_GUEST_HANDLE(pm_px_val_t); struct pm_px_stat { - uint8_t total; /* total Px states */ + /* + * IN: Number of elements in pt, number of rows/columns in trans_pt + * (PMSTAT_get_pxstat) + * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) + */ + uint8_t total; uint8_t usable; /* usable Px states */ uint8_t last; /* last Px state */ uint8_t cur; /* current Px state */ - XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ + /* + * OUT: Px transition table. This should have total * total elements. + * As it is a 2-D array, this will not be copied if input total is + * less than output total. (PMSTAT_get_pxstat) + */ + XEN_GUEST_HANDLE_64(uint64) trans_pt; + /* OUT: This should have total elements (PMSTAT_get_pxstat) */ XEN_GUEST_HANDLE_64(pm_px_val_t) pt; }; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:23:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026025.1401305 (Exim 4.92) (envelope-from ) id 1uUht3-0003Ms-QO; Thu, 26 Jun 2025 08:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026025.1401305; Thu, 26 Jun 2025 08:23: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 1uUht3-0003Ml-Ny; Thu, 26 Jun 2025 08:23:13 +0000 Received: by outflank-mailman (input) for mailman id 1026025; Thu, 26 Jun 2025 08:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUht2-0003MW-Ao for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUht2-003YAC-0y for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUht2-0056E1-0s for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23: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=0v0WTCDUi/XvzT0tR8uHpRufCx0J+o4wHV04py/1dD8=; b=P6UQfTacRJjs6zS7pFRSScE8i2 1d7T9UFakPjjj5k6nf5o+aHQf/VvQCqh/CuIM0s+ZnK1Zk/lHBj1vMSVRuesE9eml0PzzzejOahXg VFX4WS6N4zSPn4NWRVGvlB7SyBpqEnC3TthkpHbCNAZ3VAaIONYOv3oeKDX+453akFxo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] cpufreq: Avoid potential buffer overrun and leak Message-Id: Date: Thu, 26 Jun 2025 08:23:12 +0000 commit 2b82a9d8819accb0c50953176e8a4153acaf0980 Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:49:06 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:49:06 2025 +0200 cpufreq: Avoid potential buffer overrun and leak If set_px_pminfo is called a second time with a larger state_count than the first call, calls to PMSTAT_get_pxstat will read beyond the end of the pt and trans_pt buffers allocated in cpufreq_statistic_init() since they would have been allocated with the original state_count. Secondly, the states array leaks on each subsequent call of set_px_pminfo. Fix both these issues by ignoring subsequent calls to set_px_pminfo if it completed successfully previously. Return success rather than an error to avoid errors in the dom0 kernel log when reloading the xen_acpi_processor module. At the same time, fix a leak of the states array on error. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: 2f36bef3d8478f304f262fffeca543de480872a4 master date: 2025-06-11 11:06:24 +0200 --- xen/drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 8659ad3aee..3bdf86a52a 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -510,7 +510,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } } - if ( perf->flags & XEN_PX_PSS ) + if ( perf->flags & XEN_PX_PSS && !pxpt->states ) { /* capability check */ if ( perf->state_count <= 1 ) @@ -527,6 +527,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) { + XFREE(pxpt->states); ret = -EFAULT; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 08:23:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 08:23:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026026.1401310 (Exim 4.92) (envelope-from ) id 1uUhtD-0003PF-SA; Thu, 26 Jun 2025 08:23:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026026.1401310; Thu, 26 Jun 2025 08:23: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 1uUhtD-0003P3-PO; Thu, 26 Jun 2025 08:23:23 +0000 Received: by outflank-mailman (input) for mailman id 1026026; Thu, 26 Jun 2025 08:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUhtC-0003Oq-E5 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUhtC-003YAG-1K for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUhtC-0056I4-1B for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 08:23: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=mB8v6gm3Hy8jLRb5PeD+d1cxbhYdnY/LPRe4u7/OfxU=; b=bxmrRGrqkf1BHIVHWE973U6lDG vMgIHljmDMr/2dsqqAQK+eroKBFur9GmPrbcGCs/rpA8QcPqy0N1+iuKz8rsW5SstlJMzGJojwhxY VVmDD3NgE+6FkRjuyAwXdfW0oPsxcEix1B6IsvelH2Xegc1b2EsU5VvWyMsGKgI1dnlI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xenalyze: Add 2 missed VCPUOPs in vcpu_op_str Message-Id: Date: Thu, 26 Jun 2025 08:23:22 +0000 commit 4d6ddd30eed61a8c27f9f7d91d3a3b341640e498 Author: Gang Ji AuthorDate: Thu Jun 26 08:49:19 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:49:19 2025 +0200 xenalyze: Add 2 missed VCPUOPs in vcpu_op_str The 2 missed ones are: register_runstate_phys_area and register_vcpu_time_phys_area. Fixes: d5df44275e7a ("domain: introduce GADDR based runstate area registration alternative") Fixes: 60e544a8c58f ("x86: introduce GADDR based secondary time area registration alternative") Signed-off-by: Gang Ji Reviewed-by: Andrew Cooper master commit: ed939591e4c6ccf794395fc78cd358aa24a94ed8 master date: 2025-06-11 11:08:11 +0200 --- tools/xentrace/xenalyze.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index adc96dd7e4..1c13682aaa 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6513,7 +6513,8 @@ static const char *vcpu_op_str[] = { "register_runstate_memory_area", "set_periodic_timer", "stop_periodic_timer", "set_singleshot_timer", "stop_singleshot_timer", "register_vcpu_info", "send_nmi", "get_physid", - "register_vcpu_time_memory_area", + "register_vcpu_time_memory_area", "register_runstate_phys_area", + "register_vcpu_time_phys_area", }; static const char *sched_op_str[] = { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026065.1401325 (Exim 4.92) (envelope-from ) id 1uUiyc-0003j1-Vf; Thu, 26 Jun 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 1026065.1401325; Thu, 26 Jun 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 1uUiyc-0003ir-Rh; Thu, 26 Jun 2025 09:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1026065; Thu, 26 Jun 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 1uUiyc-0003il-5d for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUiyc-003ZRs-01 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUiyb-005Rv1-2x for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09: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=87o+B/K79C0ijbhZkyBvskcWLx5P+h5bwzjHDY9/Hyo=; b=totReHRSk6ztvmilUn72icaiBj XiHiOunAuvqCKI2PjYNO9cExSul9CIewfenytDo02H/haCCBMvVAZ35PGoBcb5x1NxkHFKwrbQ2p6 bkt8TYPd2ybHO4O7trGdNHDPUzCd92tQDqckoXagbGnqPk8p0Wd6CiSeDjyE1oz/zzag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pdx: simplify calculation of domain struct allocation boundary Message-Id: Date: Thu, 26 Jun 2025 09:33:01 +0000 commit a2602f3a6398758d697437b93f944f90304dc1f2 Author: Roger Pau Monne AuthorDate: Mon May 26 19:32:21 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu Jun 26 10:37:13 2025 +0200 x86/pdx: simplify calculation of domain struct allocation boundary When not using CONFIG_BIGMEM there are some restrictions in the address width for allocations of the domain structure, as it's PDX truncated to 32 bits it's stashed into page_info structure for domain allocated pages. The current logic to calculate this limit is based on the internals of the PDX compression used, which is not strictly required. Instead simplify the logic to rely on the existing PDX to PFN conversion helpers used elsewhere. This has the added benefit of allowing alternative PDX compression algorithms to be implemented without requiring to change the calculation of the domain structure allocation boundary. As a side effect introduce pdx_to_paddr() conversion macro and use it. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 40 +++++++++++----------------------------- xen/include/xen/pdx.h | 1 + 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index d025befe3d..b67342797f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -461,30 +461,6 @@ void domain_cpu_policy_changed(struct domain *d) } } -#if !defined(CONFIG_BIGMEM) && defined(CONFIG_PDX_COMPRESSION) -/* - * The hole may be at or above the 44-bit boundary, so we need to determine - * the total bit count until reaching 32 significant (not squashed out) bits - * in PFN representations. - * Note that the way "bits" gets initialized/updated/bounds-checked guarantees - * that the function will never return zero, and hence will never be called - * more than once (which is important due to it being deliberately placed in - * .init.text). - */ -static unsigned int __init noinline _domain_struct_bits(void) -{ - unsigned int bits = 32 + PAGE_SHIFT; - unsigned int sig = hweight32(~pfn_hole_mask); - unsigned int mask = pfn_hole_mask >> 32; - - for ( ; bits < BITS_PER_LONG && sig < 32; ++bits, mask >>= 1 ) - if ( !(mask & 1) ) - ++sig; - - return bits; -} -#endif - struct domain *alloc_domain_struct(void) { struct domain *d; @@ -498,14 +474,20 @@ struct domain *alloc_domain_struct(void) * On systems with CONFIG_BIGMEM there's no packing, and so there's no * such restriction. */ -#if defined(CONFIG_BIGMEM) || !defined(CONFIG_PDX_COMPRESSION) - const unsigned int bits = IS_ENABLED(CONFIG_BIGMEM) ? 0 : - 32 + PAGE_SHIFT; +#if defined(CONFIG_BIGMEM) + const unsigned int bits = 0; #else - static unsigned int __read_mostly bits; + static unsigned int __ro_after_init bits; if ( unlikely(!bits) ) - bits = _domain_struct_bits(); + /* + * Get the width for the next pfn, and unconditionally subtract one + * from it to ensure the used width will not allocate past the PDX + * field limit. + */ + bits = flsl(pdx_to_paddr(1UL << + (sizeof(frame_table->v.inuse._domain) * 8))) + - 1; #endif BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 9faeea3ac9..c1423d64a9 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -99,6 +99,7 @@ bool __mfn_valid(unsigned long mfn); #define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) #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 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:44:09 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026066.1401328 (Exim 4.92) (envelope-from ) id 1uUj9I-0004qh-Oa; Thu, 26 Jun 2025 09:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026066.1401328; Thu, 26 Jun 2025 09: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 1uUj9I-0004qZ-M3; Thu, 26 Jun 2025 09:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1026066; Thu, 26 Jun 2025 09:44:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUj9H-0004qT-8K for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUj9G-003Zdm-1D for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUj9G-005W5g-0z for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09: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=ZqYz2ACdyjQ/elw91jFMtvAXRoBMCJ4t+3o31CuOSgE=; b=qVvNjkwh7ziZXkq5gBp+NshVcD tKamVimLRPz64P+aw6fsPFjsJg6tqTTOoj4D+U6Pd1F/fsKhORmvq62Qsy+W5PtNOuBQWPYK3wu0n YFy54PnjrSS8zNf+xSrIqYNxq0/+y3nk9gtppSdjyC6n0SB9ByFR/iSNI1nMGKd8ONjA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches Message-Id: Date: Thu, 26 Jun 2025 09:44:02 +0000 commit a60e95308072355dbe966c2129c0315f8222da30 Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:34:24 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:34:24 2025 +0200 x86/pv: fix emulation of wb{,no}invd to flush all pCPU caches The current emulation of wb{,no}invd is bogus for PV guests: it will only flush the current pCPU cache, without taking into account pCPUs where the vCPU had run previously. Resort to flushing the cache on all host pCPUs to make it correct. Fixes: 799fed0a7cc5 ("Priv-op emulation in Xen, for RDMSR/WRMSR/WBINVD") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich [backport: no FLUSH_CACHE_WRITEBACK] master commit: b0f8bf86057b8f01fb4e48b506805d3818600f76 master date: 2025-05-20 16:35:52 +0200 --- xen/arch/x86/pv/emul-priv-op.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 295d847ea2..a21d499519 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1198,13 +1198,11 @@ static int cf_check cache_op( if ( !cache_flush_permitted(current->domain) ) /* * Non-physdev domain attempted WBINVD; ignore for now since - * newer linux uses this in some start-of-day timing loops. + * Linux uses this in some start-of-day code. */ ; - else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); else - wbinvd(); + flush_all(FLUSH_CACHE); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:44:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026067.1401333 (Exim 4.92) (envelope-from ) id 1uUj9R-0004sL-RX; Thu, 26 Jun 2025 09:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026067.1401333; Thu, 26 Jun 2025 09: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 1uUj9R-0004sD-NQ; Thu, 26 Jun 2025 09:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1026067; Thu, 26 Jun 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 1uUj9Q-0004s3-GR for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUj9Q-003Zds-1V for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUj9Q-005WCT-1O for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09: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=+7lehLCKHQiGL3ufPiR2qYkei0k4WQFi631MK3XpEFU=; b=u+SlrFKgulKdylGdjz8xirFRYH zOGczJwX1drU4KWcf8oFBCbiCwoA13H5+wrmqACIFlwrtB2VscnoTywV+aECMQta2gGVaJkfCh3nA GIiAL0bM/U++ZTZSNh0VMAI5UFRPJ9rjGDKevKlPBfBXflbHA/TYjYhQTfd/OU4lQC2w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/vpci: fix handling of BAR overlaps with non-hole regions Message-Id: Date: Thu, 26 Jun 2025 09:44:12 +0000 commit 59199179214ad64ba8ab8ad054735b2db3f3aad7 Author: Roger Pau Monné AuthorDate: Thu Jun 26 08:35:12 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:35:12 2025 +0200 x86/vpci: fix handling of BAR overlaps with non-hole regions For once the message printed when a BAR overlaps with a non-hole regions is not accurate on x86. While the BAR won't be mapped by the vPCI logic, it is quite likely overlapping with a reserved region in the memory map, and already mapped as by default all reserved regions are identity mapped in the p2m. Avoid printing the warning message in modify_bars(), and instead print a more lax message in the x86 implementation of pci_check_bar() to note the current BAR position overlaps with non-hole region(s). Secondly, when an overlap is detected the BAR 'enabled' field is not set, hence other vPCI code that depends on it like vPCI MSI-X handling won't function properly, as it sees the BAR as disabled, even when memory decoding is enabled for the device and the BAR is likely mapped in the p2m. Change the handling of BARs that overlap non-hole regions to instead remove any overlapped regions from the rangeset, so the resulting ranges to map just contain the hole regions. This requires introducing a new pci_sanitize_bar_memory() that's implemented per-arch and sanitizes the address range to add to the p2m. For x86 pci_sanitize_bar_memory() removes any regions present in the host memory map, for ARM this is currently left as a dummy handler to not change existing behavior. Ultimately the above changes should fix the vPCI MSI-X handlers not working correctly when the BAR that contains the MSI-X table overlaps with a non-hole region, as then the 'enabled' BAR bit won't be set and the MSI-X traps won't handle accesses as expected. Reported-by: Stefano Stabellini Fixes: 53d9133638c3 ('pci: do not disable memory decoding for devices') Signed-off-by: Roger Pau Monné Tested-by: Victor M Lira Reviewed-by: Jan Beulich Acked-by: Julien Grall x86/vpci: fix off-by-one in pci_sanitize_bar_memory() rangeset_remove_range() uses inclusive ranges, and hence the end of the range should be calculated using PFN_DOWN(), not PFN_UP(). Fixes: 4acab25a9300 ('x86/vpci: fix handling of BAR overlaps with non-hole regions') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: 4acab25a9300ba69a3c1441491470bd65af52d0f master date: 2025-05-21 18:29:55 +0200 master commit: 7ab4b392b78b5ac1c7a1fb1d085637526e67521a master date: 2025-05-22 16:17:12 +0200 --- xen/arch/arm/include/asm/pci.h | 3 +++ xen/arch/x86/include/asm/pci.h | 13 ++++------- xen/arch/x86/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/header.c | 9 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 7f77226c9b..1605ec660d 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -128,6 +128,9 @@ int pci_host_bridge_mappings(struct domain *d); bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end); +static inline int pci_sanitize_bar_memory(struct rangeset *r) +{ return 0; } + #else /*!CONFIG_HAS_PCI*/ struct pci_dev; diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h index fd5480d67d..bed99437cc 100644 --- a/xen/arch/x86/include/asm/pci.h +++ b/xen/arch/x86/include/asm/pci.h @@ -57,14 +57,9 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); -static inline bool pci_check_bar(const struct pci_dev *pdev, - mfn_t start, mfn_t end) -{ - /* - * Check if BAR is not overlapping with any memory region defined - * in the memory map. - */ - return is_memory_hole(start, end); -} +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); #endif /* __X86_PCI_H__ */ diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 97b792e578..26bb7f6a3c 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -98,3 +98,53 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, return rc; } + +bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) +{ + /* + * Check if BAR is not overlapping with any memory region defined + * in the memory map. + */ + if ( !is_memory_hole(start, end) ) + gdprintk(XENLOG_WARNING, + "%pp: BAR at [%"PRI_mfn", %"PRI_mfn"] not in memory map hole\n", + &pdev->sbdf, mfn_x(start), mfn_x(end)); + + /* + * Unconditionally return true, pci_sanitize_bar_memory() will remove any + * non-hole regions. + */ + return true; +} + +/* Remove overlaps with any ranges defined in the host memory map. */ +int pci_sanitize_bar_memory(struct rangeset *r) +{ + unsigned int i; + + for ( i = 0; i < e820.nr_map; i++ ) + { + const struct e820entry *entry = &e820.map[i]; + int rc; + + if ( !entry->size ) + continue; + + rc = rangeset_remove_range(r, PFN_DOWN(entry->addr), + PFN_DOWN(entry->addr + entry->size - 1)); + if ( rc ) + return rc; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ef6c965c08..1f48f2aac6 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -394,6 +394,15 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) return rc; } } + + rc = pci_sanitize_bar_memory(bar->mem); + if ( rc ) + { + gprintk(XENLOG_WARNING, + "%pp: failed to sanitize BAR#%u memory: %d\n", + &pdev->sbdf, i, rc); + return rc; + } } /* Remove any MSIX regions if present. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026068.1401335 (Exim 4.92) (envelope-from ) id 1uUj9b-0004vW-Rr; Thu, 26 Jun 2025 09:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026068.1401335; Thu, 26 Jun 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 1uUj9b-0004vO-Oy; Thu, 26 Jun 2025 09:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1026068; Thu, 26 Jun 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 1uUj9a-0004uX-JB for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUj9a-003Ze4-1o for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUj9a-005WGM-1h for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=9AR/t7vHmJAUBbpB3FGdoQFOVJDPAO9DS7vQ8WdOLNk=; b=bIbZ7+T9/U6IKViytk+P4p86Ro 60Di/JHxiUjipFBglaICZwFHtWB/K6bB8DeG7caGPHvNUHLgqz3TsqEf18EZK4mxRWNrCeesxnyke fjMCZu5ZVGc4oZbfboQAKHLSNLwrY5QUJCMlr4OD0gCosb1FnAIob+9zt0D9dWOAlZv8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Message-Id: Date: Thu, 26 Jun 2025 09:44:22 +0000 commit ed3bf0a89bd0f80e23bb68e9587ae8d88c6e4672 Author: Andrew Cooper AuthorDate: Thu Jun 26 08:35:42 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:35:42 2025 +0200 x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Paging Writeable depends on EPT so must be disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: d779e3f98c2a765aae57f6ab4b0257413c12ac97 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 8c0ea789c1..f9538063da 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1150,9 +1150,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &= - ~(SECONDARY_EXEC_ENABLE_EPT | + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &= + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026069.1401340 (Exim 4.92) (envelope-from ) id 1uUj9l-0004yk-T6; Thu, 26 Jun 2025 09:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026069.1401340; Thu, 26 Jun 2025 09: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 1uUj9l-0004yd-QS; Thu, 26 Jun 2025 09:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1026069; Thu, 26 Jun 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 1uUj9k-0004yP-M6 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUj9k-003Ze8-27 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUj9k-005WLD-1z for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=nCQJZCScWTVbYbcpZAo1gNIbkjuG5q5ZY/1StbeXFR8=; b=l7E5BfFX62hMavvFuvCgpB9nVC 5bCV5WZWDhWKKx6WOcfg2qB241/CHExsGkw9LD5WVfl+A2CQdbjiiiWkz+vNx1E/2qh2JHdbe5hzD ySlNsVYC2+lx+W9n0CSkrDTqA5Wql5p8VOktnxxb/eJrlhJuazZq3IJyfd74RVUesng8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/pv: Fix breakpoint reporting Message-Id: Date: Thu, 26 Jun 2025 09:44:32 +0000 commit 60f61371906ed00d86577da686760d9009e969df Author: Andrew Cooper AuthorDate: Thu Jun 26 08:36:08 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:36:08 2025 +0200 x86/pv: Fix breakpoint reporting x86_merge_dr6() is not a no-op when 0 is passed in; it will discard the previously latched breakpoint bits. The combination of do_debug()'s manual call to x86_merge_dr6() for external debuggers, and pv_inject_DB() calling pv_inject_event(), results in two x86_merge_dr6() calls. Feed the same pending_dbg in the second time. This makes pv_inject_event()'s update of dr6 effectively a no-op, retaining the correct breakpoint bits. Fixes: db39fa4b27ea ("x86/pv: Fix merging of new status bits into %dr6") Reported-by: Manuel Bouyer Signed-off-by: Andrew Cooper Tested-by: Manuel Bouyer Acked-by: Roger Pau Monné master commit: d965e2ee07c56c341d8896852550914d87ea5374 master date: 2025-05-27 12:21:38 +0100 --- xen/arch/x86/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index dca11a613d..9eb7bd2e07 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2040,7 +2040,7 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } - pv_inject_DB(0 /* N/A, already merged */); + pv_inject_DB(dr6 ^ X86_DR6_DEFAULT); } void asmlinkage do_entry_CP(struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:44:44 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026070.1401346 (Exim 4.92) (envelope-from ) id 1uUj9w-000511-01; Thu, 26 Jun 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 1026070.1401346; Thu, 26 Jun 2025 09:44: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 1uUj9v-00050r-S3; Thu, 26 Jun 2025 09:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1026070; Thu, 26 Jun 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 1uUj9u-00050j-Px for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUj9u-003ZeC-2T for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUj9u-005WNd-2I for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=IEmysRGwGK2H2QWr9YChhM3ZWsbsZwyXMvbUoZ5bFk4=; b=aJZ19kSKpGJm4nGUQJdPyChp5z Uy/nLtI3xsVb5plRWRZdTsXM+gJrQ0PwcUTjNmoJlX+GiXDRNIb79IyWHgQ8AyilqpzB0dee2WAeZ 6yPLpgfjFe4zovCPF+Uyzqy8il56SU/ijhLaWP3DNFAfkvTWYMVccG1mHljIb4/mIaF8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] tools/libxl: Only access legacy altp2m on HVM Message-Id: Date: Thu, 26 Jun 2025 09:44:42 +0000 commit 0cd774e8c27218af88ec6f80dfac377277631b2c Author: Jason Andryuk AuthorDate: Thu Jun 26 08:36:29 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:36:29 2025 +0200 tools/libxl: Only access legacy altp2m on HVM Only access the HVM union b_info->u.hvm on HVM guests. The union access is not guarded, so this reads and sets the default even on non-HVM guests. Usually this doesn't matter as PV and PVH unions are smaller and zero-initialized, but the zero default will be re-written as a -1 boolean. Generally, it could incorrectly set b_info->altp2m through aliased data. Fixes: 0291089f6ea8 ("xen: enable altp2m at create domain domctl") Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD master commit: 01dfd25509cc44011e83677e989dc7f55e2657d5 master date: 2025-06-02 10:31:21 +0200 --- tools/libs/light/libxl_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 0a7f64ad46..786d946188 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -804,17 +804,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); - /* - * The config parameter "altp2m" replaces the parameter "altp2mhvm". - * For legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. - */ - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); - if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(b_info->u.hvm.altp2m)) - b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:44:54 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026071.1401347 (Exim 4.92) (envelope-from ) id 1uUjA6-00053c-0D; Thu, 26 Jun 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 1026071.1401347; Thu, 26 Jun 2025 09:44: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 1uUjA5-00053U-TW; Thu, 26 Jun 2025 09:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1026071; Thu, 26 Jun 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 1uUjA4-00053K-SW for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUjA4-003ZeZ-2k for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUjA4-005WRN-2d for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=zEaOYWQyZYbNe2eqWVGSDOW3mi/L+TPyJaByz8WnypU=; b=acH/YcELgD0OcOKXY9vos8NNLo 8Bcm+Vk8SSAkkAMvS/udRorvgEiWyT9UqBNDSEQcfwkcU9/RGejKMoGnnVxU0WoJW+MLt8Qbr/MGf XC5OUCw205kOOgZkjXd1PaBVwwtglcXKHs4ERevKE9x7S43E1KBsPBqSH5gqmeAH2YRg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/pmstat: Check size of PMSTAT_get_pxstat buffers Message-Id: Date: Thu, 26 Jun 2025 09:44:52 +0000 commit 110bc6ef1a4e81f52c5740293edd852caf15902b Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:37:15 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:37:15 2025 +0200 x86/pmstat: Check size of PMSTAT_get_pxstat buffers Check that the total number of states passed in and hence the size of buffers is sufficient to avoid writing more than the caller has allocated. The interface is not explicit about whether getpx.total is expected to be set by the caller in this case but since it is always set in libxenctrl it seems reasonable to check it and make it explicit. Fixes: c06a7db0c547 ("X86 and IA64: Update cpufreq statistic logic for supporting both x86 and ia64") Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich x86/pmstat: correct PMSTAT_get_pxstat buffer size checking min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt. Fixes: aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Ross Lagerwall master commit: aa70996a6896dfc9de60f60540098b7d3ac3fb4f master date: 2025-06-11 11:05:42 +0200 master commit: fb16c7411d6e1278155c144fd3310a12f2efbf5e master date: 2025-06-18 09:25:09 +0200 --- xen/drivers/acpi/pmstat.c | 8 +++++++- xen/include/public/sysctl.h | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index b6ea19d103..74b3b7d71c 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -103,8 +103,14 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) cpufreq_residency_update(op->cpuid, pxpt->u.cur); + /* + * Avoid partial copying of 2-D array, whereas partial copying of a + * simple vector (further down) is deemed okay. + */ ct = pmpt->perf.state_count; - if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct*ct) ) + if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; + else if ( copy_to_guest(op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) { spin_unlock(cpufreq_statistic_lock); ret = -EFAULT; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index b0fec271d3..a164fe2bc9 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -215,11 +215,22 @@ typedef struct pm_px_val pm_px_val_t; DEFINE_XEN_GUEST_HANDLE(pm_px_val_t); struct pm_px_stat { - uint8_t total; /* total Px states */ + /* + * IN: Number of elements in pt, number of rows/columns in trans_pt + * (PMSTAT_get_pxstat) + * OUT: total Px states (PMSTAT_get_max_px, PMSTAT_get_pxstat) + */ + uint8_t total; uint8_t usable; /* usable Px states */ uint8_t last; /* last Px state */ uint8_t cur; /* current Px state */ - XEN_GUEST_HANDLE_64(uint64) trans_pt; /* Px transition table */ + /* + * OUT: Px transition table. This should have total * total elements. + * As it is a 2-D array, this will not be copied if input total is + * less than output total. (PMSTAT_get_pxstat) + */ + XEN_GUEST_HANDLE_64(uint64) trans_pt; + /* OUT: This should have total elements (PMSTAT_get_pxstat) */ XEN_GUEST_HANDLE_64(pm_px_val_t) pt; }; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:45:04 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026072.1401351 (Exim 4.92) (envelope-from ) id 1uUjAG-00056X-2Y; Thu, 26 Jun 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 1026072.1401351; Thu, 26 Jun 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 1uUjAF-00056Q-WD; Thu, 26 Jun 2025 09:45:04 +0000 Received: by outflank-mailman (input) for mailman id 1026072; Thu, 26 Jun 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 1uUjAE-00056G-Vj for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUjAE-003Zf3-32 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUjAE-005WUJ-2u for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=FWkdqEQ5aOI3EfkREZaQ78W3aLL5sUrI7CQNL6E2nDE=; b=kpJwR97cyzYOILvJwdqvLwDpk/ Ojg+yG1J9CkIxBH4xgkriW5taWiy2gn6LCqNsM+FMp8RWvm+zWzlq2EAEP2km7TBVngfmGb1df+FH EiBdasKk7C6J4UnlleAng/tOPU15J5a/bs1VusWT45/WtPuAtBVrxc0XrJ4UOkjnPTlw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] cpufreq: Avoid potential buffer overrun and leak Message-Id: Date: Thu, 26 Jun 2025 09:45:02 +0000 commit fd64f59cc74e2e072240154429103e38c9a7fcf4 Author: Ross Lagerwall AuthorDate: Thu Jun 26 08:37:38 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:37:38 2025 +0200 cpufreq: Avoid potential buffer overrun and leak If set_px_pminfo is called a second time with a larger state_count than the first call, calls to PMSTAT_get_pxstat will read beyond the end of the pt and trans_pt buffers allocated in cpufreq_statistic_init() since they would have been allocated with the original state_count. Secondly, the states array leaks on each subsequent call of set_px_pminfo. Fix both these issues by ignoring subsequent calls to set_px_pminfo if it completed successfully previously. Return success rather than an error to avoid errors in the dom0 kernel log when reloading the xen_acpi_processor module. At the same time, fix a leak of the states array on error. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: 2f36bef3d8478f304f262fffeca543de480872a4 master date: 2025-06-11 11:06:24 +0200 --- xen/drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 4a103c6de9..5cb8339536 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -511,7 +511,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } } - if ( perf->flags & XEN_PX_PSS ) + if ( perf->flags & XEN_PX_PSS && !pxpt->states ) { /* capability check */ if ( perf->state_count <= 1 ) @@ -528,6 +528,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) } if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) { + XFREE(pxpt->states); ret = -EFAULT; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 09:45:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 09:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026073.1401356 (Exim 4.92) (envelope-from ) id 1uUjAQ-000596-3r; Thu, 26 Jun 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 1026073.1401356; Thu, 26 Jun 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 1uUjAQ-00058y-1L; Thu, 26 Jun 2025 09:45:14 +0000 Received: by outflank-mailman (input) for mailman id 1026073; Thu, 26 Jun 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 1uUjAP-00058p-1t for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUjAP-003ZfA-06 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 09:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUjAP-005WXR-00 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=OpIyqYaTyU3UyZ1cg5Xt8Ws7EnwtdeshCIZPstHcVhY=; b=XJvsB3TrDcC81v2yDpgYCpXoY8 e+4c84cf5lgh1co9ZUeSdbDsL8baygsGgdipTRO3sI3KN3y6NYPIuIlNOsMoG91LkhKAhBeNEKE7D vRJo2Ng+4lKwieHFmnvWoBUwo/wip9HXcxYkF3+MeVwjpLsBN+NPmdgYMl1aJNqZk0VY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xenalyze: Add 2 missed VCPUOPs in vcpu_op_str Message-Id: Date: Thu, 26 Jun 2025 09:45:13 +0000 commit 2f80f3071a87706f97d404fa785b518a0cdadb92 Author: Gang Ji AuthorDate: Thu Jun 26 08:37:53 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 08:37:53 2025 +0200 xenalyze: Add 2 missed VCPUOPs in vcpu_op_str The 2 missed ones are: register_runstate_phys_area and register_vcpu_time_phys_area. Fixes: d5df44275e7a ("domain: introduce GADDR based runstate area registration alternative") Fixes: 60e544a8c58f ("x86: introduce GADDR based secondary time area registration alternative") Signed-off-by: Gang Ji Reviewed-by: Andrew Cooper master commit: ed939591e4c6ccf794395fc78cd358aa24a94ed8 master date: 2025-06-11 11:08:11 +0200 --- tools/xentrace/xenalyze.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index adc96dd7e4..1c13682aaa 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6513,7 +6513,8 @@ static const char *vcpu_op_str[] = { "register_runstate_memory_area", "set_periodic_timer", "stop_periodic_timer", "set_singleshot_timer", "stop_singleshot_timer", "register_vcpu_info", "send_nmi", "get_physid", - "register_vcpu_time_memory_area", + "register_vcpu_time_memory_area", "register_runstate_phys_area", + "register_vcpu_time_phys_area", }; static const char *sched_op_str[] = { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 10:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 10:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026139.1401381 (Exim 4.92) (envelope-from ) id 1uUjug-0003PF-Q6; Thu, 26 Jun 2025 10:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026139.1401381; Thu, 26 Jun 2025 10: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 1uUjug-0003P7-NC; Thu, 26 Jun 2025 10:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1026139; Thu, 26 Jun 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 1uUjug-0003P1-8F for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUjug-003aep-0J for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 10:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUjug-005k8R-0B for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 10: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=c2hBpZCP8Tr5RJkFPtwaxY3obzPAN18nIF4SnfJ8XxI=; b=uleFNq+HiYbyXZ1zpR97PbQCmA GvTwYBIEP8H1hBKs+SHFvX+mw2S8iUjuQDzqLg34A1b9HogRbUrlu25JzfS8FGK2/DiIZYD6tlEm7 kt7DOLhBVD3Y9ZQK6x4uIRJWLgMojca6/TGWxlhpso5dqLv4u2KkLYTg65QdedM2ik+c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pdx: simplify calculation of domain struct allocation boundary Message-Id: Date: Thu, 26 Jun 2025 10:33:02 +0000 commit a2602f3a6398758d697437b93f944f90304dc1f2 Author: Roger Pau Monne AuthorDate: Mon May 26 19:32:21 2025 +0200 Commit: Roger Pau Monne CommitDate: Thu Jun 26 10:37:13 2025 +0200 x86/pdx: simplify calculation of domain struct allocation boundary When not using CONFIG_BIGMEM there are some restrictions in the address width for allocations of the domain structure, as it's PDX truncated to 32 bits it's stashed into page_info structure for domain allocated pages. The current logic to calculate this limit is based on the internals of the PDX compression used, which is not strictly required. Instead simplify the logic to rely on the existing PDX to PFN conversion helpers used elsewhere. This has the added benefit of allowing alternative PDX compression algorithms to be implemented without requiring to change the calculation of the domain structure allocation boundary. As a side effect introduce pdx_to_paddr() conversion macro and use it. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 40 +++++++++++----------------------------- xen/include/xen/pdx.h | 1 + 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index d025befe3d..b67342797f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -461,30 +461,6 @@ void domain_cpu_policy_changed(struct domain *d) } } -#if !defined(CONFIG_BIGMEM) && defined(CONFIG_PDX_COMPRESSION) -/* - * The hole may be at or above the 44-bit boundary, so we need to determine - * the total bit count until reaching 32 significant (not squashed out) bits - * in PFN representations. - * Note that the way "bits" gets initialized/updated/bounds-checked guarantees - * that the function will never return zero, and hence will never be called - * more than once (which is important due to it being deliberately placed in - * .init.text). - */ -static unsigned int __init noinline _domain_struct_bits(void) -{ - unsigned int bits = 32 + PAGE_SHIFT; - unsigned int sig = hweight32(~pfn_hole_mask); - unsigned int mask = pfn_hole_mask >> 32; - - for ( ; bits < BITS_PER_LONG && sig < 32; ++bits, mask >>= 1 ) - if ( !(mask & 1) ) - ++sig; - - return bits; -} -#endif - struct domain *alloc_domain_struct(void) { struct domain *d; @@ -498,14 +474,20 @@ struct domain *alloc_domain_struct(void) * On systems with CONFIG_BIGMEM there's no packing, and so there's no * such restriction. */ -#if defined(CONFIG_BIGMEM) || !defined(CONFIG_PDX_COMPRESSION) - const unsigned int bits = IS_ENABLED(CONFIG_BIGMEM) ? 0 : - 32 + PAGE_SHIFT; +#if defined(CONFIG_BIGMEM) + const unsigned int bits = 0; #else - static unsigned int __read_mostly bits; + static unsigned int __ro_after_init bits; if ( unlikely(!bits) ) - bits = _domain_struct_bits(); + /* + * Get the width for the next pfn, and unconditionally subtract one + * from it to ensure the used width will not allocate past the PDX + * field limit. + */ + bits = flsl(pdx_to_paddr(1UL << + (sizeof(frame_table->v.inuse._domain) * 8))) + - 1; #endif BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 9faeea3ac9..c1423d64a9 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -99,6 +99,7 @@ bool __mfn_valid(unsigned long mfn); #define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) #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 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:00:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026338.1401525 (Exim 4.92) (envelope-from ) id 1uUmCy-0003bX-B1; Thu, 26 Jun 2025 13:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026338.1401525; Thu, 26 Jun 2025 13:00: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 1uUmCy-0003bP-80; Thu, 26 Jun 2025 13:00:04 +0000 Received: by outflank-mailman (input) for mailman id 1026338; Thu, 26 Jun 2025 13:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUmCw-0003H3-QS for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUmCw-003dRo-1f for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmCw-006Jrk-1T for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:00: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=lUaa/zigf8GsyhslMX1v1Gy2ETIOqmycr3i0wV1akvI=; b=51jCrRUAFV71kFXrDs0fAFYg1S beYBMSuQfzlQrSIfGQ0A+QCLq/TEbN4pzdAj3XnwNBv7sqMjJODa0g9ky3JX5D3sfHC0AAYIu5mx7 CPUWhTWZyHEEBJ3CWPYttJSH04cyPBh5bkNsHeS9krZ3hvr/k1u3DyzjR6xJcxw/pnek=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] x86/pv: fix breakage of grub-pv build Message-Id: Date: Thu, 26 Jun 2025 13:00:02 +0000 commit 2d3b22f842a969574cf967925b435c5913e8a6e0 Author: Juergen Gross AuthorDate: Thu Jun 26 14:59:48 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:59:48 2025 +0200 x86/pv: fix breakage of grub-pv build grub-pv is relying on start_info being defined, so provide a definition which can be used. Fixes: d669a312b2b2 ("x86/pv: remove global start_info") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- arch/x86/setup.c | 1 + include/hypervisor.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/x86/setup.c b/arch/x86/setup.c index b3fc835..ed28d94 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -67,6 +67,7 @@ static inline void sse_init(void) { * This pointer holds a reference to the start_info struct. */ start_info_t *start_info_ptr; +EXPORT_SYMBOL(start_info_ptr); #define hpc_init() diff --git a/include/hypervisor.h b/include/hypervisor.h index f40bc8c..d199f03 100644 --- a/include/hypervisor.h +++ b/include/hypervisor.h @@ -30,6 +30,8 @@ #ifdef CONFIG_PARAVIRT /* A pointer to the start of day information passed up from the hypervisor. */ extern start_info_t *start_info_ptr; + +#define start_info (*start_info_ptr) #else int hvm_get_parameter(int idx, uint64_t *value); int hvm_set_parameter(int idx, uint64_t value); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:11:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026353.1401548 (Exim 4.92) (envelope-from ) id 1uUmNb-00069z-Hl; Thu, 26 Jun 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 1026353.1401548; Thu, 26 Jun 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 1uUmNb-00069r-FC; Thu, 26 Jun 2025 13:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1026353; Thu, 26 Jun 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 1uUmNa-00069G-1m for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUmNZ-003dfo-2J for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmNZ-006LyG-28 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=NYSGj+j2Pq7FeF6uJtt97+ZbU72N3J/07Wf8fidjr74=; b=oVv6u4NULcVPKY443vd2gVtB4X DqVE7gDWq+uC3lr2cI/xaQ/IS5RYhOdUZkwqxpKgpNGKxlY8U/5PqMACYPXQucu9gBJMOT6VHbATw +9Yfpg9+xwEeEHOmHaotDPKnQrqHzI+5vNhjJfm5ZH4A5Wc5fTHjEz/n61H7Fa6IkSCc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/char: wrap suspend/resume console callbacks with CONFIG_SYSTEM_SUSPEND Message-Id: Date: Thu, 26 Jun 2025 13:11:01 +0000 commit 3e5f9674c0dfc1e620800ecf16db3a6e6c19b77b Author: Mykola Kvach AuthorDate: Thu Jun 26 14:57:22 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:57:22 2025 +0200 xen/char: wrap suspend/resume console callbacks with CONFIG_SYSTEM_SUSPEND This patch wraps the suspend/resume console callbacks and related code within CONFIG_SYSTEM_SUSPEND blocks. This ensures that these functions and their calls are only included in the build when CONFIG_SYSTEM_SUSPEND is enabled. This addresses Misra Rule 2.1 violations. Suggested-by: Jan Beulich Signed-off-by: Mykola Kvach --- xen/drivers/char/console.c | 4 ++++ xen/drivers/char/ehci-dbgp.c | 6 ++++++ xen/drivers/char/ns16550.c | 12 ++++++++++++ xen/drivers/char/serial.c | 4 ++++ xen/drivers/char/xhci-dbc.c | 6 ++++++ xen/include/xen/console.h | 2 ++ xen/include/xen/serial.h | 4 ++++ 7 files changed, 38 insertions(+) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 5879e31786..ba5a809a99 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1365,6 +1365,8 @@ void panic(const char *fmt, ...) machine_restart(5000); } +#ifdef CONFIG_SYSTEM_SUSPEND + /* * ************************************************************** * ****************** Console suspend/resume ******************** @@ -1388,6 +1390,8 @@ int console_resume(void) return 0; } +#endif /* CONFIG_SYSTEM_SUSPEND */ + /* * Local variables: * mode: C diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index e9cd59b254..a5c79f56fc 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1419,6 +1419,8 @@ static void __init cf_check ehci_dbgp_endboot(struct serial_port *port) ehci_dbgp_check_release(port->uart); } +#ifdef CONFIG_SYSTEM_SUSPEND + static void cf_check ehci_dbgp_suspend(struct serial_port *port) { struct ehci_dbgp *dbgp = port->uart; @@ -1452,12 +1454,16 @@ static void cf_check ehci_dbgp_resume(struct serial_port *port) ehci_dbgp_setup_postirq(dbgp); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + static struct uart_driver __read_mostly ehci_dbgp_driver = { .init_preirq = ehci_dbgp_init_preirq, .init_postirq = ehci_dbgp_init_postirq, .endboot = ehci_dbgp_endboot, +#ifdef CONFIG_SYSTEM_SUSPEND .suspend = ehci_dbgp_suspend, .resume = ehci_dbgp_resume, +#endif .tx_ready = ehci_dbgp_tx_ready, .putc = ehci_dbgp_putc, .flush = ehci_dbgp_flush, diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index eaeb0e09d0..6b4fb4ad31 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -57,7 +57,9 @@ static struct ns16550 { #endif /* UART with no IRQ line: periodically-polled I/O. */ struct timer timer; +#ifdef CONFIG_SYSTEM_SUSPEND struct timer resume_timer; +#endif unsigned int timeout_ms; bool intr_works; bool dw_usr_bsy; @@ -113,7 +115,9 @@ struct ns16550_config_param { static void enable_exar_enhanced_bits(const struct ns16550 *uart); #endif +#ifdef CONFIG_SYSTEM_SUSPEND static void cf_check ns16550_delayed_resume(void *data); +#endif static u8 ns_read_reg(const struct ns16550 *uart, unsigned int reg) { @@ -420,7 +424,9 @@ static void __init cf_check ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); +#ifdef CONFIG_SYSTEM_SUSPEND init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); +#endif /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -506,6 +512,8 @@ static void __init cf_check ns16550_init_postirq(struct serial_port *port) ns16550_setup_postirq(uart); } +#ifdef CONFIG_SYSTEM_SUSPEND + static void cf_check ns16550_suspend(struct serial_port *port) { struct ns16550 *uart = port->uart; @@ -584,6 +592,8 @@ static void cf_check ns16550_resume(struct serial_port *port) _ns16550_resume(port); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + static void __init cf_check ns16550_endboot(struct serial_port *port) { #ifdef CONFIG_HAS_IOPORTS @@ -638,8 +648,10 @@ static struct uart_driver __read_mostly ns16550_driver = { .init_irq = ns16550_init_irq, .init_postirq = ns16550_init_postirq, .endboot = ns16550_endboot, +#ifdef CONFIG_SYSTEM_SUSPEND .suspend = ns16550_suspend, .resume = ns16550_resume, +#endif .tx_ready = ns16550_tx_ready, .putc = ns16550_putc, .getc = ns16550_getc, diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 591a009008..adb312d796 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -495,6 +495,8 @@ const struct vuart_info *serial_vuart_info(int idx) return NULL; } +#ifdef CONFIG_SYSTEM_SUSPEND + void serial_suspend(void) { int i; @@ -511,6 +513,8 @@ void serial_resume(void) com[i].driver->resume(&com[i]); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + void __init serial_register_uart(int idx, struct uart_driver *driver, void *uart) { diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index d011159d18..1f7d4395dc 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -1271,6 +1271,8 @@ static void cf_check dbc_uart_flush(struct serial_port *port) set_timer(&uart->timer, goal); } +#ifdef CONFIG_SYSTEM_SUSPEND + static void cf_check dbc_uart_suspend(struct serial_port *port) { struct dbc_uart *uart = port->uart; @@ -1303,6 +1305,8 @@ static void cf_check dbc_uart_resume(struct serial_port *port) set_timer(&uart->timer, NOW() + MICROSECS(DBC_POLL_INTERVAL)); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + static struct uart_driver dbc_uart_driver = { .init_preirq = dbc_uart_init_preirq, .init_postirq = dbc_uart_init_postirq, @@ -1310,8 +1314,10 @@ static struct uart_driver dbc_uart_driver = { .putc = dbc_uart_putc, .getc = dbc_uart_getc, .flush = dbc_uart_flush, +#ifdef CONFIG_SYSTEM_SUSPEND .suspend = dbc_uart_suspend, .resume = dbc_uart_resume, +#endif }; /* Those are accessed via DMA. */ diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index 83cbc9fbda..feb57f92f1 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -44,8 +44,10 @@ int console_steal(int handle, void (*fn)(const char *str, size_t nr)); /* Give back stolen console. Takes the identifier returned by console_steal. */ void console_giveback(int id); +#ifdef CONFIG_SYSTEM_SUSPEND int console_suspend(void); int console_resume(void); +#endif /* Emit a string via the serial console. */ void console_serial_puts(const char *s, size_t nr); diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 63a82b032d..8e18445552 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -66,9 +66,11 @@ struct uart_driver { void (*init_postirq)(struct serial_port *port); /* Hook to clean up after Xen bootstrap (before domain 0 runs). */ void (*endboot)(struct serial_port *port); +#ifdef CONFIG_SYSTEM_SUSPEND /* Driver suspend/resume. */ void (*suspend)(struct serial_port *port); void (*resume)(struct serial_port *port); +#endif /* Return number of characters the port can hold for transmit, * or -EIO if port is inaccesible */ int (*tx_ready)(struct serial_port *port); @@ -131,9 +133,11 @@ int serial_irq(int idx); /* Retrieve basic UART information to emulate it (base address, size...) */ const struct vuart_info* serial_vuart_info(int idx); +#ifdef CONFIG_SYSTEM_SUSPEND /* Serial suspend/resume. */ void serial_suspend(void); void serial_resume(void); +#endif /* * Initialisation and helper functions for uart drivers. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026357.1401577 (Exim 4.92) (envelope-from ) id 1uUmNl-0006oJ-FN; Thu, 26 Jun 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 1026357.1401577; Thu, 26 Jun 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 1uUmNl-0006ne-AN; Thu, 26 Jun 2025 13:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1026357; Thu, 26 Jun 2025 13:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUmNj-0006jj-Rj for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUmNj-003dg6-2a for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmNj-006M00-2U for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=f4seXcFjPIaHfiT3XF3RSOpL5Ir2r8BMceL9edk5ZMw=; b=EOnZUKdxjxtEjc8UpfDGyT6inY haVhhN/cc7y73G8TMZISF8ncNfLy6DkgohJMaimiL+NgJcBYtg9tIz+JreA+486LiA+J5wxjbQ0eH vI85hpQjo+Qa5bTQnnV4CJrIm/wL0bDYNc2y8Stu1OwRctpShyUw5FdCwZaN4KOOqVys=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/efi: Handle cases where file didn't come from ESP Message-Id: Date: Thu, 26 Jun 2025 13:11:11 +0000 commit 196cdc097ff1603f2a7b4d9d165313073fdf5a75 Author: Frediano Ziglio AuthorDate: Thu Jun 26 14:58:10 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:58:10 2025 +0200 xen/efi: Handle cases where file didn't come from ESP A boot loader can load files from outside ESP. In these cases device could be not provided or path could be something not supported. In these cases allows to boot anyway, all information could be provided using UKI or using other boot loader features. Signed-off-by: Frediano Ziglio Acked-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 1a9b4e7dae..9306dc8953 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -443,6 +443,18 @@ static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_i CHAR16 *pathend, *ptr; EFI_STATUS ret; + /* + * In some cases the image could not come from a specific device. + * For instance this can happen if Xen was loaded using GRUB2 "linux" + * command. + */ + *leaf = NULL; + if ( !loaded_image->DeviceHandle ) + { + PrintStr(L"Xen image loaded without providing a device\r\n"); + return NULL; + } + do { EFI_FILE_IO_INTERFACE *fio; @@ -466,7 +478,15 @@ static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_i if ( DevicePathType(dp) != MEDIA_DEVICE_PATH || DevicePathSubType(dp) != MEDIA_FILEPATH_DP ) - blexit(L"Unsupported device path component"); + { + /* + * The image could come from an unsupported device. + * For instance this can happen if Xen was loaded using GRUB2 + * "chainloader" command and the file was not from ESP. + */ + PrintStr(L"Unsupported device path component\r\n"); + return NULL; + } if ( *buffer ) { @@ -772,8 +792,11 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, if ( !name ) PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); - ret = dir_handle->Open(dir_handle, &FileHandle, name, - EFI_FILE_MODE_READ, 0); + if ( dir_handle ) + ret = dir_handle->Open(dir_handle, &FileHandle, name, + EFI_FILE_MODE_READ, 0); + else + ret = EFI_NOT_FOUND; if ( file == &cfg && ret == EFI_NOT_FOUND ) return false; if ( EFI_ERROR(ret) ) @@ -1404,7 +1427,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, /* Read and parse the config file. */ if ( read_section(loaded_image, L"config", &cfg, NULL) ) PrintStr(L"Using builtin config file\r\n"); - else if ( !cfg_file_name ) + else if ( !cfg_file_name && file_name ) { CHAR16 *tail; @@ -1515,7 +1538,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); cfg.addr = 0; - dir_handle->Close(dir_handle); + if ( dir_handle ) + dir_handle->Close(dir_handle); if ( gop && !base_video ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:11:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026362.1401595 (Exim 4.92) (envelope-from ) id 1uUmNu-0007Ym-MZ; Thu, 26 Jun 2025 13:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026362.1401595; Thu, 26 Jun 2025 13: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 1uUmNu-0007Ye-Jp; Thu, 26 Jun 2025 13:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1026362; Thu, 26 Jun 2025 13:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUmNt-0007Vi-Tf for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUmNt-003dgK-2r for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmNt-006M1U-2l for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13: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=5khft4nbLNFbxovUKq6YTXQ22kqmm3VjwfgydWRWY3Q=; b=OLiVGZKVpGgxWTbTE7uaczHajg ocXiKlpP4vpEqhIhTfevxyUSpJ3K7P7dMMI4Pj+le01agOJgbJi8f+ctnCSHI3+bIna1/1pFZv35L fjAxdK4GkcmVdBi2H0SL7snJ/MuZxTlSACZx9sobnM7ZA9VRFcAk9AIoQphxSJVA19RU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: move l_bootmap Message-Id: Date: Thu, 26 Jun 2025 13:11:21 +0000 commit afbb876f1fe6f45ca5c3c425925d3d15101c7382 Author: Jan Beulich AuthorDate: Thu Jun 26 14:59:05 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:59:05 2025 +0200 x86/boot: move l_bootmap Having them in the general .init.data section is somewhat wasteful, due to involved padding. Move them into .init.data.page_aligned, and place that right after .init.bss.stack_aligned. Overall .init.data* shrinks by slightly over 2 pages in the build I'm looking at. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/boot/x86_64.S | 2 +- xen/arch/x86/xen.lds.S | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 08ae97e261..95a6b6cf63 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -193,7 +193,7 @@ END(idle_pg_table) GLOBAL(__page_tables_end) /* Init pagetables. Enough page directories to map into 4GB. */ - .section .init.data, "aw", @progbits + .section .init.data.page_aligned, "aw", @progbits DATA_LOCAL(l1_bootmap, PAGE_SIZE) .fill L1_PAGETABLE_ENTRIES, 8, 0 diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index bf956b6c5f..636c7768aa 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -221,6 +221,7 @@ SECTIONS DECL_SECTION(.init.data) { #endif *(.init.bss.stack_aligned) + *(.init.data.page_aligned) . = ALIGN(POINTER_ALIGN); __initdata_cf_clobber_start = .; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:44:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026433.1401630 (Exim 4.92) (envelope-from ) id 1uUmtX-0006EE-Ml; Thu, 26 Jun 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 1026433.1401630; Thu, 26 Jun 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 1uUmtX-0006E6-Jx; Thu, 26 Jun 2025 13:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1026433; Thu, 26 Jun 2025 13:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUmtV-0006Dy-RC for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUmtV-003eH0-1Y for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmtV-006VCf-1O for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=FkHZcayPvSWz4apJaBUgUwy3LAYCsyGCiCe49S9dAYQ=; b=tg5xjbWgwRJ8OB5mZyQl1WaB6s RFii1IzDjOk7N+rSpms+JZGR/3wGepZeGJDG95uFW1O8YrSISk9SacmBWr4JXpGwvUvINCrOs2eMX JXa5RffGXRX9hpCP9P2Bh6nE7Rd5Og1nrJ1swHBkU68kRaW5RbFV2AwNJQZFaXHvyX5w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/char: wrap suspend/resume console callbacks with CONFIG_SYSTEM_SUSPEND Message-Id: Date: Thu, 26 Jun 2025 13:44:01 +0000 commit 3e5f9674c0dfc1e620800ecf16db3a6e6c19b77b Author: Mykola Kvach AuthorDate: Thu Jun 26 14:57:22 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:57:22 2025 +0200 xen/char: wrap suspend/resume console callbacks with CONFIG_SYSTEM_SUSPEND This patch wraps the suspend/resume console callbacks and related code within CONFIG_SYSTEM_SUSPEND blocks. This ensures that these functions and their calls are only included in the build when CONFIG_SYSTEM_SUSPEND is enabled. This addresses Misra Rule 2.1 violations. Suggested-by: Jan Beulich Signed-off-by: Mykola Kvach --- xen/drivers/char/console.c | 4 ++++ xen/drivers/char/ehci-dbgp.c | 6 ++++++ xen/drivers/char/ns16550.c | 12 ++++++++++++ xen/drivers/char/serial.c | 4 ++++ xen/drivers/char/xhci-dbc.c | 6 ++++++ xen/include/xen/console.h | 2 ++ xen/include/xen/serial.h | 4 ++++ 7 files changed, 38 insertions(+) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 5879e31786..ba5a809a99 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1365,6 +1365,8 @@ void panic(const char *fmt, ...) machine_restart(5000); } +#ifdef CONFIG_SYSTEM_SUSPEND + /* * ************************************************************** * ****************** Console suspend/resume ******************** @@ -1388,6 +1390,8 @@ int console_resume(void) return 0; } +#endif /* CONFIG_SYSTEM_SUSPEND */ + /* * Local variables: * mode: C diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index e9cd59b254..a5c79f56fc 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1419,6 +1419,8 @@ static void __init cf_check ehci_dbgp_endboot(struct serial_port *port) ehci_dbgp_check_release(port->uart); } +#ifdef CONFIG_SYSTEM_SUSPEND + static void cf_check ehci_dbgp_suspend(struct serial_port *port) { struct ehci_dbgp *dbgp = port->uart; @@ -1452,12 +1454,16 @@ static void cf_check ehci_dbgp_resume(struct serial_port *port) ehci_dbgp_setup_postirq(dbgp); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + static struct uart_driver __read_mostly ehci_dbgp_driver = { .init_preirq = ehci_dbgp_init_preirq, .init_postirq = ehci_dbgp_init_postirq, .endboot = ehci_dbgp_endboot, +#ifdef CONFIG_SYSTEM_SUSPEND .suspend = ehci_dbgp_suspend, .resume = ehci_dbgp_resume, +#endif .tx_ready = ehci_dbgp_tx_ready, .putc = ehci_dbgp_putc, .flush = ehci_dbgp_flush, diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index eaeb0e09d0..6b4fb4ad31 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -57,7 +57,9 @@ static struct ns16550 { #endif /* UART with no IRQ line: periodically-polled I/O. */ struct timer timer; +#ifdef CONFIG_SYSTEM_SUSPEND struct timer resume_timer; +#endif unsigned int timeout_ms; bool intr_works; bool dw_usr_bsy; @@ -113,7 +115,9 @@ struct ns16550_config_param { static void enable_exar_enhanced_bits(const struct ns16550 *uart); #endif +#ifdef CONFIG_SYSTEM_SUSPEND static void cf_check ns16550_delayed_resume(void *data); +#endif static u8 ns_read_reg(const struct ns16550 *uart, unsigned int reg) { @@ -420,7 +424,9 @@ static void __init cf_check ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); init_timer(&uart->timer, ns16550_poll, port, 0); +#ifdef CONFIG_SYSTEM_SUSPEND init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0); +#endif /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; @@ -506,6 +512,8 @@ static void __init cf_check ns16550_init_postirq(struct serial_port *port) ns16550_setup_postirq(uart); } +#ifdef CONFIG_SYSTEM_SUSPEND + static void cf_check ns16550_suspend(struct serial_port *port) { struct ns16550 *uart = port->uart; @@ -584,6 +592,8 @@ static void cf_check ns16550_resume(struct serial_port *port) _ns16550_resume(port); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + static void __init cf_check ns16550_endboot(struct serial_port *port) { #ifdef CONFIG_HAS_IOPORTS @@ -638,8 +648,10 @@ static struct uart_driver __read_mostly ns16550_driver = { .init_irq = ns16550_init_irq, .init_postirq = ns16550_init_postirq, .endboot = ns16550_endboot, +#ifdef CONFIG_SYSTEM_SUSPEND .suspend = ns16550_suspend, .resume = ns16550_resume, +#endif .tx_ready = ns16550_tx_ready, .putc = ns16550_putc, .getc = ns16550_getc, diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 591a009008..adb312d796 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -495,6 +495,8 @@ const struct vuart_info *serial_vuart_info(int idx) return NULL; } +#ifdef CONFIG_SYSTEM_SUSPEND + void serial_suspend(void) { int i; @@ -511,6 +513,8 @@ void serial_resume(void) com[i].driver->resume(&com[i]); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + void __init serial_register_uart(int idx, struct uart_driver *driver, void *uart) { diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index d011159d18..1f7d4395dc 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -1271,6 +1271,8 @@ static void cf_check dbc_uart_flush(struct serial_port *port) set_timer(&uart->timer, goal); } +#ifdef CONFIG_SYSTEM_SUSPEND + static void cf_check dbc_uart_suspend(struct serial_port *port) { struct dbc_uart *uart = port->uart; @@ -1303,6 +1305,8 @@ static void cf_check dbc_uart_resume(struct serial_port *port) set_timer(&uart->timer, NOW() + MICROSECS(DBC_POLL_INTERVAL)); } +#endif /* CONFIG_SYSTEM_SUSPEND */ + static struct uart_driver dbc_uart_driver = { .init_preirq = dbc_uart_init_preirq, .init_postirq = dbc_uart_init_postirq, @@ -1310,8 +1314,10 @@ static struct uart_driver dbc_uart_driver = { .putc = dbc_uart_putc, .getc = dbc_uart_getc, .flush = dbc_uart_flush, +#ifdef CONFIG_SYSTEM_SUSPEND .suspend = dbc_uart_suspend, .resume = dbc_uart_resume, +#endif }; /* Those are accessed via DMA. */ diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index 83cbc9fbda..feb57f92f1 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -44,8 +44,10 @@ int console_steal(int handle, void (*fn)(const char *str, size_t nr)); /* Give back stolen console. Takes the identifier returned by console_steal. */ void console_giveback(int id); +#ifdef CONFIG_SYSTEM_SUSPEND int console_suspend(void); int console_resume(void); +#endif /* Emit a string via the serial console. */ void console_serial_puts(const char *s, size_t nr); diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 63a82b032d..8e18445552 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -66,9 +66,11 @@ struct uart_driver { void (*init_postirq)(struct serial_port *port); /* Hook to clean up after Xen bootstrap (before domain 0 runs). */ void (*endboot)(struct serial_port *port); +#ifdef CONFIG_SYSTEM_SUSPEND /* Driver suspend/resume. */ void (*suspend)(struct serial_port *port); void (*resume)(struct serial_port *port); +#endif /* Return number of characters the port can hold for transmit, * or -EIO if port is inaccesible */ int (*tx_ready)(struct serial_port *port); @@ -131,9 +133,11 @@ int serial_irq(int idx); /* Retrieve basic UART information to emulate it (base address, size...) */ const struct vuart_info* serial_vuart_info(int idx); +#ifdef CONFIG_SYSTEM_SUSPEND /* Serial suspend/resume. */ void serial_suspend(void); void serial_resume(void); +#endif /* * Initialisation and helper functions for uart drivers. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:44:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026434.1401634 (Exim 4.92) (envelope-from ) id 1uUmtg-0006Gi-Pw; Thu, 26 Jun 2025 13:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026434.1401634; Thu, 26 Jun 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 1uUmtg-0006Ga-NQ; Thu, 26 Jun 2025 13:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1026434; Thu, 26 Jun 2025 13:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUmtf-0006GN-KF for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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 1uUmtf-003eH6-1v for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmtf-006VHc-1j for xen-changelog@lists.xenproject.org; Thu, 26 Jun 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=xQc5GL2LRygJsGZL+Nk3WzC+VDTK5TKd5IwCo/mxTGk=; b=GKUx5tjz5h+VDzu1zykxPbrcMq ZKIRZX3x/jebqL7/FgKaqwdq5xsVWExjdF2fnmDG2ZEzOEoWcCy/T++cyQ2bF/SnkMTfQett6LeMH 97MQf/WAchX5DlU7YnfrGT2wfpvjIUuwYv7NmFC0UN1WfrMNnU3x7O6abGxnSKLgVpzM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/efi: Handle cases where file didn't come from ESP Message-Id: Date: Thu, 26 Jun 2025 13:44:11 +0000 commit 196cdc097ff1603f2a7b4d9d165313073fdf5a75 Author: Frediano Ziglio AuthorDate: Thu Jun 26 14:58:10 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:58:10 2025 +0200 xen/efi: Handle cases where file didn't come from ESP A boot loader can load files from outside ESP. In these cases device could be not provided or path could be something not supported. In these cases allows to boot anyway, all information could be provided using UKI or using other boot loader features. Signed-off-by: Frediano Ziglio Acked-by: Marek Marczykowski-Górecki --- xen/common/efi/boot.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 1a9b4e7dae..9306dc8953 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -443,6 +443,18 @@ static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_i CHAR16 *pathend, *ptr; EFI_STATUS ret; + /* + * In some cases the image could not come from a specific device. + * For instance this can happen if Xen was loaded using GRUB2 "linux" + * command. + */ + *leaf = NULL; + if ( !loaded_image->DeviceHandle ) + { + PrintStr(L"Xen image loaded without providing a device\r\n"); + return NULL; + } + do { EFI_FILE_IO_INTERFACE *fio; @@ -466,7 +478,15 @@ static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_i if ( DevicePathType(dp) != MEDIA_DEVICE_PATH || DevicePathSubType(dp) != MEDIA_FILEPATH_DP ) - blexit(L"Unsupported device path component"); + { + /* + * The image could come from an unsupported device. + * For instance this can happen if Xen was loaded using GRUB2 + * "chainloader" command and the file was not from ESP. + */ + PrintStr(L"Unsupported device path component\r\n"); + return NULL; + } if ( *buffer ) { @@ -772,8 +792,11 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, if ( !name ) PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); - ret = dir_handle->Open(dir_handle, &FileHandle, name, - EFI_FILE_MODE_READ, 0); + if ( dir_handle ) + ret = dir_handle->Open(dir_handle, &FileHandle, name, + EFI_FILE_MODE_READ, 0); + else + ret = EFI_NOT_FOUND; if ( file == &cfg && ret == EFI_NOT_FOUND ) return false; if ( EFI_ERROR(ret) ) @@ -1404,7 +1427,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, /* Read and parse the config file. */ if ( read_section(loaded_image, L"config", &cfg, NULL) ) PrintStr(L"Using builtin config file\r\n"); - else if ( !cfg_file_name ) + else if ( !cfg_file_name && file_name ) { CHAR16 *tail; @@ -1515,7 +1538,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); cfg.addr = 0; - dir_handle->Close(dir_handle); + if ( dir_handle ) + dir_handle->Close(dir_handle); if ( gop && !base_video ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 26 13:44:22 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 26 Jun 2025 13:44:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1026435.1401638 (Exim 4.92) (envelope-from ) id 1uUmtq-0006Iy-Rd; Thu, 26 Jun 2025 13:44:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026435.1401638; Thu, 26 Jun 2025 13:44: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 1uUmtq-0006Io-P0; Thu, 26 Jun 2025 13:44:22 +0000 Received: by outflank-mailman (input) for mailman id 1026435; Thu, 26 Jun 2025 13:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUmtp-0006Ic-N9 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uUmtp-003eHE-2D for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uUmtp-006VKi-25 for xen-changelog@lists.xenproject.org; Thu, 26 Jun 2025 13:44: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=0ABDIKfCnKysPeHwRr1oNeMcjlhrF0pKxxojSv3DE7o=; b=vuV7I/3ETGtiv17meZupTob+Nl 0SqNtwxbYh1QjMf/ngCwztzNNR/RNKpAsqkvwGtJKmsYM2vPVG0/F+8wbwhnFchHI38QE+e3888LG ZEIH+8H0aloRCCTTrkhccTZ3lQmZT1INphGLpSrKSnZ31O6Qw4zWo9x6Hc29vdO8laPg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: move l_bootmap Message-Id: Date: Thu, 26 Jun 2025 13:44:21 +0000 commit afbb876f1fe6f45ca5c3c425925d3d15101c7382 Author: Jan Beulich AuthorDate: Thu Jun 26 14:59:05 2025 +0200 Commit: Jan Beulich CommitDate: Thu Jun 26 14:59:05 2025 +0200 x86/boot: move l_bootmap Having them in the general .init.data section is somewhat wasteful, due to involved padding. Move them into .init.data.page_aligned, and place that right after .init.bss.stack_aligned. Overall .init.data* shrinks by slightly over 2 pages in the build I'm looking at. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/boot/x86_64.S | 2 +- xen/arch/x86/xen.lds.S | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 08ae97e261..95a6b6cf63 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -193,7 +193,7 @@ END(idle_pg_table) GLOBAL(__page_tables_end) /* Init pagetables. Enough page directories to map into 4GB. */ - .section .init.data, "aw", @progbits + .section .init.data.page_aligned, "aw", @progbits DATA_LOCAL(l1_bootmap, PAGE_SIZE) .fill L1_PAGETABLE_ENTRIES, 8, 0 diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index bf956b6c5f..636c7768aa 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -221,6 +221,7 @@ SECTIONS DECL_SECTION(.init.data) { #endif *(.init.bss.stack_aligned) + *(.init.data.page_aligned) . = ALIGN(POINTER_ALIGN); __initdata_cf_clobber_start = .; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:11:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:11:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028902.1402578 (Exim 4.92) (envelope-from ) id 1uW9bT-00042M-B1; Mon, 30 Jun 2025 08:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028902.1402578; Mon, 30 Jun 2025 08: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 1uW9bT-00042E-8M; Mon, 30 Jun 2025 08:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1028902; Mon, 30 Jun 2025 08:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9bS-000428-0u for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9bR-00AC3p-2Z for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9bR-00BUzB-2S for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=qRmT4UZAABExGx2OvOejbO4ByPt0ly24lFGiP2KqhUQ=; b=juDgnyRZOwWrVvu1B7VfGLKU9S osTUiHECV4puATIDg8VQEOHNZ3Q99GYtg+XGK1awrdBHcqVQ2hypVEbqL6T76YcVaxbxQhuf7kIgJ 7bJGFDpYmeNFz4W9mtt6eNL+2gv6xXRiWTFpxKHZ4noYQM+dOCow+9MoEM3pPlijQooM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: introduce CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 08:11:01 +0000 commit 36d07d40ca3f836d6b03576e12fe889c87098ad0 Author: Stefano Stabellini AuthorDate: Mon Jun 30 09:58:58 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 09:58:58 2025 +0200 xen: introduce CONFIG_SYSCTL We introduce a new Kconfig CONFIG_SYSCTL, which shall only be disabled on some dom0less systems or PV shim on x86, to reduce Xen footprint. Making SYSCTL without prompt is transient and it will be adjusted in the final patch. And the consequence of introducing "CONFIG_SYSCTL=y" in .config file generated from pvshim_defconfig is transient too, which will also be adjusted in the final patch. Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 867710134a..fb5c60517a 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -611,4 +611,12 @@ config SYSTEM_SUSPEND If unsure, say N. +menu "Supported hypercall interfaces" + visible if EXPERT + +config SYSCTL + def_bool y + +endmenu + endmenu -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:11:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028903.1402582 (Exim 4.92) (envelope-from ) id 1uW9bd-00043z-CW; Mon, 30 Jun 2025 08:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028903.1402582; Mon, 30 Jun 2025 08: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 1uW9bd-00043s-9k; Mon, 30 Jun 2025 08:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1028903; Mon, 30 Jun 2025 08:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9bb-00043g-Vo for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9bb-00AC4B-2u for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9bb-00BVBl-2j for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=xOAFhs2cOwPiTzkVjpNYAZHDaLv9gZINi8zqYOEB6dw=; b=hmPlltZhSboRv3QGaIBr5oRK7q coJJZJdBLCvd/pa5W7XokflurpsEFZl89F85TeoDVtLON13uO1rxTZ8kmRWZs1OJU00ZAEfKHPpce boM9pihYKkVciBEcXFjYVVdEhUDWI+9S3+jAi++WS8POdtBCCIIc/S02DxZ6fnB4I5VY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sysctl: make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 08:11:11 +0000 commit 1d62a36aaa0273fbd61e774a736cd9e2423d906b Author: Penny Zheng AuthorDate: Mon Jun 30 10:02:12 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:02:12 2025 +0200 xen/sysctl: make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Users could only access trace buffers via hypercall XEN_SYSCTL_tbuf_op, so we shall make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index fb5c60517a..dbd9747d1f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -564,6 +564,7 @@ config DTB_FILE config TRACEBUFFER bool "Enable tracing infrastructure" if EXPERT default y + depends on SYSCTL help Enable tracing infrastructure and pre-defined tracepoints within Xen. This will allow live information about Xen's execution and performance -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:11:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028904.1402586 (Exim 4.92) (envelope-from ) id 1uW9bn-00046P-Du; Mon, 30 Jun 2025 08:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028904.1402586; Mon, 30 Jun 2025 08: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 1uW9bn-00046H-BC; Mon, 30 Jun 2025 08:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1028904; Mon, 30 Jun 2025 08:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9bm-000467-1K for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9bm-00AC4K-01 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9bl-00BVLD-35 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=ymI99jjeaOHc09Ow8f3Prsz2yf4lzXcmrk9pEKyxXxc=; b=ZtunkXxzonoZImOQVgqeVlL1cA 9qM3j+3Ev0Ej87PE8t+Lzyo2sP18u1tzFrnwp8kbvR4avhJWxzSULYav8WlXcxTxwXKYmi2g9GWX0 FpdeK2uKNyytysHGjSy7B94G5jNUvn2Ngd1KPSZV1HjqWYZQKLo6jkYHldlFlxVGZFHI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sysctl: wrap around XEN_SYSCTL_perfc_op Message-Id: Date: Mon, 30 Jun 2025 08:11:21 +0000 commit dbe929a2205df4397e70c314fc942f3e29c84951 Author: Penny Zheng AuthorDate: Mon Jun 30 10:02:35 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:02:35 2025 +0200 xen/sysctl: wrap around XEN_SYSCTL_perfc_op perfc_control() and perfc_copy_info() are responsible for providing control of perf counters via XEN_SYSCTL_perfc_op in DOM0, so they both shall be wrapped. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/perfc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 8302b7cf6d..0f3b89af2c 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -149,6 +149,7 @@ void cf_check perfc_reset(unsigned char key) } } +#ifdef CONFIG_SYSCTL static struct xen_sysctl_perfc_desc perfc_d[NR_PERFCTRS]; static xen_sysctl_perfc_val_t *perfc_vals; static unsigned int perfc_nbr_vals; @@ -265,6 +266,7 @@ int perfc_control(struct xen_sysctl_perfc_op *pc) return rc; } +#endif /* CONFIG_SYSCTL */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:11:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028905.1402589 (Exim 4.92) (envelope-from ) id 1uW9bx-00048U-F9; Mon, 30 Jun 2025 08:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028905.1402589; Mon, 30 Jun 2025 08: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 1uW9bx-00048M-Cc; Mon, 30 Jun 2025 08:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1028905; Mon, 30 Jun 2025 08:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9bw-00048C-3h for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9bw-00AC4O-0H for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9bw-00BVUh-0B for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=NQSAmpfZU8XmjOfbr1josh6nRZEjj2IizZxUP6kjwTY=; b=ep8d6fYmLIBRMyduxC3pkrcSO3 D9yK0x19LNoxJVqcEdLoTcQuY37htNX6T/r7BGS7zGnXxTol3z3g7CpJfE8rSHqtTyaQn/pqUb5U8 uQvHRipd6By+mn9edHq6aDpv4T1aSwitaEhnWZqAxEulA/8w/clRtJPxdBR1r8a3YclI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sysctl: wrap around XEN_SYSCTL_lockprof_op Message-Id: Date: Mon, 30 Jun 2025 08:11:32 +0000 commit 8597f8552ea1ac41bb99ee11bd440b7343ef4968 Author: Penny Zheng AuthorDate: Mon Jun 30 10:02:55 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:02:55 2025 +0200 xen/sysctl: wrap around XEN_SYSCTL_lockprof_op The following function is only to serve spinlock profiling via XEN_SYSCTL_lockprof_op, so it shall be wrapped: - spinlock_profile_control() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/spinlock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 38caa10a2e..0389293b09 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -690,6 +690,7 @@ void cf_check spinlock_profile_reset(unsigned char key) spinlock_profile_iterate(spinlock_profile_reset_elem, NULL); } +#ifdef CONFIG_SYSCTL typedef struct { struct xen_sysctl_lockprof_op *pc; int rc; @@ -749,6 +750,7 @@ int spinlock_profile_control(struct xen_sysctl_lockprof_op *pc) return rc; } +#endif /* CONFIG_SYSCTL */ void _lock_profile_register_struct( int32_t type, struct lock_profile_qhead *qhead, int32_t idx) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:11:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028906.1402595 (Exim 4.92) (envelope-from ) id 1uW9c7-0004BO-H5; Mon, 30 Jun 2025 08:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028906.1402595; Mon, 30 Jun 2025 08: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 1uW9c7-0004BG-Dw; Mon, 30 Jun 2025 08:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1028906; Mon, 30 Jun 2025 08:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9c6-0004B0-74 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9c6-00AC4T-0b for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9c6-00BVg1-0T for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=1nRjlyB/QGvcZwFNjW2d4cYQ9wA5Y+NcOAIFOc2whaQ=; b=ZVmE6ixcbXmqInNqkrRXtxTtpQ N7KQn6DX1id2czKW+IFBwBQJNBK8b0TI6/Yc7Q6uqC9ZAIcs1JvSe02ve+zwo114i3PTaUvcsWItY O+5xorYKtTDjSOqPAiYnmmisvTDsIUU8JaotNxp09XsDUcoT66oz0GxqDFA6NeFHfBg8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sysctl: wrap around XEN_SYSCTL_physinfo Message-Id: Date: Mon, 30 Jun 2025 08:11:42 +0000 commit 6363d0172fa49999e2ea00ae64c1256e2d2961c2 Author: Penny Zheng AuthorDate: Mon Jun 30 10:03:16 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:03:16 2025 +0200 xen/sysctl: wrap around XEN_SYSCTL_physinfo The following functions are only used to deal with XEN_SYSCTL_physinfo, then they shall be wrapped: - arch_do_physinfo() - get_outstanding_claims() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/arm/sysctl.c | 2 ++ xen/arch/riscv/stubs.c | 2 ++ xen/arch/x86/sysctl.c | 2 ++ xen/common/page_alloc.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index 32cab4feff..2d350b700a 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -15,6 +15,7 @@ #include #include +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; @@ -22,6 +23,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) pi->arch_capabilities |= MASK_INSR(sve_encode_vl(get_sys_vl_len()), XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } +#endif long arch_do_sysctl(struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index e396b67cd3..f86a1c17cb 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -310,10 +310,12 @@ long arch_do_sysctl(struct xen_sysctl *sysctl, BUG_ON("unimplemented"); } +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { BUG_ON("unimplemented"); } +#endif /* CONFIG_SYSCTL */ /* p2m.c */ diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 1b04947516..f64addbe2b 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -91,6 +91,7 @@ static long cf_check smt_up_down_helper(void *data) return ret; } +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { memcpy(pi->hw_cap, boot_cpu_data.x86_capability, @@ -104,6 +105,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) if ( IS_ENABLED(CONFIG_SHADOW_PAGING) ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_shadow; } +#endif /* CONFIG_SYSCTL */ long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b204f22f50..8f93a4c354 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -601,6 +601,7 @@ out: return ret; } +#ifdef CONFIG_SYSCTL void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) { spin_lock(&heap_lock); @@ -608,6 +609,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) *free_pages = avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); spin_unlock(&heap_lock); } +#endif /* CONFIG_SYSCTL */ static bool __read_mostly first_node_initialised; #ifndef CONFIG_SEPARATE_XENHEAP -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:11:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028907.1402597 (Exim 4.92) (envelope-from ) id 1uW9cH-0004Dz-I0; Mon, 30 Jun 2025 08:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028907.1402597; Mon, 30 Jun 2025 08: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 1uW9cH-0004Dq-FJ; Mon, 30 Jun 2025 08:11:53 +0000 Received: by outflank-mailman (input) for mailman id 1028907; Mon, 30 Jun 2025 08:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9cG-0004De-9w for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9cG-00AC4X-0t for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9cG-00BVrr-0m for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=K0PkUQgAZsnEW/xaVN8J/MMPLDRJWXwvKrqj3rffZpY=; b=SP6eAl1QTzTqY64ujQYsRqiD6n wtYL6poQ6t7xvY65DVAaplukdLKkqCqgvrF3FrcnJRSGxpyB24oMWiMaFr4DX0C9ns7ET6DudXpOZ 5dkFYSeo+jcdJLHFM4uDZ+sW3Xwvb+0nSPEypY+lfzbK1p3bCwqcJHGjiEAUzXPx6a8s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sysctl: make CONFIG_COVERAGE depend on CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 08:11:52 +0000 commit a31a59beca78bf80611ba4eb25f17277c8ea37ee Author: Penny Zheng AuthorDate: Mon Jun 30 10:04:20 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:04:20 2025 +0200 xen/sysctl: make CONFIG_COVERAGE depend on CONFIG_SYSCTL Users rely on SYSCTL_coverage_op hypercall to interact with the coverage data, that is, according operations shall be wrapped around with CONFIG_SYSCTL. Right now, it is compiled under CONFIG_COVERAGE, so we shall make CONFIG_COVERAGE depend on CONFIG_SYSCTL. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index d14093017e..38a134fa3b 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -37,7 +37,7 @@ config SELF_TESTS config COVERAGE bool "Code coverage support" - depends on !LIVEPATCH + depends on SYSCTL && !LIVEPATCH select SUPPRESS_DUPLICATE_SYMBOL_WARNINGS if !ENFORCE_UNIQUE_SYMBOLS help Enable code coverage support. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:12:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028908.1402602 (Exim 4.92) (envelope-from ) id 1uW9cR-0004GJ-Jd; Mon, 30 Jun 2025 08:12:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028908.1402602; Mon, 30 Jun 2025 08: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 1uW9cR-0004GB-Gg; Mon, 30 Jun 2025 08:12:03 +0000 Received: by outflank-mailman (input) for mailman id 1028908; Mon, 30 Jun 2025 08:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9cQ-0004G0-Ca for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9cQ-00AC4o-19 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9cQ-00BW6F-13 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=DvpLtcj9gBMZRGK7Cr8bQouqX2xe4T/6SPfEyAdNF5I=; b=SHKPsAFY/OWQNUFcX3dvoKfDZS QIk+pk6fxxY15HZOejGXzbyet1prFnwYA/P4KKjBpUrhjiazcCAgWCu0qurPbIx6GIwHECE49n/ak QE6kBbUi78mKh1pQ0e8xzGy03N0ZIT0ApstXGsWeEOl9wcgaFxVVZePvSd91mPWBte1c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sysctl: make CONFIG_LIVEPATCH depend on CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 08:12:02 +0000 commit 31aca815c7a18f1dcf7801f4dfebd44b42ea6da2 Author: Penny Zheng AuthorDate: Mon Jun 30 10:04:37 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:04:37 2025 +0200 xen/sysctl: make CONFIG_LIVEPATCH depend on CONFIG_SYSCTL LIVEPATCH mechanism relies on LIVEPATCH_SYSCTL hypercall, so CONFIG_LIVEPATCH shall depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index dbd9747d1f..6d784da839 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -472,7 +472,7 @@ config CRYPTO config LIVEPATCH bool "Live patching support" default X86 - depends on "$(XEN_HAS_BUILD_ID)" = "y" + depends on "$(XEN_HAS_BUILD_ID)" = "y" && SYSCTL select CC_SPLIT_SECTIONS help Allows a running Xen hypervisor to be dynamically patched using -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:12:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028909.1402605 (Exim 4.92) (envelope-from ) id 1uW9cc-0004Ik-Ko; Mon, 30 Jun 2025 08:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028909.1402605; Mon, 30 Jun 2025 08: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 1uW9cc-0004Id-I6; Mon, 30 Jun 2025 08:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1028909; Mon, 30 Jun 2025 08:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9ca-0004IM-Gw for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9ca-00AC5B-1b for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9ca-00BWHV-1K for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=iQWhFZ94MCK/WK5+1BvId9A/1rLxtYohTRiOEZL/cZ8=; b=LpGNWW9QegJ2e4Sm6QpGLV0iyu mH1z0Y/7YattLMusPiGRrOyXetvBMNT3Atk4RJUWA1MAkaAgZxqjP67nQe3Rg9N9K7xkiL0H0eGAK sSZp/ABCqkmRXqlusjUEdJKEEaRzBNvgD0q/4HLDffNEIWMGsbHX045+xrQScGOAMvwA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: move __ro_after_init section symbols to xen/sections.h Message-Id: Date: Mon, 30 Jun 2025 08:12:12 +0000 commit 04289eca9ea1ff1569c2849552dd3425434b3827 Author: Oleksii Kurochko AuthorDate: Mon Jun 30 10:05:04 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:05:04 2025 +0200 xen: move __ro_after_init section symbols to xen/sections.h Instead of declaring __ro_after_init_{start,end} in each architecture's asm/setup.h, move these declarations to the common header xen/sections.h. This centralizes the declarations and reduces duplication across architectures. No functional change intended. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/setup.h | 2 -- xen/arch/x86/include/asm/setup.h | 1 - xen/include/xen/sections.h | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 2b58549c1a..b199d92a42 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -65,8 +65,6 @@ int map_irq_to_domain(struct domain *d, unsigned int irq, int map_range_to_domain(const struct dt_device_node *dev, uint64_t addr, uint64_t len, void *data); -extern const char __ro_after_init_start[], __ro_after_init_end[]; - struct init_info { /* Pointer to the stack, used by head.S when entering in C */ diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index ac34c69855..b01e83a8ed 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -5,7 +5,6 @@ #include extern const char __2M_text_start[], __2M_text_end[]; -extern const char __ro_after_init_start[], __ro_after_init_end[]; extern const char __2M_rodata_start[], __2M_rodata_end[]; extern char __2M_init_start[], __2M_init_end[]; extern char __2M_rwdata_start[], __2M_rwdata_end[]; diff --git a/xen/include/xen/sections.h b/xen/include/xen/sections.h index fe49d7d0e6..cd542bfe10 100644 --- a/xen/include/xen/sections.h +++ b/xen/include/xen/sections.h @@ -5,6 +5,9 @@ #include +/* SAF-0-safe */ +extern const char __ro_after_init_start[], __ro_after_init_end[]; + /* SAF-0-safe */ extern char __init_begin[], __init_end[]; #define is_init_section(p) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:12:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028910.1402610 (Exim 4.92) (envelope-from ) id 1uW9cm-0004Ku-MP; Mon, 30 Jun 2025 08:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028910.1402610; Mon, 30 Jun 2025 08: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 1uW9cm-0004Km-Jc; Mon, 30 Jun 2025 08:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1028910; Mon, 30 Jun 2025 08:12:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9ck-0004Kc-JV for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9ck-00AC5K-1q for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9ck-00BWQV-1m for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=9Jj4p553zoZN4HhvEDHHCUNWKKVagR6Buko/vacghtc=; b=1lMfyQdBLH9vg2PWLRxgBs64oB 8Z2zpL6DqKU+Z17pCwmfXIfLGXezGU7Mtt7pg0pbBZPVLSvfASbXdCQ+CubYIWKqXQ7aWFVDpnsXf 6iNgeq6/FOsxF5DA7CNH6Y3mQdOELV/HUwJbzn6OEBL5sSDGWhil0D9QVM+KHp0z+Epk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxenguest: fix build in stubdom environment Message-Id: Date: Mon, 30 Jun 2025 08:12:22 +0000 commit 448826d95dc487661a7ec1f11e08bb5c5f904334 Author: Juergen Gross AuthorDate: Mon Jun 30 10:05:42 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:05:42 2025 +0200 tools/libxenguest: fix build in stubdom environment With introduction of the new byteswap infrastructure the build of libxenguest for stubdoms was broken. Fix that again. Fixes: 60dcff871e34 ("xen/decompressors: Remove use of *_to_cpup() helpers") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c | 9 +++++++++ tools/libs/guest/xg_dom_decompress_unsafe_xz.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c b/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c index ca2f37d915..356f228718 100644 --- a/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c +++ b/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c @@ -25,6 +25,15 @@ static inline uint16_t be16_to_cpu(const uint16_t v) #endif } +static inline uint32_t be32_to_cpu(const uint32_t v) +{ +#if BYTE_ORDER == LITTLE_ENDIAN + return __builtin_bswap32(v); +#else + return v; +#endif +} + #include "../../xen/common/lzo.c" #include "../../xen/common/unlzo.c" diff --git a/tools/libs/guest/xg_dom_decompress_unsafe_xz.c b/tools/libs/guest/xg_dom_decompress_unsafe_xz.c index 1f52875340..0501f7f693 100644 --- a/tools/libs/guest/xg_dom_decompress_unsafe_xz.c +++ b/tools/libs/guest/xg_dom_decompress_unsafe_xz.c @@ -25,7 +25,7 @@ static inline uint32_t cpu_to_le32(const uint32_t v) #endif } -static inline uint32_t le32_to_cpu(const uint32_t p) +static inline uint32_t le32_to_cpu(const uint32_t v) { #if BYTE_ORDER == BIG_ENDIAN return __builtin_bswap32(v); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 08:12:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 08:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028911.1402614 (Exim 4.92) (envelope-from ) id 1uW9cw-0004No-PF; Mon, 30 Jun 2025 08:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028911.1402614; Mon, 30 Jun 2025 08: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 1uW9cw-0004Nf-Mc; Mon, 30 Jun 2025 08:12:34 +0000 Received: by outflank-mailman (input) for mailman id 1028911; Mon, 30 Jun 2025 08:12:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uW9cu-0004NQ-M9 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uW9cu-00AC5U-26 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08:12:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uW9cu-00BWYF-20 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 08: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=Nfach0CQyQZQ+/4gZjdqM/8vSVbKhZtdpz2I4kNjSC0=; b=CQSLC9JFqcRdVfRqQVH0lXaTvY 6T1VaSwJfC0PCfW5AbHtWSQwgy9zrtZuIlPm7UCbbw4Rvvu79atfDIbt3n7FzY0sz0LjhG9lpd6ob z6Fzkb7uql6YiwGWK7piu4juZuCgzAM6Szpol1ibPmnOkeVgHzctAeJy3SbUbjTZovoI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: fix unspecified behavior in tr invocation Message-Id: Date: Mon, 30 Jun 2025 08:12:32 +0000 commit 09a338ae72d2f9dd8e9372669a2ebb2f4652a905 Author: Nicola Vetrini AuthorDate: Mon Jun 30 10:06:54 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:06:54 2025 +0200 xen: fix unspecified behavior in tr invocation The result of the command is undefined according to the specification if the "string2" argument in tr is shorter than "string1". GNU tr behaves correctly by extending "string2" to repeat the last character. Fixes: eb61a4fb14d2 ("xen: fix header guard generation for asm-generic headers") Reported-by: Jan Beulich Signed-off-by: Nicola Vetrini Reviewed-by: Jan Beulich --- xen/scripts/Makefile.asm-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic index f6850758c5..4e628e116a 100644 --- a/xen/scripts/Makefile.asm-generic +++ b/xen/scripts/Makefile.asm-generic @@ -34,7 +34,7 @@ unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) quiet_cmd_wrap = WRAP $@ cmd_wrap = \ arch=$$(echo $@ | sed -n 's:.*arch/\([^/]*\)/.*:\1:p' | tr a-z A-Z); \ - upper=$$(echo $*.h | tr a-z A-Z | tr '/.-' '__'); \ + upper=$$(echo $*.h | tr a-z A-Z | tr '/.-' '___'); \ echo "\#ifndef $${arch}_GENERIC_$${upper}" > $@.new; \ echo "\#define $${arch}_GENERIC_$${upper}" >> $@.new; \ echo "\#include " >> $@.new; \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:44:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028977.1402698 (Exim 4.92) (envelope-from ) id 1uWB3T-0002Xd-Ln; Mon, 30 Jun 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 1028977.1402698; Mon, 30 Jun 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 1uWB3T-0002XV-J4; Mon, 30 Jun 2025 09:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1028977; Mon, 30 Jun 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 1uWB3S-0002XP-2i for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWB3R-00AE1F-2G for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB3R-00CtA0-22 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=MieKKQpc9h+uBIBp0TKlEj2AwSK13Pyi9J133hdjHWs=; b=KsAR19EIH/kW9Z0RLW8Suwo84J vOkjKQ02Viyq90NPBsKw/hEn9dg/bHDkKZFmLjv7QQgeKkfNZ3AZbSOVMZmEcMUNULqyUu1JA0ejq Q0RjcrVco9UaYQBule1ch25GCqFyvvrleGgheyfzabaVXfShdkJOtvxHO673GGc0K1PE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: introduce CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 09:44:01 +0000 commit 36d07d40ca3f836d6b03576e12fe889c87098ad0 Author: Stefano Stabellini AuthorDate: Mon Jun 30 09:58:58 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 09:58:58 2025 +0200 xen: introduce CONFIG_SYSCTL We introduce a new Kconfig CONFIG_SYSCTL, which shall only be disabled on some dom0less systems or PV shim on x86, to reduce Xen footprint. Making SYSCTL without prompt is transient and it will be adjusted in the final patch. And the consequence of introducing "CONFIG_SYSCTL=y" in .config file generated from pvshim_defconfig is transient too, which will also be adjusted in the final patch. Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 867710134a..fb5c60517a 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -611,4 +611,12 @@ config SYSTEM_SUSPEND If unsure, say N. +menu "Supported hypercall interfaces" + visible if EXPERT + +config SYSCTL + def_bool y + +endmenu + endmenu -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:44:12 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028978.1402701 (Exim 4.92) (envelope-from ) id 1uWB3c-0002ZB-Ms; Mon, 30 Jun 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 1028978.1402701; Mon, 30 Jun 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 1uWB3c-0002Z3-KN; Mon, 30 Jun 2025 09:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1028978; Mon, 30 Jun 2025 09:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWB3b-0002Yv-Qu for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWB3b-00AE1L-2Z for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB3b-00CtI8-2R for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=6gYuyzCN04Pt1jfqwKYRzaPeek/rhyofpCnjqK7HOho=; b=BQKX10zh+GphTnfux5EuBVFaVc Lc0TrcOjJk5FJlc9RlC4eeDI9NeJskiis7TGDe1XT5d+8RHxuXMvYTwcjx1JZKDd9jyEOtcK5tWcg 0s3umqh34e8yX5izwj9TwUmxDty/VNhoZDEsvbgl0lkBsp7EmIX6bqb+UIjFSU0arGXw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 09:44:11 +0000 commit 1d62a36aaa0273fbd61e774a736cd9e2423d906b Author: Penny Zheng AuthorDate: Mon Jun 30 10:02:12 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:02:12 2025 +0200 xen/sysctl: make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Users could only access trace buffers via hypercall XEN_SYSCTL_tbuf_op, so we shall make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index fb5c60517a..dbd9747d1f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -564,6 +564,7 @@ config DTB_FILE config TRACEBUFFER bool "Enable tracing infrastructure" if EXPERT default y + depends on SYSCTL help Enable tracing infrastructure and pre-defined tracepoints within Xen. This will allow live information about Xen's execution and performance -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:44:23 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028979.1402705 (Exim 4.92) (envelope-from ) id 1uWB3n-0002cZ-Oh; Mon, 30 Jun 2025 09:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028979.1402705; Mon, 30 Jun 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 1uWB3n-0002cS-Ll; Mon, 30 Jun 2025 09:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1028979; Mon, 30 Jun 2025 09:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWB3l-0002bS-Th for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWB3l-00AE1m-2s for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB3l-00CtTU-2k for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44: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=GGls9KUUUqZ2NRg29LD5beJPCJnUJ5aiKZQiGE2tYRs=; b=M5XM07qeHuY20/YHiwVHh9RhPT vvw9qQRHUX7kDbHj0hOuYqcdM6DosyQbY/S6Lju5w8xRgFysfORBQkIXOLckep8pXQW3NZ3xtFgAa w+bG80/VjIaullP4oaXIsFdbOdgzjWlKkp6YLJaZHKtOyRlf15NbUcv+QT04C4eCHauA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: wrap around XEN_SYSCTL_perfc_op Message-Id: Date: Mon, 30 Jun 2025 09:44:21 +0000 commit dbe929a2205df4397e70c314fc942f3e29c84951 Author: Penny Zheng AuthorDate: Mon Jun 30 10:02:35 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:02:35 2025 +0200 xen/sysctl: wrap around XEN_SYSCTL_perfc_op perfc_control() and perfc_copy_info() are responsible for providing control of perf counters via XEN_SYSCTL_perfc_op in DOM0, so they both shall be wrapped. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/perfc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 8302b7cf6d..0f3b89af2c 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -149,6 +149,7 @@ void cf_check perfc_reset(unsigned char key) } } +#ifdef CONFIG_SYSCTL static struct xen_sysctl_perfc_desc perfc_d[NR_PERFCTRS]; static xen_sysctl_perfc_val_t *perfc_vals; static unsigned int perfc_nbr_vals; @@ -265,6 +266,7 @@ int perfc_control(struct xen_sysctl_perfc_op *pc) return rc; } +#endif /* CONFIG_SYSCTL */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:44:33 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028980.1402710 (Exim 4.92) (envelope-from ) id 1uWB3x-0002fX-Q7; Mon, 30 Jun 2025 09:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028980.1402710; Mon, 30 Jun 2025 09: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 1uWB3x-0002fP-NR; Mon, 30 Jun 2025 09:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1028980; Mon, 30 Jun 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 1uWB3w-0002fD-0H for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWB3v-00AE1q-39 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB3v-00Ctfs-32 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44: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=FPyc9KjUvCSfgYJDOLm/2uzS49Kqe2wV2+M1VhTMSpk=; b=6zMVKI+7YvjlPhCBtGf9gUT2cH /WLtFviALvHy7o3LyIH8RK9WuxcVudr6rJ9pWSmLqVIPgt4w6Ohn+kJokuHnolMFmZVAZYeUFeNWL 3e5JspONc5USpOPxvjhgQDpv2qakMUOVoFHkyRoTmRCe1/KnOmICVq93nNKQGkb39gOU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: wrap around XEN_SYSCTL_lockprof_op Message-Id: Date: Mon, 30 Jun 2025 09:44:31 +0000 commit 8597f8552ea1ac41bb99ee11bd440b7343ef4968 Author: Penny Zheng AuthorDate: Mon Jun 30 10:02:55 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:02:55 2025 +0200 xen/sysctl: wrap around XEN_SYSCTL_lockprof_op The following function is only to serve spinlock profiling via XEN_SYSCTL_lockprof_op, so it shall be wrapped: - spinlock_profile_control() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/spinlock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 38caa10a2e..0389293b09 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -690,6 +690,7 @@ void cf_check spinlock_profile_reset(unsigned char key) spinlock_profile_iterate(spinlock_profile_reset_elem, NULL); } +#ifdef CONFIG_SYSCTL typedef struct { struct xen_sysctl_lockprof_op *pc; int rc; @@ -749,6 +750,7 @@ int spinlock_profile_control(struct xen_sysctl_lockprof_op *pc) return rc; } +#endif /* CONFIG_SYSCTL */ void _lock_profile_register_struct( int32_t type, struct lock_profile_qhead *qhead, int32_t idx) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:44:43 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028981.1402714 (Exim 4.92) (envelope-from ) id 1uWB47-0002i1-RT; Mon, 30 Jun 2025 09:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028981.1402714; Mon, 30 Jun 2025 09:44: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 1uWB47-0002ht-On; Mon, 30 Jun 2025 09:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1028981; Mon, 30 Jun 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 1uWB46-0002hc-2x for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWB46-00AE1v-0D for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB46-00CtpT-07 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=VdWkSU/s8AY5y02qn5qL85J2zW++o5u+uTIeYKYiKys=; b=26HYC5yy6eir/G2EJ90by1mBPm ApUS+Z+yeOdDMwddjVxDiyggN6bLWS4LyoHn6tYwYKrHMghiy4qvCXV0U4PX/0BvVAN4BgAFIZcA8 alXFkn05IDPQShW3PCv55L34QGAhE4z5WtakwJiuyOPhF4zUR7dLTbije46bOnqs6izU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: wrap around XEN_SYSCTL_physinfo Message-Id: Date: Mon, 30 Jun 2025 09:44:42 +0000 commit 6363d0172fa49999e2ea00ae64c1256e2d2961c2 Author: Penny Zheng AuthorDate: Mon Jun 30 10:03:16 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:03:16 2025 +0200 xen/sysctl: wrap around XEN_SYSCTL_physinfo The following functions are only used to deal with XEN_SYSCTL_physinfo, then they shall be wrapped: - arch_do_physinfo() - get_outstanding_claims() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/arm/sysctl.c | 2 ++ xen/arch/riscv/stubs.c | 2 ++ xen/arch/x86/sysctl.c | 2 ++ xen/common/page_alloc.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index 32cab4feff..2d350b700a 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -15,6 +15,7 @@ #include #include +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; @@ -22,6 +23,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) pi->arch_capabilities |= MASK_INSR(sve_encode_vl(get_sys_vl_len()), XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } +#endif long arch_do_sysctl(struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index e396b67cd3..f86a1c17cb 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -310,10 +310,12 @@ long arch_do_sysctl(struct xen_sysctl *sysctl, BUG_ON("unimplemented"); } +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { BUG_ON("unimplemented"); } +#endif /* CONFIG_SYSCTL */ /* p2m.c */ diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 1b04947516..f64addbe2b 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -91,6 +91,7 @@ static long cf_check smt_up_down_helper(void *data) return ret; } +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { memcpy(pi->hw_cap, boot_cpu_data.x86_capability, @@ -104,6 +105,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) if ( IS_ENABLED(CONFIG_SHADOW_PAGING) ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_shadow; } +#endif /* CONFIG_SYSCTL */ long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b204f22f50..8f93a4c354 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -601,6 +601,7 @@ out: return ret; } +#ifdef CONFIG_SYSCTL void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) { spin_lock(&heap_lock); @@ -608,6 +609,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) *free_pages = avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); spin_unlock(&heap_lock); } +#endif /* CONFIG_SYSCTL */ static bool __read_mostly first_node_initialised; #ifndef CONFIG_SEPARATE_XENHEAP -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:44:53 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028982.1402718 (Exim 4.92) (envelope-from ) id 1uWB4H-0002kb-Ss; Mon, 30 Jun 2025 09:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028982.1402718; Mon, 30 Jun 2025 09:44: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 1uWB4H-0002kT-QC; Mon, 30 Jun 2025 09:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1028982; Mon, 30 Jun 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 1uWB4G-0002kJ-6P for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWB4G-00AE1z-0V for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB4G-00Cu1P-0N for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=0MWvzBrmda6K080iQ7Im2Q9SvECtIx3BxCMKOElIs/c=; b=y/sTOco0J5TsgYgyf4yLKfAcQC 73kOrk6+DZcmS1w7wRu7056ZalACqfbvHSJ8x5A/BgzQwvdZ0X5hPKY3JdcJ2LCfsh/F03ZsUa+gM cQe6EmBEmxTp9h/SfIo/9ED/GNCjKvIJ/5dkLkdnHY4C6PmWLz7z7eik4qUrmblnafeI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: make CONFIG_COVERAGE depend on CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 09:44:52 +0000 commit a31a59beca78bf80611ba4eb25f17277c8ea37ee Author: Penny Zheng AuthorDate: Mon Jun 30 10:04:20 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:04:20 2025 +0200 xen/sysctl: make CONFIG_COVERAGE depend on CONFIG_SYSCTL Users rely on SYSCTL_coverage_op hypercall to interact with the coverage data, that is, according operations shall be wrapped around with CONFIG_SYSCTL. Right now, it is compiled under CONFIG_COVERAGE, so we shall make CONFIG_COVERAGE depend on CONFIG_SYSCTL. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index d14093017e..38a134fa3b 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -37,7 +37,7 @@ config SELF_TESTS config COVERAGE bool "Code coverage support" - depends on !LIVEPATCH + depends on SYSCTL && !LIVEPATCH select SUPPRESS_DUPLICATE_SYMBOL_WARNINGS if !ENFORCE_UNIQUE_SYMBOLS help Enable code coverage support. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:45:03 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028983.1402722 (Exim 4.92) (envelope-from ) id 1uWB4R-0002mq-UC; Mon, 30 Jun 2025 09:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028983.1402722; Mon, 30 Jun 2025 09: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 1uWB4R-0002mj-Rd; Mon, 30 Jun 2025 09:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1028983; Mon, 30 Jun 2025 09:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWB4Q-0002mb-AX for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWB4Q-00AE2R-0x for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB4Q-00CuAb-0f for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=afPofh+UZjKlOx7PtjUmf4LnFTycOhet48OLckANbLw=; b=FKo9CqZk+CNeBC+3SBQwh72khq mBWENfOmLtbmBytzo68mzZZqSAggxhMV7AsnJPGGjykyP0nhKrVSxnHO/60lUNOwJRwrA/fXnaQ29 2ZO1dSbzyVGdDIv2Y8hr1EqxqbhlcT23KsRlqYnXO2a+q/f/XokMVc/b368PZnVoEwcE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sysctl: make CONFIG_LIVEPATCH depend on CONFIG_SYSCTL Message-Id: Date: Mon, 30 Jun 2025 09:45:02 +0000 commit 31aca815c7a18f1dcf7801f4dfebd44b42ea6da2 Author: Penny Zheng AuthorDate: Mon Jun 30 10:04:37 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:04:37 2025 +0200 xen/sysctl: make CONFIG_LIVEPATCH depend on CONFIG_SYSCTL LIVEPATCH mechanism relies on LIVEPATCH_SYSCTL hypercall, so CONFIG_LIVEPATCH shall depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index dbd9747d1f..6d784da839 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -472,7 +472,7 @@ config CRYPTO config LIVEPATCH bool "Live patching support" default X86 - depends on "$(XEN_HAS_BUILD_ID)" = "y" + depends on "$(XEN_HAS_BUILD_ID)" = "y" && SYSCTL select CC_SPLIT_SECTIONS help Allows a running Xen hypervisor to be dynamically patched using -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:45:14 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028984.1402726 (Exim 4.92) (envelope-from ) id 1uWB4b-0002pD-W1; Mon, 30 Jun 2025 09:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028984.1402726; Mon, 30 Jun 2025 09:45: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 1uWB4b-0002p6-TF; Mon, 30 Jun 2025 09:45:13 +0000 Received: by outflank-mailman (input) for mailman id 1028984; Mon, 30 Jun 2025 09:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWB4a-0002os-E3 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWB4a-00AE2m-1I for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB4a-00CuIx-18 for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45: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=+B7snGwW7/AOu9VQLxhZZt5lX9FnOe+fQUDHFuDDNGY=; b=EX8GbMilvjVdXQ4m+F26V0Zfxg u5umJvdsL36zFJg5EzFFU9Z3/7iFxy72geNZbDmscvLpo3PUHvbCWnUdhAQvE9BgMBOaxALCMzWxD KSV4p/d5khXUmEcYGwrzLHqg2yM5rW+0RiAQdtkeVhE+04GVJGrEuOfMlqj604yNalrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: move __ro_after_init section symbols to xen/sections.h Message-Id: Date: Mon, 30 Jun 2025 09:45:12 +0000 commit 04289eca9ea1ff1569c2849552dd3425434b3827 Author: Oleksii Kurochko AuthorDate: Mon Jun 30 10:05:04 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:05:04 2025 +0200 xen: move __ro_after_init section symbols to xen/sections.h Instead of declaring __ro_after_init_{start,end} in each architecture's asm/setup.h, move these declarations to the common header xen/sections.h. This centralizes the declarations and reduces duplication across architectures. No functional change intended. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/setup.h | 2 -- xen/arch/x86/include/asm/setup.h | 1 - xen/include/xen/sections.h | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 2b58549c1a..b199d92a42 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -65,8 +65,6 @@ int map_irq_to_domain(struct domain *d, unsigned int irq, int map_range_to_domain(const struct dt_device_node *dev, uint64_t addr, uint64_t len, void *data); -extern const char __ro_after_init_start[], __ro_after_init_end[]; - struct init_info { /* Pointer to the stack, used by head.S when entering in C */ diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index ac34c69855..b01e83a8ed 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -5,7 +5,6 @@ #include extern const char __2M_text_start[], __2M_text_end[]; -extern const char __ro_after_init_start[], __ro_after_init_end[]; extern const char __2M_rodata_start[], __2M_rodata_end[]; extern char __2M_init_start[], __2M_init_end[]; extern char __2M_rwdata_start[], __2M_rwdata_end[]; diff --git a/xen/include/xen/sections.h b/xen/include/xen/sections.h index fe49d7d0e6..cd542bfe10 100644 --- a/xen/include/xen/sections.h +++ b/xen/include/xen/sections.h @@ -5,6 +5,9 @@ #include +/* SAF-0-safe */ +extern const char __ro_after_init_start[], __ro_after_init_end[]; + /* SAF-0-safe */ extern char __init_begin[], __init_end[]; #define is_init_section(p) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:45:24 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028985.1402730 (Exim 4.92) (envelope-from ) id 1uWB4m-0002sA-2N; Mon, 30 Jun 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 1028985.1402730; Mon, 30 Jun 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 1uWB4l-0002s3-W2; Mon, 30 Jun 2025 09:45:23 +0000 Received: by outflank-mailman (input) for mailman id 1028985; Mon, 30 Jun 2025 09:45:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWB4k-0002rs-GV for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWB4k-00AE2q-1Y for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB4k-00CuTZ-1S for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45: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=64bWDG+fYjgBzvyjrZSzMEsekqvtnkU+CbDB41g4oaw=; b=xrDxu4EsJsOrd6TaePNzQnJGTO dVUAaIwGNW622weaEAWyGsecEw3iuq9XVbM5f7begHpAu+4P8SQ4vUtuec3vvV7W+6GJgUQpS0EXY zMsyTzhYnsFuv9rXAYxqP2K2GrrTgMlqjqdpe70vd73ceadnGCxRJI2attZEB3gZJSE4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxenguest: fix build in stubdom environment Message-Id: Date: Mon, 30 Jun 2025 09:45:22 +0000 commit 448826d95dc487661a7ec1f11e08bb5c5f904334 Author: Juergen Gross AuthorDate: Mon Jun 30 10:05:42 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:05:42 2025 +0200 tools/libxenguest: fix build in stubdom environment With introduction of the new byteswap infrastructure the build of libxenguest for stubdoms was broken. Fix that again. Fixes: 60dcff871e34 ("xen/decompressors: Remove use of *_to_cpup() helpers") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c | 9 +++++++++ tools/libs/guest/xg_dom_decompress_unsafe_xz.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c b/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c index ca2f37d915..356f228718 100644 --- a/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c +++ b/tools/libs/guest/xg_dom_decompress_unsafe_lzo1x.c @@ -25,6 +25,15 @@ static inline uint16_t be16_to_cpu(const uint16_t v) #endif } +static inline uint32_t be32_to_cpu(const uint32_t v) +{ +#if BYTE_ORDER == LITTLE_ENDIAN + return __builtin_bswap32(v); +#else + return v; +#endif +} + #include "../../xen/common/lzo.c" #include "../../xen/common/unlzo.c" diff --git a/tools/libs/guest/xg_dom_decompress_unsafe_xz.c b/tools/libs/guest/xg_dom_decompress_unsafe_xz.c index 1f52875340..0501f7f693 100644 --- a/tools/libs/guest/xg_dom_decompress_unsafe_xz.c +++ b/tools/libs/guest/xg_dom_decompress_unsafe_xz.c @@ -25,7 +25,7 @@ static inline uint32_t cpu_to_le32(const uint32_t v) #endif } -static inline uint32_t le32_to_cpu(const uint32_t p) +static inline uint32_t le32_to_cpu(const uint32_t v) { #if BYTE_ORDER == BIG_ENDIAN return __builtin_bswap32(v); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:45:34 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028986.1402735 (Exim 4.92) (envelope-from ) id 1uWB4w-0002uT-4a; Mon, 30 Jun 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 1028986.1402735; Mon, 30 Jun 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 1uWB4w-0002uK-1I; Mon, 30 Jun 2025 09:45:34 +0000 Received: by outflank-mailman (input) for mailman id 1028986; Mon, 30 Jun 2025 09:45:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWB4u-0002u4-Iy for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWB4u-00AE2x-1n for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWB4u-00Cubf-1i for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:45: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=q9jJdqX4L4O+a8O8Oc4Y6/lj4GdUd+1VjZS5WQlSPmM=; b=vTHQrfUgwy/zDqGLDaVyjsy1JH vxjAWiAKSPDNxXdAvMHKRgVt54q2AkszuUAitEkt/1HlXN0zFGk4CaaNVJdMWHLkT3k2YWrvWqSBk WZrPfbM5tlPgTttDHZTGw56E08zHX3FksgtgukMNmBf7TOhV5SteojNAPA9smLeEm0mk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: fix unspecified behavior in tr invocation Message-Id: Date: Mon, 30 Jun 2025 09:45:32 +0000 commit 09a338ae72d2f9dd8e9372669a2ebb2f4652a905 Author: Nicola Vetrini AuthorDate: Mon Jun 30 10:06:54 2025 +0200 Commit: Jan Beulich CommitDate: Mon Jun 30 10:06:54 2025 +0200 xen: fix unspecified behavior in tr invocation The result of the command is undefined according to the specification if the "string2" argument in tr is shorter than "string1". GNU tr behaves correctly by extending "string2" to repeat the last character. Fixes: eb61a4fb14d2 ("xen: fix header guard generation for asm-generic headers") Reported-by: Jan Beulich Signed-off-by: Nicola Vetrini Reviewed-by: Jan Beulich --- xen/scripts/Makefile.asm-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/scripts/Makefile.asm-generic b/xen/scripts/Makefile.asm-generic index f6850758c5..4e628e116a 100644 --- a/xen/scripts/Makefile.asm-generic +++ b/xen/scripts/Makefile.asm-generic @@ -34,7 +34,7 @@ unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers)) quiet_cmd_wrap = WRAP $@ cmd_wrap = \ arch=$$(echo $@ | sed -n 's:.*arch/\([^/]*\)/.*:\1:p' | tr a-z A-Z); \ - upper=$$(echo $*.h | tr a-z A-Z | tr '/.-' '__'); \ + upper=$$(echo $*.h | tr a-z A-Z | tr '/.-' '___'); \ echo "\#ifndef $${arch}_GENERIC_$${upper}" > $@.new; \ echo "\#define $${arch}_GENERIC_$${upper}" >> $@.new; \ echo "\#include " >> $@.new; \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:55:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028987.1402738 (Exim 4.92) (envelope-from ) id 1uWBE7-000438-Nu; Mon, 30 Jun 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 1028987.1402738; Mon, 30 Jun 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 1uWBE7-000430-LK; Mon, 30 Jun 2025 09:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1028987; Mon, 30 Jun 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 1uWBE5-00042u-Uh for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWBE5-00AEDI-2K for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWBE5-00D33b-2B for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09: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=3E4Fc/QCGs0W1A5G1bzC3WfGn3IEjcAx1PH5dO9MYpw=; b=v25oGG8nbjBvr4Uh7VKHQ+Q9Yj aAnnlRV9dNARQykRs3pOb2KmETS7lPpI0fB/eaHU1gkAHozGzVQ/uz4R0+Y2HiVqd4vj/iVEHmMnq w3Bolx0IURDjOdQiIy9vyNGxfvYfiMqvH5qR/NcPLPrFZKMTg+/mYwmkvipt4LOhCbdY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: cmdline: Update serial_tx_buffer default value Message-Id: Date: Mon, 30 Jun 2025 09:55:01 +0000 commit 71880d7ca4724b360e693535076423f0a4e49879 Author: Michal Orzel AuthorDate: Fri Jun 27 09:06:04 2025 +0200 Commit: Michal Orzel CommitDate: Mon Jun 30 11:50:35 2025 +0200 docs: cmdline: Update serial_tx_buffer default value After commit 4df2e99d7314 ("console/serial: set the default transmit buffer size in Kconfig"), the default value is set by Kconfig option CONFIG_SERIAL_TX_BUFSIZE. Moreover it was bumped to 32KB by commit d09e44e5d8fd ("console/serial: bump buffer from 16K to 32K"). Signed-off-by: Michal Orzel Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index b0eadd2c5d..6865a61220 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2370,7 +2370,7 @@ accidentally leaking secrets by releasing pages without proper sanitization. ### serial_tx_buffer > `= ` -> Default: `16kB` +> Default: `CONFIG_SERIAL_TX_BUFSIZE` Set the serial transmit buffer size. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 09:55:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 09:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1028988.1402742 (Exim 4.92) (envelope-from ) id 1uWBEH-000450-PG; Mon, 30 Jun 2025 09:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1028988.1402742; Mon, 30 Jun 2025 09: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 1uWBEH-00044s-Mk; Mon, 30 Jun 2025 09:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1028988; Mon, 30 Jun 2025 09:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWBEF-00044e-Rc for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWBEF-00AEDY-2f for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWBEF-00D3Eb-2V for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 09: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=n9sbYCUdModIgeZSvNK63niqbFCn2VZGu6/Njnd36kM=; b=5XgRIrJBdgWBZqtlXWU0QRj19s /hOp97EX7FMiL0nR3/U7avR+mFAFOpw7RzIJh/H+IOHbfCFN6IPUHpWlIeFg1ELKicXs1CqWvcmBN V/1nUnT+Ub+UKx8TYVtRQ4ZN35H+PL5UyXwKS6waWBbtBQ5uuQnYu4r4wbYoUkz0iCk4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Drop frametable_virt_end Message-Id: Date: Mon, 30 Jun 2025 09:55:11 +0000 commit fe6a12a0838864e8c296432965df1694659c104b Author: Michal Orzel AuthorDate: Fri Jun 27 10:43:34 2025 +0200 Commit: Michal Orzel CommitDate: Mon Jun 30 11:50:50 2025 +0200 xen/arm: Drop frametable_virt_end It has never been used since the introduction and is technically a dead code violating MISRA C. Signed-off-by: Michal Orzel Reviewed-by: Ayan Kumar Halder Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/config.h | 4 ---- xen/arch/arm/mmu/mm.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 272e4565e5..f18825bc2d 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -66,10 +66,6 @@ #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) -#ifndef __ASSEMBLY__ -extern unsigned long frametable_virt_end; -#endif - #define watchdog_disable() ((void)0) #define watchdog_enable() ((void)0) diff --git a/xen/arch/arm/mmu/mm.c b/xen/arch/arm/mmu/mm.c index 9c50479c63..6604f3bf4e 100644 --- a/xen/arch/arm/mmu/mm.c +++ b/xen/arch/arm/mmu/mm.c @@ -8,8 +8,6 @@ #include #include -unsigned long frametable_virt_end __read_mostly; - /* Map a frame table to cover physical addresses ps through pe */ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) { @@ -46,9 +44,6 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); memset(&frame_table[nr_pdxs], -1, frametable_size - (nr_pdxs * sizeof(struct page_info))); - - frametable_virt_end = FRAMETABLE_VIRT_START + (nr_pdxs * - sizeof(struct page_info)); } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 10:33:06 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 10:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1029002.1402750 (Exim 4.92) (envelope-from ) id 1uWBot-00005y-CA; Mon, 30 Jun 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 1029002.1402750; Mon, 30 Jun 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 1uWBot-00005p-9j; Mon, 30 Jun 2025 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1029002; Mon, 30 Jun 2025 10:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWBor-00005j-Ot for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWBor-00AEz1-1V for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWBor-00Dbhu-1C for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=XHc1SNLgsW3Mi4p1YWjVmXTxRtghgYLUhqe/HbeCGAY=; b=w61DvI+gRhBMo6zcww4GNF+Ovo 95HWdR5JAsbmAynJbaGJ54bdx9BnepzBZ5SMcxwdDyaFW4wnoAFfhwkwcx/5Ty7FikqPTFe3tRI3T AJAy1vFKC5tJ5nvknWtDKyiia33lza9RYbbC+FofxfvPUkniX4PMI+IojgiITXzSRlqk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: cmdline: Update serial_tx_buffer default value Message-Id: Date: Mon, 30 Jun 2025 10:33:01 +0000 commit 71880d7ca4724b360e693535076423f0a4e49879 Author: Michal Orzel AuthorDate: Fri Jun 27 09:06:04 2025 +0200 Commit: Michal Orzel CommitDate: Mon Jun 30 11:50:35 2025 +0200 docs: cmdline: Update serial_tx_buffer default value After commit 4df2e99d7314 ("console/serial: set the default transmit buffer size in Kconfig"), the default value is set by Kconfig option CONFIG_SERIAL_TX_BUFSIZE. Moreover it was bumped to 32KB by commit d09e44e5d8fd ("console/serial: bump buffer from 16K to 32K"). Signed-off-by: Michal Orzel Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index b0eadd2c5d..6865a61220 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2370,7 +2370,7 @@ accidentally leaking secrets by releasing pages without proper sanitization. ### serial_tx_buffer > `= ` -> Default: `16kB` +> Default: `CONFIG_SERIAL_TX_BUFSIZE` Set the serial transmit buffer size. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 10:33:13 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1029003.1402754 (Exim 4.92) (envelope-from ) id 1uWBp3-00007r-De; Mon, 30 Jun 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 1029003.1402754; Mon, 30 Jun 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 1uWBp3-00007j-B5; Mon, 30 Jun 2025 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1029003; Mon, 30 Jun 2025 10:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWBp1-00007R-Mh for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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 1uWBp1-00AEzG-1x for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 10:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWBp1-00Dbqe-1f for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=wV1cQpyteZqtkWiXvhkT9vRKfSfsy9Jfd4hhJB01oNw=; b=WkMaIJ2ULh2vLZywPaVxEGkyxE 5Xe6mNVmwxBicKh/vMPyGRfmHFWNAGkD9I6E0f95kFsqwRpwUpZvqatRLp1Kf31rNWl63Yv4bLenn 3s73+n1Re5KrQ4n7UhWvVV9ct0qaBTTc7dsUWdGKnLnAR2wM5sgE9EYpMOdqcYir7TeQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Drop frametable_virt_end Message-Id: Date: Mon, 30 Jun 2025 10:33:11 +0000 commit fe6a12a0838864e8c296432965df1694659c104b Author: Michal Orzel AuthorDate: Fri Jun 27 10:43:34 2025 +0200 Commit: Michal Orzel CommitDate: Mon Jun 30 11:50:50 2025 +0200 xen/arm: Drop frametable_virt_end It has never been used since the introduction and is technically a dead code violating MISRA C. Signed-off-by: Michal Orzel Reviewed-by: Ayan Kumar Halder Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/config.h | 4 ---- xen/arch/arm/mmu/mm.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 272e4565e5..f18825bc2d 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -66,10 +66,6 @@ #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) -#ifndef __ASSEMBLY__ -extern unsigned long frametable_virt_end; -#endif - #define watchdog_disable() ((void)0) #define watchdog_enable() ((void)0) diff --git a/xen/arch/arm/mmu/mm.c b/xen/arch/arm/mmu/mm.c index 9c50479c63..6604f3bf4e 100644 --- a/xen/arch/arm/mmu/mm.c +++ b/xen/arch/arm/mmu/mm.c @@ -8,8 +8,6 @@ #include #include -unsigned long frametable_virt_end __read_mostly; - /* Map a frame table to cover physical addresses ps through pe */ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) { @@ -46,9 +44,6 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); memset(&frame_table[nr_pdxs], -1, frametable_size - (nr_pdxs * sizeof(struct page_info))); - - frametable_virt_end = FRAMETABLE_VIRT_START + (nr_pdxs * - sizeof(struct page_info)); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 11:55:08 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 11:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1029086.1402820 (Exim 4.92) (envelope-from ) id 1uWD6G-0003c4-Aj; Mon, 30 Jun 2025 11:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1029086.1402820; Mon, 30 Jun 2025 11: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 1uWD6G-0003bw-8A; Mon, 30 Jun 2025 11:55:04 +0000 Received: by outflank-mailman (input) for mailman id 1029086; Mon, 30 Jun 2025 11:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWD6F-0003bq-Ir for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 11:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWD6E-00AGYr-0W for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 11:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWD6E-00EqBn-0C for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=m48YRspdxn3rhxrLPiwYruC3dUPlDzy/tVYYu8+vR+s=; b=V46EyPzcQWuO3II0jnipQjSm2d mc+/cHUhA5bBCJha5vkJS63HsVDTHTpcKU1myxBuEDPpbokFq3lgssDARsvV0Vm+XBxL8SZEcvz6K 50mtSsQuqFK+J7K6qtFDJio+c0XliXR7V3KDOJUNOBA6x3rDQumBAIdsdIcIu6tj6c9Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpu-policy: Simplify logic in guest_common_default_feature_adjustments() Message-Id: Date: Mon, 30 Jun 2025 11:55:02 +0000 commit 30f8fed68f3c2e63594ff9202b3d05b971781e36 Author: Andrew Cooper AuthorDate: Fri Jun 27 14:46:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 30 12:41:33 2025 +0100 x86/cpu-policy: Simplify logic in guest_common_default_feature_adjustments() For features which are unconditionally set in the max policies, making the default policy to match the host can be done with a conditional clear. This is simpler than the unconditional clear, conditional set currently performed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu-policy.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 060b34d913..518f9c9e54 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -515,17 +515,14 @@ static void __init guest_common_default_feature_adjustments(uint32_t *fs) * reasons, so reset the default policy back to the host values in * case we're unaffected. */ - __clear_bit(X86_FEATURE_MD_CLEAR, fs); - if ( cpu_has_md_clear ) - __set_bit(X86_FEATURE_MD_CLEAR, fs); + if ( !cpu_has_md_clear ) + __clear_bit(X86_FEATURE_MD_CLEAR, fs); - __clear_bit(X86_FEATURE_FB_CLEAR, fs); - if ( cpu_has_fb_clear ) - __set_bit(X86_FEATURE_FB_CLEAR, fs); + if ( !cpu_has_fb_clear ) + __clear_bit(X86_FEATURE_FB_CLEAR, fs); - __clear_bit(X86_FEATURE_RFDS_CLEAR, fs); - if ( cpu_has_rfds_clear ) - __set_bit(X86_FEATURE_RFDS_CLEAR, fs); + if ( !cpu_has_rfds_clear ) + __clear_bit(X86_FEATURE_RFDS_CLEAR, fs); /* * The Gather Data Sampling microcode mitigation (August 2023) has an @@ -545,13 +542,11 @@ static void __init guest_common_default_feature_adjustments(uint32_t *fs) * Topology information is at the toolstack's discretion so these are * unconditionally set in max, but pick a default which matches the host. */ - __clear_bit(X86_FEATURE_HTT, fs); - if ( cpu_has_htt ) - __set_bit(X86_FEATURE_HTT, fs); + if ( !cpu_has_htt ) + __clear_bit(X86_FEATURE_HTT, fs); - __clear_bit(X86_FEATURE_CMP_LEGACY, fs); - if ( cpu_has_cmp_legacy ) - __set_bit(X86_FEATURE_CMP_LEGACY, fs); + if ( !cpu_has_cmp_legacy ) + __clear_bit(X86_FEATURE_CMP_LEGACY, fs); /* * On certain hardware, speculative or errata workarounds can result in -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Jun 30 12:33:05 2025 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 30 Jun 2025 12:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1029129.1402874 (Exim 4.92) (envelope-from ) id 1uWDh1-0002fg-6v; Mon, 30 Jun 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 1029129.1402874; Mon, 30 Jun 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 1uWDh1-0002fY-4M; Mon, 30 Jun 2025 12:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1029129; Mon, 30 Jun 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 1uWDh0-0002fQ-4x for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 12:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1uWDgz-00AHIL-2y for xen-changelog@lists.xenproject.org; Mon, 30 Jun 2025 12:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1uWDgz-00FORe-2c for xen-changelog@lists.xenproject.org; Mon, 30 Jun 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=6/Tv1BhT4OS81zlI+UpMmpdjPrbQf1XG2MxXcQbfXYQ=; b=C4Yql7AfzLOtq7UhcYj/qHB6me Hv2DW1d7MAmCXWx9EeKDyhD96CshB0M6ekx24VToRy3zsDlOgl/OUcaKFzTiVd83RTdHHivnC/ioH 7qm1936REOr4aMyGPlNbRxqYVtBvHVSB90bd/wrhVLSNZQWb6Sj1KSCKAWbP2Oc3Jm/I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Simplify logic in guest_common_default_feature_adjustments() Message-Id: Date: Mon, 30 Jun 2025 12:33:01 +0000 commit 30f8fed68f3c2e63594ff9202b3d05b971781e36 Author: Andrew Cooper AuthorDate: Fri Jun 27 14:46:01 2025 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 30 12:41:33 2025 +0100 x86/cpu-policy: Simplify logic in guest_common_default_feature_adjustments() For features which are unconditionally set in the max policies, making the default policy to match the host can be done with a conditional clear. This is simpler than the unconditional clear, conditional set currently performed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu-policy.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 060b34d913..518f9c9e54 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -515,17 +515,14 @@ static void __init guest_common_default_feature_adjustments(uint32_t *fs) * reasons, so reset the default policy back to the host values in * case we're unaffected. */ - __clear_bit(X86_FEATURE_MD_CLEAR, fs); - if ( cpu_has_md_clear ) - __set_bit(X86_FEATURE_MD_CLEAR, fs); + if ( !cpu_has_md_clear ) + __clear_bit(X86_FEATURE_MD_CLEAR, fs); - __clear_bit(X86_FEATURE_FB_CLEAR, fs); - if ( cpu_has_fb_clear ) - __set_bit(X86_FEATURE_FB_CLEAR, fs); + if ( !cpu_has_fb_clear ) + __clear_bit(X86_FEATURE_FB_CLEAR, fs); - __clear_bit(X86_FEATURE_RFDS_CLEAR, fs); - if ( cpu_has_rfds_clear ) - __set_bit(X86_FEATURE_RFDS_CLEAR, fs); + if ( !cpu_has_rfds_clear ) + __clear_bit(X86_FEATURE_RFDS_CLEAR, fs); /* * The Gather Data Sampling microcode mitigation (August 2023) has an @@ -545,13 +542,11 @@ static void __init guest_common_default_feature_adjustments(uint32_t *fs) * Topology information is at the toolstack's discretion so these are * unconditionally set in max, but pick a default which matches the host. */ - __clear_bit(X86_FEATURE_HTT, fs); - if ( cpu_has_htt ) - __set_bit(X86_FEATURE_HTT, fs); + if ( !cpu_has_htt ) + __clear_bit(X86_FEATURE_HTT, fs); - __clear_bit(X86_FEATURE_CMP_LEGACY, fs); - if ( cpu_has_cmp_legacy ) - __set_bit(X86_FEATURE_CMP_LEGACY, fs); + if ( !cpu_has_cmp_legacy ) + __clear_bit(X86_FEATURE_CMP_LEGACY, fs); /* * On certain hardware, speculative or errata workarounds can result in -- generated by git-patchbot for /home/xen/git/xen.git#master