From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 16:00:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 16:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244439.1543879 (Exim 4.92) (envelope-from ) id 1vx5gh-0003VC-Gb; Mon, 02 Mar 2026 16:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244439.1543879; Mon, 02 Mar 2026 16:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx5gh-0003Ur-Dg; Mon, 02 Mar 2026 16:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1244439; Mon, 02 Mar 2026 16:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx5gg-0003DS-Df for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vx5gg-001Z9N-1F for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vx5gg-00CzlP-16 for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16: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=8oqnBJ6ikKAnS1YullS/mvy320ju4/kXilzcV1NJiak=; b=t0EJcdgWhsbziTYfcSW180IFLd vdZUg0FEz/aQK4lRvwo9RvRMfDQr133csCiO7OQOLrxd34fGc6C7BbqoDi/LC6RWbUXtDMoK87MCb usuU2wVPW66PIePFXG8dkKMCtHSI3JgROAcHHiL5SFc041sdiA3P84YZVetwUN47Hl64=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: Fix when config "cpus" is set, but "vcpus" is missing Message-Id: Date: Mon, 02 Mar 2026 16:00:02 +0000 commit 4b71a86eaa7aa2249d4434c808102f5e301e2c8d Author: Anthony PERARD AuthorDate: Wed Dec 17 18:26:33 2025 +0100 Commit: Anthony PERARD CommitDate: Mon Mar 2 15:39:58 2026 +0100 tools/xl: Fix when config "cpus" is set, but "vcpus" is missing If we start a guest with 'cpus="all"' and without 'vcpus' or 'maxvcpus' (or sets them to 0), we execute parse_vcpu_affinity() with `num_cpus=0`. This malloc "b_info->vcpu_hard_affinity" with a buffer of size 0, which is implementation defined, and we still initialise the "first" bitmap of this allocation, which mean we have a buffer overflow. On Alpine Linux, this result in a segv when the buffer is being disposed of. Since libxl will assume there's at least 1 vcpu, we default to 1 in xl as well. (libxl sets max_vcpus to 1 if unset, and allocate avail_vcpus if its size is 0.) Link: https://gitlab.alpinelinux.org/alpine/aports/-/issues/17809 Fixes: a5dbdcf6743a ("libxl/xl: push VCPU affinity pinning down to libxl") Signed-off-by: Anthony PERARD Reviewed-by: Jason Andryuk --- tools/xl/xl_parse.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index af86d3186d..1a2ea8b5d5 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1518,14 +1518,22 @@ void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { vcpus = l; - if (libxl_cpu_bitmap_alloc(ctx, &b_info->avail_vcpus, l)) { - fprintf(stderr, "Unable to allocate cpumap\n"); - exit(1); - } - libxl_bitmap_set_none(&b_info->avail_vcpus); - while (l-- > 0) - libxl_bitmap_set((&b_info->avail_vcpus), l); } + if (vcpus < 1) { + /* + * Default to 1 vCPU, libxl is already assuming this + * when vcpus == 0 and parse_vcpu_affinity() also assume there's at + * least one vcpu. + */ + vcpus = 1; + } + if (libxl_cpu_bitmap_alloc(ctx, &b_info->avail_vcpus, vcpus)) { + fprintf(stderr, "Unable to allocate cpumap\n"); + exit(1); + } + libxl_bitmap_set_none(&b_info->avail_vcpus); + for (long vcpu = vcpus; vcpu-- > 0;) + libxl_bitmap_set((&b_info->avail_vcpus), vcpu); if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 16:00:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 16:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244440.1543884 (Exim 4.92) (envelope-from ) id 1vx5gr-000455-Hr; Mon, 02 Mar 2026 16:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244440.1543884; Mon, 02 Mar 2026 16:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx5gr-00044x-F5; Mon, 02 Mar 2026 16:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1244440; Mon, 02 Mar 2026 16:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx5gq-00044r-Gp for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vx5gq-001ZOo-1X for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vx5gq-00CzmZ-1Q for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16: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=TWQ5MXCIG5qXpLpOQBwMkzXBNJuHbAv9FBYW0VFSJjo=; b=fZWLKbADHPBJTjiJj4tLhG1v4J 1cWY6piNL8/Bf4domIOKQq1irhVh5Jf3+NER5hyNZH1HlyKeKcxIR6bU5dqolKBrMjNTvpXIjNKUz JWEFhmFfnp4CojadIQDxIV6HrdYg++dMSP5ukFoD5xbH4/yjkGlVBAjrUhxytwSMvMJU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Remove `brctl` from Arch Linux container Message-Id: Date: Mon, 02 Mar 2026 16:00:12 +0000 commit 8596535982ea2054f31d6c9a06bb40c44f8eb42d Author: Anthony PERARD AuthorDate: Fri Feb 13 11:19:21 2026 +0100 Commit: Anthony PERARD CommitDate: Mon Mar 2 15:39:58 2026 +0100 CI: Remove `brctl` from Arch Linux container Package "bridge-utils" have been removed from the official repos, it contained `brctl`. That utility is used by network hotplug scripts, but they already check if it is available and switch to use "iproute2" (`ip`) when not. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/build/archlinux/current.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 4e53c835fa..a257027772 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -6,7 +6,6 @@ LABEL maintainer.name="The Xen Project" \ RUN pacman-key --init RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ - bridge-utils \ bzip2 \ cpio \ discount \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 16:33:10 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 16:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244462.1543908 (Exim 4.92) (envelope-from ) id 1vx6Cd-0000e7-4p; Mon, 02 Mar 2026 16:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244462.1543908; Mon, 02 Mar 2026 16:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx6Cd-0000dz-27; Mon, 02 Mar 2026 16:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1244462; Mon, 02 Mar 2026 16:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx6Cb-0000dt-KA for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vx6Cb-001a2d-1p for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vx6Cb-00D22U-1h for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z385Xtk5H/jHVSKZ34VgmktAg6L1DvePnuZCRSbbfu4=; b=KTgahwFocr/WnUpgKTwpKvoH7W lmQYJz5dORtw0ucXXZM+V+YSJqLU2JjBJVrKotKqrQ5cwefpCtHY58+fQCWgLOSgOuZPdHaVkkOaD Dbz38r9U+5bZrNrwiNHLJbGTK9DSDxcrTxwN5AEEtJHd5ElDP2XmOgN8phQRg0y3kL1Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/efi: remove unreachable efi_halt_system() function Message-Id: Date: Mon, 02 Mar 2026 16:33:01 +0000 commit 0f410b45de689172a2c2928759e305bb79ea1d47 Author: Roger Pau Monne AuthorDate: Tue Feb 24 20:55:19 2026 +0100 Commit: Roger Pau Monne CommitDate: Mon Mar 2 17:16:26 2026 +0100 x86/efi: remove unreachable efi_halt_system() function After e4c3755d4dd7 the function efi_halt_system() is unreachable, remove it from the file. No functional change expected, as the function is not called. Fixes: e4c3755d4dd7 ("x86-64/EFI: don't call EfiResetSystem() from machine_halt()") Signed-off-by: Roger Pau Monné Reviewed-by: Jason Andryuk Acked-by: Marek Marczykowski-Górecki --- xen/common/efi/common-stub.c | 1 - xen/common/efi/runtime.c | 13 ------------- xen/include/xen/efi.h | 1 - 3 files changed, 15 deletions(-) diff --git a/xen/common/efi/common-stub.c b/xen/common/efi/common-stub.c index 77f138a6c5..9dc8aa538c 100644 --- a/xen/common/efi/common-stub.c +++ b/xen/common/efi/common-stub.c @@ -18,7 +18,6 @@ unsigned long efi_get_time(void) return 0; } -void efi_halt_system(void) { } void efi_reset_system(bool warm) { } int efi_get_info(uint32_t idx, union xenpf_efi_info *info) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index f786ceb007..ba27c62132 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -188,19 +188,6 @@ unsigned long efi_get_time(void) time.Hour, time.Minute, time.Second); } -void efi_halt_system(void) -{ - EFI_STATUS status; - struct efi_rs_state state = efi_rs_enter(); - - if ( !state.cr3 ) - return; - status = efi_rs->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); - efi_rs_leave(&state); - - printk(XENLOG_WARNING "EFI: could not halt system (%#lx)\n", status); -} - void efi_reset_system(bool warm) { EFI_STATUS status; diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 723cb80852..2e36b01e20 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -42,7 +42,6 @@ void efi_init_memory(void); bool efi_boot_mem_unused(unsigned long *start, unsigned long *end); bool efi_rs_using_pgtables(void); unsigned long efi_get_time(void); -void efi_halt_system(void); void efi_reset_system(bool warm); #ifndef COMPAT int efi_get_info(uint32_t idx, union xenpf_efi_info *info); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 16:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 16:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244463.1543911 (Exim 4.92) (envelope-from ) id 1vx6Cn-0000fc-6C; Mon, 02 Mar 2026 16:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244463.1543911; Mon, 02 Mar 2026 16:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx6Cn-0000fU-3V; Mon, 02 Mar 2026 16:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1244463; Mon, 02 Mar 2026 16:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx6Cl-0000fK-OI for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vx6Cl-001a2t-2K for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vx6Cl-00D26P-20 for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=r1An5Wo8v9PczOO9X8V6W3iMrhk4wbR3PpgMAQvzjJM=; b=ysziH9B5bNMLuBUatVlyGZQzkm 63QAojATu5aRrG74LqbS6qFQjQ+3ROnMonvpGIjzRIa3MVwEP+PNWdXmZtWAp5ZcXvwsn+SLdQxzy Xua0ELyYS/Du+T6nk/gi225BWZoN9oHAFR/AmPh8KQFvVNE3b7EKTRqU+92BgyfSc/VI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Mon, 02 Mar 2026 16:33:11 +0000 commit 74867aae25cb6356b8a7d1140c81666e2a23b818 Author: Roger Pau Monne AuthorDate: Thu Feb 26 18:53:02 2026 +0100 Commit: Roger Pau Monne CommitDate: Mon Mar 2 17:16:26 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 0126a3f5d9..537695eaab 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -117,11 +117,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 16:33:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 16:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244464.1543917 (Exim 4.92) (envelope-from ) id 1vx6Cx-0000iQ-7p; Mon, 02 Mar 2026 16:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244464.1543917; Mon, 02 Mar 2026 16:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx6Cx-0000iH-4n; Mon, 02 Mar 2026 16:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1244464; Mon, 02 Mar 2026 16:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vx6Cv-0000iA-R3 for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vx6Cv-001a5K-2b for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vx6Cv-00D284-2V for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 16:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=joDkZeD17Y24hVVm2+25miSOys+gfad+Rx6sluW5ms8=; b=dmK/ZsFi1lQVhwiSKHif/zoBiY 2zVI9uB8cu+ayvxAkgXLAOZsaGguYhqfVCSmhCPuRuXaLp7e2zYCe/vQH9Gd8UVu2o4t//NCuqa74 fM6VnqQPG5Ut4pRuunOOYOVLptQGrOg0o/QjmOQYHLNVE0vmHKPoMM8cxycXMMEQl698=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Mon, 02 Mar 2026 16:33:21 +0000 commit a0ed5bcfbeee81c91c574ad484faa057054eaf09 Author: Roger Pau Monne AuthorDate: Thu Feb 26 18:54:19 2026 +0100 Commit: Roger Pau Monne CommitDate: Mon Mar 2 17:16:26 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 537695eaab..0d94c0e464 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -185,7 +185,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -400,6 +401,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 21:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 21:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244541.1543983 (Exim 4.92) (envelope-from ) id 1vxAiJ-0003Ul-GH; Mon, 02 Mar 2026 21:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244541.1543983; Mon, 02 Mar 2026 21: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 1vxAiJ-0003Ud-DT; Mon, 02 Mar 2026 21:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1244541; Mon, 02 Mar 2026 21:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxAiH-0003UX-TX for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxAiH-001fw5-2R for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxAiH-00DQw8-2J for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21: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=SHmKbALHzL+mMgB/HPI7W8N0XyLAg58hYJuyYbFobSk=; b=wcxIty973b/CDFYu+4xzu4L2kn VUBmsboXrx9yWQXQ3iLJHbhm6GElezVK/Jxooc+naFDQqLSKnotdLIoxmbG0mB+vlnmWqPoQFXdOe ruVv/lindExZlvxKqQNvuS79UqI9PkQFMyjJMekEGzkG0oGiVzQOYjkw42Nufc9Xi2W8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: Fix when config "cpus" is set, but "vcpus" is missing Message-Id: Date: Mon, 02 Mar 2026 21:22:01 +0000 commit 4b71a86eaa7aa2249d4434c808102f5e301e2c8d Author: Anthony PERARD AuthorDate: Wed Dec 17 18:26:33 2025 +0100 Commit: Anthony PERARD CommitDate: Mon Mar 2 15:39:58 2026 +0100 tools/xl: Fix when config "cpus" is set, but "vcpus" is missing If we start a guest with 'cpus="all"' and without 'vcpus' or 'maxvcpus' (or sets them to 0), we execute parse_vcpu_affinity() with `num_cpus=0`. This malloc "b_info->vcpu_hard_affinity" with a buffer of size 0, which is implementation defined, and we still initialise the "first" bitmap of this allocation, which mean we have a buffer overflow. On Alpine Linux, this result in a segv when the buffer is being disposed of. Since libxl will assume there's at least 1 vcpu, we default to 1 in xl as well. (libxl sets max_vcpus to 1 if unset, and allocate avail_vcpus if its size is 0.) Link: https://gitlab.alpinelinux.org/alpine/aports/-/issues/17809 Fixes: a5dbdcf6743a ("libxl/xl: push VCPU affinity pinning down to libxl") Signed-off-by: Anthony PERARD Reviewed-by: Jason Andryuk --- tools/xl/xl_parse.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index af86d3186d..1a2ea8b5d5 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1518,14 +1518,22 @@ void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { vcpus = l; - if (libxl_cpu_bitmap_alloc(ctx, &b_info->avail_vcpus, l)) { - fprintf(stderr, "Unable to allocate cpumap\n"); - exit(1); - } - libxl_bitmap_set_none(&b_info->avail_vcpus); - while (l-- > 0) - libxl_bitmap_set((&b_info->avail_vcpus), l); } + if (vcpus < 1) { + /* + * Default to 1 vCPU, libxl is already assuming this + * when vcpus == 0 and parse_vcpu_affinity() also assume there's at + * least one vcpu. + */ + vcpus = 1; + } + if (libxl_cpu_bitmap_alloc(ctx, &b_info->avail_vcpus, vcpus)) { + fprintf(stderr, "Unable to allocate cpumap\n"); + exit(1); + } + libxl_bitmap_set_none(&b_info->avail_vcpus); + for (long vcpu = vcpus; vcpu-- > 0;) + libxl_bitmap_set((&b_info->avail_vcpus), vcpu); if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 21:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 21:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244542.1543987 (Exim 4.92) (envelope-from ) id 1vxAiT-0003WC-Hl; Mon, 02 Mar 2026 21:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244542.1543987; Mon, 02 Mar 2026 21: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 1vxAiT-0003W4-Eu; Mon, 02 Mar 2026 21:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1244542; Mon, 02 Mar 2026 21:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxAiR-0003Vk-Sc for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxAiR-001fwA-2j for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxAiR-00DQwr-2c for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21: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=qfqXwbKBLCycCT9JWmxmMcPrn23io4GqgzT546rGWLU=; b=br4xWVp5ugpBWdMLJhZ3NIvf0B SvcgOrnENTtupqwE7attxHPcSLf47KMM4pkaJcnThEECQGF4UmZ8QttE5rRer4AyER4f3i84bPTUV 5PtDGyJQbHgA7G+ggoi98lCzjPxhmylj4lFofF3VK3/I61UuPUZTLCCTioLVgPQntYmw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Remove `brctl` from Arch Linux container Message-Id: Date: Mon, 02 Mar 2026 21:22:11 +0000 commit 8596535982ea2054f31d6c9a06bb40c44f8eb42d Author: Anthony PERARD AuthorDate: Fri Feb 13 11:19:21 2026 +0100 Commit: Anthony PERARD CommitDate: Mon Mar 2 15:39:58 2026 +0100 CI: Remove `brctl` from Arch Linux container Package "bridge-utils" have been removed from the official repos, it contained `brctl`. That utility is used by network hotplug scripts, but they already check if it is available and switch to use "iproute2" (`ip`) when not. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/build/archlinux/current.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 4e53c835fa..a257027772 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -6,7 +6,6 @@ LABEL maintainer.name="The Xen Project" \ RUN pacman-key --init RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ - bridge-utils \ bzip2 \ cpio \ discount \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 21:22:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 21:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244543.1543990 (Exim 4.92) (envelope-from ) id 1vxAid-0003Yk-J8; Mon, 02 Mar 2026 21:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244543.1543990; Mon, 02 Mar 2026 21: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 1vxAid-0003Yc-GU; Mon, 02 Mar 2026 21:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1244543; Mon, 02 Mar 2026 21:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxAib-0003YT-Vv for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxAib-001fwE-32 for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxAib-00DQxL-2t for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21: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=tk3l6h8AImsYukxpN+AbGJpOBJLQ2eUQiDpEX/sLdJw=; b=XbOhHzuepdaMtF2xokntXWmNP9 gQJVNddn5pU8wKnqqWTUe+fqXorUCM5gyWSC/GGvBM2CHw4EYPMLJcCwHU3/j2JBSr1BG7wsB7Yqs jgssib4XYRJWnnru/ur4OGkf8IbHf5VHN0prrYe62B1CPHkQ7EEpCViAHO5HpMY1cCVk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/efi: remove unreachable efi_halt_system() function Message-Id: Date: Mon, 02 Mar 2026 21:22:21 +0000 commit 0f410b45de689172a2c2928759e305bb79ea1d47 Author: Roger Pau Monne AuthorDate: Tue Feb 24 20:55:19 2026 +0100 Commit: Roger Pau Monne CommitDate: Mon Mar 2 17:16:26 2026 +0100 x86/efi: remove unreachable efi_halt_system() function After e4c3755d4dd7 the function efi_halt_system() is unreachable, remove it from the file. No functional change expected, as the function is not called. Fixes: e4c3755d4dd7 ("x86-64/EFI: don't call EfiResetSystem() from machine_halt()") Signed-off-by: Roger Pau Monné Reviewed-by: Jason Andryuk Acked-by: Marek Marczykowski-Górecki --- xen/common/efi/common-stub.c | 1 - xen/common/efi/runtime.c | 13 ------------- xen/include/xen/efi.h | 1 - 3 files changed, 15 deletions(-) diff --git a/xen/common/efi/common-stub.c b/xen/common/efi/common-stub.c index 77f138a6c5..9dc8aa538c 100644 --- a/xen/common/efi/common-stub.c +++ b/xen/common/efi/common-stub.c @@ -18,7 +18,6 @@ unsigned long efi_get_time(void) return 0; } -void efi_halt_system(void) { } void efi_reset_system(bool warm) { } int efi_get_info(uint32_t idx, union xenpf_efi_info *info) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index f786ceb007..ba27c62132 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -188,19 +188,6 @@ unsigned long efi_get_time(void) time.Hour, time.Minute, time.Second); } -void efi_halt_system(void) -{ - EFI_STATUS status; - struct efi_rs_state state = efi_rs_enter(); - - if ( !state.cr3 ) - return; - status = efi_rs->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); - efi_rs_leave(&state); - - printk(XENLOG_WARNING "EFI: could not halt system (%#lx)\n", status); -} - void efi_reset_system(bool warm) { EFI_STATUS status; diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 723cb80852..2e36b01e20 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -42,7 +42,6 @@ void efi_init_memory(void); bool efi_boot_mem_unused(unsigned long *start, unsigned long *end); bool efi_rs_using_pgtables(void); unsigned long efi_get_time(void); -void efi_halt_system(void); void efi_reset_system(bool warm); #ifndef COMPAT int efi_get_info(uint32_t idx, union xenpf_efi_info *info); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 21:22:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 21:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244544.1543995 (Exim 4.92) (envelope-from ) id 1vxAin-0003bJ-MJ; Mon, 02 Mar 2026 21:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244544.1543995; Mon, 02 Mar 2026 21: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 1vxAin-0003bB-Jd; Mon, 02 Mar 2026 21:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1244544; Mon, 02 Mar 2026 21:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxAim-0003b0-23 for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxAim-001fwY-06 for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxAil-00DQxn-3D for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21: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=SYgs1hGxQ/QHMXzq8I+2ov7oBcOla7QUTqPcsaZpGSY=; b=PQXQ47y7IBd+ic1BGCDv5OPhfV xxaSsM0GTZgAbwjKnW1/1D9yjnhCtV1aX5pWnGnYzJX6G1ZGqhJEPWArSWT4AgSQ/KUeE1rEgWAfX k3SIYmklozaFSLGX2i8e+evgc/NXrlMuwf8TjZFK708iQ9RZY8KpduL02tz9usJ+zC3E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Mon, 02 Mar 2026 21:22:31 +0000 commit 74867aae25cb6356b8a7d1140c81666e2a23b818 Author: Roger Pau Monne AuthorDate: Thu Feb 26 18:53:02 2026 +0100 Commit: Roger Pau Monne CommitDate: Mon Mar 2 17:16:26 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 0126a3f5d9..537695eaab 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -117,11 +117,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Mar 02 21:22:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 02 Mar 2026 21:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1244545.1543998 (Exim 4.92) (envelope-from ) id 1vxAix-0003di-NV; Mon, 02 Mar 2026 21:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1244545.1543998; Mon, 02 Mar 2026 21: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 1vxAix-0003da-L1; Mon, 02 Mar 2026 21:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1244545; Mon, 02 Mar 2026 21:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxAiw-0003dS-6q for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxAiw-001fwk-0Q for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxAiw-00DQyO-0H for xen-changelog@lists.xenproject.org; Mon, 02 Mar 2026 21: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=TZDmx771ApBFeSNUVje9KFhtxexSWnsphAwdBccHdbE=; b=cB4bT4MXdkWSzXZYiSGhx5sIIY ii5x9F0rt1Gvt8DLM8UqNAVRKl536n2IH0Bkhap61L/gnz/y4NBCR4LlFmsNDDLMcti1MGFrDLX0V QubblyS31yBWLs1TR2MEwGNoGQNXqCk8NqnR1rxwSIaKX5FwW4u86Wh9GIXr3AkoU8l8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Mon, 02 Mar 2026 21:22:42 +0000 commit a0ed5bcfbeee81c91c574ad484faa057054eaf09 Author: Roger Pau Monne AuthorDate: Thu Feb 26 18:54:19 2026 +0100 Commit: Roger Pau Monne CommitDate: Mon Mar 2 17:16:26 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 537695eaab..0d94c0e464 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -185,7 +185,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -400,6 +401,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:11:12 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245002.1544333 (Exim 4.92) (envelope-from ) id 1vxUD1-0003lr-UR; Tue, 03 Mar 2026 18:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245002.1544333; Tue, 03 Mar 2026 18: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 1vxUD1-0003lj-RI; Tue, 03 Mar 2026 18:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1245002; Tue, 03 Mar 2026 18:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUD0-0003ld-6R for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUD0-003Jg9-0J for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUD0-00EjZz-0A for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=enra8xmiXZwKA4h/T5r46juwe60CZeU3bzAi/uMnxko=; b=T8z3z4uQVRBbZB4XSI9Spwvbg/ JkQMO4kmRAKBxO571q41Gv0Jr0M6gu3TM5+/M57Ti9827hka0nnU0hWFN4psC5rSsBIs/er0eep0t xrwsGzI2YUHStvuhiM+6VBG2JHfbeR01D182D/rRlifMCuD5SQdMm4MKv3sgRaJ9RGTE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ucode: Support discrete modules being CPIO archives Message-Id: Date: Tue, 03 Mar 2026 18:11:02 +0000 commit 878a9cfa451878dcba6108ae5b7879c80f049661 Author: Andrew Cooper AuthorDate: Tue Jan 27 14:25:26 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:53 2026 +0000 x86/ucode: Support discrete modules being CPIO archives Multiple downstream distros have tried passing discrete CPIO archives and tripped over this not working. It turns out to be easy to support, so do so. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Tested-by: Teddy Astie --- CHANGELOG.md | 1 + docs/misc/xen-command-line.pandoc | 19 ++++++++----------- xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++++- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18f3d10f20..c191e504ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Support for Bus Lock Threshold on AMD Zen5 and later CPUs, used by Xen to mitigate (by rate-limiting) the system wide impact of an HVM guest misusing atomic instructions. + - Support for CPIO microcode in discrete multiboot modules. ### Removed - On x86: diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index c1f2def9f9..ebdca007d2 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2764,23 +2764,20 @@ Controls for CPU microcode loading, available when `CONFIG_MICROCODE_LOADING` is enabled. In order to load microcode at boot, Xen needs to find a suitable update -amongst the modules provided by the bootloader. Two kinds of microcode update -are supported: +amongst the modules provided by the bootloader. Two formats are supported: 1. Raw microcode containers. The format of the container is CPU vendor specific. - 2. CPIO archive. This is Linux's preferred mechanism, and involves having - the raw containers expressed as files + 2. CPIO archive, which involves having the raw containers expressed as files (e.g. `kernel/x86/microcode/{GenuineIntel,AuthenticAMD}.bin`) in a CPIO - archive, typically prepended to the initrd. + archive. Linux commonly prepends this to the initrd. -The `` and `scan=` options are mutually exclusive and select -between these two options. Further restrictions exist for booting xen.efi -(see below). +The `` and `scan=` options are mutually exclusive and work as +follows. Further restrictions exist for booting xen.efi (see below). - * The `` option nominates a specific multiboot module as a raw - container (option 1 above). Valid options start from 1 (module 0 is + * The `` option nominates a specific multiboot module as containing + microcode in either format. Valid options start from 1 (module 0 is always the dom0 kernel). A negative number may be used, and will back-reference from the end of the module list. i.e. `ucode=-1` will nominate the final multiboot module. @@ -2794,7 +2791,7 @@ When booting xen.efi natively, the concept of multiboot modules doesn't exist. Instead: * In the [EFI configuration file](efi.html), `ucode=` can be used - to identify a file as a raw container (option 1 above). Use of this + to identify a file as containing microcode in either format. Use of this mechanism will disable both `` and `scan=`. * If `ucode=` in the EFI configuration file is not used, it is diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index ea0b35c499..9b8d1e09cb 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -767,6 +767,7 @@ static int __init early_microcode_load(struct boot_info *bi) void *data = NULL; size_t size; const struct microcode_patch *patch; + struct cpio_data cd; int idx = opt_mod_idx; int rc; @@ -783,7 +784,6 @@ static int __init early_microcode_load(struct boot_info *bi) for ( idx = 0; idx < bi->nr_modules; ++idx ) { const struct boot_module *bm = &bi->mods[idx]; - struct cpio_data cd; /* Search anything unclaimed or likely to be a CPIO archive. */ if ( bm->kind != BOOTMOD_UNKNOWN && bm->kind != BOOTMOD_RAMDISK ) @@ -851,6 +851,24 @@ static int __init early_microcode_load(struct boot_info *bi) idx, size); return -ENODEV; } + + /* + * If this blob appears to be a CPIO archive, try interpreting it as + * one. Otherwise treat it as a raw vendor blob. + */ + cd = find_cpio_data(ucode_ops.cpio_path, data, size); + if ( cd.data ) + { + data = cd.data; + size = cd.size; + + /* + * (Ab)use opt_scan to inform microcode_init_cache() that + * early_mod_idx refers to a CPIO archive. + */ + opt_scan = true; + } + goto found; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:11:12 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245003.1544336 (Exim 4.92) (envelope-from ) id 1vxUDA-0003n6-VH; Tue, 03 Mar 2026 18:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245003.1544336; Tue, 03 Mar 2026 18: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 1vxUDA-0003my-Se; Tue, 03 Mar 2026 18:11:12 +0000 Received: by outflank-mailman (input) for mailman id 1245003; Tue, 03 Mar 2026 18:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUDA-0003mo-8w for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUDA-003JgI-0c for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUDA-00Ejag-0V for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=YFMW01HOI00EWXaOtdMzqH+ebadzvhVgthoJciCoeII=; b=RSrunTeEGwW1ODwC7kL5YIp5CO 6Y//yyo5QCi+iMMvAGR0mSybKPWrlZAB7aa2Z1ajGNXIJtUEkWCZJq2eZEZMFB6Uj1jrCRniLJ4xd JFhZSjllDYcZbryzLgt3DNoVUNQyKSuN1WBiXWEX8yvx49AuSuUqIjXCx8wKK3GON/Aw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 03 Mar 2026 18:11:12 +0000 commit a934a600c45486b7acfe8abc3658e284e64e5dd5 Author: Andrew Cooper AuthorDate: Thu Feb 19 13:20:26 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:53 2026 +0000 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 8c20119092..16e9a8d2aa 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -17,6 +17,7 @@ int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -31,6 +32,7 @@ static inline bool pv_trap_callback_registered(const struct vcpu *v, static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index fba1e25c31..64d47ab677 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1401,6 +1402,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3c01c5eb53..bcae704d96 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1379,8 +1379,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:11:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245004.1544340 (Exim 4.92) (envelope-from ) id 1vxUDL-0003pt-0c; Tue, 03 Mar 2026 18:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245004.1544340; Tue, 03 Mar 2026 18: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 1vxUDK-0003pl-U6; Tue, 03 Mar 2026 18:11:22 +0000 Received: by outflank-mailman (input) for mailman id 1245004; Tue, 03 Mar 2026 18:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUDK-0003pd-C6 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUDK-003JgN-17 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUDK-00EjcM-0n for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=TlIg75EdUjVq4Ney0WQWSZbRwIo8nOxvhpyY7UnU7QI=; b=oEHTMeNrIVq6ndHCeGKgSxTJ/J jNslqG+0dM5mo+Mxr4YTCmgk07fr7h6jajDl17MSQFW7ahv4YxMDOkuZgKGpuojycUcY4992Gj8nN 3dfTCw+wyaUDkpz5CpkQR5FC5/KSe1MTMSnmZyAxkg9bwPpIDyX/FCuF1i2w8o+U5rNY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/guest-guide: Describe the PV traps and entrypoints ABI Message-Id: Date: Tue, 03 Mar 2026 18:11:22 +0000 commit 31cbb8e2a52a5470d375ad725b9771da670f6d62 Author: Andrew Cooper AuthorDate: Thu Feb 19 13:20:26 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:53 2026 +0000 docs/guest-guide: Describe the PV traps and entrypoints ABI ... seeing as I've had to thoroughly reverse engineer it for FRED and make tweaks in places. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- docs/glossary.rst | 3 + docs/guest-guide/x86/index.rst | 1 + docs/guest-guide/x86/pv-traps.rst | 126 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/docs/glossary.rst b/docs/glossary.rst index 6adeec77e1..5c3229a8c4 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -43,6 +43,9 @@ Glossary Sapphire Rapids (Server, 2023) CPUs. AMD support only CET-SS, starting with Zen3 (Both client and server, 2020) CPUs. + event channel + A paravirtual facility for guests to send and receive interrupts. + guest The term 'guest' has two different meanings, depending on context, and should not be confused with :term:`domain`. diff --git a/docs/guest-guide/x86/index.rst b/docs/guest-guide/x86/index.rst index 502968490d..5b38ae397a 100644 --- a/docs/guest-guide/x86/index.rst +++ b/docs/guest-guide/x86/index.rst @@ -7,3 +7,4 @@ x86 :maxdepth: 2 hypercall-abi + pv-traps diff --git a/docs/guest-guide/x86/pv-traps.rst b/docs/guest-guide/x86/pv-traps.rst new file mode 100644 index 0000000000..c10001e023 --- /dev/null +++ b/docs/guest-guide/x86/pv-traps.rst @@ -0,0 +1,126 @@ +.. SPDX-License-Identifier: CC-BY-4.0 + +PV Traps and Entrypoints +======================== + +.. note:: + + The details here are specific to 64bit builds of Xen. Details for 32bit + builds of Xen are different and not discussed further. + +PV guests are subject to Xen's linkage setup for events (interrupts, +exceptions and system calls). x86's IDT architecture and limitations are the +majority influence on the PV ABI. + +All external interrupts are routed to PV guests via the :term:`Event Channel` +interface, and not discussed further here. + +What remain are exceptions, and the instructions which cause control +transfers. In the x86 architecture, the instructions relevant for PV guests +are: + + * ``INT3``, which generates ``#BP``. + + * ``INTO``, which generates ``#OF`` only if the overflow flag is set. It is + only usable in compatibility mode, and will ``#UD`` in 64bit mode. + + * ``CALL (far)`` referencing a gate in the GDT. + + * ``INT $N``, which invokes an arbitrary IDT gate. These four instructions + so far all check the gate DPL and will ``#GP`` otherwise. + + * ``INT1``, also known as ``ICEBP``, which generates ``#DB``. This + instruction does *not* check DPL, and can be used unconditionally by + userspace. + + * ``SYSCALL``, which enters CPL0 as configured by the ``{C,L,}STAR`` MSRs. + It is usable if enabled by ``MSR_EFER.SCE``, and will ``#UD`` otherwise. + On Intel parts, ``SYSCALL`` is unusable outside of 64bit mode. + + * ``SYSENTER``, which enters CPL0 as configured by the ``SEP`` MSRs. It is + usable if enabled by ``MSR_SYSENTER_CS`` having a non-NUL selector, and + will ``#GP`` otherwise. On AMD parts, ``SYSENTER`` is unusable in Long + mode. + +The ``BOUND`` instruction is not included. It is a hardware exception and +strictly a fault, with no trapping configuraton. + + +Xen's configuration +------------------- + +Xen maintains a complete IDT, with most gates configured with DPL0. This +causes most ``INT $N`` instructions to ``#GP``. This allows Xen to emulate +the instruction, referring to the guest kernels vDPL choice. + + * Vectors 3 ``#BP`` and 4 ``#OF`` are DPL3, in order to allow the ``INT3`` + and ``INTO`` instructions to function in userspace. + + * Vector 0x80 is DPL3 because of it's common usage for syscall in UNIXes. + This is a fastpath to avoid the emulation overhead. + + * Vector 0x82 is DPL1 when PV32 is enabled, allowing the guest kernel to make + hypercalls to Xen. All other cases (PV32 guest userspace, and both PV64 + modes) operate in CPL3 and this vector behaves like all others to ``INT + $N`` instructions. + +A range of the GDT is guest-owned, allowing for call gates. During audit, Xen +forces all call gates to DPL0, causing their use to ``#GP`` allowing for +emulation. + +Xen enables ``SYSCALL`` in all cases as it is mandatory in 64bit mode, and +enables ``SYSENTER`` when available in 64bit mode. + +When Xen is using FRED delivery the hardware configuration is substantially +different, but the behaviour for guests remains as unchanged as possible. + + +PV Guest's configuration +------------------------ + +The PV ABI contains the "trap table", modelled closely on the IDT. It is +manipulated by ``HYPERCALL_set_trap_table``, has 256 entries, each containing +a code segment selector, an address, and flags. A guest is expected to +configure handlers for all exceptions; failure to do so is terminal and +similar to a Triple Fault. + +Part of the GDT is guest owned with descriptors audited by Xen. This range +can be manipulated with ``HYPERVISOR_set_gdt`` and +``HYPERVISOR_update_descriptor``. + +Other entrypoints are configured via ``HYPERVISOR_callback_op``. Of note here +are the callback types ``syscall``, ``syscall32`` (relevant for AMD parts) and +``sysenter`` (relevant for Intel parts). + +.. warning:: + + Prior to Xen 4.15, there was no check that the ``syscall`` or ``syscall32`` + callbacks had been registered before attempting to deliver via them. + Guests are strongly advised to ensure the entrypoints are registered before + running userspace. + + +Notes +----- + +``INT3`` vs ``INT $3`` and ``INTO`` vs ``INT $4`` are hard to distinguish +architecturally as both forms have a DPL check and use the same IDT vectors. +Because Xen configures both as DPL3, the ``INT $`` forms do not fault for +emulation, and are treated as if they were exceptions. This means the guest +can't block these instruction by trying to configure them with vDPL0. + +The instructions which trap into Xen (``INT $0x80``, ``SYSCALL``, +``SYSENTER``) but can be disabled by guest configuration need turning back +into faults for the guest kernel to process. + + * When using IDT delivery, instruction lengths are not provided by hardware + and Xen does not account for possible prefixes. ``%rip`` only gets rewound + by the length of the un-prefixed instruction. This is observable, but not + expected to be an issue in practice. + + * When Xen is using FRED delivery, the full instruction length is provided by + hardware, and ``%rip`` is rewound fully. + +While both PV32 and PV64 guests are permitted to write Call Gates into the +GDT, emulation is only wired up for PV32. At the time of writing, the x86 +maintainers feel no specific need to fix this omission. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:11:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245006.1544344 (Exim 4.92) (envelope-from ) id 1vxUDV-0003sI-1z; Tue, 03 Mar 2026 18:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245006.1544344; Tue, 03 Mar 2026 18: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 1vxUDU-0003sA-VT; Tue, 03 Mar 2026 18:11:32 +0000 Received: by outflank-mailman (input) for mailman id 1245006; Tue, 03 Mar 2026 18:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUDU-0003s2-Fg for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUDU-003Jgb-1Q for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUDU-00Ejcw-1J for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=uWYmLQnBBVWUPyxkeBg6UMFUwFInaob5gR+dFkeGADc=; b=N+WeaxR2Q1UGH/LnVZsQxdk4Qy PSbyYG3/RFWA6JMaPpj7S5Vr482ku8NljzAbfOyiIp9tpRGpxxSAqHWsxAiE6bTMsLSWjaUrdNRIV 3xDcCmzNSbjyumHJnwIX73AIDgX3e9SO+lbIo0XmGIHsY2302HaM39jQMfSrsX0P6FlM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Move gdt_l1e caching out of traps_init() Message-Id: Date: Tue, 03 Mar 2026 18:11:32 +0000 commit a1e6afbf54283be0ea3db9bf6cb046c683fcf684 Author: Andrew Cooper AuthorDate: Fri Feb 13 23:45:28 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/boot: Move gdt_l1e caching out of traps_init() Commit 564d261687c0 ("x86/ctxt-switch: Document and improve GDT handling") put the initialisation of {,compat_}gdt_l1e into traps_init() but this wasn't a great choice. Instead, put it in smp_prepare_cpus() which performs the BSP preparation of variables normally set up by cpu_smpboot_alloc() for APs. This removes an implicit dependency that prevents traps_init() moving earlier than move_xen() in the boot sequence. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 2 ++ xen/arch/x86/smpboot.c | 11 +++++++++++ xen/arch/x86/traps-setup.c | 7 ------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8eb1509782..e658c2d647 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2029,6 +2029,8 @@ static always_inline bool need_full_gdt(const struct domain *d) static void update_xen_slot_in_full_gdt(const struct vcpu *v, unsigned int cpu) { + ASSERT(per_cpu(gdt_l1e, cpu).l1); /* Confirm these have been cached. */ + l1e_write(pv_gdt_ptes(v) + FIRST_RESERVED_GDT_PAGE, !is_pv_32bit_vcpu(v) ? per_cpu(gdt_l1e, cpu) : per_cpu(compat_gdt_l1e, cpu)); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 961bdf5333..491cbbba33 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1167,6 +1167,17 @@ void __init smp_prepare_cpus(void) initialize_cpu_data(0); /* Final full version of the data */ print_cpu_info(0); + /* + * Cache {,compat_}gdt_l1e for the BSP now that physically relocation is + * done. It must be after physical relocation of Xen, and before the + * first context_switch(). + */ + this_cpu(gdt_l1e) = + l1e_from_pfn(virt_to_mfn(boot_gdt), __PAGE_HYPERVISOR_RW); + if ( IS_ENABLED(CONFIG_PV32) ) + this_cpu(compat_gdt_l1e) = + l1e_from_pfn(virt_to_mfn(boot_compat_gdt), __PAGE_HYPERVISOR_RW); + boot_cpu_physical_apicid = get_apic_id(); x86_cpu_to_apicid[0] = boot_cpu_physical_apicid; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index d77be8f839..c5fc71c75b 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -341,13 +341,6 @@ void __init traps_init(void) init_ler(); - /* Cache {,compat_}gdt_l1e now that physically relocation is done. */ - this_cpu(gdt_l1e) = - l1e_from_pfn(virt_to_mfn(boot_gdt), __PAGE_HYPERVISOR_RW); - if ( IS_ENABLED(CONFIG_PV32) ) - this_cpu(compat_gdt_l1e) = - l1e_from_pfn(virt_to_mfn(boot_compat_gdt), __PAGE_HYPERVISOR_RW); - percpu_traps_init(); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:11:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245007.1544348 (Exim 4.92) (envelope-from ) id 1vxUDf-0003uQ-35; Tue, 03 Mar 2026 18:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245007.1544348; Tue, 03 Mar 2026 18: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 1vxUDf-0003uJ-0W; Tue, 03 Mar 2026 18:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1245007; Tue, 03 Mar 2026 18:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUDe-0003uC-I5 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUDe-003Jgi-1i for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUDe-00Ejdr-1b for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=oJNsQCfC9b1UkhqL/6wj04OKL/MV/5e11vwx0uQGlnM=; b=ZlXGVzLGi3LzuPV3SIzi2esoCu 91if4omLCjJX5vRSPxU2cI24onc9KmZKL7dh2woyefQD3dkp+usfUSItZt+76fH/gykRYI92FqaaJ FnvkRaIxYK0lSF/zcs0kRFVJvEVuaBMFwNeyq3paGqafSAdRTI5YgkmfHaPI5wcTzKrM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Document the ordering dependency of _svm_cpu_up() Message-Id: Date: Tue, 03 Mar 2026 18:11:42 +0000 commit c2f15b0fff94ca71fe32792ea933fcf2a907111d Author: Andrew Cooper AuthorDate: Mon Feb 16 20:57:02 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/boot: Document the ordering dependency of _svm_cpu_up() Lets just say this took an unreasonable amount of time and effort to track down, when trying to move traps_init() earlier during boot. When the SYSCALL linkage MSRs are not configured ahead of _svm_cpu_up() on the BSP, context switch clobbers the later-set-up linkage with the 0's cached here. Amongst other problems, this causes PV guest to enter at 0 in supervisor mode on the user stack. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 14 ++++++++++++++ xen/arch/x86/setup.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 18ba837738..243c41fb13 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1581,6 +1581,20 @@ static int _svm_cpu_up(bool bsp) /* Initialize OSVW bits to be used by guests */ svm_host_osvw_init(); + /* + * VMSAVE writes out the current full FS, GS, LDTR and TR segments, and + * the GS_SHADOW, SYSENTER and SYSCALL linkage MSRs. + * + * The segment data gets modified by the svm_load_segs() optimisation for + * PV context switches, but all values get reloaded at that point, as well + * as during context switch from SVM. + * + * If PV guests are available, it is critical that the SYSCALL linkage + * MSRs been configured at this juncture even in FRED mode. + */ + if ( IS_ENABLED(CONFIG_PV) ) + ASSERT(rdmsr(MSR_STAR) == XEN_MSR_STAR); + svm_vmsave_pa(per_cpu(host_vmcb, cpu)); return 0; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 27c63d1d97..675de3a649 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -2078,7 +2078,7 @@ void asmlinkage __init noreturn __start_xen(void) &this_cpu(stubs).mfn); BUG_ON(!this_cpu(stubs.addr)); - traps_init(); /* Needs stubs allocated. */ + traps_init(); /* Needs stubs allocated, must be before presmp_initcalls. */ cpu_init(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:11:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245008.1544352 (Exim 4.92) (envelope-from ) id 1vxUDp-0003wm-5o; Tue, 03 Mar 2026 18:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245008.1544352; Tue, 03 Mar 2026 18: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 1vxUDp-0003wa-3F; Tue, 03 Mar 2026 18:11:53 +0000 Received: by outflank-mailman (input) for mailman id 1245008; Tue, 03 Mar 2026 18:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUDo-0003wU-L8 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUDo-003Jh9-21 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUDo-00EjeD-1t for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=wDS7Wr7QyyO4aOomuKvgzUNBPtjh9iWYTxq2TelvBnk=; b=TH3JVW6jAwl2wjpCThT4gIeneS iWeqvL79Ds5E/ThB7O8XRNIh9Lm1jNf1mvxBdxILns7BsdpoTa1ht665rP2EK9FYTF3AYc8dFOt+9 BJM309c6QOSrigEXFSyYNLoAsRDIN2Ix7K6kkAVtKEdP9Cry/RQhqS+qQUV/GPfsxpRA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Move traps_init() earlier on boot Message-Id: Date: Tue, 03 Mar 2026 18:11:52 +0000 commit 8e4775d118c327782f5bf286e5b353a9de797bef Author: Andrew Cooper AuthorDate: Fri Aug 15 22:56:42 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Move traps_init() earlier on boot We wish to make use of opt_fred earlier on boot, which involves moving traps_init() earlier, but this comes with several ordering complications. The feature word containing FRED needs collecting in early_cpu_init(), and legacy_syscall_init() cannot be moved that early because it relies on the stubs being allocated, yet must be called ahead of cpu_init() so the SYSCALL linkage MSRs are set up before being cached. Delaying legacy_syscall_init() is easy enough based on a system_state check. Reuse bsp_traps_reinit() to cause a call to legacy_syscall_init() to occur at the same point as previously. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 4 +++- xen/arch/x86/setup.c | 4 +++- xen/arch/x86/traps-setup.c | 12 +++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index bfa63fcfb7..5d0523a78b 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -407,7 +407,9 @@ void __init early_cpu_init(bool verbose) } if (max_subleaf >= 1) - cpuid_count(7, 1, &eax, &ebx, &ecx, + cpuid_count(7, 1, + &c->x86_capability[FEATURESET_7a1], + &ebx, &ecx, &c->x86_capability[FEATURESET_7d1]); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 675de3a649..0816a713e1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1386,6 +1386,8 @@ void asmlinkage __init noreturn __start_xen(void) else panic("Bootloader provided no memory information\n"); + traps_init(); + /* Choose shadow stack early, to set infrastructure up appropriately. */ if ( !boot_cpu_has(X86_FEATURE_CET_SS) ) opt_xen_shstk = 0; @@ -2078,7 +2080,7 @@ void asmlinkage __init noreturn __start_xen(void) &this_cpu(stubs).mfn); BUG_ON(!this_cpu(stubs.addr)); - traps_init(); /* Needs stubs allocated, must be before presmp_initcalls. */ + bsp_traps_reinit(); /* Needs stubs allocated, must be before presmp_initcalls. */ cpu_init(); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index c5fc71c75b..b2c161943d 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -346,6 +346,10 @@ void __init traps_init(void) /* * Re-initialise all state referencing the early-boot stack. + * + * This is called twice during boot, first to ensure legacy_syscall_init() has + * run (deferred from earlier), and second when the virtual address of the BSP + * stack changes. */ void __init bsp_traps_reinit(void) { @@ -359,7 +363,13 @@ void __init bsp_traps_reinit(void) */ void percpu_traps_init(void) { - legacy_syscall_init(); + /* + * Skip legacy_syscall_init() at early boot. It requires the stubs being + * allocated, limiting the placement of the traps_init() call, and gets + * re-done anyway by bsp_traps_reinit(). + */ + if ( system_state > SYS_STATE_early_boot ) + legacy_syscall_init(); if ( cpu_has_xen_lbr ) wrmsrl(MSR_IA32_DEBUGCTLMSR, IA32_DEBUGCTLMSR_LBR); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:12:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245009.1544356 (Exim 4.92) (envelope-from ) id 1vxUDz-0003yz-7X; Tue, 03 Mar 2026 18:12:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245009.1544356; Tue, 03 Mar 2026 18: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 1vxUDz-0003ys-4Z; Tue, 03 Mar 2026 18:12:03 +0000 Received: by outflank-mailman (input) for mailman id 1245009; Tue, 03 Mar 2026 18:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUDy-0003ym-OY for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUDy-003JhQ-2J for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUDy-00Ejf6-2D for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=JiKYpz/9CGqPu+C13bQSY4/qqaOuxQCugyjyBF8cwhM=; b=mUJp3Ya4q/f4Xi9iJktuhmHD1S bij8kaRUttEf3HjtPFiSEgF8NtvCfeEs5kmhBhEbAxTW26FQxA3TENXILs1IJOj2H8wWrgYKJl0qH jknKN+5aKbIfzKESJR/QAq6F0e93a9MdQ16ruge7N3YAKuDz+jgY7JcBHhAsJIWaDn2A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Don't configure Supervisor Shadow Stack tokens in FRED mode Message-Id: Date: Tue, 03 Mar 2026 18:12:02 +0000 commit 7634f5662551864a4976d5f0022263a056efd14d Author: Andrew Cooper AuthorDate: Fri Aug 15 22:56:42 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Don't configure Supervisor Shadow Stack tokens in FRED mode FRED doesn't use Supervisor Shadow Stack tokens. This means that: 1) memguard_guard_stack() should not write Supervisor Shadow Stack Tokens. 2) cpu_has_bug_shstk_fracture is no longer relevant when deciding whether to enable Shadow Stacks or not. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/mm.c | 14 +++++++++++--- xen/arch/x86/setup.c | 16 ++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 0d0d529295..4c404b6c13 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -129,6 +129,7 @@ #include #include #include +#include #include #include @@ -6441,8 +6442,15 @@ static void write_sss_token(unsigned long *ptr) void memguard_guard_stack(void *p) { - /* IST Shadow stacks. 4x 1k in stack page 0. */ - if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + ASSERT(opt_fred >= 0); /* Confirm that FRED-ness has been resolved */ + + /* + * IST Shadow stacks. 4x 1k in stack page 0. + * + * With IDT delivery, we need Supervisor Shadow Stack tokens at the base + * of each stack. With FRED delivery, these no longer exist. + */ + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && !opt_fred ) { write_sss_token(p + (IST_MCE * IST_SHSTK_SIZE) - 8); write_sss_token(p + (IST_NMI * IST_SHSTK_SIZE) - 8); @@ -6453,7 +6461,7 @@ void memguard_guard_stack(void *p) /* Primary Shadow Stack. 1x 4k in stack page 5. */ p += PRIMARY_SHSTK_SLOT * PAGE_SIZE; - if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && !opt_fred ) write_sss_token(p + PAGE_SIZE - 8); map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, PAGE_HYPERVISOR_SHSTK); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0816a713e1..8e59c9801a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1412,15 +1412,19 @@ void asmlinkage __init noreturn __start_xen(void) boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && !boot_cpu_has(X86_FEATURE_CET_SSS); + ASSERT(opt_fred >= 0); /* Confirm that FRED-ness has been resolved */ + /* - * On bare metal, assume that Xen won't be impacted by shstk - * fracturing problems. Under virt, be more conservative and disable - * shstk by default. + * If FRED is in use, Supervisor Shadow Stack tokens are not used and + * shstk fracturing is of no consequence. Otherwise: + * - On bare metal, assume that Xen won't be impacted by shstk + * fracturing problems. + * - Under virt, be more conservative and disable shstk by default. */ if ( opt_xen_shstk == -1 ) opt_xen_shstk = - cpu_has_hypervisor ? !cpu_has_bug_shstk_fracture - : true; + opt_fred || (cpu_has_hypervisor ? !cpu_has_bug_shstk_fracture + : true); if ( opt_xen_shstk ) { @@ -1925,7 +1929,7 @@ void asmlinkage __init noreturn __start_xen(void) system_state = SYS_STATE_boot; - bsp_stack = cpu_alloc_stack(0); + bsp_stack = cpu_alloc_stack(0); /* Needs to know IDT vs FRED */ if ( !bsp_stack ) panic("No memory for BSP stack\n"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:12:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245010.1544362 (Exim 4.92) (envelope-from ) id 1vxUEA-000414-9b; Tue, 03 Mar 2026 18:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245010.1544362; Tue, 03 Mar 2026 18: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 1vxUEA-00040w-69; Tue, 03 Mar 2026 18:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1245010; Tue, 03 Mar 2026 18:12:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUE8-00040p-RN for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:12:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUE8-003JhX-2e for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:12:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUE8-00Ejfl-2V for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=tFyfv00zydjzbHYf51ODZYAcGDhGvFDIM/ZmzkG5bOU=; b=OFU8veCLMKQn2gMOgFXV0JK8H7 T3kaK86O4RJW2T4wuDKgPR/ukaqdIwUgUfkKd2nKS6UGjy7DaXD40W/wMTCFARmfs+BOM2WiFdFvL mkqUrC2/YiFUZuCyqR9vhk58f/TVUtHmZ4FPac4qnSMzKybQZCigtZFZgORXDjpJhuMQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Introduce FRED entrypoints Message-Id: Date: Tue, 03 Mar 2026 18:12:12 +0000 commit 0e9cc04453fc2d7234ad3ced51b520c597c7bfbf Author: Andrew Cooper AuthorDate: Tue Dec 24 11:03:06 2024 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Introduce FRED entrypoints Under FRED, there's one entrypoint from Ring 3, and one from Ring 0. FRED gives us a good stack (even for SYSCALL/SYSENTER), and a unified event frame on the stack with all flags cleared, meaning that all software needs to do is spill the GPRs with a line of PUSHes. Introduce PUSH_AND_CLEAR_GPRS for this purpose, along with the matching POP_GPRS. Introduce entry_FRED_R0() which to a first approximation is complete for all event handling within Xen. entry_FRED_R0() needs deriving from entry_FRED_R3(), so introduce a basic Ring3 handler. There is more work required to make the return-to-guest path work under FRED. Also introduce entry_from_{xen,pv}() to be the C level handlers. By simply copying regs->fred_ss.vector into regs->entry_vector, we can reuse all the existing fault handlers. Extend fatal_trap() to render the event type including name, when FRED is active. This is slightly complicated, because X86_ET_OTHER must not use vector_name() or SYSCALL and SYSENTER get rendered as #BP and #DB. This is sufficient to handle all interrupts and exceptions encountered during development, including plenty of Double Faults. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/asm_defns.h | 63 ++++++++++++++ xen/arch/x86/traps.c | 155 +++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/Makefile | 1 + xen/arch/x86/x86_64/entry-fred.S | 33 ++++++++ 4 files changed, 252 insertions(+) diff --git a/xen/arch/x86/include/asm/asm_defns.h b/xen/arch/x86/include/asm/asm_defns.h index 4a21a7b466..0dd63270fc 100644 --- a/xen/arch/x86/include/asm/asm_defns.h +++ b/xen/arch/x86/include/asm/asm_defns.h @@ -312,6 +312,69 @@ static always_inline void stac(void) subq $-(UREGS_error_code-UREGS_r15+\adj), %rsp .endm +/* + * Push and clear GPRs + */ +.macro PUSH_AND_CLEAR_GPRS + push %rdi + xor %edi, %edi + push %rsi + xor %esi, %esi + push %rdx + xor %edx, %edx + push %rcx + xor %ecx, %ecx + push %rax + xor %eax, %eax + push %r8 + xor %r8d, %r8d + push %r9 + xor %r9d, %r9d + push %r10 + xor %r10d, %r10d + push %r11 + xor %r11d, %r11d + push %rbx + xor %ebx, %ebx + push %rbp +#ifdef CONFIG_FRAME_POINTER +/* Indicate special exception stack frame by inverting the frame pointer. */ + mov %rsp, %rbp + not %rbp +#else + xor %ebp, %ebp +#endif + push %r12 + xor %r12d, %r12d + push %r13 + xor %r13d, %r13d + push %r14 + xor %r14d, %r14d + push %r15 + xor %r15d, %r15d +.endm + +/* + * POP GPRs from a UREGS_* frame on the stack. Does not modify flags. + */ +.macro POP_GPRS + pop %r15 + pop %r14 + pop %r13 + pop %r12 + pop %rbp + pop %rbx + pop %r11 + pop %r10 + pop %r9 + pop %r8 + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi +.endm + #ifdef CONFIG_PV32 #define CR4_PV32_RESTORE \ ALTERNATIVE_2 "", \ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index bcae704d96..e40b51d693 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -88,6 +88,13 @@ const unsigned int nmi_cpu; #define stack_words_per_line 4 #define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)(regs)->rsp) +/* Only valid to use when FRED is active. */ +static inline struct fred_info *cpu_regs_fred_info(struct cpu_user_regs *regs) +{ + ASSERT(read_cr4() & X86_CR4_FRED); + return &container_of(regs, struct cpu_info, guest_cpu_user_regs)->_fred; +} + struct extra_state { unsigned long cr0, cr2, cr3, cr4; @@ -1028,6 +1035,32 @@ void show_execution_state_nmi(const cpumask_t *mask, bool show_all) printk("Non-responding CPUs: {%*pbl}\n", CPUMASK_PR(&show_state_mask)); } +static const char *x86_et_name(unsigned int type) +{ + static const char *const names[] = { + [X86_ET_EXT_INTR] = "EXT_INTR", + [X86_ET_NMI] = "NMI", + [X86_ET_HW_EXC] = "HW_EXC", + [X86_ET_SW_INT] = "SW_INT", + [X86_ET_PRIV_SW_EXC] = "PRIV_SW_EXC", + [X86_ET_SW_EXC] = "SW_EXC", + [X86_ET_OTHER] = "OTHER", + }; + + return (type < ARRAY_SIZE(names) && names[type]) ? names[type] : "???"; +} + +static const char *x86_et_other_name(unsigned int what) +{ + static const char *const names[] = { + [0] = "MTF", + [1] = "SYSCALL", + [2] = "SYSENTER", + }; + + return (what < ARRAY_SIZE(names) && names[what]) ? names[what] : "???"; +} + const char *vector_name(unsigned int vec) { static const char names[][4] = { @@ -1106,6 +1139,38 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) } } + if ( read_cr4() & X86_CR4_FRED ) + { + bool render_ec = false; + const char *vec_name = NULL; + + switch ( regs->fred_ss.type ) + { + case X86_ET_HW_EXC: + case X86_ET_PRIV_SW_EXC: + case X86_ET_SW_EXC: + render_ec = true; + vec_name = vector_name(regs->fred_ss.vector); + break; + + case X86_ET_OTHER: + vec_name = x86_et_other_name(regs->fred_ss.vector); + break; + } + + if ( render_ec ) + panic("FATAL TRAP: type %u, %s, vec %u, %s[%04x]%s\n", + regs->fred_ss.type, x86_et_name(regs->fred_ss.type), + regs->fred_ss.vector, vec_name ?: "", + regs->error_code, + (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); + else + panic("FATAL TRAP: type %u, %s, vec %u, %s%s\n", + regs->fred_ss.type, x86_et_name(regs->fred_ss.type), + regs->fred_ss.vector, vec_name ?: "", + (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); + } + panic("FATAL TRAP: vec %u, %s[%04x]%s\n", trapnr, vector_name(trapnr), regs->error_code, (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); @@ -2200,6 +2265,96 @@ void asmlinkage check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) } #endif +void asmlinkage entry_from_pv(struct cpu_user_regs *regs) +{ + /* Copy fred_ss.vector into entry_vector as IDT delivery would have done. */ + regs->entry_vector = regs->fred_ss.vector; + + fatal_trap(regs, false); +} + +void asmlinkage entry_from_xen(struct cpu_user_regs *regs) +{ + struct fred_info *fi = cpu_regs_fred_info(regs); + uint8_t type = regs->fred_ss.type; + + /* Copy fred_ss.vector into entry_vector as IDT delivery would have done. */ + regs->entry_vector = regs->fred_ss.vector; + + /* + * First, handle the asynchronous or fatal events. These are either + * unrelated to the interrupted context, or may not have valid context + * recorded, and all have special rules on how/whether to re-enable IRQs. + */ + if ( regs->fred_ss.nested ) + goto fatal; + + switch ( type ) + { + case X86_ET_EXT_INTR: + return do_IRQ(regs); + + case X86_ET_NMI: + return do_nmi(regs); + + case X86_ET_HW_EXC: + switch ( regs->fred_ss.vector ) + { + case X86_EXC_DF: return do_double_fault(regs); + case X86_EXC_MC: return do_machine_check(regs); + } + break; + } + + /* + * With the asynchronous events handled, what remains are the synchronous + * ones. If we interrupted an IRQs-on region, we should re-enable IRQs + * now; for #PF and #DB, %cr2 and PENDING_DBG are on the stack in edata. + */ + if ( regs->eflags & X86_EFLAGS_IF ) + local_irq_enable(); + + switch ( type ) + { + case X86_ET_HW_EXC: + case X86_ET_PRIV_SW_EXC: + case X86_ET_SW_EXC: + switch ( regs->fred_ss.vector ) + { + case X86_EXC_PF: handle_PF(regs, fi->edata); break; + case X86_EXC_GP: do_general_protection(regs); break; + case X86_EXC_UD: do_invalid_op(regs); break; + case X86_EXC_NM: do_device_not_available(regs); break; + case X86_EXC_BP: do_int3(regs); break; + case X86_EXC_DB: handle_DB(regs, fi->edata); break; + case X86_EXC_CP: do_entry_CP(regs); break; + + case X86_EXC_DE: + case X86_EXC_OF: + case X86_EXC_BR: + case X86_EXC_NP: + case X86_EXC_SS: + case X86_EXC_MF: + case X86_EXC_AC: + case X86_EXC_XM: + do_trap(regs); + break; + + default: + goto fatal; + } + break; + + default: + goto fatal; + } + + return; + + fatal: + fatal_trap(regs, false); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index f207630887..c0a0b66032 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_PV32) += compat/ +obj-bin-y += entry-fred.o obj-bin-y += entry.o obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += pci.o diff --git a/xen/arch/x86/x86_64/entry-fred.S b/xen/arch/x86/x86_64/entry-fred.S new file mode 100644 index 0000000000..3c3320df22 --- /dev/null +++ b/xen/arch/x86/x86_64/entry-fred.S @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + + .file "x86_64/entry-fred.S" + +#include +#include + + .section .text.entry, "ax", @progbits + + /* The Ring3 entry point is required to be 4k aligned. */ + +FUNC(entry_FRED_R3, 4096) + PUSH_AND_CLEAR_GPRS + + mov %rsp, %rdi + call entry_from_pv + + POP_GPRS + eretu +END(entry_FRED_R3) + + /* The Ring0 entrypoint is at Ring3 + 0x100. */ + .org entry_FRED_R3 + 0x100, 0xcc + +FUNC_LOCAL(entry_FRED_R0, 0) + PUSH_AND_CLEAR_GPRS + + mov %rsp, %rdi + call entry_from_xen + + POP_GPRS + erets +END(entry_FRED_R0) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 18:12:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 18:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245011.1544363 (Exim 4.92) (envelope-from ) id 1vxUEK-000438-A5; Tue, 03 Mar 2026 18:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245011.1544363; Tue, 03 Mar 2026 18: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 1vxUEK-000430-7V; Tue, 03 Mar 2026 18:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1245011; Tue, 03 Mar 2026 18:12:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxUEI-00042n-UA for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:12:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxUEI-003Jhb-2v for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18:12:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxUEI-00Ejgg-2o for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 18: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=vz95rcit0HVVeRewC6cvm86erjhu1Gx1v6ks8Xd2MxA=; b=hrrct6I2iCJMZuTqhgJOYSCnNC wbHOPemx+aeB1Beo/dzD41cjQV489zWLn57Txftdrx6mRNmGohhU2tweH8arjRIPqnp02EEAZnNPQ 563cQxO7L8Ufhmeizz+kba3qwuU6EM7cWe0txki5dGO0pFT7+arc5FeVGJZmuIzGeZMc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Enable FRED when requested Message-Id: Date: Tue, 03 Mar 2026 18:12:22 +0000 commit bbfb30f649fc11281b091b91fd353954df1354a0 Author: Andrew Cooper AuthorDate: Tue Dec 24 11:03:06 2024 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Enable FRED when requested With the shadow stack and exception handling adjustements in place, we can now activate FRED when appropriate. Note that opt_fred is still disabled by default until more development is complete. Introduce init_fred() to set up all the MSRs relevant for FRED. FRED uses MSR_STAR (entries from Ring3 only), and MSR_FRED_SSP_SL0 aliases MSR_PL0_SSP when CET-SS is active. Otherwise, they're all new MSRs. Also introduce init_fred_tss(). At this juncture we need a TSS set up, even if it is mostly unused. Reinsert the BUILD_BUG_ON() checking the size of the TSS against 0x67, this time with a more precise comment. With init_fred() existing, load_system_tables() and legacy_syscall_init() should only be used when setting up IDT delivery. Insert ASSERT()s to this effect, and adjust the various init functions to make this property true. The FRED initialisation path still needs to write to all system table registers at least once, even if only to invalidate them. Per the documentation, percpu_early_traps_init() is responsible for switching off the boot GDT, which also needs doing even in FRED mode. Finally, set CR4.FRED in traps_init()/percpu_early_traps_init(). Xen can now boot in FRED mode and run a PVH dom0. PV guests still need more work before they can be run under FRED. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/current.h | 3 + xen/arch/x86/include/asm/traps.h | 2 + xen/arch/x86/traps-setup.c | 130 +++++++++++++++++++++++++++++++++++-- 3 files changed, 130 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index 62817e8476..6139980ab1 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -23,6 +23,9 @@ * 2 - NMI IST stack * 1 - #MC IST stack * 0 - IST Shadow Stacks (4x 1k, read-only) + * + * In FRED mode, #DB and NMI do not need special stacks, so their IST stacks + * are unused. */ /* diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 73097e957d..5d7504bc44 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -16,6 +16,8 @@ void traps_init(void); void bsp_traps_reinit(void); void percpu_traps_init(void); +void nocall entry_FRED_R3(void); + extern unsigned int ler_msr; const char *vector_name(unsigned int vec); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index b2c161943d..9b8301c23e 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -59,6 +59,8 @@ static void load_system_tables(void) .limit = sizeof(bsp_idt) - 1, }; + ASSERT(opt_fred == 0); + /* * Set up the TSS. Warning - may be live, and the NMI/#MC must remain * valid on every instruction boundary. (Note: these are all @@ -191,6 +193,8 @@ static void legacy_syscall_init(void) unsigned char *stub_page; unsigned int offset; + ASSERT(opt_fred == 0); + /* No PV guests? No need to set up SYSCALL/SYSENTER infrastructure. */ if ( !IS_ENABLED(CONFIG_PV) ) return; @@ -268,6 +272,76 @@ static void __init init_ler(void) setup_force_cpu_cap(X86_FEATURE_XEN_LBR); } +/* + * Set up all MSRs relevant for FRED event delivery. + * + * Xen does not use any of the optional config in MSR_FRED_CONFIG, so all that + * is needed is the entrypoint. + * + * Because FRED always provides a good stack, NMI and #DB do not need any + * special treatment. Only #DF needs another stack level, and #MC for the + * off-chance that Xen's main stack suffers an uncorrectable error. + * + * This makes Stack Level 1 unused, but we use #DB's stacks, and with the + * regular and shadow stack pointers reversed as poison to guarantee that any + * use escalates to #DF. + * + * FRED reuses MSR_STAR to provide the segment selector values to load on + * entry from Ring3. Entry from Ring0 leave %cs and %ss unmodified. + */ +static void init_fred(void) +{ + unsigned long stack_top = get_stack_bottom() & ~(STACK_SIZE - 1); + + ASSERT(opt_fred == 1); + + wrmsrns(MSR_STAR, XEN_MSR_STAR); + wrmsrns(MSR_FRED_CONFIG, (unsigned long)entry_FRED_R3); + + /* + * MSR_FRED_RSP_* all come with an 64-byte alignment check, avoiding the + * need for an explicit BUG_ON(). + */ + wrmsrns(MSR_FRED_RSP_SL0, (unsigned long)(&get_cpu_info()->_fred + 1)); + wrmsrns(MSR_FRED_RSP_SL1, stack_top + (IST_DB * IST_SHSTK_SIZE)); /* Poison */ + wrmsrns(MSR_FRED_RSP_SL2, stack_top + (1 + IST_MCE) * PAGE_SIZE); + wrmsrns(MSR_FRED_RSP_SL3, stack_top + (1 + IST_DF) * PAGE_SIZE); + wrmsrns(MSR_FRED_STK_LVLS, ((2UL << (X86_EXC_MC * 2)) | + (3UL << (X86_EXC_DF * 2)))); + + if ( cpu_has_xen_shstk ) + { + wrmsrns(MSR_FRED_SSP_SL0, stack_top + (PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE); + wrmsrns(MSR_FRED_SSP_SL1, stack_top + (1 + IST_DB) * PAGE_SIZE); /* Poison */ + wrmsrns(MSR_FRED_SSP_SL2, stack_top + (IST_MCE * IST_SHSTK_SIZE)); + wrmsrns(MSR_FRED_SSP_SL3, stack_top + (IST_DF * IST_SHSTK_SIZE)); + } +} + +/* + * Set up a minimal TSS and selector for use in FRED mode. + * + * With FRED moving the stack pointers into MSRs, we would like to avoid + * having a TSS at all, but: + * - VT-x VMExit unconditionally sets TR.limit to 0x67, meaning that + * HOST_TR_BASE needs to point to a good TSS. + * - show_stack_overflow() cross-checks tss->rsp0. + * + * Fill in rsp0 and the bitmap offset, and load a zero-length TR. If VT-x + * does get used, it will clobber TR to refer to this_cpu(tss_page).tss. + */ +static void init_fred_tss(void) +{ + seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; + struct tss64 *tss = &this_cpu(tss_page).tss; + + tss->rsp0 = get_stack_bottom(); + tss->bitmap = IOBMP_INVALID_OFFSET; + + _set_tssldt_desc(gdt + TSS_ENTRY, 0, 0, SYS_DESC_tss_avail); + ltr(TSS_SELECTOR); +} + /* * Configure basic exception handling. This is prior to parsing the command * line or configuring a console, and needs to be as simple as possible. @@ -322,6 +396,8 @@ void __init traps_init(void) if ( opt_fred ) { + const struct desc_ptr idtr = {}; + #ifdef CONFIG_PV32 if ( opt_pv32 ) { @@ -329,16 +405,27 @@ void __init traps_init(void) printk(XENLOG_INFO "Disabling PV32 due to FRED\n"); } #endif + + init_fred(); + set_in_cr4(X86_CR4_FRED); + + /* + * Invalidate the IDT as it's not used. Set up a minimal TSS. The + * LDT was configured by bsp_early_traps_init(). + */ + lidt(&idtr); + init_fred_tss(); + setup_force_cpu_cap(X86_FEATURE_XEN_FRED); printk("Using FRED event delivery\n"); } else { + load_system_tables(); + printk("Using IDT event delivery\n"); } - load_system_tables(); - init_ler(); percpu_traps_init(); @@ -353,7 +440,11 @@ void __init traps_init(void) */ void __init bsp_traps_reinit(void) { - load_system_tables(); + if ( opt_fred ) + init_fred(); + else + load_system_tables(); + percpu_traps_init(); } @@ -368,7 +459,7 @@ void percpu_traps_init(void) * allocated, limiting the placement of the traps_init() call, and gets * re-done anyway by bsp_traps_reinit(). */ - if ( system_state > SYS_STATE_early_boot ) + if ( !opt_fred && system_state > SYS_STATE_early_boot ) legacy_syscall_init(); if ( cpu_has_xen_lbr ) @@ -384,7 +475,29 @@ void percpu_traps_init(void) */ void asmlinkage percpu_early_traps_init(void) { - load_system_tables(); + if ( opt_fred ) + { + seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; + const struct desc_ptr gdtr = { + .base = (unsigned long)gdt, + .limit = LAST_RESERVED_GDT_BYTE, + }, idtr = {}; + + lgdt(&gdtr); + + init_fred(); + write_cr4(read_cr4() | X86_CR4_FRED); + + /* + * Invalidate the IDT (not used) and LDT (not set up yet). Set up a + * minimal TSS. + */ + lidt(&idtr); + init_fred_tss(); + lldt(0); + } + else + load_system_tables(); } static void __init __maybe_unused build_assertions(void) @@ -403,4 +516,11 @@ static void __init __maybe_unused build_assertions(void) endof_field(struct cpu_info, guest_cpu_user_regs)) & 15); BUILD_BUG_ON((sizeof(struct cpu_info) - endof_field(struct cpu_info, _fred)) & 63); + + /* + * The x86 architecture is happy with TR.limit being less than 0x67, but + * VT-x is not. VMExit unconditionally sets the limit to 0x67, meaning + * that HOST_TR_BASE needs to refer to a good TSS of at least this size. + */ + BUILD_BUG_ON(sizeof(struct tss64) <= 0x67); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:22:06 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245035.1544383 (Exim 4.92) (envelope-from ) id 1vxVJj-0003ze-At; Tue, 03 Mar 2026 19:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245035.1544383; Tue, 03 Mar 2026 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 1vxVJj-0003zX-8K; Tue, 03 Mar 2026 19:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1245035; Tue, 03 Mar 2026 19:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVJi-0003zR-DI for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVJi-003L7I-19 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVJi-00EnwQ-11 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19: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=IiuR0mIvzCqoA5bWG7GnsdWJB0jtgyysu9Ie/x7L/rw=; b=z/uAnhOLtpX7xfseL8sW0eJjQe gs8a1Ylmt/LqhzlULwABaRKo2IDz4OoIsolkH+gpRzciIZx+Cq926m/OWJfzmBfGo7PYAUezJqLZp PNKNMdHQqDI1+tWhdjH0oNDm2Q33pK8bLFcjjhr5x5noefaz9+cI9IwFCb6BwlwWODgI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ucode: Support discrete modules being CPIO archives Message-Id: Date: Tue, 03 Mar 2026 19:22:02 +0000 commit 878a9cfa451878dcba6108ae5b7879c80f049661 Author: Andrew Cooper AuthorDate: Tue Jan 27 14:25:26 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:53 2026 +0000 x86/ucode: Support discrete modules being CPIO archives Multiple downstream distros have tried passing discrete CPIO archives and tripped over this not working. It turns out to be easy to support, so do so. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Tested-by: Teddy Astie --- CHANGELOG.md | 1 + docs/misc/xen-command-line.pandoc | 19 ++++++++----------- xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++++- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18f3d10f20..c191e504ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Support for Bus Lock Threshold on AMD Zen5 and later CPUs, used by Xen to mitigate (by rate-limiting) the system wide impact of an HVM guest misusing atomic instructions. + - Support for CPIO microcode in discrete multiboot modules. ### Removed - On x86: diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index c1f2def9f9..ebdca007d2 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2764,23 +2764,20 @@ Controls for CPU microcode loading, available when `CONFIG_MICROCODE_LOADING` is enabled. In order to load microcode at boot, Xen needs to find a suitable update -amongst the modules provided by the bootloader. Two kinds of microcode update -are supported: +amongst the modules provided by the bootloader. Two formats are supported: 1. Raw microcode containers. The format of the container is CPU vendor specific. - 2. CPIO archive. This is Linux's preferred mechanism, and involves having - the raw containers expressed as files + 2. CPIO archive, which involves having the raw containers expressed as files (e.g. `kernel/x86/microcode/{GenuineIntel,AuthenticAMD}.bin`) in a CPIO - archive, typically prepended to the initrd. + archive. Linux commonly prepends this to the initrd. -The `` and `scan=` options are mutually exclusive and select -between these two options. Further restrictions exist for booting xen.efi -(see below). +The `` and `scan=` options are mutually exclusive and work as +follows. Further restrictions exist for booting xen.efi (see below). - * The `` option nominates a specific multiboot module as a raw - container (option 1 above). Valid options start from 1 (module 0 is + * The `` option nominates a specific multiboot module as containing + microcode in either format. Valid options start from 1 (module 0 is always the dom0 kernel). A negative number may be used, and will back-reference from the end of the module list. i.e. `ucode=-1` will nominate the final multiboot module. @@ -2794,7 +2791,7 @@ When booting xen.efi natively, the concept of multiboot modules doesn't exist. Instead: * In the [EFI configuration file](efi.html), `ucode=` can be used - to identify a file as a raw container (option 1 above). Use of this + to identify a file as containing microcode in either format. Use of this mechanism will disable both `` and `scan=`. * If `ucode=` in the EFI configuration file is not used, it is diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index ea0b35c499..9b8d1e09cb 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -767,6 +767,7 @@ static int __init early_microcode_load(struct boot_info *bi) void *data = NULL; size_t size; const struct microcode_patch *patch; + struct cpio_data cd; int idx = opt_mod_idx; int rc; @@ -783,7 +784,6 @@ static int __init early_microcode_load(struct boot_info *bi) for ( idx = 0; idx < bi->nr_modules; ++idx ) { const struct boot_module *bm = &bi->mods[idx]; - struct cpio_data cd; /* Search anything unclaimed or likely to be a CPIO archive. */ if ( bm->kind != BOOTMOD_UNKNOWN && bm->kind != BOOTMOD_RAMDISK ) @@ -851,6 +851,24 @@ static int __init early_microcode_load(struct boot_info *bi) idx, size); return -ENODEV; } + + /* + * If this blob appears to be a CPIO archive, try interpreting it as + * one. Otherwise treat it as a raw vendor blob. + */ + cd = find_cpio_data(ucode_ops.cpio_path, data, size); + if ( cd.data ) + { + data = cd.data; + size = cd.size; + + /* + * (Ab)use opt_scan to inform microcode_init_cache() that + * early_mod_idx refers to a CPIO archive. + */ + opt_scan = true; + } + goto found; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245036.1544389 (Exim 4.92) (envelope-from ) id 1vxVJt-00041Q-E3; Tue, 03 Mar 2026 19:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245036.1544389; Tue, 03 Mar 2026 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 1vxVJt-00041I-9w; Tue, 03 Mar 2026 19:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1245036; Tue, 03 Mar 2026 19:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVJs-00041A-GW for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVJs-003L7R-1V for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVJs-00EnxE-1K for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19: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=wfXcaWe1pt/23t5B2RDRegWyfYbZjBdzZFh0XOabMnI=; b=I/B0GwdgPsZUb6wew+MNuusdq6 WucdljXTDp3RcWMMASYQOn0FPRQUq4Z7oBydYZZ2hRX+XfxGYIF9rNM1/bUoFtObSRRtd1MzowEWz wJIY+ciGYOvLbbe/mQ/oRlhNN3CDnfFNLU8eK5j/cCftYLGDKq7Y8WvZ0hn86ztknvbY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 03 Mar 2026 19:22:12 +0000 commit a934a600c45486b7acfe8abc3658e284e64e5dd5 Author: Andrew Cooper AuthorDate: Thu Feb 19 13:20:26 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:53 2026 +0000 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 8c20119092..16e9a8d2aa 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -17,6 +17,7 @@ int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -31,6 +32,7 @@ static inline bool pv_trap_callback_registered(const struct vcpu *v, static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index fba1e25c31..64d47ab677 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1401,6 +1402,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3c01c5eb53..bcae704d96 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1379,8 +1379,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:22:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245037.1544392 (Exim 4.92) (envelope-from ) id 1vxVK4-00043i-E1; Tue, 03 Mar 2026 19:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245037.1544392; Tue, 03 Mar 2026 19:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVK4-00043Z-BO; Tue, 03 Mar 2026 19:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1245037; Tue, 03 Mar 2026 19:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVK2-00043M-JB for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVK2-003L7V-1p for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVK2-00Enxu-1f for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19: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=Q0lhyx34frkirpQJsvsnu9kMOCKW3OMtmrZIxAbIVMA=; b=O9nsGQ9e9wHgURuy/6G28pBaGc Ol5HDUaAqN/5F+lQ7tkTOqyW2X4S+YZYQ4sntZtdVnecBZ3pX71eAO6dcG/W4LFCp96GAaI1G9ZhH /YLPkD29eBY1o6Qt/hYplfVCMfTTZlYPiUI/WhzZHOmXG1x8piycPpYjXdRcWVBa+Epw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/guest-guide: Describe the PV traps and entrypoints ABI Message-Id: Date: Tue, 03 Mar 2026 19:22:22 +0000 commit 31cbb8e2a52a5470d375ad725b9771da670f6d62 Author: Andrew Cooper AuthorDate: Thu Feb 19 13:20:26 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:53 2026 +0000 docs/guest-guide: Describe the PV traps and entrypoints ABI ... seeing as I've had to thoroughly reverse engineer it for FRED and make tweaks in places. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- docs/glossary.rst | 3 + docs/guest-guide/x86/index.rst | 1 + docs/guest-guide/x86/pv-traps.rst | 126 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/docs/glossary.rst b/docs/glossary.rst index 6adeec77e1..5c3229a8c4 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -43,6 +43,9 @@ Glossary Sapphire Rapids (Server, 2023) CPUs. AMD support only CET-SS, starting with Zen3 (Both client and server, 2020) CPUs. + event channel + A paravirtual facility for guests to send and receive interrupts. + guest The term 'guest' has two different meanings, depending on context, and should not be confused with :term:`domain`. diff --git a/docs/guest-guide/x86/index.rst b/docs/guest-guide/x86/index.rst index 502968490d..5b38ae397a 100644 --- a/docs/guest-guide/x86/index.rst +++ b/docs/guest-guide/x86/index.rst @@ -7,3 +7,4 @@ x86 :maxdepth: 2 hypercall-abi + pv-traps diff --git a/docs/guest-guide/x86/pv-traps.rst b/docs/guest-guide/x86/pv-traps.rst new file mode 100644 index 0000000000..c10001e023 --- /dev/null +++ b/docs/guest-guide/x86/pv-traps.rst @@ -0,0 +1,126 @@ +.. SPDX-License-Identifier: CC-BY-4.0 + +PV Traps and Entrypoints +======================== + +.. note:: + + The details here are specific to 64bit builds of Xen. Details for 32bit + builds of Xen are different and not discussed further. + +PV guests are subject to Xen's linkage setup for events (interrupts, +exceptions and system calls). x86's IDT architecture and limitations are the +majority influence on the PV ABI. + +All external interrupts are routed to PV guests via the :term:`Event Channel` +interface, and not discussed further here. + +What remain are exceptions, and the instructions which cause control +transfers. In the x86 architecture, the instructions relevant for PV guests +are: + + * ``INT3``, which generates ``#BP``. + + * ``INTO``, which generates ``#OF`` only if the overflow flag is set. It is + only usable in compatibility mode, and will ``#UD`` in 64bit mode. + + * ``CALL (far)`` referencing a gate in the GDT. + + * ``INT $N``, which invokes an arbitrary IDT gate. These four instructions + so far all check the gate DPL and will ``#GP`` otherwise. + + * ``INT1``, also known as ``ICEBP``, which generates ``#DB``. This + instruction does *not* check DPL, and can be used unconditionally by + userspace. + + * ``SYSCALL``, which enters CPL0 as configured by the ``{C,L,}STAR`` MSRs. + It is usable if enabled by ``MSR_EFER.SCE``, and will ``#UD`` otherwise. + On Intel parts, ``SYSCALL`` is unusable outside of 64bit mode. + + * ``SYSENTER``, which enters CPL0 as configured by the ``SEP`` MSRs. It is + usable if enabled by ``MSR_SYSENTER_CS`` having a non-NUL selector, and + will ``#GP`` otherwise. On AMD parts, ``SYSENTER`` is unusable in Long + mode. + +The ``BOUND`` instruction is not included. It is a hardware exception and +strictly a fault, with no trapping configuraton. + + +Xen's configuration +------------------- + +Xen maintains a complete IDT, with most gates configured with DPL0. This +causes most ``INT $N`` instructions to ``#GP``. This allows Xen to emulate +the instruction, referring to the guest kernels vDPL choice. + + * Vectors 3 ``#BP`` and 4 ``#OF`` are DPL3, in order to allow the ``INT3`` + and ``INTO`` instructions to function in userspace. + + * Vector 0x80 is DPL3 because of it's common usage for syscall in UNIXes. + This is a fastpath to avoid the emulation overhead. + + * Vector 0x82 is DPL1 when PV32 is enabled, allowing the guest kernel to make + hypercalls to Xen. All other cases (PV32 guest userspace, and both PV64 + modes) operate in CPL3 and this vector behaves like all others to ``INT + $N`` instructions. + +A range of the GDT is guest-owned, allowing for call gates. During audit, Xen +forces all call gates to DPL0, causing their use to ``#GP`` allowing for +emulation. + +Xen enables ``SYSCALL`` in all cases as it is mandatory in 64bit mode, and +enables ``SYSENTER`` when available in 64bit mode. + +When Xen is using FRED delivery the hardware configuration is substantially +different, but the behaviour for guests remains as unchanged as possible. + + +PV Guest's configuration +------------------------ + +The PV ABI contains the "trap table", modelled closely on the IDT. It is +manipulated by ``HYPERCALL_set_trap_table``, has 256 entries, each containing +a code segment selector, an address, and flags. A guest is expected to +configure handlers for all exceptions; failure to do so is terminal and +similar to a Triple Fault. + +Part of the GDT is guest owned with descriptors audited by Xen. This range +can be manipulated with ``HYPERVISOR_set_gdt`` and +``HYPERVISOR_update_descriptor``. + +Other entrypoints are configured via ``HYPERVISOR_callback_op``. Of note here +are the callback types ``syscall``, ``syscall32`` (relevant for AMD parts) and +``sysenter`` (relevant for Intel parts). + +.. warning:: + + Prior to Xen 4.15, there was no check that the ``syscall`` or ``syscall32`` + callbacks had been registered before attempting to deliver via them. + Guests are strongly advised to ensure the entrypoints are registered before + running userspace. + + +Notes +----- + +``INT3`` vs ``INT $3`` and ``INTO`` vs ``INT $4`` are hard to distinguish +architecturally as both forms have a DPL check and use the same IDT vectors. +Because Xen configures both as DPL3, the ``INT $`` forms do not fault for +emulation, and are treated as if they were exceptions. This means the guest +can't block these instruction by trying to configure them with vDPL0. + +The instructions which trap into Xen (``INT $0x80``, ``SYSCALL``, +``SYSENTER``) but can be disabled by guest configuration need turning back +into faults for the guest kernel to process. + + * When using IDT delivery, instruction lengths are not provided by hardware + and Xen does not account for possible prefixes. ``%rip`` only gets rewound + by the length of the un-prefixed instruction. This is observable, but not + expected to be an issue in practice. + + * When Xen is using FRED delivery, the full instruction length is provided by + hardware, and ``%rip`` is rewound fully. + +While both PV32 and PV64 guests are permitted to write Call Gates into the +GDT, emulation is only wired up for PV32. At the time of writing, the x86 +maintainers feel no specific need to fix this omission. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:22:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245038.1544396 (Exim 4.92) (envelope-from ) id 1vxVKE-000460-FU; Tue, 03 Mar 2026 19:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245038.1544396; Tue, 03 Mar 2026 19:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVKE-00045s-Cl; Tue, 03 Mar 2026 19:22:34 +0000 Received: by outflank-mailman (input) for mailman id 1245038; Tue, 03 Mar 2026 19:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVKC-00045L-Nx for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVKC-003L7Z-2I for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVKC-00EnyQ-20 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19: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=mZBMf60GQZK04+/qYSgOs3Tis9JfipIztub5C7Ezhc0=; b=WtCq2XTNVGssoB99iTTI106Eh1 RhCSh7frXR//E2BucoGiPdzMaNmeEp04bBJACmZwntjEg09s+fk2lIZa34jajT8Vqa6A0844Wc9o6 3Y6LBE344L0AhjhojVo/Aa7ExWJDF4Nt8qxzeIqA7aLiDi4g9h98tcG+uiWDg4Fv+gEo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Move gdt_l1e caching out of traps_init() Message-Id: Date: Tue, 03 Mar 2026 19:22:32 +0000 commit a1e6afbf54283be0ea3db9bf6cb046c683fcf684 Author: Andrew Cooper AuthorDate: Fri Feb 13 23:45:28 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/boot: Move gdt_l1e caching out of traps_init() Commit 564d261687c0 ("x86/ctxt-switch: Document and improve GDT handling") put the initialisation of {,compat_}gdt_l1e into traps_init() but this wasn't a great choice. Instead, put it in smp_prepare_cpus() which performs the BSP preparation of variables normally set up by cpu_smpboot_alloc() for APs. This removes an implicit dependency that prevents traps_init() moving earlier than move_xen() in the boot sequence. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 2 ++ xen/arch/x86/smpboot.c | 11 +++++++++++ xen/arch/x86/traps-setup.c | 7 ------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8eb1509782..e658c2d647 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2029,6 +2029,8 @@ static always_inline bool need_full_gdt(const struct domain *d) static void update_xen_slot_in_full_gdt(const struct vcpu *v, unsigned int cpu) { + ASSERT(per_cpu(gdt_l1e, cpu).l1); /* Confirm these have been cached. */ + l1e_write(pv_gdt_ptes(v) + FIRST_RESERVED_GDT_PAGE, !is_pv_32bit_vcpu(v) ? per_cpu(gdt_l1e, cpu) : per_cpu(compat_gdt_l1e, cpu)); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 961bdf5333..491cbbba33 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1167,6 +1167,17 @@ void __init smp_prepare_cpus(void) initialize_cpu_data(0); /* Final full version of the data */ print_cpu_info(0); + /* + * Cache {,compat_}gdt_l1e for the BSP now that physically relocation is + * done. It must be after physical relocation of Xen, and before the + * first context_switch(). + */ + this_cpu(gdt_l1e) = + l1e_from_pfn(virt_to_mfn(boot_gdt), __PAGE_HYPERVISOR_RW); + if ( IS_ENABLED(CONFIG_PV32) ) + this_cpu(compat_gdt_l1e) = + l1e_from_pfn(virt_to_mfn(boot_compat_gdt), __PAGE_HYPERVISOR_RW); + boot_cpu_physical_apicid = get_apic_id(); x86_cpu_to_apicid[0] = boot_cpu_physical_apicid; diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index d77be8f839..c5fc71c75b 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -341,13 +341,6 @@ void __init traps_init(void) init_ler(); - /* Cache {,compat_}gdt_l1e now that physically relocation is done. */ - this_cpu(gdt_l1e) = - l1e_from_pfn(virt_to_mfn(boot_gdt), __PAGE_HYPERVISOR_RW); - if ( IS_ENABLED(CONFIG_PV32) ) - this_cpu(compat_gdt_l1e) = - l1e_from_pfn(virt_to_mfn(boot_compat_gdt), __PAGE_HYPERVISOR_RW); - percpu_traps_init(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:22:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245039.1544400 (Exim 4.92) (envelope-from ) id 1vxVKO-00048W-H0; Tue, 03 Mar 2026 19:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245039.1544400; Tue, 03 Mar 2026 19:22: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 1vxVKO-00048O-E6; Tue, 03 Mar 2026 19:22:44 +0000 Received: by outflank-mailman (input) for mailman id 1245039; Tue, 03 Mar 2026 19:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVKM-00048E-Sa for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVKM-003L7j-2l for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVKM-00Enyt-2T for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19: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=14ikjtlVOZqajt99K5nbd5JqZxImw8ZC3TN9lmYVVeA=; b=i8nuwiQnD2S1paUE5agApVzwXj 5Rd75EjUtAqldKffX0uZ4Q5JkksA8BbZ/VtfE6FeOjz36QXom3XUEdkvAiVXHZHcmEQcNh7C9xDBE jhAKIg5P4dZbUc+eoBa0/ht74xPQBs63LhMkt0ycqogOI66lWa6ez0FCgJz0XA8Uj0do=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Document the ordering dependency of _svm_cpu_up() Message-Id: Date: Tue, 03 Mar 2026 19:22:42 +0000 commit c2f15b0fff94ca71fe32792ea933fcf2a907111d Author: Andrew Cooper AuthorDate: Mon Feb 16 20:57:02 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/boot: Document the ordering dependency of _svm_cpu_up() Lets just say this took an unreasonable amount of time and effort to track down, when trying to move traps_init() earlier during boot. When the SYSCALL linkage MSRs are not configured ahead of _svm_cpu_up() on the BSP, context switch clobbers the later-set-up linkage with the 0's cached here. Amongst other problems, this causes PV guest to enter at 0 in supervisor mode on the user stack. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 14 ++++++++++++++ xen/arch/x86/setup.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 18ba837738..243c41fb13 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1581,6 +1581,20 @@ static int _svm_cpu_up(bool bsp) /* Initialize OSVW bits to be used by guests */ svm_host_osvw_init(); + /* + * VMSAVE writes out the current full FS, GS, LDTR and TR segments, and + * the GS_SHADOW, SYSENTER and SYSCALL linkage MSRs. + * + * The segment data gets modified by the svm_load_segs() optimisation for + * PV context switches, but all values get reloaded at that point, as well + * as during context switch from SVM. + * + * If PV guests are available, it is critical that the SYSCALL linkage + * MSRs been configured at this juncture even in FRED mode. + */ + if ( IS_ENABLED(CONFIG_PV) ) + ASSERT(rdmsr(MSR_STAR) == XEN_MSR_STAR); + svm_vmsave_pa(per_cpu(host_vmcb, cpu)); return 0; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 27c63d1d97..675de3a649 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -2078,7 +2078,7 @@ void asmlinkage __init noreturn __start_xen(void) &this_cpu(stubs).mfn); BUG_ON(!this_cpu(stubs.addr)); - traps_init(); /* Needs stubs allocated. */ + traps_init(); /* Needs stubs allocated, must be before presmp_initcalls. */ cpu_init(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:22:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245041.1544403 (Exim 4.92) (envelope-from ) id 1vxVKY-0004BC-Jl; Tue, 03 Mar 2026 19:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245041.1544403; Tue, 03 Mar 2026 19:22: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 1vxVKY-0004B4-HE; Tue, 03 Mar 2026 19:22:54 +0000 Received: by outflank-mailman (input) for mailman id 1245041; Tue, 03 Mar 2026 19:22:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVKW-0004Aw-Vk for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVKW-003L83-35 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVKW-00EnzL-2x for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19: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=huZ5MKJjoryaxeM5NOOeCEvDeebL+okd96VW//vMTcg=; b=z6Mlty9cgBXn2bzRXi/Zda1A4r x2zQq4VLWiEI4MG0kCTa8O9pA0acH/GEUeXMS9e7/K2E7DIBqv4UH5CJR3HV+K37U5ankdGXhmLzo 07kBlMlSCjhkX240tjXE0Og791eM3EsgXa/JJaOJEEm/sdvv8EzSKT6LSTe8GjsfVotg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Move traps_init() earlier on boot Message-Id: Date: Tue, 03 Mar 2026 19:22:52 +0000 commit 8e4775d118c327782f5bf286e5b353a9de797bef Author: Andrew Cooper AuthorDate: Fri Aug 15 22:56:42 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Move traps_init() earlier on boot We wish to make use of opt_fred earlier on boot, which involves moving traps_init() earlier, but this comes with several ordering complications. The feature word containing FRED needs collecting in early_cpu_init(), and legacy_syscall_init() cannot be moved that early because it relies on the stubs being allocated, yet must be called ahead of cpu_init() so the SYSCALL linkage MSRs are set up before being cached. Delaying legacy_syscall_init() is easy enough based on a system_state check. Reuse bsp_traps_reinit() to cause a call to legacy_syscall_init() to occur at the same point as previously. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 4 +++- xen/arch/x86/setup.c | 4 +++- xen/arch/x86/traps-setup.c | 12 +++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index bfa63fcfb7..5d0523a78b 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -407,7 +407,9 @@ void __init early_cpu_init(bool verbose) } if (max_subleaf >= 1) - cpuid_count(7, 1, &eax, &ebx, &ecx, + cpuid_count(7, 1, + &c->x86_capability[FEATURESET_7a1], + &ebx, &ecx, &c->x86_capability[FEATURESET_7d1]); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 675de3a649..0816a713e1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1386,6 +1386,8 @@ void asmlinkage __init noreturn __start_xen(void) else panic("Bootloader provided no memory information\n"); + traps_init(); + /* Choose shadow stack early, to set infrastructure up appropriately. */ if ( !boot_cpu_has(X86_FEATURE_CET_SS) ) opt_xen_shstk = 0; @@ -2078,7 +2080,7 @@ void asmlinkage __init noreturn __start_xen(void) &this_cpu(stubs).mfn); BUG_ON(!this_cpu(stubs.addr)); - traps_init(); /* Needs stubs allocated, must be before presmp_initcalls. */ + bsp_traps_reinit(); /* Needs stubs allocated, must be before presmp_initcalls. */ cpu_init(); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index c5fc71c75b..b2c161943d 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -346,6 +346,10 @@ void __init traps_init(void) /* * Re-initialise all state referencing the early-boot stack. + * + * This is called twice during boot, first to ensure legacy_syscall_init() has + * run (deferred from earlier), and second when the virtual address of the BSP + * stack changes. */ void __init bsp_traps_reinit(void) { @@ -359,7 +363,13 @@ void __init bsp_traps_reinit(void) */ void percpu_traps_init(void) { - legacy_syscall_init(); + /* + * Skip legacy_syscall_init() at early boot. It requires the stubs being + * allocated, limiting the placement of the traps_init() call, and gets + * re-done anyway by bsp_traps_reinit(). + */ + if ( system_state > SYS_STATE_early_boot ) + legacy_syscall_init(); if ( cpu_has_xen_lbr ) wrmsrl(MSR_IA32_DEBUGCTLMSR, IA32_DEBUGCTLMSR_LBR); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:23:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245042.1544408 (Exim 4.92) (envelope-from ) id 1vxVKi-0004DE-LD; Tue, 03 Mar 2026 19:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245042.1544408; Tue, 03 Mar 2026 19:23: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 1vxVKi-0004D6-Ia; Tue, 03 Mar 2026 19:23:04 +0000 Received: by outflank-mailman (input) for mailman id 1245042; Tue, 03 Mar 2026 19:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVKh-0004Cy-2s for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVKh-003L8N-09 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVKh-00Eo0D-03 for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23: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=eGXw4WxcqUv01F9P+hoNnBI7Zy0ZEPD8+T8Goo0/T3o=; b=PE4JTUnVN+9u9n4tiAdIKBQieZ rmnxMLo5mYwBsgenkxabAmjrFYMou610fluxttFpaGOccUa6NhvQLcFma6rORq+VFDD5qlU2ODnRm mY/VNHMizg9OlikY4WoiSwawb6wQHDylbR3DxKWDWKFy9gYtUXIxCQ92C1HzDH76b/oU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Don't configure Supervisor Shadow Stack tokens in FRED mode Message-Id: Date: Tue, 03 Mar 2026 19:23:03 +0000 commit 7634f5662551864a4976d5f0022263a056efd14d Author: Andrew Cooper AuthorDate: Fri Aug 15 22:56:42 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Don't configure Supervisor Shadow Stack tokens in FRED mode FRED doesn't use Supervisor Shadow Stack tokens. This means that: 1) memguard_guard_stack() should not write Supervisor Shadow Stack Tokens. 2) cpu_has_bug_shstk_fracture is no longer relevant when deciding whether to enable Shadow Stacks or not. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/mm.c | 14 +++++++++++--- xen/arch/x86/setup.c | 16 ++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 0d0d529295..4c404b6c13 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -129,6 +129,7 @@ #include #include #include +#include #include #include @@ -6441,8 +6442,15 @@ static void write_sss_token(unsigned long *ptr) void memguard_guard_stack(void *p) { - /* IST Shadow stacks. 4x 1k in stack page 0. */ - if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + ASSERT(opt_fred >= 0); /* Confirm that FRED-ness has been resolved */ + + /* + * IST Shadow stacks. 4x 1k in stack page 0. + * + * With IDT delivery, we need Supervisor Shadow Stack tokens at the base + * of each stack. With FRED delivery, these no longer exist. + */ + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && !opt_fred ) { write_sss_token(p + (IST_MCE * IST_SHSTK_SIZE) - 8); write_sss_token(p + (IST_NMI * IST_SHSTK_SIZE) - 8); @@ -6453,7 +6461,7 @@ void memguard_guard_stack(void *p) /* Primary Shadow Stack. 1x 4k in stack page 5. */ p += PRIMARY_SHSTK_SLOT * PAGE_SIZE; - if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && !opt_fred ) write_sss_token(p + PAGE_SIZE - 8); map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, PAGE_HYPERVISOR_SHSTK); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0816a713e1..8e59c9801a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1412,15 +1412,19 @@ void asmlinkage __init noreturn __start_xen(void) boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && !boot_cpu_has(X86_FEATURE_CET_SSS); + ASSERT(opt_fred >= 0); /* Confirm that FRED-ness has been resolved */ + /* - * On bare metal, assume that Xen won't be impacted by shstk - * fracturing problems. Under virt, be more conservative and disable - * shstk by default. + * If FRED is in use, Supervisor Shadow Stack tokens are not used and + * shstk fracturing is of no consequence. Otherwise: + * - On bare metal, assume that Xen won't be impacted by shstk + * fracturing problems. + * - Under virt, be more conservative and disable shstk by default. */ if ( opt_xen_shstk == -1 ) opt_xen_shstk = - cpu_has_hypervisor ? !cpu_has_bug_shstk_fracture - : true; + opt_fred || (cpu_has_hypervisor ? !cpu_has_bug_shstk_fracture + : true); if ( opt_xen_shstk ) { @@ -1925,7 +1929,7 @@ void asmlinkage __init noreturn __start_xen(void) system_state = SYS_STATE_boot; - bsp_stack = cpu_alloc_stack(0); + bsp_stack = cpu_alloc_stack(0); /* Needs to know IDT vs FRED */ if ( !bsp_stack ) panic("No memory for BSP stack\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:23:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245043.1544412 (Exim 4.92) (envelope-from ) id 1vxVKs-0004FE-Mi; Tue, 03 Mar 2026 19:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245043.1544412; Tue, 03 Mar 2026 19:23: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 1vxVKs-0004F7-Jv; Tue, 03 Mar 2026 19:23:14 +0000 Received: by outflank-mailman (input) for mailman id 1245043; Tue, 03 Mar 2026 19:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVKr-0004Ew-5l for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVKr-003L8T-0T for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVKr-00Eo3B-0K for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23: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=Xt44ejn64yBUr7wMPWMGK7N18gcyARvBbNC/qD0vmxs=; b=R+9gwGJqtkdaO5e++33lOpzWiI 8uvS3+VWOJwptHRvHezJldnMNxY0S5p/LWKnweBBlAbgkRgmO/2KjXd94Ms43EzoZyNlQHoGAwU1l GGrRCAfa/w2nN3+i0fWJMzkTHGIJTZ+7RhVBfXo358sj5qwe8EO7vOylNGDLK+tzGldM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Introduce FRED entrypoints Message-Id: Date: Tue, 03 Mar 2026 19:23:13 +0000 commit 0e9cc04453fc2d7234ad3ced51b520c597c7bfbf Author: Andrew Cooper AuthorDate: Tue Dec 24 11:03:06 2024 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Introduce FRED entrypoints Under FRED, there's one entrypoint from Ring 3, and one from Ring 0. FRED gives us a good stack (even for SYSCALL/SYSENTER), and a unified event frame on the stack with all flags cleared, meaning that all software needs to do is spill the GPRs with a line of PUSHes. Introduce PUSH_AND_CLEAR_GPRS for this purpose, along with the matching POP_GPRS. Introduce entry_FRED_R0() which to a first approximation is complete for all event handling within Xen. entry_FRED_R0() needs deriving from entry_FRED_R3(), so introduce a basic Ring3 handler. There is more work required to make the return-to-guest path work under FRED. Also introduce entry_from_{xen,pv}() to be the C level handlers. By simply copying regs->fred_ss.vector into regs->entry_vector, we can reuse all the existing fault handlers. Extend fatal_trap() to render the event type including name, when FRED is active. This is slightly complicated, because X86_ET_OTHER must not use vector_name() or SYSCALL and SYSENTER get rendered as #BP and #DB. This is sufficient to handle all interrupts and exceptions encountered during development, including plenty of Double Faults. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/asm_defns.h | 63 ++++++++++++++ xen/arch/x86/traps.c | 155 +++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/Makefile | 1 + xen/arch/x86/x86_64/entry-fred.S | 33 ++++++++ 4 files changed, 252 insertions(+) diff --git a/xen/arch/x86/include/asm/asm_defns.h b/xen/arch/x86/include/asm/asm_defns.h index 4a21a7b466..0dd63270fc 100644 --- a/xen/arch/x86/include/asm/asm_defns.h +++ b/xen/arch/x86/include/asm/asm_defns.h @@ -312,6 +312,69 @@ static always_inline void stac(void) subq $-(UREGS_error_code-UREGS_r15+\adj), %rsp .endm +/* + * Push and clear GPRs + */ +.macro PUSH_AND_CLEAR_GPRS + push %rdi + xor %edi, %edi + push %rsi + xor %esi, %esi + push %rdx + xor %edx, %edx + push %rcx + xor %ecx, %ecx + push %rax + xor %eax, %eax + push %r8 + xor %r8d, %r8d + push %r9 + xor %r9d, %r9d + push %r10 + xor %r10d, %r10d + push %r11 + xor %r11d, %r11d + push %rbx + xor %ebx, %ebx + push %rbp +#ifdef CONFIG_FRAME_POINTER +/* Indicate special exception stack frame by inverting the frame pointer. */ + mov %rsp, %rbp + not %rbp +#else + xor %ebp, %ebp +#endif + push %r12 + xor %r12d, %r12d + push %r13 + xor %r13d, %r13d + push %r14 + xor %r14d, %r14d + push %r15 + xor %r15d, %r15d +.endm + +/* + * POP GPRs from a UREGS_* frame on the stack. Does not modify flags. + */ +.macro POP_GPRS + pop %r15 + pop %r14 + pop %r13 + pop %r12 + pop %rbp + pop %rbx + pop %r11 + pop %r10 + pop %r9 + pop %r8 + pop %rax + pop %rcx + pop %rdx + pop %rsi + pop %rdi +.endm + #ifdef CONFIG_PV32 #define CR4_PV32_RESTORE \ ALTERNATIVE_2 "", \ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index bcae704d96..e40b51d693 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -88,6 +88,13 @@ const unsigned int nmi_cpu; #define stack_words_per_line 4 #define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)(regs)->rsp) +/* Only valid to use when FRED is active. */ +static inline struct fred_info *cpu_regs_fred_info(struct cpu_user_regs *regs) +{ + ASSERT(read_cr4() & X86_CR4_FRED); + return &container_of(regs, struct cpu_info, guest_cpu_user_regs)->_fred; +} + struct extra_state { unsigned long cr0, cr2, cr3, cr4; @@ -1028,6 +1035,32 @@ void show_execution_state_nmi(const cpumask_t *mask, bool show_all) printk("Non-responding CPUs: {%*pbl}\n", CPUMASK_PR(&show_state_mask)); } +static const char *x86_et_name(unsigned int type) +{ + static const char *const names[] = { + [X86_ET_EXT_INTR] = "EXT_INTR", + [X86_ET_NMI] = "NMI", + [X86_ET_HW_EXC] = "HW_EXC", + [X86_ET_SW_INT] = "SW_INT", + [X86_ET_PRIV_SW_EXC] = "PRIV_SW_EXC", + [X86_ET_SW_EXC] = "SW_EXC", + [X86_ET_OTHER] = "OTHER", + }; + + return (type < ARRAY_SIZE(names) && names[type]) ? names[type] : "???"; +} + +static const char *x86_et_other_name(unsigned int what) +{ + static const char *const names[] = { + [0] = "MTF", + [1] = "SYSCALL", + [2] = "SYSENTER", + }; + + return (what < ARRAY_SIZE(names) && names[what]) ? names[what] : "???"; +} + const char *vector_name(unsigned int vec) { static const char names[][4] = { @@ -1106,6 +1139,38 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) } } + if ( read_cr4() & X86_CR4_FRED ) + { + bool render_ec = false; + const char *vec_name = NULL; + + switch ( regs->fred_ss.type ) + { + case X86_ET_HW_EXC: + case X86_ET_PRIV_SW_EXC: + case X86_ET_SW_EXC: + render_ec = true; + vec_name = vector_name(regs->fred_ss.vector); + break; + + case X86_ET_OTHER: + vec_name = x86_et_other_name(regs->fred_ss.vector); + break; + } + + if ( render_ec ) + panic("FATAL TRAP: type %u, %s, vec %u, %s[%04x]%s\n", + regs->fred_ss.type, x86_et_name(regs->fred_ss.type), + regs->fred_ss.vector, vec_name ?: "", + regs->error_code, + (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); + else + panic("FATAL TRAP: type %u, %s, vec %u, %s%s\n", + regs->fred_ss.type, x86_et_name(regs->fred_ss.type), + regs->fred_ss.vector, vec_name ?: "", + (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); + } + panic("FATAL TRAP: vec %u, %s[%04x]%s\n", trapnr, vector_name(trapnr), regs->error_code, (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); @@ -2200,6 +2265,96 @@ void asmlinkage check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) } #endif +void asmlinkage entry_from_pv(struct cpu_user_regs *regs) +{ + /* Copy fred_ss.vector into entry_vector as IDT delivery would have done. */ + regs->entry_vector = regs->fred_ss.vector; + + fatal_trap(regs, false); +} + +void asmlinkage entry_from_xen(struct cpu_user_regs *regs) +{ + struct fred_info *fi = cpu_regs_fred_info(regs); + uint8_t type = regs->fred_ss.type; + + /* Copy fred_ss.vector into entry_vector as IDT delivery would have done. */ + regs->entry_vector = regs->fred_ss.vector; + + /* + * First, handle the asynchronous or fatal events. These are either + * unrelated to the interrupted context, or may not have valid context + * recorded, and all have special rules on how/whether to re-enable IRQs. + */ + if ( regs->fred_ss.nested ) + goto fatal; + + switch ( type ) + { + case X86_ET_EXT_INTR: + return do_IRQ(regs); + + case X86_ET_NMI: + return do_nmi(regs); + + case X86_ET_HW_EXC: + switch ( regs->fred_ss.vector ) + { + case X86_EXC_DF: return do_double_fault(regs); + case X86_EXC_MC: return do_machine_check(regs); + } + break; + } + + /* + * With the asynchronous events handled, what remains are the synchronous + * ones. If we interrupted an IRQs-on region, we should re-enable IRQs + * now; for #PF and #DB, %cr2 and PENDING_DBG are on the stack in edata. + */ + if ( regs->eflags & X86_EFLAGS_IF ) + local_irq_enable(); + + switch ( type ) + { + case X86_ET_HW_EXC: + case X86_ET_PRIV_SW_EXC: + case X86_ET_SW_EXC: + switch ( regs->fred_ss.vector ) + { + case X86_EXC_PF: handle_PF(regs, fi->edata); break; + case X86_EXC_GP: do_general_protection(regs); break; + case X86_EXC_UD: do_invalid_op(regs); break; + case X86_EXC_NM: do_device_not_available(regs); break; + case X86_EXC_BP: do_int3(regs); break; + case X86_EXC_DB: handle_DB(regs, fi->edata); break; + case X86_EXC_CP: do_entry_CP(regs); break; + + case X86_EXC_DE: + case X86_EXC_OF: + case X86_EXC_BR: + case X86_EXC_NP: + case X86_EXC_SS: + case X86_EXC_MF: + case X86_EXC_AC: + case X86_EXC_XM: + do_trap(regs); + break; + + default: + goto fatal; + } + break; + + default: + goto fatal; + } + + return; + + fatal: + fatal_trap(regs, false); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index f207630887..c0a0b66032 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_PV32) += compat/ +obj-bin-y += entry-fred.o obj-bin-y += entry.o obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += pci.o diff --git a/xen/arch/x86/x86_64/entry-fred.S b/xen/arch/x86/x86_64/entry-fred.S new file mode 100644 index 0000000000..3c3320df22 --- /dev/null +++ b/xen/arch/x86/x86_64/entry-fred.S @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + + .file "x86_64/entry-fred.S" + +#include +#include + + .section .text.entry, "ax", @progbits + + /* The Ring3 entry point is required to be 4k aligned. */ + +FUNC(entry_FRED_R3, 4096) + PUSH_AND_CLEAR_GPRS + + mov %rsp, %rdi + call entry_from_pv + + POP_GPRS + eretu +END(entry_FRED_R3) + + /* The Ring0 entrypoint is at Ring3 + 0x100. */ + .org entry_FRED_R3 + 0x100, 0xcc + +FUNC_LOCAL(entry_FRED_R0, 0) + PUSH_AND_CLEAR_GPRS + + mov %rsp, %rdi + call entry_from_xen + + POP_GPRS + erets +END(entry_FRED_R0) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 03 19:23:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 03 Mar 2026 19:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245044.1544417 (Exim 4.92) (envelope-from ) id 1vxVL2-0004HH-PK; Tue, 03 Mar 2026 19:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245044.1544417; Tue, 03 Mar 2026 19:23: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 1vxVL2-0004H8-LY; Tue, 03 Mar 2026 19:23:24 +0000 Received: by outflank-mailman (input) for mailman id 1245044; Tue, 03 Mar 2026 19:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxVL1-0004Gw-8Z for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxVL1-003LAu-0l for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxVL1-00Eo3X-0e for xen-changelog@lists.xenproject.org; Tue, 03 Mar 2026 19:23: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=1FIlIPyRAhFbFpvxf49c8UD1oDYoQxG81/vUw1VsGNQ=; b=CTvkc7fQxrAiwBo6mlIUotDf21 Mmk3BQI+DKj3KH6xWq0yQbi9EceqH6lFAGvyH991ppWvPc1p3F2XlplWgjz47TlSsLYHgHeOEYrEt OK6ucHnrSY5tXWfCWVFrQ9tcmpjJoTtcVcxCSEhrj2WCYNnK/+2EPSt+AK8JG0ZApAGA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Enable FRED when requested Message-Id: Date: Tue, 03 Mar 2026 19:23:23 +0000 commit bbfb30f649fc11281b091b91fd353954df1354a0 Author: Andrew Cooper AuthorDate: Tue Dec 24 11:03:06 2024 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 3 15:15:54 2026 +0000 x86/traps: Enable FRED when requested With the shadow stack and exception handling adjustements in place, we can now activate FRED when appropriate. Note that opt_fred is still disabled by default until more development is complete. Introduce init_fred() to set up all the MSRs relevant for FRED. FRED uses MSR_STAR (entries from Ring3 only), and MSR_FRED_SSP_SL0 aliases MSR_PL0_SSP when CET-SS is active. Otherwise, they're all new MSRs. Also introduce init_fred_tss(). At this juncture we need a TSS set up, even if it is mostly unused. Reinsert the BUILD_BUG_ON() checking the size of the TSS against 0x67, this time with a more precise comment. With init_fred() existing, load_system_tables() and legacy_syscall_init() should only be used when setting up IDT delivery. Insert ASSERT()s to this effect, and adjust the various init functions to make this property true. The FRED initialisation path still needs to write to all system table registers at least once, even if only to invalidate them. Per the documentation, percpu_early_traps_init() is responsible for switching off the boot GDT, which also needs doing even in FRED mode. Finally, set CR4.FRED in traps_init()/percpu_early_traps_init(). Xen can now boot in FRED mode and run a PVH dom0. PV guests still need more work before they can be run under FRED. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/current.h | 3 + xen/arch/x86/include/asm/traps.h | 2 + xen/arch/x86/traps-setup.c | 130 +++++++++++++++++++++++++++++++++++-- 3 files changed, 130 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/current.h index 62817e8476..6139980ab1 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -23,6 +23,9 @@ * 2 - NMI IST stack * 1 - #MC IST stack * 0 - IST Shadow Stacks (4x 1k, read-only) + * + * In FRED mode, #DB and NMI do not need special stacks, so their IST stacks + * are unused. */ /* diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index 73097e957d..5d7504bc44 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -16,6 +16,8 @@ void traps_init(void); void bsp_traps_reinit(void); void percpu_traps_init(void); +void nocall entry_FRED_R3(void); + extern unsigned int ler_msr; const char *vector_name(unsigned int vec); diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index b2c161943d..9b8301c23e 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -59,6 +59,8 @@ static void load_system_tables(void) .limit = sizeof(bsp_idt) - 1, }; + ASSERT(opt_fred == 0); + /* * Set up the TSS. Warning - may be live, and the NMI/#MC must remain * valid on every instruction boundary. (Note: these are all @@ -191,6 +193,8 @@ static void legacy_syscall_init(void) unsigned char *stub_page; unsigned int offset; + ASSERT(opt_fred == 0); + /* No PV guests? No need to set up SYSCALL/SYSENTER infrastructure. */ if ( !IS_ENABLED(CONFIG_PV) ) return; @@ -268,6 +272,76 @@ static void __init init_ler(void) setup_force_cpu_cap(X86_FEATURE_XEN_LBR); } +/* + * Set up all MSRs relevant for FRED event delivery. + * + * Xen does not use any of the optional config in MSR_FRED_CONFIG, so all that + * is needed is the entrypoint. + * + * Because FRED always provides a good stack, NMI and #DB do not need any + * special treatment. Only #DF needs another stack level, and #MC for the + * off-chance that Xen's main stack suffers an uncorrectable error. + * + * This makes Stack Level 1 unused, but we use #DB's stacks, and with the + * regular and shadow stack pointers reversed as poison to guarantee that any + * use escalates to #DF. + * + * FRED reuses MSR_STAR to provide the segment selector values to load on + * entry from Ring3. Entry from Ring0 leave %cs and %ss unmodified. + */ +static void init_fred(void) +{ + unsigned long stack_top = get_stack_bottom() & ~(STACK_SIZE - 1); + + ASSERT(opt_fred == 1); + + wrmsrns(MSR_STAR, XEN_MSR_STAR); + wrmsrns(MSR_FRED_CONFIG, (unsigned long)entry_FRED_R3); + + /* + * MSR_FRED_RSP_* all come with an 64-byte alignment check, avoiding the + * need for an explicit BUG_ON(). + */ + wrmsrns(MSR_FRED_RSP_SL0, (unsigned long)(&get_cpu_info()->_fred + 1)); + wrmsrns(MSR_FRED_RSP_SL1, stack_top + (IST_DB * IST_SHSTK_SIZE)); /* Poison */ + wrmsrns(MSR_FRED_RSP_SL2, stack_top + (1 + IST_MCE) * PAGE_SIZE); + wrmsrns(MSR_FRED_RSP_SL3, stack_top + (1 + IST_DF) * PAGE_SIZE); + wrmsrns(MSR_FRED_STK_LVLS, ((2UL << (X86_EXC_MC * 2)) | + (3UL << (X86_EXC_DF * 2)))); + + if ( cpu_has_xen_shstk ) + { + wrmsrns(MSR_FRED_SSP_SL0, stack_top + (PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE); + wrmsrns(MSR_FRED_SSP_SL1, stack_top + (1 + IST_DB) * PAGE_SIZE); /* Poison */ + wrmsrns(MSR_FRED_SSP_SL2, stack_top + (IST_MCE * IST_SHSTK_SIZE)); + wrmsrns(MSR_FRED_SSP_SL3, stack_top + (IST_DF * IST_SHSTK_SIZE)); + } +} + +/* + * Set up a minimal TSS and selector for use in FRED mode. + * + * With FRED moving the stack pointers into MSRs, we would like to avoid + * having a TSS at all, but: + * - VT-x VMExit unconditionally sets TR.limit to 0x67, meaning that + * HOST_TR_BASE needs to point to a good TSS. + * - show_stack_overflow() cross-checks tss->rsp0. + * + * Fill in rsp0 and the bitmap offset, and load a zero-length TR. If VT-x + * does get used, it will clobber TR to refer to this_cpu(tss_page).tss. + */ +static void init_fred_tss(void) +{ + seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; + struct tss64 *tss = &this_cpu(tss_page).tss; + + tss->rsp0 = get_stack_bottom(); + tss->bitmap = IOBMP_INVALID_OFFSET; + + _set_tssldt_desc(gdt + TSS_ENTRY, 0, 0, SYS_DESC_tss_avail); + ltr(TSS_SELECTOR); +} + /* * Configure basic exception handling. This is prior to parsing the command * line or configuring a console, and needs to be as simple as possible. @@ -322,6 +396,8 @@ void __init traps_init(void) if ( opt_fred ) { + const struct desc_ptr idtr = {}; + #ifdef CONFIG_PV32 if ( opt_pv32 ) { @@ -329,16 +405,27 @@ void __init traps_init(void) printk(XENLOG_INFO "Disabling PV32 due to FRED\n"); } #endif + + init_fred(); + set_in_cr4(X86_CR4_FRED); + + /* + * Invalidate the IDT as it's not used. Set up a minimal TSS. The + * LDT was configured by bsp_early_traps_init(). + */ + lidt(&idtr); + init_fred_tss(); + setup_force_cpu_cap(X86_FEATURE_XEN_FRED); printk("Using FRED event delivery\n"); } else { + load_system_tables(); + printk("Using IDT event delivery\n"); } - load_system_tables(); - init_ler(); percpu_traps_init(); @@ -353,7 +440,11 @@ void __init traps_init(void) */ void __init bsp_traps_reinit(void) { - load_system_tables(); + if ( opt_fred ) + init_fred(); + else + load_system_tables(); + percpu_traps_init(); } @@ -368,7 +459,7 @@ void percpu_traps_init(void) * allocated, limiting the placement of the traps_init() call, and gets * re-done anyway by bsp_traps_reinit(). */ - if ( system_state > SYS_STATE_early_boot ) + if ( !opt_fred && system_state > SYS_STATE_early_boot ) legacy_syscall_init(); if ( cpu_has_xen_lbr ) @@ -384,7 +475,29 @@ void percpu_traps_init(void) */ void asmlinkage percpu_early_traps_init(void) { - load_system_tables(); + if ( opt_fred ) + { + seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; + const struct desc_ptr gdtr = { + .base = (unsigned long)gdt, + .limit = LAST_RESERVED_GDT_BYTE, + }, idtr = {}; + + lgdt(&gdtr); + + init_fred(); + write_cr4(read_cr4() | X86_CR4_FRED); + + /* + * Invalidate the IDT (not used) and LDT (not set up yet). Set up a + * minimal TSS. + */ + lidt(&idtr); + init_fred_tss(); + lldt(0); + } + else + load_system_tables(); } static void __init __maybe_unused build_assertions(void) @@ -403,4 +516,11 @@ static void __init __maybe_unused build_assertions(void) endof_field(struct cpu_info, guest_cpu_user_regs)) & 15); BUILD_BUG_ON((sizeof(struct cpu_info) - endof_field(struct cpu_info, _fred)) & 63); + + /* + * The x86 architecture is happy with TR.limit being less than 0x67, but + * VT-x is not. VMExit unconditionally sets the limit to 0x67, meaning + * that HOST_TR_BASE needs to refer to a good TSS of at least this size. + */ + BUILD_BUG_ON(sizeof(struct tss64) <= 0x67); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 08:44:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245166.1544524 (Exim 4.92) (envelope-from ) id 1vxhpr-0001m6-CD; Wed, 04 Mar 2026 08:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245166.1544524; Wed, 04 Mar 2026 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 1vxhpr-0001ly-98; Wed, 04 Mar 2026 08:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1245166; Wed, 04 Mar 2026 08:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxhpp-0001lg-MK for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxhpp-004nS3-22 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhpp-00FZZo-1p for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08: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=TUt6bOkzHO2NrPsQNMNZnFhgw8Cwdbqmu+dprCVJPsU=; b=PDhVGiYG2QjMu8FdFXSgnAzlL9 x6NTtD48c+haSo7LTrlDU6Sa8IUwDQwGwsSQQd7Bi0nQSTQpCa8/avaQkeuDnsg6XEVDc5D4vwCqB U2FaXyvvP03qRAhNnx/Mu3LTSWeTIO59YVhltFayUiHtsXOycQ+bBqE1eVQB4707K0mM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI: introduce private header Message-Id: Date: Wed, 04 Mar 2026 08:44:01 +0000 commit c6f5590c93444d39170f145c4cf682878aac09d2 Author: Jan Beulich AuthorDate: Wed Mar 4 08:21:28 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:21:28 2026 +0100 vPCI: introduce private header Before adding more private stuff to xen/vpci.h, split it up. In order to be able to include the private header first in a CU, the per-arch struct decls also need to move (to new asm/vpci.h files). While adjusting the test harness'es Makefile, also switch the pre-existing header symlink-ing rule to a pattern one. Apart from in the test harness code, things only move; no functional change intended. Signed-off-by: Jan Beulich Reviewed-by: Stewart Hildebrand Acked-by: Roger Pau Monné --- .gitignore | 1 + tools/tests/vpci/Makefile | 16 ++--- tools/tests/vpci/emul.h | 1 + xen/arch/arm/include/asm/pci.h | 8 --- xen/arch/arm/include/asm/vpci.h | 13 ++++ xen/arch/x86/include/asm/hvm/io.h | 11 ---- xen/arch/x86/include/asm/vpci.h | 29 +++++++++ xen/drivers/vpci/header.c | 3 +- xen/drivers/vpci/msi.c | 3 +- xen/drivers/vpci/msix.c | 3 +- xen/drivers/vpci/private.h | 126 ++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/rebar.c | 3 +- xen/drivers/vpci/vpci.c | 3 +- xen/include/xen/vpci.h | 107 +------------------------------- 14 files changed, 189 insertions(+), 138 deletions(-) diff --git a/.gitignore b/.gitignore index 57d54f676f..bfc7bdf043 100644 --- a/.gitignore +++ b/.gitignore @@ -154,6 +154,7 @@ tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/vpci/list.h +tools/tests/vpci/private.h tools/tests/vpci/vpci.[hc] tools/tests/vpci/test_vpci tools/xcutils/lsevtchn diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 97359ff67f..28b6009332 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -14,12 +14,12 @@ else $(warning HOSTCC != CC, will not run test) endif -$(TARGET): vpci.c vpci.h list.h main.c emul.h - $(CC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c +$(TARGET): vpci.c vpci.h list.h private.h main.c emul.h + $(CC) $(CFLAGS_xeninclude) -include emul.h -g -o $@ vpci.c main.c .PHONY: clean clean: - rm -rf $(TARGET) *.o *~ vpci.h vpci.c list.h + rm -rf $(TARGET) *.o *~ vpci.h vpci.c list.h private.h .PHONY: distclean distclean: clean @@ -34,10 +34,10 @@ uninstall: $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) vpci.c: $(XEN_ROOT)/xen/drivers/vpci/vpci.c - # Remove includes and add the test harness header - sed -e '/#include/d' -e '1s/^/#include "emul.h"/' <$< >$@ + sed -e '/#include/d' <$< >$@ + +private.h: %.h: $(XEN_ROOT)/xen/drivers/vpci/%.h + sed -e '/#include/d' <$< >$@ -list.h: $(XEN_ROOT)/xen/include/xen/list.h -vpci.h: $(XEN_ROOT)/xen/include/xen/vpci.h -list.h vpci.h: +list.h vpci.h: %.h: $(XEN_ROOT)/xen/include/xen/%.h sed -e '/#include/d' <$< >$@ diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index dd048cffbf..38211afbb8 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -86,6 +86,7 @@ typedef union { #define CONFIG_HAS_VPCI #include "vpci.h" +#include "private.h" #define __hwdom_init diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 73c3be74ae..7c3211823f 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -31,14 +31,6 @@ struct arch_pci_dev { struct device dev; }; -/* Arch-specific MSI data for vPCI. */ -struct vpci_arch_msi { -}; - -/* Arch-specific MSI-X entry data for vPCI. */ -struct vpci_arch_msix_entry { -}; - /* * Because of the header cross-dependencies, e.g. we need both * struct pci_dev and struct arch_pci_dev at the same time, this cannot be diff --git a/xen/arch/arm/include/asm/vpci.h b/xen/arch/arm/include/asm/vpci.h new file mode 100644 index 0000000000..db04687fc0 --- /dev/null +++ b/xen/arch/arm/include/asm/vpci.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef ARM_VPCI_H +#define ARM_VPCI_H + +/* Arch-specific MSI data for vPCI. */ +struct vpci_arch_msi { +}; + +/* Arch-specific MSI-X entry data for vPCI. */ +struct vpci_arch_msix_entry { +}; + +#endif /* ARM_VPCI_H */ diff --git a/xen/arch/x86/include/asm/hvm/io.h b/xen/arch/x86/include/asm/hvm/io.h index c12f099a03..986822ff15 100644 --- a/xen/arch/x86/include/asm/hvm/io.h +++ b/xen/arch/x86/include/asm/hvm/io.h @@ -97,17 +97,6 @@ void msixtbl_init(struct domain *d); static inline void msixtbl_init(struct domain *d) {} #endif -/* Arch-specific MSI data for vPCI. */ -struct vpci_arch_msi { - int pirq; - bool bound; -}; - -/* Arch-specific MSI-X entry data for vPCI. */ -struct vpci_arch_msix_entry { - int pirq; -}; - void stdvga_init(struct domain *d); extern void hvm_dpci_msi_eoi(struct domain *d, int vector); diff --git a/xen/arch/x86/include/asm/vpci.h b/xen/arch/x86/include/asm/vpci.h new file mode 100644 index 0000000000..c501ff1709 --- /dev/null +++ b/xen/arch/x86/include/asm/vpci.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef X86_VPCI_H +#define X86_VPCI_H + +#include + +/* Arch-specific MSI data for vPCI. */ +struct vpci_arch_msi { + int pirq; + bool bound; +}; + +/* Arch-specific MSI-X entry data for vPCI. */ +struct vpci_arch_msix_entry { + int pirq; +}; + +#endif /* X86_VPCI_H */ + +/* + * 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 739a5f610e..b90a7f2b4e 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -17,11 +17,12 @@ * License along with this program; If not, see . */ +#include "private.h" + #include #include #include #include -#include #include diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 737770ffa3..f736054b2b 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -16,9 +16,10 @@ * License along with this program; If not, see . */ +#include "private.h" + #include #include -#include #include diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index eaf8fae970..f87212b46f 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -17,10 +17,11 @@ * License along with this program; If not, see . */ +#include "private.h" + #include #include #include -#include #include #include diff --git a/xen/drivers/vpci/private.h b/xen/drivers/vpci/private.h new file mode 100644 index 0000000000..5a7ca47557 --- /dev/null +++ b/xen/drivers/vpci/private.h @@ -0,0 +1,126 @@ +#ifndef VPCI_PRIVATE_H +#define VPCI_PRIVATE_H + +#include + +typedef uint32_t vpci_read_t(const struct pci_dev *pdev, unsigned int reg, + void *data); + +typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, + uint32_t val, void *data); + +typedef struct { + unsigned int id; + bool is_ext; + int (* init)(struct pci_dev *pdev); + int (* cleanup)(const struct pci_dev *pdev, bool hide); +} vpci_capability_t; + +#define REGISTER_VPCI_CAPABILITY(cap, name, finit, fclean, ext) \ + static const vpci_capability_t name##_entry \ + __used_section(".data.rel.ro.vpci") = { \ + .id = (cap), \ + .init = (finit), \ + .cleanup = (fclean), \ + .is_ext = (ext), \ + } + +#define REGISTER_VPCI_CAP(name, finit, fclean) \ + REGISTER_VPCI_CAPABILITY(PCI_CAP_ID_##name, name, finit, fclean, false) +#define REGISTER_VPCI_EXTCAP(name, finit, fclean) \ + REGISTER_VPCI_CAPABILITY(PCI_EXT_CAP_ID_##name, name, finit, fclean, true) + +int __must_check vpci_init_header(struct pci_dev *pdev); + +/* Add/remove a register handler. */ +int __must_check vpci_add_register_mask(struct vpci *vpci, + vpci_read_t *read_handler, + vpci_write_t *write_handler, + unsigned int offset, unsigned int size, + void *data, uint32_t ro_mask, + uint32_t rw1c_mask, uint32_t rsvdp_mask, + uint32_t rsvdz_mask); +int __must_check vpci_add_register(struct vpci *vpci, + vpci_read_t *read_handler, + vpci_write_t *write_handler, + unsigned int offset, unsigned int size, + void *data); + +int vpci_remove_registers(struct vpci *vpci, unsigned int start, + unsigned int size); + +/* Helper to return the value passed in data. */ +uint32_t cf_check vpci_read_val( + const struct pci_dev *pdev, unsigned int reg, void *data); + +/* Passthrough handlers. */ +uint32_t cf_check vpci_hw_read8( + const struct pci_dev *pdev, unsigned int reg, void *data); +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); + +#ifdef __XEN__ +/* Make sure there's a hole in the p2m for the MSIX mmio areas. */ +int vpci_make_msix_hole(const struct pci_dev *pdev); + +/* + * Helper functions to fetch MSIX related data. They are used by both the + * emulated MSIX code and the BAR handlers. + */ +static inline paddr_t vmsix_table_host_base(const struct vpci *vpci, + unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].addr; +} + +static inline paddr_t vmsix_table_host_addr(const struct vpci *vpci, + unsigned int nr) +{ + return vmsix_table_host_base(vpci, nr) + + (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); +} + +static inline paddr_t vmsix_table_base(const struct vpci *vpci, unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & + PCI_MSIX_BIRMASK].guest_addr; +} + +static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) +{ + return vmsix_table_base(vpci, nr) + + (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); +} + +/* + * Note regarding the size calculation of the PBA: the spec mentions "The last + * QWORD will not necessarily be fully populated", so it implies that the PBA + * size is 64-bit aligned. + */ +static inline size_t vmsix_table_size(const struct vpci *vpci, unsigned int nr) +{ + return + (nr == VPCI_MSIX_TABLE) ? vpci->msix->max_entries * PCI_MSIX_ENTRY_SIZE + : ROUNDUP(DIV_ROUND_UP(vpci->msix->max_entries, + 8), 8); +} + +#endif /* __XEN__ */ + +#endif /* VPCI_PRIVATE_H */ + +/* + * 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/rebar.c b/xen/drivers/vpci/rebar.c index 4d22f08af3..ab5c5453a8 100644 --- a/xen/drivers/vpci/rebar.c +++ b/xen/drivers/vpci/rebar.c @@ -5,8 +5,9 @@ * Author: Jiqian Chen */ +#include "private.h" + #include -#include static void cf_check rebar_ctrl_write(const struct pci_dev *pdev, unsigned int reg, diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index f66f50c8ba..ce0f297b44 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -17,8 +17,9 @@ * License along with this program; If not, see . */ +#include "private.h" + #include -#include #include /* Internal struct to store the emulated PCI registers. */ diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index d6310104ea..d104efbce2 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -7,18 +7,7 @@ #include #include -typedef uint32_t vpci_read_t(const struct pci_dev *pdev, unsigned int reg, - void *data); - -typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, - uint32_t val, void *data); - -typedef struct { - unsigned int id; - bool is_ext; - int (* init)(struct pci_dev *pdev); - int (* cleanup)(const struct pci_dev *pdev, bool hide); -} vpci_capability_t; +#include #define VPCI_ECAM_BDF(addr) (((addr) & 0x0ffff000) >> 12) @@ -30,66 +19,17 @@ typedef struct { */ #define VPCI_MAX_VIRT_DEV (PCI_SLOT(~0) + 1) -#define REGISTER_VPCI_CAPABILITY(cap, name, finit, fclean, ext) \ - static const vpci_capability_t name##_entry \ - __used_section(".data.rel.ro.vpci") = { \ - .id = (cap), \ - .init = (finit), \ - .cleanup = (fclean), \ - .is_ext = (ext), \ - } - -#define REGISTER_VPCI_CAP(name, finit, fclean) \ - REGISTER_VPCI_CAPABILITY(PCI_CAP_ID_##name, name, finit, fclean, false) -#define REGISTER_VPCI_EXTCAP(name, finit, fclean) \ - REGISTER_VPCI_CAPABILITY(PCI_EXT_CAP_ID_##name, name, finit, fclean, true) - -int __must_check vpci_init_header(struct pci_dev *pdev); - /* Assign vPCI to device by adding handlers. */ int __must_check vpci_assign_device(struct pci_dev *pdev); /* Remove all handlers and free vpci related structures. */ void vpci_deassign_device(struct pci_dev *pdev); -/* Add/remove a register handler. */ -int __must_check vpci_add_register_mask(struct vpci *vpci, - vpci_read_t *read_handler, - vpci_write_t *write_handler, - unsigned int offset, unsigned int size, - void *data, uint32_t ro_mask, - uint32_t rw1c_mask, uint32_t rsvdp_mask, - uint32_t rsvdz_mask); -int __must_check vpci_add_register(struct vpci *vpci, - vpci_read_t *read_handler, - vpci_write_t *write_handler, - unsigned int offset, unsigned int size, - void *data); - -int vpci_remove_registers(struct vpci *vpci, unsigned int start, - unsigned int size); - /* Generic read/write handlers for the PCI config space. */ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size); void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, uint32_t data); -/* Helper to return the value passed in data. */ -uint32_t cf_check vpci_read_val( - const struct pci_dev *pdev, unsigned int reg, void *data); - -/* Passthrough handlers. */ -uint32_t cf_check vpci_hw_read8( - const struct pci_dev *pdev, unsigned int reg, void *data); -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); - /* * Check for pending vPCI operations on this vcpu. Returns true if the vcpu * should not run. @@ -213,9 +153,6 @@ struct vpci_vcpu { #ifdef __XEN__ void vpci_dump_msi(void); -/* Make sure there's a hole in the p2m for the MSIX mmio areas. */ -int vpci_make_msix_hole(const struct pci_dev *pdev); - /* Arch-specific vPCI MSI helpers. */ void vpci_msi_arch_mask(struct vpci_msi *msi, const struct pci_dev *pdev, unsigned int entry, bool mask); @@ -238,48 +175,6 @@ int __must_check vpci_msix_arch_disable_entry(struct vpci_msix_entry *entry, void vpci_msix_arch_init_entry(struct vpci_msix_entry *entry); int vpci_msix_arch_print(const struct vpci_msix *msix); -/* - * Helper functions to fetch MSIX related data. They are used by both the - * emulated MSIX code and the BAR handlers. - */ -static inline paddr_t vmsix_table_host_base(const struct vpci *vpci, - unsigned int nr) -{ - return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].addr; -} - -static inline paddr_t vmsix_table_host_addr(const struct vpci *vpci, - unsigned int nr) -{ - return vmsix_table_host_base(vpci, nr) + - (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); -} - -static inline paddr_t vmsix_table_base(const struct vpci *vpci, unsigned int nr) -{ - return vpci->header.bars[vpci->msix->tables[nr] & - PCI_MSIX_BIRMASK].guest_addr; -} - -static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) -{ - return vmsix_table_base(vpci, nr) + - (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); -} - -/* - * Note regarding the size calculation of the PBA: the spec mentions "The last - * QWORD will not necessarily be fully populated", so it implies that the PBA - * size is 64-bit aligned. - */ -static inline size_t vmsix_table_size(const struct vpci *vpci, unsigned int nr) -{ - return - (nr == VPCI_MSIX_TABLE) ? vpci->msix->max_entries * PCI_MSIX_ENTRY_SIZE - : ROUNDUP(DIV_ROUND_UP(vpci->msix->max_entries, - 8), 8); -} - static inline unsigned int vmsix_entry_nr(const struct vpci_msix *msix, const struct vpci_msix_entry *entry) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 08:44:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245167.1544527 (Exim 4.92) (envelope-from ) id 1vxhq1-0001ob-DD; Wed, 04 Mar 2026 08:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245167.1544527; Wed, 04 Mar 2026 08: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 1vxhq1-0001oT-Ad; Wed, 04 Mar 2026 08:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1245167; Wed, 04 Mar 2026 08:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxhpz-0001oC-P4 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxhpz-004nSA-2O for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhpz-00FZb1-2D for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08: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=y6NeUat9gXwmCN/0z7jmczZhoxfuRfnPqKgxBFzgu4o=; b=UPJCYe4SMt6UZrqSUkwoMXfD38 XYwQBu8c32ZchEvxHXc4/T+60rajbNsBo7A+XSqeB6RQN2AWo5VjnUvsoGD7jBsXtmMTxaWwsEFCm E0cY3fVYLB7bPlGySswK5MYLS9JeEJgWGzr55ymuKJOkQBGtISe3uiVphpJgzIzgHVS8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI: move vpci_init_capabilities() to a separate file Message-Id: Date: Wed, 04 Mar 2026 08:44:11 +0000 commit 998060dd91015988760e21b6e5966a4455868df8 Author: Jan Beulich AuthorDate: Wed Mar 4 08:22:42 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:22:42 2026 +0100 vPCI: move vpci_init_capabilities() to a separate file Let's keep capability handling together. Start with moving vpci_init_capabilities() and its helpers, plus splitting out of its cleanup counterpart. Signed-off-by: Jan Beulich Reviewed-by: Stewart Hildebrand Acked-by: Roger Pau Monné --- xen/drivers/vpci/Makefile | 1 + xen/drivers/vpci/cap.c | 252 +++++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/private.h | 21 ++++ xen/drivers/vpci/vpci.c | 250 +------------------------------------------- 4 files changed, 278 insertions(+), 246 deletions(-) diff --git a/xen/drivers/vpci/Makefile b/xen/drivers/vpci/Makefile index a7c8a30a89..9793a4f9b0 100644 --- a/xen/drivers/vpci/Makefile +++ b/xen/drivers/vpci/Makefile @@ -1,2 +1,3 @@ +obj-y += cap.o obj-y += vpci.o header.o rebar.o obj-$(CONFIG_HAS_PCI_MSI) += msi.o msix.o diff --git a/xen/drivers/vpci/cap.c b/xen/drivers/vpci/cap.c new file mode 100644 index 0000000000..37c1811c62 --- /dev/null +++ b/xen/drivers/vpci/cap.c @@ -0,0 +1,252 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Capability handling for guest PCI configuration space. + */ + +#include "private.h" + +#include + +extern const vpci_capability_t __start_vpci_array[]; +extern const vpci_capability_t __end_vpci_array[]; +#define NUM_VPCI_INIT (__end_vpci_array - __start_vpci_array) + +static struct vpci_register *vpci_get_previous_cap_register( + const struct vpci *vpci, unsigned int offset) +{ + unsigned int next; + struct vpci_register *r; + + if ( offset < 0x40 ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + + for ( r = vpci_get_register(vpci, PCI_CAPABILITY_LIST, 1); r; + r = next >= 0x40 ? vpci_get_register(vpci, + next + PCI_CAP_LIST_NEXT, 1) + : NULL ) + { + next = (unsigned int)(uintptr_t)r->private; + ASSERT(next == (uintptr_t)r->private); + if ( next == offset ) + break; + } + + return r; +} + +static int vpci_capability_hide(const struct pci_dev *pdev, unsigned int cap) +{ + const unsigned int offset = pci_find_cap_offset(pdev->sbdf, cap); + struct vpci_register *prev_r, *next_r; + struct vpci *vpci = pdev->vpci; + + if ( !offset ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + spin_lock(&vpci->lock); + prev_r = vpci_get_previous_cap_register(vpci, offset); + next_r = vpci_get_register(vpci, offset + PCI_CAP_LIST_NEXT, 1); + if ( !prev_r || !next_r ) + { + spin_unlock(&vpci->lock); + return -ENODEV; + } + + prev_r->private = next_r->private; + /* + * Not calling vpci_remove_registers() here is to avoid redoing + * the register search. + */ + list_del(&next_r->node); + spin_unlock(&vpci->lock); + xfree(next_r); + + if ( !is_hardware_domain(pdev->domain) ) + return vpci_remove_registers(vpci, offset + PCI_CAP_LIST_ID, 1); + + return 0; +} + +static struct vpci_register *vpci_get_previous_ext_cap_register( + const struct vpci *vpci, unsigned int offset) +{ + unsigned int pos = PCI_CFG_SPACE_SIZE; + struct vpci_register *r; + + if ( offset <= PCI_CFG_SPACE_SIZE ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + + for ( r = vpci_get_register(vpci, pos, 4); r; + r = pos > PCI_CFG_SPACE_SIZE ? vpci_get_register(vpci, pos, 4) + : NULL ) + { + uint32_t header = (uint32_t)(uintptr_t)r->private; + + ASSERT(header == (uintptr_t)r->private); + + pos = PCI_EXT_CAP_NEXT(header); + if ( pos == offset ) + break; + } + + return r; +} + +static int vpci_ext_capability_hide( + const struct pci_dev *pdev, unsigned int cap) +{ + const unsigned int offset = pci_find_ext_capability(pdev, cap); + struct vpci_register *r, *prev_r; + struct vpci *vpci = pdev->vpci; + uint32_t header, pre_header; + + if ( offset < PCI_CFG_SPACE_SIZE ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + spin_lock(&vpci->lock); + r = vpci_get_register(vpci, offset, 4); + if ( !r ) + { + spin_unlock(&vpci->lock); + return -ENODEV; + } + + header = (uint32_t)(uintptr_t)r->private; + if ( offset == PCI_CFG_SPACE_SIZE ) + { + if ( PCI_EXT_CAP_NEXT(header) <= PCI_CFG_SPACE_SIZE ) + r->private = (void *)0; + else + /* + * The first extended capability (0x100) can not be removed from + * the linked list, so instead mask its capability ID to return 0 + * hopefully forcing OSes to skip it. + */ + r->private = (void *)(uintptr_t)(header & ~PCI_EXT_CAP_ID(header)); + + spin_unlock(&vpci->lock); + return 0; + } + + prev_r = vpci_get_previous_ext_cap_register(vpci, offset); + if ( !prev_r ) + { + spin_unlock(&vpci->lock); + return -ENODEV; + } + + pre_header = (uint32_t)(uintptr_t)prev_r->private; + pre_header &= ~PCI_EXT_CAP_NEXT_MASK; + pre_header |= header & PCI_EXT_CAP_NEXT_MASK; + prev_r->private = (void *)(uintptr_t)pre_header; + + list_del(&r->node); + spin_unlock(&vpci->lock); + xfree(r); + + return 0; +} + +int vpci_init_capabilities(struct pci_dev *pdev) +{ + for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) + { + const vpci_capability_t *capability = &__start_vpci_array[i]; + const unsigned int cap = capability->id; + const bool is_ext = capability->is_ext; + unsigned int pos = 0; + int rc; + + if ( !is_ext ) + pos = pci_find_cap_offset(pdev->sbdf, cap); + else if ( is_hardware_domain(pdev->domain) ) + pos = pci_find_ext_capability(pdev, cap); + + if ( !pos ) + continue; + + rc = capability->init(pdev); + if ( rc ) + { + const char *type = is_ext ? "extended" : "legacy"; + + printk(XENLOG_WARNING + "%pd %pp: init %s cap %u fail rc=%d, mask it\n", + pdev->domain, &pdev->sbdf, type, cap, rc); + + if ( capability->cleanup ) + { + rc = capability->cleanup(pdev, true); + if ( rc ) + { + printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", + pdev->domain, &pdev->sbdf, type, cap, rc); + if ( !is_hardware_domain(pdev->domain) ) + return rc; + } + } + + if ( !is_ext ) + rc = vpci_capability_hide(pdev, cap); + else + rc = vpci_ext_capability_hide(pdev, cap); + if ( rc ) + { + printk(XENLOG_ERR "%pd %pp: hide %s cap %u fail rc=%d\n", + pdev->domain, &pdev->sbdf, type, cap, rc); + return rc; + } + } + } + + return 0; +} + +void vpci_cleanup_capabilities(struct pci_dev *pdev) +{ + for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) + { + const vpci_capability_t *capability = &__start_vpci_array[i]; + const unsigned int cap = capability->id; + unsigned int pos = 0; + + if ( !capability->cleanup ) + continue; + + if ( !capability->is_ext ) + pos = pci_find_cap_offset(pdev->sbdf, cap); + else if ( is_hardware_domain(pdev->domain) ) + pos = pci_find_ext_capability(pdev, cap); + if ( pos ) + { + int rc = capability->cleanup(pdev, false); + + if ( rc ) + printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", + pdev->domain, &pdev->sbdf, + capability->is_ext ? "extended" : "legacy", cap, rc); + } + } +} + +/* + * 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/private.h b/xen/drivers/vpci/private.h index 5a7ca47557..140092cc52 100644 --- a/xen/drivers/vpci/private.h +++ b/xen/drivers/vpci/private.h @@ -9,6 +9,20 @@ typedef uint32_t vpci_read_t(const struct pci_dev *pdev, unsigned int reg, typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data); +/* Internal struct to store the emulated PCI registers. */ +struct vpci_register { + vpci_read_t *read; + vpci_write_t *write; + unsigned int size; + unsigned int offset; + void *private; + struct list_head node; + uint32_t ro_mask; + uint32_t rw1c_mask; + uint32_t rsvdp_mask; + uint32_t rsvdz_mask; +}; + typedef struct { unsigned int id; bool is_ext; @@ -32,6 +46,9 @@ typedef struct { int __must_check vpci_init_header(struct pci_dev *pdev); +int vpci_init_capabilities(struct pci_dev *pdev); +void vpci_cleanup_capabilities(struct pci_dev *pdev); + /* Add/remove a register handler. */ int __must_check vpci_add_register_mask(struct vpci *vpci, vpci_read_t *read_handler, @@ -49,6 +66,10 @@ int __must_check vpci_add_register(struct vpci *vpci, int vpci_remove_registers(struct vpci *vpci, unsigned int start, unsigned int size); +struct vpci_register *vpci_get_register(const struct vpci *vpci, + unsigned int offset, + unsigned int size); + /* Helper to return the value passed in data. */ uint32_t cf_check vpci_read_val( const struct pci_dev *pdev, unsigned int reg, void *data); diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index ce0f297b44..683d5fc36c 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -22,24 +22,7 @@ #include #include -/* Internal struct to store the emulated PCI registers. */ -struct vpci_register { - vpci_read_t *read; - vpci_write_t *write; - unsigned int size; - unsigned int offset; - void *private; - struct list_head node; - uint32_t ro_mask; - uint32_t rw1c_mask; - uint32_t rsvdp_mask; - uint32_t rsvdz_mask; -}; - #ifdef __XEN__ -extern const vpci_capability_t __start_vpci_array[]; -extern const vpci_capability_t __end_vpci_array[]; -#define NUM_VPCI_INIT (__end_vpci_array - __start_vpci_array) #ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT static int assign_virtual_sbdf(struct pci_dev *pdev) @@ -84,9 +67,9 @@ static int assign_virtual_sbdf(struct pci_dev *pdev) #endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ -static struct vpci_register *vpci_get_register(const struct vpci *vpci, - unsigned int offset, - unsigned int size) +struct vpci_register *vpci_get_register(const struct vpci *vpci, + unsigned int offset, + unsigned int size) { struct vpci_register *r; @@ -104,209 +87,6 @@ static struct vpci_register *vpci_get_register(const struct vpci *vpci, return NULL; } -static struct vpci_register *vpci_get_previous_cap_register( - const struct vpci *vpci, unsigned int offset) -{ - unsigned int next; - struct vpci_register *r; - - if ( offset < 0x40 ) - { - ASSERT_UNREACHABLE(); - return NULL; - } - - for ( r = vpci_get_register(vpci, PCI_CAPABILITY_LIST, 1); r; - r = next >= 0x40 ? vpci_get_register(vpci, - next + PCI_CAP_LIST_NEXT, 1) - : NULL ) - { - next = (unsigned int)(uintptr_t)r->private; - ASSERT(next == (uintptr_t)r->private); - if ( next == offset ) - break; - } - - return r; -} - -static int vpci_capability_hide(const struct pci_dev *pdev, unsigned int cap) -{ - const unsigned int offset = pci_find_cap_offset(pdev->sbdf, cap); - struct vpci_register *prev_r, *next_r; - struct vpci *vpci = pdev->vpci; - - if ( !offset ) - { - ASSERT_UNREACHABLE(); - return 0; - } - - spin_lock(&vpci->lock); - prev_r = vpci_get_previous_cap_register(vpci, offset); - next_r = vpci_get_register(vpci, offset + PCI_CAP_LIST_NEXT, 1); - if ( !prev_r || !next_r ) - { - spin_unlock(&vpci->lock); - return -ENODEV; - } - - prev_r->private = next_r->private; - /* - * Not calling vpci_remove_registers() here is to avoid redoing - * the register search. - */ - list_del(&next_r->node); - spin_unlock(&vpci->lock); - xfree(next_r); - - if ( !is_hardware_domain(pdev->domain) ) - return vpci_remove_registers(vpci, offset + PCI_CAP_LIST_ID, 1); - - return 0; -} - -static struct vpci_register *vpci_get_previous_ext_cap_register( - const struct vpci *vpci, unsigned int offset) -{ - unsigned int pos = PCI_CFG_SPACE_SIZE; - struct vpci_register *r; - - if ( offset <= PCI_CFG_SPACE_SIZE ) - { - ASSERT_UNREACHABLE(); - return NULL; - } - - for ( r = vpci_get_register(vpci, pos, 4); r; - r = pos > PCI_CFG_SPACE_SIZE ? vpci_get_register(vpci, pos, 4) - : NULL ) - { - uint32_t header = (uint32_t)(uintptr_t)r->private; - - ASSERT(header == (uintptr_t)r->private); - - pos = PCI_EXT_CAP_NEXT(header); - if ( pos == offset ) - break; - } - - return r; -} - -static int vpci_ext_capability_hide( - const struct pci_dev *pdev, unsigned int cap) -{ - const unsigned int offset = pci_find_ext_capability(pdev, cap); - struct vpci_register *r, *prev_r; - struct vpci *vpci = pdev->vpci; - uint32_t header, pre_header; - - if ( offset < PCI_CFG_SPACE_SIZE ) - { - ASSERT_UNREACHABLE(); - return 0; - } - - spin_lock(&vpci->lock); - r = vpci_get_register(vpci, offset, 4); - if ( !r ) - { - spin_unlock(&vpci->lock); - return -ENODEV; - } - - header = (uint32_t)(uintptr_t)r->private; - if ( offset == PCI_CFG_SPACE_SIZE ) - { - if ( PCI_EXT_CAP_NEXT(header) <= PCI_CFG_SPACE_SIZE ) - r->private = (void *)0; - else - /* - * The first extended capability (0x100) can not be removed from - * the linked list, so instead mask its capability ID to return 0 - * hopefully forcing OSes to skip it. - */ - r->private = (void *)(uintptr_t)(header & ~PCI_EXT_CAP_ID(header)); - - spin_unlock(&vpci->lock); - return 0; - } - - prev_r = vpci_get_previous_ext_cap_register(vpci, offset); - if ( !prev_r ) - { - spin_unlock(&vpci->lock); - return -ENODEV; - } - - pre_header = (uint32_t)(uintptr_t)prev_r->private; - pre_header &= ~PCI_EXT_CAP_NEXT_MASK; - pre_header |= header & PCI_EXT_CAP_NEXT_MASK; - prev_r->private = (void *)(uintptr_t)pre_header; - - list_del(&r->node); - spin_unlock(&vpci->lock); - xfree(r); - - return 0; -} - -static int vpci_init_capabilities(struct pci_dev *pdev) -{ - for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) - { - const vpci_capability_t *capability = &__start_vpci_array[i]; - const unsigned int cap = capability->id; - const bool is_ext = capability->is_ext; - unsigned int pos = 0; - int rc; - - if ( !is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); - else if ( is_hardware_domain(pdev->domain) ) - pos = pci_find_ext_capability(pdev, cap); - - if ( !pos ) - continue; - - rc = capability->init(pdev); - if ( rc ) - { - const char *type = is_ext ? "extended" : "legacy"; - - printk(XENLOG_WARNING - "%pd %pp: init %s cap %u fail rc=%d, mask it\n", - pdev->domain, &pdev->sbdf, type, cap, rc); - - if ( capability->cleanup ) - { - rc = capability->cleanup(pdev, true); - if ( rc ) - { - printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", - pdev->domain, &pdev->sbdf, type, cap, rc); - if ( !is_hardware_domain(pdev->domain) ) - return rc; - } - } - - if ( !is_ext ) - rc = vpci_capability_hide(pdev, cap); - else - rc = vpci_ext_capability_hide(pdev, cap); - if ( rc ) - { - printk(XENLOG_ERR "%pd %pp: hide %s cap %u fail rc=%d\n", - pdev->domain, &pdev->sbdf, type, cap, rc); - return rc; - } - } - } - - return 0; -} - void vpci_deassign_device(struct pci_dev *pdev) { unsigned int i; @@ -322,29 +102,7 @@ void vpci_deassign_device(struct pci_dev *pdev) &pdev->domain->vpci_dev_assigned_map); #endif - for ( i = 0; i < NUM_VPCI_INIT; i++ ) - { - const vpci_capability_t *capability = &__start_vpci_array[i]; - const unsigned int cap = capability->id; - unsigned int pos = 0; - - if ( !capability->cleanup ) - continue; - - if ( !capability->is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); - else if ( is_hardware_domain(pdev->domain) ) - pos = pci_find_ext_capability(pdev, cap); - if ( pos ) - { - int rc = capability->cleanup(pdev, false); - - if ( rc ) - printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", - pdev->domain, &pdev->sbdf, - capability->is_ext ? "extended" : "legacy", cap, rc); - } - } + vpci_cleanup_capabilities(pdev); spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 08:44:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245168.1544532 (Exim 4.92) (envelope-from ) id 1vxhqB-0001vD-GG; Wed, 04 Mar 2026 08:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245168.1544532; Wed, 04 Mar 2026 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 1vxhqB-0001v5-DL; Wed, 04 Mar 2026 08:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1245168; Wed, 04 Mar 2026 08:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxhq9-0001uo-To for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxhq9-004nSE-2s for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhq9-00FZd7-2a for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08: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=9SB0hSuPUMDp7ySZUY1FnyrGOap4AihzyBGVh9YAY9I=; b=1dN/74K7kfKDWIbO/ppjZonIWf tvutg4zv3ygZRA+fcH7H/u+6ZbUGsGVvO/9gE8diMEr5IXOYvLitjPqwpDaMzRplS5MXXSr2W7c6o 8pT6mzky11Jceojs1vaYbMVE+2U2tclAdIF/WL1msTBHIDI7UUkqbYHYOg6MQXau6LCg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI: move capability-list init Message-Id: Date: Wed, 04 Mar 2026 08:44:21 +0000 commit 16c3761129cd5bddd36da16a77b40bde973d8e54 Author: Jan Beulich AuthorDate: Wed Mar 4 08:23:22 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:23:22 2026 +0100 vPCI: move capability-list init ... both for when the functions are invoked and where they live in source. Don't invoke them directly in vpci_init_header(), but instead first thing in vpci_init_capabilities(). Suggested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Stewart Hildebrand Acked-by: Roger Pau Monné --- xen/drivers/vpci/cap.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- xen/drivers/vpci/header.c | 134 --------------------------------------------- 2 files changed, 136 insertions(+), 135 deletions(-) diff --git a/xen/drivers/vpci/cap.c b/xen/drivers/vpci/cap.c index 37c1811c62..e26a2f95da 100644 --- a/xen/drivers/vpci/cap.c +++ b/xen/drivers/vpci/cap.c @@ -159,15 +159,150 @@ static int vpci_ext_capability_hide( return 0; } +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 ( 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, + }; + /* + * 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, n, &ttl); + + 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 ) + return rc; + + next &= ~3; + + 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 + * 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, n, &ttl); + + 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, + is_hwdom ? vpci_hw_write8 : NULL, + pos + PCI_CAP_LIST_NEXT, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &= ~3; + } + } + + /* 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, + 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 vpci_init_ext_capability_list(const struct pci_dev *pdev) +{ + unsigned int pos = PCI_CFG_SPACE_SIZE; + + if ( !pdev->ext_cfg ) + return 0; + + if ( !is_hardware_domain(pdev->domain) ) + /* Extended capabilities read as zero, write ignore for DomU */ + return vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos, 4, (void *)0); + + do + { + uint32_t header = pci_conf_read32(pdev->sbdf, pos); + int rc; + + if ( header == 0xffffffffU ) + { + printk(XENLOG_WARNING + "%pd %pp: broken extended cap list, offset %#x\n", + pdev->domain, &pdev->sbdf, pos); + return 0; + } + + rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos, 4, (void *)(uintptr_t)header); + if ( rc == -EEXIST ) + { + printk(XENLOG_WARNING + "%pd %pp: overlap in extended cap list, offset %#x\n", + pdev->domain, &pdev->sbdf, pos); + return 0; + } + + if ( rc ) + return rc; + + pos = PCI_EXT_CAP_NEXT(header); + } while ( pos >= PCI_CFG_SPACE_SIZE ); + + return 0; +} + int vpci_init_capabilities(struct pci_dev *pdev) { + int rc; + + rc = vpci_init_capability_list(pdev); + if ( rc ) + return rc; + + rc = vpci_init_ext_capability_list(pdev); + if ( rc ) + return rc; + for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) { const vpci_capability_t *capability = &__start_vpci_array[i]; const unsigned int cap = capability->id; const bool is_ext = capability->is_ext; unsigned int pos = 0; - int rc; if ( !is_ext ) pos = pci_find_cap_offset(pdev->sbdf, cap); diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index b90a7f2b4e..1c0818c2e7 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -744,132 +744,6 @@ 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; - bool is_hwdom = is_hardware_domain(pdev->domain); - - 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, - }; - /* - * 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, n, &ttl); - - 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 ) - return rc; - - next &= ~3; - - 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 - * 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, n, &ttl); - - 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, - is_hwdom ? vpci_hw_write8 : NULL, - pos + PCI_CAP_LIST_NEXT, 1, - (void *)(uintptr_t)next); - if ( rc ) - return rc; - - next &= ~3; - } - } - - /* 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, - 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 vpci_init_ext_capability_list(const struct pci_dev *pdev) -{ - unsigned int pos = PCI_CFG_SPACE_SIZE; - - if ( !pdev->ext_cfg ) - return 0; - - if ( !is_hardware_domain(pdev->domain) ) - /* Extended capabilities read as zero, write ignore for DomU */ - return vpci_add_register(pdev->vpci, vpci_read_val, NULL, - pos, 4, (void *)0); - - do - { - uint32_t header = pci_conf_read32(pdev->sbdf, pos); - int rc; - - if ( header == 0xffffffffU ) - { - printk(XENLOG_WARNING - "%pd %pp: broken extended cap list, offset %#x\n", - pdev->domain, &pdev->sbdf, pos); - return 0; - } - - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, - pos, 4, (void *)(uintptr_t)header); - if ( rc == -EEXIST ) - { - printk(XENLOG_WARNING - "%pd %pp: overlap in extended cap list, offset %#x\n", - pdev->domain, &pdev->sbdf, pos); - return 0; - } - - if ( rc ) - return rc; - - pos = PCI_EXT_CAP_NEXT(header); - } while ( pos >= PCI_CFG_SPACE_SIZE ); - - return 0; -} - int vpci_init_header(struct pci_dev *pdev) { uint16_t cmd; @@ -918,14 +792,6 @@ int vpci_init_header(struct pci_dev *pdev) if ( rc ) return rc; - rc = vpci_init_capability_list(pdev); - if ( rc ) - return rc; - - rc = vpci_init_ext_capability_list(pdev); - 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 Wed Mar 04 08:44:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245169.1544536 (Exim 4.92) (envelope-from ) id 1vxhqL-0001y4-HF; Wed, 04 Mar 2026 08:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245169.1544536; Wed, 04 Mar 2026 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 1vxhqL-0001xw-Eh; Wed, 04 Mar 2026 08:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1245169; Wed, 04 Mar 2026 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 1vxhqK-0001xi-0O for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vxhqJ-004nSI-3A for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhqJ-00FZeY-34 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08: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=8JsQqUg46JlU7bLugFuGobOLb2ZKyamuE2LYsjk5hoc=; b=blgUxvK5BDT2F2plUESRVQB3mf wJ9ygiLdpZu64eAQHCP9vKYkuIU4M7zk/r24V5y8rDxlFiA9l2ZklIqUQu4zNqSJXkyP5k7amWMeu 6tJbNuqMx0NFVdxS6N/uvCr2h6H6Dsb1j3T7zpiME0JjCgWjb1o1tIzMwWGMtTlTgN6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/time: move ticks<->ns helpers to common code Message-Id: Date: Wed, 04 Mar 2026 08:44:31 +0000 commit c66d20357726806e754970bab4f7ecec8c8d44cb Author: Oleksii Kurochko AuthorDate: Wed Mar 4 08:24:28 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:24:28 2026 +0100 xen/time: move ticks<->ns helpers to common code ticks_to_ns() and ns_to_ticks() are not architecture-specific, so provide a common implementation that is more resilient to overflow than the historical Arm version. This is not a practical issue for Arm, as the latest ARM ARM that timer frequency should be fixed at 1 GHz and older platforms used much lower rates, which is shy of 32-bit overflow. As the helpers are declared as static inline, they should not affect x86, which does not use them. On Arm, these helpers were historically implemented as out-of-line functions because the counter frequency was originally defined as static and unavailable to headers [1]. Later changes [2] removed this restriction, but the helpers remained unchanged. Now they can be implemented as static inline without any issues. Centralising the helpers avoids duplication and removes subtle differences between architectures while keeping the implementation simple. Drop redundant includes where already pulls it in. No functional change is intended. [1] ddee56dc2994 arm: driver for the generic timer for ARMv7 [2] 096578b4e489 xen: move XEN_SYSCTL_physinfo, XEN_SYSCTL_numainfo and XEN_SYSCTL_topologyinfo to common code Suggested-by: Jan Beulich Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Bertrand Marquis --- xen/arch/arm/include/asm/time.h | 3 --- xen/arch/arm/time.c | 11 ----------- xen/arch/arm/vtimer.c | 2 +- xen/arch/riscv/include/asm/time.h | 5 ----- xen/arch/riscv/time.c | 1 + xen/include/xen/time.h | 11 +++++++++++ 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/include/asm/time.h b/xen/arch/arm/include/asm/time.h index 49ad8c1a6d..c194dbb9f5 100644 --- a/xen/arch/arm/include/asm/time.h +++ b/xen/arch/arm/include/asm/time.h @@ -101,9 +101,6 @@ extern void init_timer_interrupt(void); /* Counter value at boot time */ extern uint64_t boot_count; -extern s_time_t ticks_to_ns(uint64_t ticks); -extern uint64_t ns_to_ticks(s_time_t ns); - void preinit_xen_time(void); void force_update_vcpu_system_time(struct vcpu *v); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index cc3fcf47b6..a12912a106 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -27,7 +27,6 @@ #include #include #include -#include #include uint64_t __read_mostly boot_count; @@ -47,16 +46,6 @@ unsigned int timer_get_irq(enum timer_ppi ppi) return timer_irq[ppi]; } -/*static inline*/ s_time_t ticks_to_ns(uint64_t ticks) -{ - return muldiv64(ticks, SECONDS(1), 1000 * cpu_khz); -} - -/*static inline*/ uint64_t ns_to_ticks(s_time_t ns) -{ - return muldiv64(ns, 1000 * cpu_khz, SECONDS(1)); -} - static __initdata struct dt_device_node *timer; #ifdef CONFIG_ACPI diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index d2124b1755..2e85ff2b6e 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -12,13 +12,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/xen/arch/riscv/include/asm/time.h b/xen/arch/riscv/include/asm/time.h index 1e7801e2ea..be3875b998 100644 --- a/xen/arch/riscv/include/asm/time.h +++ b/xen/arch/riscv/include/asm/time.h @@ -24,11 +24,6 @@ static inline cycles_t get_cycles(void) return csr_read(CSR_TIME); } -static inline s_time_t ticks_to_ns(uint64_t ticks) -{ - return muldiv64(ticks, MILLISECS(1), cpu_khz); -} - void preinit_xen_time(void); #endif /* ASM__RISCV__TIME_H */ diff --git a/xen/arch/riscv/time.c b/xen/arch/riscv/time.c index e962f8518d..2c7af0a5d6 100644 --- a/xen/arch/riscv/time.c +++ b/xen/arch/riscv/time.c @@ -4,6 +4,7 @@ #include #include #include +#include #include unsigned long __ro_after_init cpu_khz; /* CPU clock frequency in kHz. */ diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index fe0d7a578a..2185dd26a4 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -8,6 +8,7 @@ #ifndef __XEN_TIME_H__ #define __XEN_TIME_H__ +#include #include #include @@ -75,6 +76,16 @@ extern void send_timer_event(struct vcpu *v); void domain_set_time_offset(struct domain *d, int64_t time_offset_seconds); +static inline s_time_t ticks_to_ns(uint64_t ticks) +{ + return muldiv64(ticks, MILLISECS(1), cpu_khz); +} + +static inline uint64_t ns_to_ticks(s_time_t ns) +{ + return muldiv64(ns, cpu_khz, MILLISECS(1)); +} + #include #endif /* __XEN_TIME_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 08:44:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245170.1544540 (Exim 4.92) (envelope-from ) id 1vxhqV-00021P-Id; Wed, 04 Mar 2026 08:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245170.1544540; Wed, 04 Mar 2026 08: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 1vxhqV-00021H-G0; Wed, 04 Mar 2026 08:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1245170; Wed, 04 Mar 2026 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 1vxhqU-000214-2s for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vxhqU-004nSO-0C for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhqU-00FZfP-06 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=KF/IJvSv9CPLUWaHgS1Ytg72jvKYelQ+BhE8j6EmNcA=; b=qvN18JjMzWpZCVBq4hgkJCccNF USRBHbFaIOl0M76xA/dWgdP6MVDYoSlcpNRgjZyf8iAMO9X+/k1KYXjMwelolr+rgq2IISimT+mpI o7ocVS4LsRpmwSBow3NKMnnVRiy9XY3jvA+fMu7uKXYtgF5GDcjQo1P1VOpvCrvByjCM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests/x86_emulator: fix build on clang-21 Message-Id: Date: Wed, 04 Mar 2026 08:44:42 +0000 commit 34e9c2151444ffc96f0be193445d3f6b146653d3 Author: Edwin Török AuthorDate: Wed Mar 4 08:25:19 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:25:19 2026 +0100 tools/tests/x86_emulator: fix build on clang-21 clang-21's built-in assembler is enabled by default, but it doesn't support some mnemonics: ``` test_x86_emulator.c:2636:36: error: invalid instruction mnemonic 'fsaves' 2636 | "fidivs %1\n\t" test_x86_emulator.c:2640:24: error: invalid instruction mnemonic 'frstors' 2640 | asm volatile ( "frstors %0" :: "m" (res[25]) : "memory" ); | ^ test_x86_emulator.c:4251:24: error: invalid instruction mnemonic 'vpcmpestriq' 4251 | put_insn(vpcmpestri, | ^ ``` Use the external assembler with Clang for consistency with GCC. Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index e18725d0c3..5003c464f3 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -297,6 +297,11 @@ x86_emulate: HOSTCFLAGS-x86_64 := -fno-PIE $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) + +# clang's integrated as does not support some mnemonics: +# https://github.com/llvm/llvm-project/issues/183635 +$(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-integrated-as) + HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 08:44:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245171.1544544 (Exim 4.92) (envelope-from ) id 1vxhqf-00023z-Jv; Wed, 04 Mar 2026 08:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245171.1544544; Wed, 04 Mar 2026 08: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 1vxhqf-00023r-HJ; Wed, 04 Mar 2026 08:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1245171; Wed, 04 Mar 2026 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 1vxhqe-00023f-99 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vxhqe-004nSd-0e for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhqe-00FZg8-0N for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=BHcRzn49JvCOzOCYMMWrSA+cX68jRDXVUivLb1RvltY=; b=0nzTQL2nuHjKvFXdS6Fk6mGGFl zX1i7oOA5GeY+gEk9KXxddag5bfy4E6++R7em/TGHKNz1fm8NnOVt6iHjkVlFmWeQVkYC4bm9kEn4 ySqgtG+SamY0jEc8E8ZjZ4DAqLYCkCSa9ng4PQFp9K+lG4G6ALDGsgaThEnhaXNKWrBY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests/x86_emulator: fix undefined behaviour in shift Message-Id: Date: Wed, 04 Mar 2026 08:44:52 +0000 commit c8ff52f87620e43e3fbd809e6450d299b567b900 Author: Edwin Török AuthorDate: Wed Mar 4 08:25:49 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:25:49 2026 +0100 tools/tests/x86_emulator: fix undefined behaviour in shift Fixes this `-fsanitize=undefined` error: ``` test_x86_emulator.c:1103:32: runtime error: left shift of 573785183 by 2 places cannot be represented in type 'int' SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior test_x86_emulator.c:1103:32 ``` Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index ea507f9c3a..f30568b7f1 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -1100,7 +1100,7 @@ int main(int argc, char **argv) regs.edi = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); if ( (rc != X86EMUL_OKAY) || - (*res != ((0x2233445F << 2) | 2)) || + (*res != ((0x2233445FU << 2) | 2)) || ((regs.eflags & (EFLAGS_MASK & ~X86_EFLAGS_OF)) != EFLAGS_ALWAYS_SET) || (regs.eip != (unsigned long)&instr[3]) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 08:45:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 08:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245172.1544549 (Exim 4.92) (envelope-from ) id 1vxhqp-00026V-Le; Wed, 04 Mar 2026 08:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245172.1544549; Wed, 04 Mar 2026 08:45:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxhqp-00026L-Ih; Wed, 04 Mar 2026 08:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1245172; Wed, 04 Mar 2026 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 1vxhqo-000267-AB for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vxhqo-004nTR-0v for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 08:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxhqo-00FZhH-0p for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=wCXI375sNC0dV1uqcYXNAg+ipmRDIBNRHaULwBEg0CQ=; b=b65Gof22+YgG/e+fzWLhBqkap+ I9epogs/vEZ6Z8TyshH6wXXFuhjVTLPnpkrk/eWYZfKxFowb7Rae+K6957UV81tu9Lm5OuOTO4DGW INJnn1idpuvRMz3dDmhRZ7g83Iv3wIxJvFrxCtgNWBMRyJCEaJAbHBAxV3ewz/TRqreI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests/x86_emulator: avoid passing NULL to memcpy Message-Id: Date: Wed, 04 Mar 2026 08:45:02 +0000 commit bdd49cc2f61510797a47ad81486be653633ab3ee Author: Edwin Török AuthorDate: Wed Mar 4 08:26:11 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:26:11 2026 +0100 tools/tests/x86_emulator: avoid passing NULL to memcpy Fixes this `-fsanitize=undefined` error: ``` test_x86_emulator.c:614:12: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:44:28: note: nonnull attribute specified here SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior test_x86_emulator.c:614:12 ``` Although this is more of a grey area: I don't see anything in the standard that'd forbid calling `memcpy` with NULL and 0, but `glibc` does specify it as non-null, which allows the compiler to make optimizations assuming it never is NULL, so this is undefined behaviour only on glibc. Best to avoid the potential undefined behaviour though. Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/test_x86_emulator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index f30568b7f1..20929b80c6 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -611,7 +611,8 @@ static int fetch( if ( verbose ) printf("** %s(CS:%p,, %u,)\n", __func__, (void *)offset, bytes); - memcpy(p_data, (void *)offset, bytes); + if ( bytes ) + memcpy(p_data, (void *)offset, bytes); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 09:44:11 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245229.1544603 (Exim 4.92) (envelope-from ) id 1vxilu-0005BG-Vt; Wed, 04 Mar 2026 09:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245229.1544603; Wed, 04 Mar 2026 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 1vxilu-0005B6-Sb; Wed, 04 Mar 2026 09:44:02 +0000 Received: by outflank-mailman (input) for mailman id 1245229; Wed, 04 Mar 2026 09:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxilt-0005Ay-Np for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxilt-004odC-23 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxilt-00FdhR-1t for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=CjtbLtpEeO3X6cN7J6rUbhpFsEGbmrF0oD1BsQAN2v4=; b=X0XrshEnEtvDZ47IyuK6oItL5q IDi3LxTpKeyTA53SEjIE2d6Yc8+zFDr6lIXdApX7hAG3mnOY5P7OzWMRklklmSlO6sI9TlomsWhu9 JUfdnqyo3vva9o6+tfeLxrSbBSOjOkDj4Xg/2d2P8lXUhh7Ll2DszUbYeMH3dN6Aeh/Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: introduce private header Message-Id: Date: Wed, 04 Mar 2026 09:44:01 +0000 commit c6f5590c93444d39170f145c4cf682878aac09d2 Author: Jan Beulich AuthorDate: Wed Mar 4 08:21:28 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:21:28 2026 +0100 vPCI: introduce private header Before adding more private stuff to xen/vpci.h, split it up. In order to be able to include the private header first in a CU, the per-arch struct decls also need to move (to new asm/vpci.h files). While adjusting the test harness'es Makefile, also switch the pre-existing header symlink-ing rule to a pattern one. Apart from in the test harness code, things only move; no functional change intended. Signed-off-by: Jan Beulich Reviewed-by: Stewart Hildebrand Acked-by: Roger Pau Monné --- .gitignore | 1 + tools/tests/vpci/Makefile | 16 ++--- tools/tests/vpci/emul.h | 1 + xen/arch/arm/include/asm/pci.h | 8 --- xen/arch/arm/include/asm/vpci.h | 13 ++++ xen/arch/x86/include/asm/hvm/io.h | 11 ---- xen/arch/x86/include/asm/vpci.h | 29 +++++++++ xen/drivers/vpci/header.c | 3 +- xen/drivers/vpci/msi.c | 3 +- xen/drivers/vpci/msix.c | 3 +- xen/drivers/vpci/private.h | 126 ++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/rebar.c | 3 +- xen/drivers/vpci/vpci.c | 3 +- xen/include/xen/vpci.h | 107 +------------------------------- 14 files changed, 189 insertions(+), 138 deletions(-) diff --git a/.gitignore b/.gitignore index 57d54f676f..bfc7bdf043 100644 --- a/.gitignore +++ b/.gitignore @@ -154,6 +154,7 @@ tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/vpci/list.h +tools/tests/vpci/private.h tools/tests/vpci/vpci.[hc] tools/tests/vpci/test_vpci tools/xcutils/lsevtchn diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 97359ff67f..28b6009332 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -14,12 +14,12 @@ else $(warning HOSTCC != CC, will not run test) endif -$(TARGET): vpci.c vpci.h list.h main.c emul.h - $(CC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c +$(TARGET): vpci.c vpci.h list.h private.h main.c emul.h + $(CC) $(CFLAGS_xeninclude) -include emul.h -g -o $@ vpci.c main.c .PHONY: clean clean: - rm -rf $(TARGET) *.o *~ vpci.h vpci.c list.h + rm -rf $(TARGET) *.o *~ vpci.h vpci.c list.h private.h .PHONY: distclean distclean: clean @@ -34,10 +34,10 @@ uninstall: $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/$(TARGET) vpci.c: $(XEN_ROOT)/xen/drivers/vpci/vpci.c - # Remove includes and add the test harness header - sed -e '/#include/d' -e '1s/^/#include "emul.h"/' <$< >$@ + sed -e '/#include/d' <$< >$@ + +private.h: %.h: $(XEN_ROOT)/xen/drivers/vpci/%.h + sed -e '/#include/d' <$< >$@ -list.h: $(XEN_ROOT)/xen/include/xen/list.h -vpci.h: $(XEN_ROOT)/xen/include/xen/vpci.h -list.h vpci.h: +list.h vpci.h: %.h: $(XEN_ROOT)/xen/include/xen/%.h sed -e '/#include/d' <$< >$@ diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index dd048cffbf..38211afbb8 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -86,6 +86,7 @@ typedef union { #define CONFIG_HAS_VPCI #include "vpci.h" +#include "private.h" #define __hwdom_init diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 73c3be74ae..7c3211823f 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -31,14 +31,6 @@ struct arch_pci_dev { struct device dev; }; -/* Arch-specific MSI data for vPCI. */ -struct vpci_arch_msi { -}; - -/* Arch-specific MSI-X entry data for vPCI. */ -struct vpci_arch_msix_entry { -}; - /* * Because of the header cross-dependencies, e.g. we need both * struct pci_dev and struct arch_pci_dev at the same time, this cannot be diff --git a/xen/arch/arm/include/asm/vpci.h b/xen/arch/arm/include/asm/vpci.h new file mode 100644 index 0000000000..db04687fc0 --- /dev/null +++ b/xen/arch/arm/include/asm/vpci.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef ARM_VPCI_H +#define ARM_VPCI_H + +/* Arch-specific MSI data for vPCI. */ +struct vpci_arch_msi { +}; + +/* Arch-specific MSI-X entry data for vPCI. */ +struct vpci_arch_msix_entry { +}; + +#endif /* ARM_VPCI_H */ diff --git a/xen/arch/x86/include/asm/hvm/io.h b/xen/arch/x86/include/asm/hvm/io.h index c12f099a03..986822ff15 100644 --- a/xen/arch/x86/include/asm/hvm/io.h +++ b/xen/arch/x86/include/asm/hvm/io.h @@ -97,17 +97,6 @@ void msixtbl_init(struct domain *d); static inline void msixtbl_init(struct domain *d) {} #endif -/* Arch-specific MSI data for vPCI. */ -struct vpci_arch_msi { - int pirq; - bool bound; -}; - -/* Arch-specific MSI-X entry data for vPCI. */ -struct vpci_arch_msix_entry { - int pirq; -}; - void stdvga_init(struct domain *d); extern void hvm_dpci_msi_eoi(struct domain *d, int vector); diff --git a/xen/arch/x86/include/asm/vpci.h b/xen/arch/x86/include/asm/vpci.h new file mode 100644 index 0000000000..c501ff1709 --- /dev/null +++ b/xen/arch/x86/include/asm/vpci.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef X86_VPCI_H +#define X86_VPCI_H + +#include + +/* Arch-specific MSI data for vPCI. */ +struct vpci_arch_msi { + int pirq; + bool bound; +}; + +/* Arch-specific MSI-X entry data for vPCI. */ +struct vpci_arch_msix_entry { + int pirq; +}; + +#endif /* X86_VPCI_H */ + +/* + * 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 739a5f610e..b90a7f2b4e 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -17,11 +17,12 @@ * License along with this program; If not, see . */ +#include "private.h" + #include #include #include #include -#include #include diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 737770ffa3..f736054b2b 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -16,9 +16,10 @@ * License along with this program; If not, see . */ +#include "private.h" + #include #include -#include #include diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index eaf8fae970..f87212b46f 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -17,10 +17,11 @@ * License along with this program; If not, see . */ +#include "private.h" + #include #include #include -#include #include #include diff --git a/xen/drivers/vpci/private.h b/xen/drivers/vpci/private.h new file mode 100644 index 0000000000..5a7ca47557 --- /dev/null +++ b/xen/drivers/vpci/private.h @@ -0,0 +1,126 @@ +#ifndef VPCI_PRIVATE_H +#define VPCI_PRIVATE_H + +#include + +typedef uint32_t vpci_read_t(const struct pci_dev *pdev, unsigned int reg, + void *data); + +typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, + uint32_t val, void *data); + +typedef struct { + unsigned int id; + bool is_ext; + int (* init)(struct pci_dev *pdev); + int (* cleanup)(const struct pci_dev *pdev, bool hide); +} vpci_capability_t; + +#define REGISTER_VPCI_CAPABILITY(cap, name, finit, fclean, ext) \ + static const vpci_capability_t name##_entry \ + __used_section(".data.rel.ro.vpci") = { \ + .id = (cap), \ + .init = (finit), \ + .cleanup = (fclean), \ + .is_ext = (ext), \ + } + +#define REGISTER_VPCI_CAP(name, finit, fclean) \ + REGISTER_VPCI_CAPABILITY(PCI_CAP_ID_##name, name, finit, fclean, false) +#define REGISTER_VPCI_EXTCAP(name, finit, fclean) \ + REGISTER_VPCI_CAPABILITY(PCI_EXT_CAP_ID_##name, name, finit, fclean, true) + +int __must_check vpci_init_header(struct pci_dev *pdev); + +/* Add/remove a register handler. */ +int __must_check vpci_add_register_mask(struct vpci *vpci, + vpci_read_t *read_handler, + vpci_write_t *write_handler, + unsigned int offset, unsigned int size, + void *data, uint32_t ro_mask, + uint32_t rw1c_mask, uint32_t rsvdp_mask, + uint32_t rsvdz_mask); +int __must_check vpci_add_register(struct vpci *vpci, + vpci_read_t *read_handler, + vpci_write_t *write_handler, + unsigned int offset, unsigned int size, + void *data); + +int vpci_remove_registers(struct vpci *vpci, unsigned int start, + unsigned int size); + +/* Helper to return the value passed in data. */ +uint32_t cf_check vpci_read_val( + const struct pci_dev *pdev, unsigned int reg, void *data); + +/* Passthrough handlers. */ +uint32_t cf_check vpci_hw_read8( + const struct pci_dev *pdev, unsigned int reg, void *data); +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); + +#ifdef __XEN__ +/* Make sure there's a hole in the p2m for the MSIX mmio areas. */ +int vpci_make_msix_hole(const struct pci_dev *pdev); + +/* + * Helper functions to fetch MSIX related data. They are used by both the + * emulated MSIX code and the BAR handlers. + */ +static inline paddr_t vmsix_table_host_base(const struct vpci *vpci, + unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].addr; +} + +static inline paddr_t vmsix_table_host_addr(const struct vpci *vpci, + unsigned int nr) +{ + return vmsix_table_host_base(vpci, nr) + + (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); +} + +static inline paddr_t vmsix_table_base(const struct vpci *vpci, unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & + PCI_MSIX_BIRMASK].guest_addr; +} + +static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) +{ + return vmsix_table_base(vpci, nr) + + (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); +} + +/* + * Note regarding the size calculation of the PBA: the spec mentions "The last + * QWORD will not necessarily be fully populated", so it implies that the PBA + * size is 64-bit aligned. + */ +static inline size_t vmsix_table_size(const struct vpci *vpci, unsigned int nr) +{ + return + (nr == VPCI_MSIX_TABLE) ? vpci->msix->max_entries * PCI_MSIX_ENTRY_SIZE + : ROUNDUP(DIV_ROUND_UP(vpci->msix->max_entries, + 8), 8); +} + +#endif /* __XEN__ */ + +#endif /* VPCI_PRIVATE_H */ + +/* + * 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/rebar.c b/xen/drivers/vpci/rebar.c index 4d22f08af3..ab5c5453a8 100644 --- a/xen/drivers/vpci/rebar.c +++ b/xen/drivers/vpci/rebar.c @@ -5,8 +5,9 @@ * Author: Jiqian Chen */ +#include "private.h" + #include -#include static void cf_check rebar_ctrl_write(const struct pci_dev *pdev, unsigned int reg, diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index f66f50c8ba..ce0f297b44 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -17,8 +17,9 @@ * License along with this program; If not, see . */ +#include "private.h" + #include -#include #include /* Internal struct to store the emulated PCI registers. */ diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index d6310104ea..d104efbce2 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -7,18 +7,7 @@ #include #include -typedef uint32_t vpci_read_t(const struct pci_dev *pdev, unsigned int reg, - void *data); - -typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, - uint32_t val, void *data); - -typedef struct { - unsigned int id; - bool is_ext; - int (* init)(struct pci_dev *pdev); - int (* cleanup)(const struct pci_dev *pdev, bool hide); -} vpci_capability_t; +#include #define VPCI_ECAM_BDF(addr) (((addr) & 0x0ffff000) >> 12) @@ -30,66 +19,17 @@ typedef struct { */ #define VPCI_MAX_VIRT_DEV (PCI_SLOT(~0) + 1) -#define REGISTER_VPCI_CAPABILITY(cap, name, finit, fclean, ext) \ - static const vpci_capability_t name##_entry \ - __used_section(".data.rel.ro.vpci") = { \ - .id = (cap), \ - .init = (finit), \ - .cleanup = (fclean), \ - .is_ext = (ext), \ - } - -#define REGISTER_VPCI_CAP(name, finit, fclean) \ - REGISTER_VPCI_CAPABILITY(PCI_CAP_ID_##name, name, finit, fclean, false) -#define REGISTER_VPCI_EXTCAP(name, finit, fclean) \ - REGISTER_VPCI_CAPABILITY(PCI_EXT_CAP_ID_##name, name, finit, fclean, true) - -int __must_check vpci_init_header(struct pci_dev *pdev); - /* Assign vPCI to device by adding handlers. */ int __must_check vpci_assign_device(struct pci_dev *pdev); /* Remove all handlers and free vpci related structures. */ void vpci_deassign_device(struct pci_dev *pdev); -/* Add/remove a register handler. */ -int __must_check vpci_add_register_mask(struct vpci *vpci, - vpci_read_t *read_handler, - vpci_write_t *write_handler, - unsigned int offset, unsigned int size, - void *data, uint32_t ro_mask, - uint32_t rw1c_mask, uint32_t rsvdp_mask, - uint32_t rsvdz_mask); -int __must_check vpci_add_register(struct vpci *vpci, - vpci_read_t *read_handler, - vpci_write_t *write_handler, - unsigned int offset, unsigned int size, - void *data); - -int vpci_remove_registers(struct vpci *vpci, unsigned int start, - unsigned int size); - /* Generic read/write handlers for the PCI config space. */ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size); void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, uint32_t data); -/* Helper to return the value passed in data. */ -uint32_t cf_check vpci_read_val( - const struct pci_dev *pdev, unsigned int reg, void *data); - -/* Passthrough handlers. */ -uint32_t cf_check vpci_hw_read8( - const struct pci_dev *pdev, unsigned int reg, void *data); -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); - /* * Check for pending vPCI operations on this vcpu. Returns true if the vcpu * should not run. @@ -213,9 +153,6 @@ struct vpci_vcpu { #ifdef __XEN__ void vpci_dump_msi(void); -/* Make sure there's a hole in the p2m for the MSIX mmio areas. */ -int vpci_make_msix_hole(const struct pci_dev *pdev); - /* Arch-specific vPCI MSI helpers. */ void vpci_msi_arch_mask(struct vpci_msi *msi, const struct pci_dev *pdev, unsigned int entry, bool mask); @@ -238,48 +175,6 @@ int __must_check vpci_msix_arch_disable_entry(struct vpci_msix_entry *entry, void vpci_msix_arch_init_entry(struct vpci_msix_entry *entry); int vpci_msix_arch_print(const struct vpci_msix *msix); -/* - * Helper functions to fetch MSIX related data. They are used by both the - * emulated MSIX code and the BAR handlers. - */ -static inline paddr_t vmsix_table_host_base(const struct vpci *vpci, - unsigned int nr) -{ - return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].addr; -} - -static inline paddr_t vmsix_table_host_addr(const struct vpci *vpci, - unsigned int nr) -{ - return vmsix_table_host_base(vpci, nr) + - (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); -} - -static inline paddr_t vmsix_table_base(const struct vpci *vpci, unsigned int nr) -{ - return vpci->header.bars[vpci->msix->tables[nr] & - PCI_MSIX_BIRMASK].guest_addr; -} - -static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) -{ - return vmsix_table_base(vpci, nr) + - (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); -} - -/* - * Note regarding the size calculation of the PBA: the spec mentions "The last - * QWORD will not necessarily be fully populated", so it implies that the PBA - * size is 64-bit aligned. - */ -static inline size_t vmsix_table_size(const struct vpci *vpci, unsigned int nr) -{ - return - (nr == VPCI_MSIX_TABLE) ? vpci->msix->max_entries * PCI_MSIX_ENTRY_SIZE - : ROUNDUP(DIV_ROUND_UP(vpci->msix->max_entries, - 8), 8); -} - static inline unsigned int vmsix_entry_nr(const struct vpci_msix *msix, const struct vpci_msix_entry *entry) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 09:44:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245230.1544605 (Exim 4.92) (envelope-from ) id 1vxim5-0005DJ-0d; Wed, 04 Mar 2026 09:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245230.1544605; Wed, 04 Mar 2026 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 1vxim4-0005DC-U7; Wed, 04 Mar 2026 09:44:12 +0000 Received: by outflank-mailman (input) for mailman id 1245230; Wed, 04 Mar 2026 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 1vxim3-0005Cx-RG for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vxim3-004odJ-2P for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxim3-00Fdkq-2F for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=NeieDq+Spx7FZV0vqwmiW0tWdYY5Hz7fBU9gx0Zih6w=; b=TZCRBIpo+HSSL3Hj8WPuSH8L5o kvj/8039dzDv6EvEV+Q0ia126lTxWCoXvsMtDpIwj+ubiAr/jmiwx6aBAipRBGgrzcVndI0d1cxTM FLSpXeG2/Pgs+GIzyl7o3q65mj2HnzbJpPdqThCFeFI+2xaeH8Dm/FHWCuu+IRHJKkec=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: move vpci_init_capabilities() to a separate file Message-Id: Date: Wed, 04 Mar 2026 09:44:11 +0000 commit 998060dd91015988760e21b6e5966a4455868df8 Author: Jan Beulich AuthorDate: Wed Mar 4 08:22:42 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:22:42 2026 +0100 vPCI: move vpci_init_capabilities() to a separate file Let's keep capability handling together. Start with moving vpci_init_capabilities() and its helpers, plus splitting out of its cleanup counterpart. Signed-off-by: Jan Beulich Reviewed-by: Stewart Hildebrand Acked-by: Roger Pau Monné --- xen/drivers/vpci/Makefile | 1 + xen/drivers/vpci/cap.c | 252 +++++++++++++++++++++++++++++++++++++++++++++ xen/drivers/vpci/private.h | 21 ++++ xen/drivers/vpci/vpci.c | 250 +------------------------------------------- 4 files changed, 278 insertions(+), 246 deletions(-) diff --git a/xen/drivers/vpci/Makefile b/xen/drivers/vpci/Makefile index a7c8a30a89..9793a4f9b0 100644 --- a/xen/drivers/vpci/Makefile +++ b/xen/drivers/vpci/Makefile @@ -1,2 +1,3 @@ +obj-y += cap.o obj-y += vpci.o header.o rebar.o obj-$(CONFIG_HAS_PCI_MSI) += msi.o msix.o diff --git a/xen/drivers/vpci/cap.c b/xen/drivers/vpci/cap.c new file mode 100644 index 0000000000..37c1811c62 --- /dev/null +++ b/xen/drivers/vpci/cap.c @@ -0,0 +1,252 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Capability handling for guest PCI configuration space. + */ + +#include "private.h" + +#include + +extern const vpci_capability_t __start_vpci_array[]; +extern const vpci_capability_t __end_vpci_array[]; +#define NUM_VPCI_INIT (__end_vpci_array - __start_vpci_array) + +static struct vpci_register *vpci_get_previous_cap_register( + const struct vpci *vpci, unsigned int offset) +{ + unsigned int next; + struct vpci_register *r; + + if ( offset < 0x40 ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + + for ( r = vpci_get_register(vpci, PCI_CAPABILITY_LIST, 1); r; + r = next >= 0x40 ? vpci_get_register(vpci, + next + PCI_CAP_LIST_NEXT, 1) + : NULL ) + { + next = (unsigned int)(uintptr_t)r->private; + ASSERT(next == (uintptr_t)r->private); + if ( next == offset ) + break; + } + + return r; +} + +static int vpci_capability_hide(const struct pci_dev *pdev, unsigned int cap) +{ + const unsigned int offset = pci_find_cap_offset(pdev->sbdf, cap); + struct vpci_register *prev_r, *next_r; + struct vpci *vpci = pdev->vpci; + + if ( !offset ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + spin_lock(&vpci->lock); + prev_r = vpci_get_previous_cap_register(vpci, offset); + next_r = vpci_get_register(vpci, offset + PCI_CAP_LIST_NEXT, 1); + if ( !prev_r || !next_r ) + { + spin_unlock(&vpci->lock); + return -ENODEV; + } + + prev_r->private = next_r->private; + /* + * Not calling vpci_remove_registers() here is to avoid redoing + * the register search. + */ + list_del(&next_r->node); + spin_unlock(&vpci->lock); + xfree(next_r); + + if ( !is_hardware_domain(pdev->domain) ) + return vpci_remove_registers(vpci, offset + PCI_CAP_LIST_ID, 1); + + return 0; +} + +static struct vpci_register *vpci_get_previous_ext_cap_register( + const struct vpci *vpci, unsigned int offset) +{ + unsigned int pos = PCI_CFG_SPACE_SIZE; + struct vpci_register *r; + + if ( offset <= PCI_CFG_SPACE_SIZE ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + + for ( r = vpci_get_register(vpci, pos, 4); r; + r = pos > PCI_CFG_SPACE_SIZE ? vpci_get_register(vpci, pos, 4) + : NULL ) + { + uint32_t header = (uint32_t)(uintptr_t)r->private; + + ASSERT(header == (uintptr_t)r->private); + + pos = PCI_EXT_CAP_NEXT(header); + if ( pos == offset ) + break; + } + + return r; +} + +static int vpci_ext_capability_hide( + const struct pci_dev *pdev, unsigned int cap) +{ + const unsigned int offset = pci_find_ext_capability(pdev, cap); + struct vpci_register *r, *prev_r; + struct vpci *vpci = pdev->vpci; + uint32_t header, pre_header; + + if ( offset < PCI_CFG_SPACE_SIZE ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + spin_lock(&vpci->lock); + r = vpci_get_register(vpci, offset, 4); + if ( !r ) + { + spin_unlock(&vpci->lock); + return -ENODEV; + } + + header = (uint32_t)(uintptr_t)r->private; + if ( offset == PCI_CFG_SPACE_SIZE ) + { + if ( PCI_EXT_CAP_NEXT(header) <= PCI_CFG_SPACE_SIZE ) + r->private = (void *)0; + else + /* + * The first extended capability (0x100) can not be removed from + * the linked list, so instead mask its capability ID to return 0 + * hopefully forcing OSes to skip it. + */ + r->private = (void *)(uintptr_t)(header & ~PCI_EXT_CAP_ID(header)); + + spin_unlock(&vpci->lock); + return 0; + } + + prev_r = vpci_get_previous_ext_cap_register(vpci, offset); + if ( !prev_r ) + { + spin_unlock(&vpci->lock); + return -ENODEV; + } + + pre_header = (uint32_t)(uintptr_t)prev_r->private; + pre_header &= ~PCI_EXT_CAP_NEXT_MASK; + pre_header |= header & PCI_EXT_CAP_NEXT_MASK; + prev_r->private = (void *)(uintptr_t)pre_header; + + list_del(&r->node); + spin_unlock(&vpci->lock); + xfree(r); + + return 0; +} + +int vpci_init_capabilities(struct pci_dev *pdev) +{ + for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) + { + const vpci_capability_t *capability = &__start_vpci_array[i]; + const unsigned int cap = capability->id; + const bool is_ext = capability->is_ext; + unsigned int pos = 0; + int rc; + + if ( !is_ext ) + pos = pci_find_cap_offset(pdev->sbdf, cap); + else if ( is_hardware_domain(pdev->domain) ) + pos = pci_find_ext_capability(pdev, cap); + + if ( !pos ) + continue; + + rc = capability->init(pdev); + if ( rc ) + { + const char *type = is_ext ? "extended" : "legacy"; + + printk(XENLOG_WARNING + "%pd %pp: init %s cap %u fail rc=%d, mask it\n", + pdev->domain, &pdev->sbdf, type, cap, rc); + + if ( capability->cleanup ) + { + rc = capability->cleanup(pdev, true); + if ( rc ) + { + printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", + pdev->domain, &pdev->sbdf, type, cap, rc); + if ( !is_hardware_domain(pdev->domain) ) + return rc; + } + } + + if ( !is_ext ) + rc = vpci_capability_hide(pdev, cap); + else + rc = vpci_ext_capability_hide(pdev, cap); + if ( rc ) + { + printk(XENLOG_ERR "%pd %pp: hide %s cap %u fail rc=%d\n", + pdev->domain, &pdev->sbdf, type, cap, rc); + return rc; + } + } + } + + return 0; +} + +void vpci_cleanup_capabilities(struct pci_dev *pdev) +{ + for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) + { + const vpci_capability_t *capability = &__start_vpci_array[i]; + const unsigned int cap = capability->id; + unsigned int pos = 0; + + if ( !capability->cleanup ) + continue; + + if ( !capability->is_ext ) + pos = pci_find_cap_offset(pdev->sbdf, cap); + else if ( is_hardware_domain(pdev->domain) ) + pos = pci_find_ext_capability(pdev, cap); + if ( pos ) + { + int rc = capability->cleanup(pdev, false); + + if ( rc ) + printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", + pdev->domain, &pdev->sbdf, + capability->is_ext ? "extended" : "legacy", cap, rc); + } + } +} + +/* + * 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/private.h b/xen/drivers/vpci/private.h index 5a7ca47557..140092cc52 100644 --- a/xen/drivers/vpci/private.h +++ b/xen/drivers/vpci/private.h @@ -9,6 +9,20 @@ typedef uint32_t vpci_read_t(const struct pci_dev *pdev, unsigned int reg, typedef void vpci_write_t(const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data); +/* Internal struct to store the emulated PCI registers. */ +struct vpci_register { + vpci_read_t *read; + vpci_write_t *write; + unsigned int size; + unsigned int offset; + void *private; + struct list_head node; + uint32_t ro_mask; + uint32_t rw1c_mask; + uint32_t rsvdp_mask; + uint32_t rsvdz_mask; +}; + typedef struct { unsigned int id; bool is_ext; @@ -32,6 +46,9 @@ typedef struct { int __must_check vpci_init_header(struct pci_dev *pdev); +int vpci_init_capabilities(struct pci_dev *pdev); +void vpci_cleanup_capabilities(struct pci_dev *pdev); + /* Add/remove a register handler. */ int __must_check vpci_add_register_mask(struct vpci *vpci, vpci_read_t *read_handler, @@ -49,6 +66,10 @@ int __must_check vpci_add_register(struct vpci *vpci, int vpci_remove_registers(struct vpci *vpci, unsigned int start, unsigned int size); +struct vpci_register *vpci_get_register(const struct vpci *vpci, + unsigned int offset, + unsigned int size); + /* Helper to return the value passed in data. */ uint32_t cf_check vpci_read_val( const struct pci_dev *pdev, unsigned int reg, void *data); diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index ce0f297b44..683d5fc36c 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -22,24 +22,7 @@ #include #include -/* Internal struct to store the emulated PCI registers. */ -struct vpci_register { - vpci_read_t *read; - vpci_write_t *write; - unsigned int size; - unsigned int offset; - void *private; - struct list_head node; - uint32_t ro_mask; - uint32_t rw1c_mask; - uint32_t rsvdp_mask; - uint32_t rsvdz_mask; -}; - #ifdef __XEN__ -extern const vpci_capability_t __start_vpci_array[]; -extern const vpci_capability_t __end_vpci_array[]; -#define NUM_VPCI_INIT (__end_vpci_array - __start_vpci_array) #ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT static int assign_virtual_sbdf(struct pci_dev *pdev) @@ -84,9 +67,9 @@ static int assign_virtual_sbdf(struct pci_dev *pdev) #endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ -static struct vpci_register *vpci_get_register(const struct vpci *vpci, - unsigned int offset, - unsigned int size) +struct vpci_register *vpci_get_register(const struct vpci *vpci, + unsigned int offset, + unsigned int size) { struct vpci_register *r; @@ -104,209 +87,6 @@ static struct vpci_register *vpci_get_register(const struct vpci *vpci, return NULL; } -static struct vpci_register *vpci_get_previous_cap_register( - const struct vpci *vpci, unsigned int offset) -{ - unsigned int next; - struct vpci_register *r; - - if ( offset < 0x40 ) - { - ASSERT_UNREACHABLE(); - return NULL; - } - - for ( r = vpci_get_register(vpci, PCI_CAPABILITY_LIST, 1); r; - r = next >= 0x40 ? vpci_get_register(vpci, - next + PCI_CAP_LIST_NEXT, 1) - : NULL ) - { - next = (unsigned int)(uintptr_t)r->private; - ASSERT(next == (uintptr_t)r->private); - if ( next == offset ) - break; - } - - return r; -} - -static int vpci_capability_hide(const struct pci_dev *pdev, unsigned int cap) -{ - const unsigned int offset = pci_find_cap_offset(pdev->sbdf, cap); - struct vpci_register *prev_r, *next_r; - struct vpci *vpci = pdev->vpci; - - if ( !offset ) - { - ASSERT_UNREACHABLE(); - return 0; - } - - spin_lock(&vpci->lock); - prev_r = vpci_get_previous_cap_register(vpci, offset); - next_r = vpci_get_register(vpci, offset + PCI_CAP_LIST_NEXT, 1); - if ( !prev_r || !next_r ) - { - spin_unlock(&vpci->lock); - return -ENODEV; - } - - prev_r->private = next_r->private; - /* - * Not calling vpci_remove_registers() here is to avoid redoing - * the register search. - */ - list_del(&next_r->node); - spin_unlock(&vpci->lock); - xfree(next_r); - - if ( !is_hardware_domain(pdev->domain) ) - return vpci_remove_registers(vpci, offset + PCI_CAP_LIST_ID, 1); - - return 0; -} - -static struct vpci_register *vpci_get_previous_ext_cap_register( - const struct vpci *vpci, unsigned int offset) -{ - unsigned int pos = PCI_CFG_SPACE_SIZE; - struct vpci_register *r; - - if ( offset <= PCI_CFG_SPACE_SIZE ) - { - ASSERT_UNREACHABLE(); - return NULL; - } - - for ( r = vpci_get_register(vpci, pos, 4); r; - r = pos > PCI_CFG_SPACE_SIZE ? vpci_get_register(vpci, pos, 4) - : NULL ) - { - uint32_t header = (uint32_t)(uintptr_t)r->private; - - ASSERT(header == (uintptr_t)r->private); - - pos = PCI_EXT_CAP_NEXT(header); - if ( pos == offset ) - break; - } - - return r; -} - -static int vpci_ext_capability_hide( - const struct pci_dev *pdev, unsigned int cap) -{ - const unsigned int offset = pci_find_ext_capability(pdev, cap); - struct vpci_register *r, *prev_r; - struct vpci *vpci = pdev->vpci; - uint32_t header, pre_header; - - if ( offset < PCI_CFG_SPACE_SIZE ) - { - ASSERT_UNREACHABLE(); - return 0; - } - - spin_lock(&vpci->lock); - r = vpci_get_register(vpci, offset, 4); - if ( !r ) - { - spin_unlock(&vpci->lock); - return -ENODEV; - } - - header = (uint32_t)(uintptr_t)r->private; - if ( offset == PCI_CFG_SPACE_SIZE ) - { - if ( PCI_EXT_CAP_NEXT(header) <= PCI_CFG_SPACE_SIZE ) - r->private = (void *)0; - else - /* - * The first extended capability (0x100) can not be removed from - * the linked list, so instead mask its capability ID to return 0 - * hopefully forcing OSes to skip it. - */ - r->private = (void *)(uintptr_t)(header & ~PCI_EXT_CAP_ID(header)); - - spin_unlock(&vpci->lock); - return 0; - } - - prev_r = vpci_get_previous_ext_cap_register(vpci, offset); - if ( !prev_r ) - { - spin_unlock(&vpci->lock); - return -ENODEV; - } - - pre_header = (uint32_t)(uintptr_t)prev_r->private; - pre_header &= ~PCI_EXT_CAP_NEXT_MASK; - pre_header |= header & PCI_EXT_CAP_NEXT_MASK; - prev_r->private = (void *)(uintptr_t)pre_header; - - list_del(&r->node); - spin_unlock(&vpci->lock); - xfree(r); - - return 0; -} - -static int vpci_init_capabilities(struct pci_dev *pdev) -{ - for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) - { - const vpci_capability_t *capability = &__start_vpci_array[i]; - const unsigned int cap = capability->id; - const bool is_ext = capability->is_ext; - unsigned int pos = 0; - int rc; - - if ( !is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); - else if ( is_hardware_domain(pdev->domain) ) - pos = pci_find_ext_capability(pdev, cap); - - if ( !pos ) - continue; - - rc = capability->init(pdev); - if ( rc ) - { - const char *type = is_ext ? "extended" : "legacy"; - - printk(XENLOG_WARNING - "%pd %pp: init %s cap %u fail rc=%d, mask it\n", - pdev->domain, &pdev->sbdf, type, cap, rc); - - if ( capability->cleanup ) - { - rc = capability->cleanup(pdev, true); - if ( rc ) - { - printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", - pdev->domain, &pdev->sbdf, type, cap, rc); - if ( !is_hardware_domain(pdev->domain) ) - return rc; - } - } - - if ( !is_ext ) - rc = vpci_capability_hide(pdev, cap); - else - rc = vpci_ext_capability_hide(pdev, cap); - if ( rc ) - { - printk(XENLOG_ERR "%pd %pp: hide %s cap %u fail rc=%d\n", - pdev->domain, &pdev->sbdf, type, cap, rc); - return rc; - } - } - } - - return 0; -} - void vpci_deassign_device(struct pci_dev *pdev) { unsigned int i; @@ -322,29 +102,7 @@ void vpci_deassign_device(struct pci_dev *pdev) &pdev->domain->vpci_dev_assigned_map); #endif - for ( i = 0; i < NUM_VPCI_INIT; i++ ) - { - const vpci_capability_t *capability = &__start_vpci_array[i]; - const unsigned int cap = capability->id; - unsigned int pos = 0; - - if ( !capability->cleanup ) - continue; - - if ( !capability->is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); - else if ( is_hardware_domain(pdev->domain) ) - pos = pci_find_ext_capability(pdev, cap); - if ( pos ) - { - int rc = capability->cleanup(pdev, false); - - if ( rc ) - printk(XENLOG_ERR "%pd %pp: clean %s cap %u fail rc=%d\n", - pdev->domain, &pdev->sbdf, - capability->is_ext ? "extended" : "legacy", cap, rc); - } - } + vpci_cleanup_capabilities(pdev); spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 09:44:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245231.1544610 (Exim 4.92) (envelope-from ) id 1vximF-0005I2-3U; Wed, 04 Mar 2026 09:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245231.1544610; Wed, 04 Mar 2026 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 1vximF-0005Hu-0n; Wed, 04 Mar 2026 09:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1245231; Wed, 04 Mar 2026 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 1vximD-0005Hk-Ry for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vximD-004odP-2h for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vximD-00FdmH-2Z for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=RAMNBSK9Iwh+IRKiqYDZJ6HeE5Tex1F2KiWs7VIa9Xw=; b=nFSBQsbRCYy3hzrLZBGCoZAy7F SJITRLxKRFmV4Tj8zBZ8l7jF0PmmXqpUvgaFTe5sQRkB7Gio5w9s4pJhP+gn/uji242h4nVih57Yd hVi97PDeE9SE0xMz5HHiZwZ6Md+FYKKssk0iBqOzhsAKmy7eeJ4HypU+4eQHtkwD9jws=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: move capability-list init Message-Id: Date: Wed, 04 Mar 2026 09:44:21 +0000 commit 16c3761129cd5bddd36da16a77b40bde973d8e54 Author: Jan Beulich AuthorDate: Wed Mar 4 08:23:22 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:23:22 2026 +0100 vPCI: move capability-list init ... both for when the functions are invoked and where they live in source. Don't invoke them directly in vpci_init_header(), but instead first thing in vpci_init_capabilities(). Suggested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Stewart Hildebrand Acked-by: Roger Pau Monné --- xen/drivers/vpci/cap.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- xen/drivers/vpci/header.c | 134 --------------------------------------------- 2 files changed, 136 insertions(+), 135 deletions(-) diff --git a/xen/drivers/vpci/cap.c b/xen/drivers/vpci/cap.c index 37c1811c62..e26a2f95da 100644 --- a/xen/drivers/vpci/cap.c +++ b/xen/drivers/vpci/cap.c @@ -159,15 +159,150 @@ static int vpci_ext_capability_hide( return 0; } +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 ( 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, + }; + /* + * 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, n, &ttl); + + 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 ) + return rc; + + next &= ~3; + + 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 + * 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, n, &ttl); + + 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, + is_hwdom ? vpci_hw_write8 : NULL, + pos + PCI_CAP_LIST_NEXT, 1, + (void *)(uintptr_t)next); + if ( rc ) + return rc; + + next &= ~3; + } + } + + /* 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, + 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 vpci_init_ext_capability_list(const struct pci_dev *pdev) +{ + unsigned int pos = PCI_CFG_SPACE_SIZE; + + if ( !pdev->ext_cfg ) + return 0; + + if ( !is_hardware_domain(pdev->domain) ) + /* Extended capabilities read as zero, write ignore for DomU */ + return vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos, 4, (void *)0); + + do + { + uint32_t header = pci_conf_read32(pdev->sbdf, pos); + int rc; + + if ( header == 0xffffffffU ) + { + printk(XENLOG_WARNING + "%pd %pp: broken extended cap list, offset %#x\n", + pdev->domain, &pdev->sbdf, pos); + return 0; + } + + rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, + pos, 4, (void *)(uintptr_t)header); + if ( rc == -EEXIST ) + { + printk(XENLOG_WARNING + "%pd %pp: overlap in extended cap list, offset %#x\n", + pdev->domain, &pdev->sbdf, pos); + return 0; + } + + if ( rc ) + return rc; + + pos = PCI_EXT_CAP_NEXT(header); + } while ( pos >= PCI_CFG_SPACE_SIZE ); + + return 0; +} + int vpci_init_capabilities(struct pci_dev *pdev) { + int rc; + + rc = vpci_init_capability_list(pdev); + if ( rc ) + return rc; + + rc = vpci_init_ext_capability_list(pdev); + if ( rc ) + return rc; + for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) { const vpci_capability_t *capability = &__start_vpci_array[i]; const unsigned int cap = capability->id; const bool is_ext = capability->is_ext; unsigned int pos = 0; - int rc; if ( !is_ext ) pos = pci_find_cap_offset(pdev->sbdf, cap); diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index b90a7f2b4e..1c0818c2e7 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -744,132 +744,6 @@ 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; - bool is_hwdom = is_hardware_domain(pdev->domain); - - 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, - }; - /* - * 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, n, &ttl); - - 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 ) - return rc; - - next &= ~3; - - 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 - * 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, n, &ttl); - - 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, - is_hwdom ? vpci_hw_write8 : NULL, - pos + PCI_CAP_LIST_NEXT, 1, - (void *)(uintptr_t)next); - if ( rc ) - return rc; - - next &= ~3; - } - } - - /* 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, - 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 vpci_init_ext_capability_list(const struct pci_dev *pdev) -{ - unsigned int pos = PCI_CFG_SPACE_SIZE; - - if ( !pdev->ext_cfg ) - return 0; - - if ( !is_hardware_domain(pdev->domain) ) - /* Extended capabilities read as zero, write ignore for DomU */ - return vpci_add_register(pdev->vpci, vpci_read_val, NULL, - pos, 4, (void *)0); - - do - { - uint32_t header = pci_conf_read32(pdev->sbdf, pos); - int rc; - - if ( header == 0xffffffffU ) - { - printk(XENLOG_WARNING - "%pd %pp: broken extended cap list, offset %#x\n", - pdev->domain, &pdev->sbdf, pos); - return 0; - } - - rc = vpci_add_register(pdev->vpci, vpci_read_val, NULL, - pos, 4, (void *)(uintptr_t)header); - if ( rc == -EEXIST ) - { - printk(XENLOG_WARNING - "%pd %pp: overlap in extended cap list, offset %#x\n", - pdev->domain, &pdev->sbdf, pos); - return 0; - } - - if ( rc ) - return rc; - - pos = PCI_EXT_CAP_NEXT(header); - } while ( pos >= PCI_CFG_SPACE_SIZE ); - - return 0; -} - int vpci_init_header(struct pci_dev *pdev) { uint16_t cmd; @@ -918,14 +792,6 @@ int vpci_init_header(struct pci_dev *pdev) if ( rc ) return rc; - rc = vpci_init_capability_list(pdev); - if ( rc ) - return rc; - - rc = vpci_init_ext_capability_list(pdev); - 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 Wed Mar 04 09:44:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245232.1544613 (Exim 4.92) (envelope-from ) id 1vximP-0005Ka-4v; Wed, 04 Mar 2026 09:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245232.1544613; Wed, 04 Mar 2026 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 1vximP-0005KS-2C; Wed, 04 Mar 2026 09:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1245232; Wed, 04 Mar 2026 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 1vximO-0005KK-0G for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vximN-004odT-2z for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vximN-00FdnY-2s for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=XN1PvChpR4dGDWwL0Gn0UrG0b7oubC8jnaQ//7+9Rbs=; b=4u8Aq/7zpECiphO0qAsgEp2nk1 8zib4q8l9ZudTCfl8hXGqncHQ5xnIf2fs+KW326mUOoHA9PZLCut25tux2z/pG2nir4ID739FNDLW +Nr/4PC6Uc2mUdIyt0bRIkRFdCAj+6pHL1NgkB7TYuTa7Mom7AL/bHNWF0nokSohOK0M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/time: move ticks<->ns helpers to common code Message-Id: Date: Wed, 04 Mar 2026 09:44:31 +0000 commit c66d20357726806e754970bab4f7ecec8c8d44cb Author: Oleksii Kurochko AuthorDate: Wed Mar 4 08:24:28 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:24:28 2026 +0100 xen/time: move ticks<->ns helpers to common code ticks_to_ns() and ns_to_ticks() are not architecture-specific, so provide a common implementation that is more resilient to overflow than the historical Arm version. This is not a practical issue for Arm, as the latest ARM ARM that timer frequency should be fixed at 1 GHz and older platforms used much lower rates, which is shy of 32-bit overflow. As the helpers are declared as static inline, they should not affect x86, which does not use them. On Arm, these helpers were historically implemented as out-of-line functions because the counter frequency was originally defined as static and unavailable to headers [1]. Later changes [2] removed this restriction, but the helpers remained unchanged. Now they can be implemented as static inline without any issues. Centralising the helpers avoids duplication and removes subtle differences between architectures while keeping the implementation simple. Drop redundant includes where already pulls it in. No functional change is intended. [1] ddee56dc2994 arm: driver for the generic timer for ARMv7 [2] 096578b4e489 xen: move XEN_SYSCTL_physinfo, XEN_SYSCTL_numainfo and XEN_SYSCTL_topologyinfo to common code Suggested-by: Jan Beulich Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Bertrand Marquis --- xen/arch/arm/include/asm/time.h | 3 --- xen/arch/arm/time.c | 11 ----------- xen/arch/arm/vtimer.c | 2 +- xen/arch/riscv/include/asm/time.h | 5 ----- xen/arch/riscv/time.c | 1 + xen/include/xen/time.h | 11 +++++++++++ 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/include/asm/time.h b/xen/arch/arm/include/asm/time.h index 49ad8c1a6d..c194dbb9f5 100644 --- a/xen/arch/arm/include/asm/time.h +++ b/xen/arch/arm/include/asm/time.h @@ -101,9 +101,6 @@ extern void init_timer_interrupt(void); /* Counter value at boot time */ extern uint64_t boot_count; -extern s_time_t ticks_to_ns(uint64_t ticks); -extern uint64_t ns_to_ticks(s_time_t ns); - void preinit_xen_time(void); void force_update_vcpu_system_time(struct vcpu *v); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index cc3fcf47b6..a12912a106 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -27,7 +27,6 @@ #include #include #include -#include #include uint64_t __read_mostly boot_count; @@ -47,16 +46,6 @@ unsigned int timer_get_irq(enum timer_ppi ppi) return timer_irq[ppi]; } -/*static inline*/ s_time_t ticks_to_ns(uint64_t ticks) -{ - return muldiv64(ticks, SECONDS(1), 1000 * cpu_khz); -} - -/*static inline*/ uint64_t ns_to_ticks(s_time_t ns) -{ - return muldiv64(ns, 1000 * cpu_khz, SECONDS(1)); -} - static __initdata struct dt_device_node *timer; #ifdef CONFIG_ACPI diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index d2124b1755..2e85ff2b6e 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -12,13 +12,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/xen/arch/riscv/include/asm/time.h b/xen/arch/riscv/include/asm/time.h index 1e7801e2ea..be3875b998 100644 --- a/xen/arch/riscv/include/asm/time.h +++ b/xen/arch/riscv/include/asm/time.h @@ -24,11 +24,6 @@ static inline cycles_t get_cycles(void) return csr_read(CSR_TIME); } -static inline s_time_t ticks_to_ns(uint64_t ticks) -{ - return muldiv64(ticks, MILLISECS(1), cpu_khz); -} - void preinit_xen_time(void); #endif /* ASM__RISCV__TIME_H */ diff --git a/xen/arch/riscv/time.c b/xen/arch/riscv/time.c index e962f8518d..2c7af0a5d6 100644 --- a/xen/arch/riscv/time.c +++ b/xen/arch/riscv/time.c @@ -4,6 +4,7 @@ #include #include #include +#include #include unsigned long __ro_after_init cpu_khz; /* CPU clock frequency in kHz. */ diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index fe0d7a578a..2185dd26a4 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -8,6 +8,7 @@ #ifndef __XEN_TIME_H__ #define __XEN_TIME_H__ +#include #include #include @@ -75,6 +76,16 @@ extern void send_timer_event(struct vcpu *v); void domain_set_time_offset(struct domain *d, int64_t time_offset_seconds); +static inline s_time_t ticks_to_ns(uint64_t ticks) +{ + return muldiv64(ticks, MILLISECS(1), cpu_khz); +} + +static inline uint64_t ns_to_ticks(s_time_t ns) +{ + return muldiv64(ns, cpu_khz, MILLISECS(1)); +} + #include #endif /* __XEN_TIME_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 09:44:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245233.1544617 (Exim 4.92) (envelope-from ) id 1vximZ-0005NB-66; Wed, 04 Mar 2026 09:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245233.1544617; Wed, 04 Mar 2026 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 1vximZ-0005N4-3Y; Wed, 04 Mar 2026 09:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1245233; Wed, 04 Mar 2026 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 1vximY-0005Mg-1e for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vximY-004odX-03 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vximX-00Fdpj-3A for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:41 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CVrrpS4JGL1TrSGvlugH07XsyiygAR3l/Es9Qs5ASPA=; b=ayxoUwxDp4Y3jKI3VoN6Z7nxs1 VD6dc2RwL9twmvFYgo5kvxSkkvDkhLGjGr4U1TSlXNVoyqB8aEMB1eqlQ7SQim9pAGTXdeBpcLOf+ 21xrxcndvQJpLE7S6n9VnVCLNxysyJJyizDaYrbItysblIOeTDNwycyWzVoiPbe2wFy4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests/x86_emulator: fix build on clang-21 Message-Id: Date: Wed, 04 Mar 2026 09:44:41 +0000 commit 34e9c2151444ffc96f0be193445d3f6b146653d3 Author: Edwin Török AuthorDate: Wed Mar 4 08:25:19 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:25:19 2026 +0100 tools/tests/x86_emulator: fix build on clang-21 clang-21's built-in assembler is enabled by default, but it doesn't support some mnemonics: ``` test_x86_emulator.c:2636:36: error: invalid instruction mnemonic 'fsaves' 2636 | "fidivs %1\n\t" test_x86_emulator.c:2640:24: error: invalid instruction mnemonic 'frstors' 2640 | asm volatile ( "frstors %0" :: "m" (res[25]) : "memory" ); | ^ test_x86_emulator.c:4251:24: error: invalid instruction mnemonic 'vpcmpestriq' 4251 | put_insn(vpcmpestri, | ^ ``` Use the external assembler with Clang for consistency with GCC. Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index e18725d0c3..5003c464f3 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -297,6 +297,11 @@ x86_emulate: HOSTCFLAGS-x86_64 := -fno-PIE $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) + +# clang's integrated as does not support some mnemonics: +# https://github.com/llvm/llvm-project/issues/183635 +$(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-integrated-as) + HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 09:44:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245234.1544622 (Exim 4.92) (envelope-from ) id 1vximj-0005Pj-7h; Wed, 04 Mar 2026 09:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245234.1544622; Wed, 04 Mar 2026 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 1vximj-0005Pb-54; Wed, 04 Mar 2026 09:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1245234; Wed, 04 Mar 2026 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 1vximi-0005PT-4J for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vximi-004odh-0L for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vximi-00Fdyy-0F for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=ZA6O6ndOVbQ6bumg9W//N3ArBP7njySvKLlkNi/s7+Q=; b=lMPszvbqi/3WqaXb543oERdkHV 461s1Ahr4x9RvN4+W5E19p9whke/a3dPSRrgOA/tqkHH9n0n6nzboqJCQs498TLeNADuGyu6clUyr wTcAInOFyxRbm3bpy6Kcpp9BVqEbhqeX2QsFYuHcJbs2sgouLgKaSN6bZssh38JQ0QeU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests/x86_emulator: fix undefined behaviour in shift Message-Id: Date: Wed, 04 Mar 2026 09:44:52 +0000 commit c8ff52f87620e43e3fbd809e6450d299b567b900 Author: Edwin Török AuthorDate: Wed Mar 4 08:25:49 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:25:49 2026 +0100 tools/tests/x86_emulator: fix undefined behaviour in shift Fixes this `-fsanitize=undefined` error: ``` test_x86_emulator.c:1103:32: runtime error: left shift of 573785183 by 2 places cannot be represented in type 'int' SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior test_x86_emulator.c:1103:32 ``` Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index ea507f9c3a..f30568b7f1 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -1100,7 +1100,7 @@ int main(int argc, char **argv) regs.edi = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); if ( (rc != X86EMUL_OKAY) || - (*res != ((0x2233445F << 2) | 2)) || + (*res != ((0x2233445FU << 2) | 2)) || ((regs.eflags & (EFLAGS_MASK & ~X86_EFLAGS_OF)) != EFLAGS_ALWAYS_SET) || (regs.eip != (unsigned long)&instr[3]) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 09:45:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 09:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245235.1544626 (Exim 4.92) (envelope-from ) id 1vximt-0005S4-8s; Wed, 04 Mar 2026 09:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245235.1544626; Wed, 04 Mar 2026 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 1vximt-0005Rw-6N; Wed, 04 Mar 2026 09:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1245235; Wed, 04 Mar 2026 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 1vxims-0005Rm-8n for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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 1vxims-004oeV-0m for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 09:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxims-00Fe7A-0W for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 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=ZG4WjN4HeJL9hJOnsI6oSL5nY4UhWSiv9HNqDKkOjs8=; b=DrskOiP84BntN+10bW6spdsS7t FX6ZDqGWSrzkrM7FzLkUqCQubifdyUNh5xQ6SY01zdVVPT/UgX0KQ6sVy4dmWIzvLMMXm+OTW/u8E RL5s0CU7iXVcN9wAemtawB60Oo0PbCeug02ZqmI4MLrog29Yka7kwci0FQbqK0aQP7hI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests/x86_emulator: avoid passing NULL to memcpy Message-Id: Date: Wed, 04 Mar 2026 09:45:02 +0000 commit bdd49cc2f61510797a47ad81486be653633ab3ee Author: Edwin Török AuthorDate: Wed Mar 4 08:26:11 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 08:26:11 2026 +0100 tools/tests/x86_emulator: avoid passing NULL to memcpy Fixes this `-fsanitize=undefined` error: ``` test_x86_emulator.c:614:12: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:44:28: note: nonnull attribute specified here SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior test_x86_emulator.c:614:12 ``` Although this is more of a grey area: I don't see anything in the standard that'd forbid calling `memcpy` with NULL and 0, but `glibc` does specify it as non-null, which allows the compiler to make optimizations assuming it never is NULL, so this is undefined behaviour only on glibc. Best to avoid the potential undefined behaviour though. Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/test_x86_emulator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index f30568b7f1..20929b80c6 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -611,7 +611,8 @@ static int fetch( if ( verbose ) printf("** %s(CS:%p,, %u,)\n", __func__, (void *)offset, bytes); - memcpy(p_data, (void *)offset, bytes); + if ( bytes ) + memcpy(p_data, (void *)offset, bytes); return X86EMUL_OKAY; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:00:08 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245404.1544729 (Exim 4.92) (envelope-from ) id 1vxmlf-0001Xh-TB; Wed, 04 Mar 2026 14:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245404.1544729; Wed, 04 Mar 2026 14: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 1vxmlf-0001XG-QU; Wed, 04 Mar 2026 14:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1245404; Wed, 04 Mar 2026 14:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmle-0001ED-FK for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmle-004u79-1I for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmle-00FyKT-1B for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14: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=OGLSbdCWt7IWZoHwE57Ul/stRI8LLVc8sebJXWCjfzA=; b=JEXnYCllcwxsJmdKFzK7LGOWAJ npsRYw00UYf7cvBtemGK7efMBZ76pc5aLajWOeT3klras17Sl5V2f/mWO9QlLzAwFY63RNMimE8bj iKhQA1Baa7DRKiXCN7Gendcc8ZsTfIHiCvBkbBwhb5Sm3R5VN7ZLqlASVz2WAksmTqEw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] EFI: Fix relocating ESRT for dom0 Message-Id: Date: Wed, 04 Mar 2026 14:00:02 +0000 commit 99bd17462dd4b7366bd40d33ffee119d21799da8 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:47:59 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:47:59 2026 +0100 EFI: Fix relocating ESRT for dom0 Fix calculating the table size - it consists of a header + entries, not just entries. This bug caused the last entry to have garbage in its final fields, including LowestSupportedFwVersion and CapsuleFlags, which (usually) made fwupd able to detect firmware update availability, but refuse actually installing it. Fixes: dc7da0874ba4 ("EFI: preserve the System Resource Table for dom0") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Daniel P. Smith master commit: 3ea44aa78c8170ca8010a89d24717d6f6ccfe564 master date: 2026-02-12 11:35:05 +0100 --- xen/common/efi/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index d7f4d0cb22..2047d58e39 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -675,7 +675,8 @@ static size_t __init get_esrt_size(const EFI_MEMORY_DESCRIPTOR *desc) if ( esrt_ptr->FwResourceCount > available_len / sizeof(esrt_ptr->Entries[0]) ) return 0; - return esrt_ptr->FwResourceCount * sizeof(esrt_ptr->Entries[0]); + return offsetof(EFI_SYSTEM_RESOURCE_TABLE, + Entries[esrt_ptr->FwResourceCount]); } static EFI_GUID __initdata esrt_guid = EFI_SYSTEM_RESOURCE_TABLE_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:00:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245406.1544733 (Exim 4.92) (envelope-from ) id 1vxmlp-00020K-UZ; Wed, 04 Mar 2026 14:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245406.1544733; Wed, 04 Mar 2026 14: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 1vxmlp-00020A-Rv; Wed, 04 Mar 2026 14:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1245406; Wed, 04 Mar 2026 14:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmlo-0001zt-Il for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmlo-004u7e-1m for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmlo-00FyM2-1T for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14: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=pLvMQYBJIZOJNohwznFwF+FNzwFqIjORPEpPrZPfMH4=; b=0EJJguka5ZJQUdtL8Gr+jROpO8 35L0C5NniVkxlHDWrkunRuOk2qSKiLLFApgGI+SccR575W4f5ZZj33JdqKxz3NxaWLToRg3P1hH3r o4WFwhV7vOQdod7qgQNLe5HixmX/+1uvSJfmKXvsMCfxSYDLnNd1m0QGYa5tDJU7hcV4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] xen/x86: fix usage of [[:blank:]] with BSD grep Message-Id: Date: Wed, 04 Mar 2026 14:00:12 +0000 commit 14db25be36de437c2603a27ee033658c58fffd1b Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:48:30 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:48:30 2026 +0100 xen/x86: fix usage of [[:blank:]] with BSD grep BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 16368a498b..22fd2bc871 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -98,7 +98,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := : -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:00:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245408.1544737 (Exim 4.92) (envelope-from ) id 1vxmlz-00022e-Vt; Wed, 04 Mar 2026 14:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245408.1544737; Wed, 04 Mar 2026 14: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 1vxmlz-00022W-TE; Wed, 04 Mar 2026 14:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1245408; Wed, 04 Mar 2026 14:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmly-00022N-Lw for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmly-004u7o-26 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmly-00FyNd-1w for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14: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=FxAP7989jpJui7KsTNzEhNeBv5qu9n08T8iyRGzLXbg=; b=QgTWKJqrHRu92IjSmxVp6DtZ6f sTaaYQ4Tem2HgmKmFvvsml3QoSJb7m4KTMxn8l7e/t4lnpeDEVAOH9FpK9VkEKEPcFurwPkqfz9to UFVhYtS1ULdNEXn5Vq2FPLRQf129TMvj7VxQn7PXffl53nC2mZ/i/7DfgpQwPYe+GSNI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] xen: add non-executable stack note uniformly Message-Id: Date: Wed, 04 Mar 2026 14:00:22 +0000 commit a7380f14379ba79eaf43852b5555ed53a35da9e4 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:48:39 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:48:39 2026 +0100 xen: add non-executable stack note uniformly Currently the -Wa,--noexecstack parameter is only passed to the compiler when building assembly files, as the assembler doesn't add such note for stack attributes. However, the default addition of the .note.GNU-stack section is dependent on the ELF target used. Adjust the passing of -Wa,--noexecstack so it's added to CFLAGS instead of AFLAGS, and hence such section is also added to object files generated from .c sources. This fixes the complains from the linker about missing .note.GNU-stack section when building x86-64 Xen on Darwin platforms. Note we could instead pass `-z noexecstack` to the linker, but that however would mask any possible errors or unintended mismatches from previous steps. Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 3dfd77003c28ff3f6bfbf76a75d40a41ccecb33f master date: 2026-02-13 16:42:42 +0100 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 9ed5853020..1a54194a1e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -415,7 +415,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) +$(call cc-option-add,CFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:00:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245411.1544741 (Exim 4.92) (envelope-from ) id 1vxmmA-00025B-2K; Wed, 04 Mar 2026 14:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245411.1544741; Wed, 04 Mar 2026 14: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 1vxmm9-000251-Vp; Wed, 04 Mar 2026 14:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1245411; Wed, 04 Mar 2026 14:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmm8-00024j-OT for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmm8-004u7w-2M for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmm8-00FyPW-2G for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14: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=5JWy0Ud4vtY/Uxf1HVpr63znLs8x+qPAEs4irjTA0MA=; b=ViWY55lpJixHcwE+TfXAkSvkVU HNuUFmswtGCm7lWe4FIKkihpg9L40nhnevEHmwOZmyaWnt4UR1ZRYJ8XIJqb9UZWaPfnSs9pZaASV 1G/j3C6MJIOEsq57QSVVXvNF0MLmPHVJoFn+CauroVmIxXzIRWnb4tcdjXHrlZ6UayL0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] VT-d: fix off-by-one when handling extra RMRR ranges Message-Id: Date: Wed, 04 Mar 2026 14:00:32 +0000 commit 615199f05b43e27b9675c485fb0c5f128603a074 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:48:56 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:48:56 2026 +0100 VT-d: fix off-by-one when handling extra RMRR ranges add_one_user_rmrr() operates on inclusive [start,end] range, which means the end page needs to be calculated as (start + page_count - 1). This off-by-one error resulted in one extra pages being mapped in IOMMU context, but not marked as reserved in the memory map. This in turns confused PVH dom0 code, resulting in the following crash: (XEN) [ 3.934848] d0: GFN 0x5475c (0x5475c,5,3) -> (0x46a0f4,0,7) not permitted (0x20) (XEN) [ 3.969657] domain_crash called from arch/x86/mm/p2m.c:695 (XEN) [ 3.972568] Domain 0 reported crashed by domain 32767 on cpu#0: (XEN) [ 3.975527] Hardware Dom0 crashed: rebooting machine in 5 seconds. (XEN) [ 8.986353] Resetting with ACPI MEMORY or I/O RESET_REG. I checked other parts of this API and it was the only error like this. Other places: - iommu_get_extra_reserved_device_memory() -> reserve_e820_ram() - this function expects exclusive range, so the code is correct - add_one_extra_ivmd() - this operates on start address and memory length Fixes: 2d9b3699136d ("IOMMU/VT-d: wire common device reserved memory API") Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné master commit: d41501fcf62457c3df779abda6718c64da8635ae master date: 2026-02-17 08:59:34 +0100 --- xen/drivers/passthrough/vtd/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 91c22b8330..2a756831a6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1065,7 +1065,8 @@ static int __init add_user_rmrr(void) static int __init cf_check add_one_extra_rmrr(xen_pfn_t start, xen_ulong_t nr, u32 id, void *ctxt) { u32 sbdf_array[] = { id }; - return add_one_user_rmrr(start, start+nr, 1, sbdf_array); + + return add_one_user_rmrr(start, start + nr - 1, 1, sbdf_array); } static int __init add_extra_rmrr(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:00:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245412.1544745 (Exim 4.92) (envelope-from ) id 1vxmmK-00027G-3c; Wed, 04 Mar 2026 14:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245412.1544745; Wed, 04 Mar 2026 14: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 1vxmmK-000277-0u; Wed, 04 Mar 2026 14:00:44 +0000 Received: by outflank-mailman (input) for mailman id 1245412; Wed, 04 Mar 2026 14:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmmI-000270-Rj for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmmI-004u8C-2c for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmmI-00FyRN-2W for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14: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=BSOdNb0Ae1/YzSZl+6U0P6T3JtVEo+l1Pv4N69jGGHM=; b=jr8GrBltC2PrGmxxRtb8EeKxSC f9KQyZRmQhmGhOtexK4CrWG2zQ9ZO0SiruT8WQykPY1rZfDVAqlX7L6dEAu/YbKTxAkbzn0NAUNy7 n5f9gUlvOApr8cuiheekWlj9CcCHBJ1LvRfdS1t9hNvTbrxTX+rHlinEAYAVMIGjGqIM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] common/domctl: xsm update for get_domain_state access Message-Id: Date: Wed, 04 Mar 2026 14:00:42 +0000 commit 4778574053ab2127d1a97a01b9788e786570412c Author: Daniel P. Smith AuthorDate: Wed Mar 4 14:49:47 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:49:47 2026 +0100 common/domctl: xsm update for get_domain_state access When using XSM Flask, passing DOMID_INVALID will result in a NULL pointer reference from the passing of NULL as the target domain to xsm_get_domain_state(). Simply not invoking xsm_get_domain_state() when the target domain is NULL opens the opportunity to circumvent the XSM get_domain_state access check. This is due to the fact that the call to xsm_domctl() for get_domain_state op is a no-op check, deferring to xsm_get_domain_state(). Modify the helper get_domain_state() to ensure the requesting domain has get_domain_state access for the target domain, whether the target domain is explicitly set or implicitly determined with a domain state search. In the case of access not being allowed for a domain found during an implicit search, the search will continue to the next domain whose state has changed. Fixes: 3ad3df1bd0aa ("xen: add new domctl get_domain_state") Reported-by: Chris Rogers Reported-by: Dmytro Firsov Signed-off-by: Daniel P. Smith Reviewed-by: Jan Beulich master commit: 0c79dde780217935a5c320300e381fc797f5fa19 master date: 2026-02-23 08:42:15 +0100 --- xen/common/domain.c | 37 ++++++++++++++++++++++--------------- xen/common/domctl.c | 7 ++----- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 6ae7c46b40..ac06532544 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -209,7 +209,7 @@ static void set_domain_state_info(struct xen_domctl_get_domain_state *info, int get_domain_state(struct xen_domctl_get_domain_state *info, struct domain *d, domid_t *domid) { - unsigned int dom; + unsigned int dom = -1; int rc = -ENOENT; struct domain *hdl; @@ -218,6 +218,10 @@ int get_domain_state(struct xen_domctl_get_domain_state *info, struct domain *d, if ( d ) { + rc = xsm_get_domain_state(XSM_XS_PRIV, d); + if ( rc ) + return rc; + set_domain_state_info(info, d); return 0; @@ -237,28 +241,31 @@ int get_domain_state(struct xen_domctl_get_domain_state *info, struct domain *d, while ( dom_state_changed ) { - dom = find_first_bit(dom_state_changed, DOMID_MASK + 1); + dom = find_next_bit(dom_state_changed, DOMID_MASK + 1, dom + 1); if ( dom >= DOMID_FIRST_RESERVED ) break; - if ( test_and_clear_bit(dom, dom_state_changed) ) - { - *domid = dom; - - d = rcu_lock_domain_by_id(dom); + d = rcu_lock_domain_by_id(dom); + if ( (d && xsm_get_domain_state(XSM_XS_PRIV, d)) || + !test_and_clear_bit(dom, dom_state_changed) ) + { if ( d ) - { - set_domain_state_info(info, d); - rcu_unlock_domain(d); - } - else - memset(info, 0, sizeof(*info)); + continue; + } - rc = 0; + *domid = dom; - break; + if ( d ) + { + set_domain_state_info(info, d); + rcu_unlock_domain(d); } + else + memset(info, 0, sizeof(*info)); + + rc = 0; + break; } out: diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 954d790226..21bbffdc40 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -854,12 +854,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_get_domain_state: - ret = xsm_get_domain_state(XSM_XS_PRIV, d); - if ( ret ) - break; - - copyback = 1; ret = get_domain_state(&op->u.get_domain_state, d, &op->domain); + if ( !ret ) + copyback = true; break; default: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:00:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245413.1544748 (Exim 4.92) (envelope-from ) id 1vxmmU-00029Y-4q; Wed, 04 Mar 2026 14:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245413.1544748; Wed, 04 Mar 2026 14:00: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 1vxmmU-00029Q-2H; Wed, 04 Mar 2026 14:00:54 +0000 Received: by outflank-mailman (input) for mailman id 1245413; Wed, 04 Mar 2026 14:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmmS-00029I-Ts for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmmS-004u8O-2u for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmmS-00FyT2-2n for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:00: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=na23mn+2/BPQOL7Pl8ukga9yZd15WCLp7TPWDfntsKc=; b=cteIX/YYbYNSpMKrWvfkaomgZS s2rD0B1FDvhLC87rLTOcAhQxKrl2x/7lr3illlYP2bopD3MCFGovQf/VBIq6jvuPbPDnko+8hEVkE egs1bRRAcuCxP5SDY2f2N38LzQIgby0PlICMBUwPnLq2/rEWjuo3B4GtX5wJwwEYXOm0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Wed, 04 Mar 2026 14:00:52 +0000 commit ae0708e940ea56e7cc4369732310353c4d1790b0 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:50:04 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:50:04 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 74867aae25cb6356b8a7d1140c81666e2a23b818 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 0126a3f5d9..537695eaab 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -117,11 +117,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:01:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245414.1544752 (Exim 4.92) (envelope-from ) id 1vxmme-0002Ba-6K; Wed, 04 Mar 2026 14:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245414.1544752; Wed, 04 Mar 2026 14:01: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 1vxmme-0002BS-3i; Wed, 04 Mar 2026 14:01:04 +0000 Received: by outflank-mailman (input) for mailman id 1245414; Wed, 04 Mar 2026 14:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmmd-0002BK-0S for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmmc-004u90-3A for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmmc-00FyUX-34 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01: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=0q8HHiN9QsZ4iPQ8+V9Py6fAc4KpI2KmSQFU4hANKJY=; b=MaXArccNvx+aI10Ox6j71/9eS2 lxmk7wywwxGG+DNNZPqa0gyarVMvv1aM+iTDsc+bEZdwh/z1V4KJVT6HA9S7dkF03c0v33YVdlbeh 5kbUgQG770On6kgedf8PUT81JWtNM9usc4pmHb3sOprHGaIBc661fPut3fhg5MQKuSW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Wed, 04 Mar 2026 14:01:02 +0000 commit 55bb6db0811d590c4d4a16f5be40180e81d3d172 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:50:21 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:50:21 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: a0ed5bcfbeee81c91c574ad484faa057054eaf09 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 537695eaab..0d94c0e464 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -185,7 +185,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -400,6 +401,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:01:15 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:01:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245415.1544757 (Exim 4.92) (envelope-from ) id 1vxmmp-0002E8-9W; Wed, 04 Mar 2026 14:01:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245415.1544757; Wed, 04 Mar 2026 14:01: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 1vxmmp-0002E0-6h; Wed, 04 Mar 2026 14:01:15 +0000 Received: by outflank-mailman (input) for mailman id 1245415; Wed, 04 Mar 2026 14:01:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmmn-0002Dr-Hl for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmmn-004u9B-1g for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmmn-00FyXf-1Y for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01: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=d1r87+N75f2awJVo6sHR/Kt1yP/szQIelKbPwvSG5UQ=; b=34qxw6MQibcZaUuLi3SK3PPKwY XyA1Bv4GUqYlh6+MQuojKh+2gveBfMH/6YUfFoi24tjyxj3/LZ3FIzFpIi4QmMDC20P+yWBmDFxhK qTT67jzwIrrvNnR8C6+wAj53zAA/gdi/uirmdT/o1yrGnhfleLtkIhq5KFn+WaHMtSWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] EFI: Fix relocating ESRT for dom0 Message-Id: Date: Wed, 04 Mar 2026 14:01:13 +0000 commit f8944780320d5528af66fb3a6b14b0e8e687c642 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:51:26 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:51:26 2026 +0100 EFI: Fix relocating ESRT for dom0 Fix calculating the table size - it consists of a header + entries, not just entries. This bug caused the last entry to have garbage in its final fields, including LowestSupportedFwVersion and CapsuleFlags, which (usually) made fwupd able to detect firmware update availability, but refuse actually installing it. Fixes: dc7da0874ba4 ("EFI: preserve the System Resource Table for dom0") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Daniel P. Smith master commit: 3ea44aa78c8170ca8010a89d24717d6f6ccfe564 master date: 2026-02-12 11:35:05 +0100 --- xen/common/efi/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 04d4bbd801..b09890cb8f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -624,7 +624,8 @@ static size_t __init get_esrt_size(const EFI_MEMORY_DESCRIPTOR *desc) if ( esrt_ptr->FwResourceCount > available_len / sizeof(esrt_ptr->Entries[0]) ) return 0; - return esrt_ptr->FwResourceCount * sizeof(esrt_ptr->Entries[0]); + return offsetof(EFI_SYSTEM_RESOURCE_TABLE, + Entries[esrt_ptr->FwResourceCount]); } static EFI_GUID __initdata esrt_guid = EFI_SYSTEM_RESOURCE_TABLE_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:01:25 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:01:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245416.1544761 (Exim 4.92) (envelope-from ) id 1vxmmz-0002GF-Ae; Wed, 04 Mar 2026 14:01:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245416.1544761; Wed, 04 Mar 2026 14:01: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 1vxmmz-0002G7-83; Wed, 04 Mar 2026 14:01:25 +0000 Received: by outflank-mailman (input) for mailman id 1245416; Wed, 04 Mar 2026 14:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmmx-0002Fy-KB for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmmx-004u9Q-1w for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmmx-00FyZv-1q for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01: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=rXTg8uHQctSNTxLpnApZKwdRJQodR1mh9905LUX+4UU=; b=64iBK/T5dfUJY9Gkn5qleGDDlq y9cNYD7lpSoqwF9SH3S8GvnSkHGsHywP4JPAZvwg5OpZgmCpxCX5BugPperSeQW5wOSK7WmurrAID BfUBhJNpRmuBDzp+4aqPKXrvzXcY4a+c9cKIOxtqGsTA1rhCZn7XkRlu5Pf5S6LUp5fw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xen/x86: fix usage of [[:blank:]] with BSD grep Message-Id: Date: Wed, 04 Mar 2026 14:01:23 +0000 commit f98cee7981dd10b8a9a3e1bb0091e0394148c304 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:52:08 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:08 2026 +0100 xen/x86: fix usage of [[:blank:]] with BSD grep BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index efdbdb6045..b7cb03a9c1 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -112,7 +112,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := : -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:01:35 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:01:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245417.1544764 (Exim 4.92) (envelope-from ) id 1vxmn9-0002IJ-Bu; Wed, 04 Mar 2026 14:01:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245417.1544764; Wed, 04 Mar 2026 14:01:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmn9-0002IB-9K; Wed, 04 Mar 2026 14:01:35 +0000 Received: by outflank-mailman (input) for mailman id 1245417; Wed, 04 Mar 2026 14:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmn7-0002I2-OU for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmn7-004u9d-2D for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmn7-00FybJ-27 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01: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=rvNUBKHNXTvYE2uqq4zKfE0JkD9iQtsxNThBkIhuxNs=; b=WUQFFeHGvjk4+ZEOHMow0fRDR9 DC5BHMX6omGjxoZxNtZ3QX1VcwZyQ/aZk/Who2FbdeFaQPscZlfcXtxhv0447g4Wv6i88eDTcC9sp 6wvueEYkuvQpM9GPPU71UP5NlH8Jg5oNrow2GhwBCxOOZUorhHwMgXo719Dhh+ih4G0A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xen: add non-executable stack note uniformly Message-Id: Date: Wed, 04 Mar 2026 14:01:33 +0000 commit 6a0a1202c69383c0d0ac62019ac41a3a56fd4cea Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:52:21 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:21 2026 +0100 xen: add non-executable stack note uniformly Currently the -Wa,--noexecstack parameter is only passed to the compiler when building assembly files, as the assembler doesn't add such note for stack attributes. However, the default addition of the .note.GNU-stack section is dependent on the ELF target used. Adjust the passing of -Wa,--noexecstack so it's added to CFLAGS instead of AFLAGS, and hence such section is also added to object files generated from .c sources. This fixes the complains from the linker about missing .note.GNU-stack section when building x86-64 Xen on Darwin platforms. Note we could instead pass `-z noexecstack` to the linker, but that however would mask any possible errors or unintended mismatches from previous steps. Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 3dfd77003c28ff3f6bfbf76a75d40a41ccecb33f master date: 2026-02-13 16:42:42 +0100 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index b7b5941159..19d4e56bd2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -415,7 +415,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) +$(call cc-option-add,CFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:01:45 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:01:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245418.1544769 (Exim 4.92) (envelope-from ) id 1vxmnJ-0002KN-DQ; Wed, 04 Mar 2026 14:01:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245418.1544769; Wed, 04 Mar 2026 14:01:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmnJ-0002KF-Ai; Wed, 04 Mar 2026 14:01:45 +0000 Received: by outflank-mailman (input) for mailman id 1245418; Wed, 04 Mar 2026 14:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmnH-0002K5-Ph for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmnH-004u9j-2U for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmnH-00Fycg-2N for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01: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=teL2x5SxB0p/MCzTSy3yFkHTW1oKEFlueuQ4ezdO1S8=; b=3nLpkyBxdfEpPHYznw3mBoIYoL /1SrHKLAfDaS4Xb/3QGxD2eSn1RW0R5AzcU4qQClRyelTuhR0w3+1/xl0FQRNAHq+6OYUWYCoEKZi EysoLo9kdv2+6ywouIDI72I1cOrsyCBrokSsBz8pZIM272Ty7dOFyhH174VTyXR1gqxM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] VT-d: fix off-by-one when handling extra RMRR ranges Message-Id: Date: Wed, 04 Mar 2026 14:01:43 +0000 commit 1aaa2a0097dc8dd7f6ff49c0d0f5965bccf4b492 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:52:30 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:30 2026 +0100 VT-d: fix off-by-one when handling extra RMRR ranges add_one_user_rmrr() operates on inclusive [start,end] range, which means the end page needs to be calculated as (start + page_count - 1). This off-by-one error resulted in one extra pages being mapped in IOMMU context, but not marked as reserved in the memory map. This in turns confused PVH dom0 code, resulting in the following crash: (XEN) [ 3.934848] d0: GFN 0x5475c (0x5475c,5,3) -> (0x46a0f4,0,7) not permitted (0x20) (XEN) [ 3.969657] domain_crash called from arch/x86/mm/p2m.c:695 (XEN) [ 3.972568] Domain 0 reported crashed by domain 32767 on cpu#0: (XEN) [ 3.975527] Hardware Dom0 crashed: rebooting machine in 5 seconds. (XEN) [ 8.986353] Resetting with ACPI MEMORY or I/O RESET_REG. I checked other parts of this API and it was the only error like this. Other places: - iommu_get_extra_reserved_device_memory() -> reserve_e820_ram() - this function expects exclusive range, so the code is correct - add_one_extra_ivmd() - this operates on start address and memory length Fixes: 2d9b3699136d ("IOMMU/VT-d: wire common device reserved memory API") Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné master commit: d41501fcf62457c3df779abda6718c64da8635ae master date: 2026-02-17 08:59:34 +0100 --- xen/drivers/passthrough/vtd/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 91c22b8330..2a756831a6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1065,7 +1065,8 @@ static int __init add_user_rmrr(void) static int __init cf_check add_one_extra_rmrr(xen_pfn_t start, xen_ulong_t nr, u32 id, void *ctxt) { u32 sbdf_array[] = { id }; - return add_one_user_rmrr(start, start+nr, 1, sbdf_array); + + return add_one_user_rmrr(start, start + nr - 1, 1, sbdf_array); } static int __init add_extra_rmrr(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:01:55 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:01:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245419.1544772 (Exim 4.92) (envelope-from ) id 1vxmnT-0002Mm-Er; Wed, 04 Mar 2026 14:01:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245419.1544772; Wed, 04 Mar 2026 14:01: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 1vxmnT-0002Me-CB; Wed, 04 Mar 2026 14:01:55 +0000 Received: by outflank-mailman (input) for mailman id 1245419; Wed, 04 Mar 2026 14:01:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmnR-0002MU-U8 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmnR-004u9p-2v for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmnR-00FyeI-2e for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:01: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=wen5I1zrbMK/mRtGg3Zc+qM4r96IIoyxCnUXbbt7kOY=; b=ZOoF2deHitaEoZWkk1IKbtX/3Y LlXnfVoTKFa3ue5oIfEfQxeJgYTupChsPUGwf/NTEQk8Vz2Eq991payKFWaJcxOIPOWZF1oTt58bA NHYjYDiG2rL9e5t0v/m+RFrL3DpwlX8ttyIV6Dt/Nvwb7nBAlxMre/SkrgFq2aAVpsKI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Wed, 04 Mar 2026 14:01:53 +0000 commit be58d3002fdc3fb5b24c0bcd2453232d1d911005 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:52:54 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:54 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 74867aae25cb6356b8a7d1140c81666e2a23b818 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 06cfc88d30..f62678fa61 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -115,11 +115,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:02:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:02:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245421.1544776 (Exim 4.92) (envelope-from ) id 1vxmnd-0002Ow-GO; Wed, 04 Mar 2026 14:02:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245421.1544776; Wed, 04 Mar 2026 14:02: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 1vxmnd-0002Op-Dd; Wed, 04 Mar 2026 14:02:05 +0000 Received: by outflank-mailman (input) for mailman id 1245421; Wed, 04 Mar 2026 14:02:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmnc-0002Oi-0G for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmnb-004uAT-3A for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmnb-00Fyhd-35 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02: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=zsCLAq5EQg+WtRHRvvF2v3jQvNHHqx1sHVPe3kQhj5A=; b=ETx8YIWCN4NyoS7BILnThV10Au Rt8/BEKDoCWvAJ+hFqpBRaNAQQQkoI7EeUoDBqXSDdKE4LyTX+5kYOWvyBMXqjUOhcSFxeECfQlqo NP41Byr5fr03teAGd+EZwqXiUpu+0MTe5EBravH0ss6ijULNL/9OxcxTFRmWowoEs8xA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Wed, 04 Mar 2026 14:02:03 +0000 commit 057f0dd56eea1bde442ca0ebd2d6c3b0c1ad0d05 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:53:05 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:53:05 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: a0ed5bcfbeee81c91c574ad484faa057054eaf09 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index f62678fa61..9828a40c4b 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -183,7 +183,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -398,6 +399,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:02:16 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:02:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245422.1544784 (Exim 4.92) (envelope-from ) id 1vxmno-0002Sa-J3; Wed, 04 Mar 2026 14:02:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245422.1544784; Wed, 04 Mar 2026 14:02:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmno-0002SS-GS; Wed, 04 Mar 2026 14:02:16 +0000 Received: by outflank-mailman (input) for mailman id 1245422; Wed, 04 Mar 2026 14:02:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmnm-0002Qm-E5 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmnm-004uAd-1K for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmnm-00Fyk3-1E for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Vxk6Ig0k8QabG5t/5wHd5KNG3NRh7RJ/skvm3/zotLU=; b=Mz3xXjk1K9JiG58SaAcpifjS/v pTO1K7k4IcpHD39wu7SD9QbkVGlf75RMfbhYlYG5ckF9VgglYzbBtv3KQeSuWZGQSLeQoFBDDhpZh zMZXoDe/+LSlYTAyPH8H9XH47T9kSxZmUuQ3LG7TwfwQMokMAWQTwim657qYokX5BmZI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] EFI: Fix relocating ESRT for dom0 Message-Id: Date: Wed, 04 Mar 2026 14:02:14 +0000 commit 68044518e078e8475e59b8be10197e3d38a04685 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:53:37 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:53:37 2026 +0100 EFI: Fix relocating ESRT for dom0 Fix calculating the table size - it consists of a header + entries, not just entries. This bug caused the last entry to have garbage in its final fields, including LowestSupportedFwVersion and CapsuleFlags, which (usually) made fwupd able to detect firmware update availability, but refuse actually installing it. Fixes: dc7da0874ba4 ("EFI: preserve the System Resource Table for dom0") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Daniel P. Smith master commit: 3ea44aa78c8170ca8010a89d24717d6f6ccfe564 master date: 2026-02-12 11:35:05 +0100 --- xen/common/efi/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 04d4bbd801..b09890cb8f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -624,7 +624,8 @@ static size_t __init get_esrt_size(const EFI_MEMORY_DESCRIPTOR *desc) if ( esrt_ptr->FwResourceCount > available_len / sizeof(esrt_ptr->Entries[0]) ) return 0; - return esrt_ptr->FwResourceCount * sizeof(esrt_ptr->Entries[0]); + return offsetof(EFI_SYSTEM_RESOURCE_TABLE, + Entries[esrt_ptr->FwResourceCount]); } static EFI_GUID __initdata esrt_guid = EFI_SYSTEM_RESOURCE_TABLE_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:02:26 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:02:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245423.1544788 (Exim 4.92) (envelope-from ) id 1vxmny-0002VF-KZ; Wed, 04 Mar 2026 14:02:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245423.1544788; Wed, 04 Mar 2026 14:02:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmny-0002V7-Hn; Wed, 04 Mar 2026 14:02:26 +0000 Received: by outflank-mailman (input) for mailman id 1245423; Wed, 04 Mar 2026 14:02:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmnw-0002Ur-Gg for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmnw-004uAs-1Z for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmnw-00Fylq-1U for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=C6EnMNGjvmvdpPvx4cANPXDfSNuXxTYwde5GGdK5KLc=; b=C/P3ctzJ6V+M2phqKYc/OAX9Os 6bllvbQKoCG5zkHxnjWOJICGtKP2TL1tFuMmk7M4w02WZuaTzrGL38URY0OENqpJc1cWq9X7zPTrX iuChtIjV9/468Z3gnK8uV+JES8+BxmQ1c2ruNvHz/Et4wNGNTcrMyXvOdQaNtjEHyZhc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xen/x86: fix usage of [[:blank:]] with BSD grep Message-Id: Date: Wed, 04 Mar 2026 14:02:24 +0000 commit 2d88bf5b69cbec182e6bc9a5fa4de44215dd620f Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:02 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:02 2026 +0100 xen/x86: fix usage of [[:blank:]] with BSD grep BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 85d3e7cbfe..4924d3c660 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -114,7 +114,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := : -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:02:35 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:02:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245425.1544792 (Exim 4.92) (envelope-from ) id 1vxmo7-0002Yc-Nq; Wed, 04 Mar 2026 14:02:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245425.1544792; Wed, 04 Mar 2026 14:02:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmo7-0002YT-L3; Wed, 04 Mar 2026 14:02:35 +0000 Received: by outflank-mailman (input) for mailman id 1245425; Wed, 04 Mar 2026 14:02:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmo6-0002YN-JV for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmo6-004uAz-1r for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmo6-00Fyng-1l for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+lm5u4FhwSsIRtCx6vjqpuPwamcWbC6iZNX+PjRRUQE=; b=SNOzCHnaALalL2NZ8gFfuAUlwf Rx/nLs5lDzZdL43ov/xu2pWehvk1eVb0T+fPGjsSTfBeoNYdTw2Dz8JmQcBX4pKS+cWD9Uex4V6mU f9GVQKA/voU2zKAvQqle8pt08otL/eqF3nNufiCfG0sq8C3Vxst7WmhU3IhpnRKL2UOk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xen: add non-executable stack note uniformly Message-Id: Date: Wed, 04 Mar 2026 14:02:34 +0000 commit 744d8cf1991a9b43c5c64ec520121a799cb332b9 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:10 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:10 2026 +0100 xen: add non-executable stack note uniformly Currently the -Wa,--noexecstack parameter is only passed to the compiler when building assembly files, as the assembler doesn't add such note for stack attributes. However, the default addition of the .note.GNU-stack section is dependent on the ELF target used. Adjust the passing of -Wa,--noexecstack so it's added to CFLAGS instead of AFLAGS, and hence such section is also added to object files generated from .c sources. This fixes the complains from the linker about missing .note.GNU-stack section when building x86-64 Xen on Darwin platforms. Note we could instead pass `-z noexecstack` to the linker, but that however would mask any possible errors or unintended mismatches from previous steps. Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 3dfd77003c28ff3f6bfbf76a75d40a41ccecb33f master date: 2026-02-13 16:42:42 +0100 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index b83e8827a4..4d34597522 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -412,7 +412,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) +$(call cc-option-add,CFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:02:45 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:02:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245429.1544795 (Exim 4.92) (envelope-from ) id 1vxmoH-0002bk-P9; Wed, 04 Mar 2026 14:02:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245429.1544795; Wed, 04 Mar 2026 14:02:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmoH-0002bc-MN; Wed, 04 Mar 2026 14:02:45 +0000 Received: by outflank-mailman (input) for mailman id 1245429; Wed, 04 Mar 2026 14:02:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmoG-0002bB-MA for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmoG-004uBB-27 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmoG-00FypV-21 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=693Td1l37/rOA2Tbr+ATJjZlapzExXC2PH5yO+ahnp4=; b=ZyMRwLP8f52sTMeMW3zgdW2Gic 5GrLOiskKZ1CXgRj2NPzlgw7NwEudZyjl6MPNyERYMTgfmz4JMg0nA6RZjXHrlB8TgB2Hlwwy1jb3 XgUET1c2jfKFmi8Ycl7g2vzcGKXDkvGlzXwGaMPgX5OLWLbBMcMVcmvd75cnz6w//TBw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] VT-d: fix off-by-one when handling extra RMRR ranges Message-Id: Date: Wed, 04 Mar 2026 14:02:44 +0000 commit aa073513622ab7f4c9b3fda3bbc4d7e9ffa775fd Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:54:27 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:27 2026 +0100 VT-d: fix off-by-one when handling extra RMRR ranges add_one_user_rmrr() operates on inclusive [start,end] range, which means the end page needs to be calculated as (start + page_count - 1). This off-by-one error resulted in one extra pages being mapped in IOMMU context, but not marked as reserved in the memory map. This in turns confused PVH dom0 code, resulting in the following crash: (XEN) [ 3.934848] d0: GFN 0x5475c (0x5475c,5,3) -> (0x46a0f4,0,7) not permitted (0x20) (XEN) [ 3.969657] domain_crash called from arch/x86/mm/p2m.c:695 (XEN) [ 3.972568] Domain 0 reported crashed by domain 32767 on cpu#0: (XEN) [ 3.975527] Hardware Dom0 crashed: rebooting machine in 5 seconds. (XEN) [ 8.986353] Resetting with ACPI MEMORY or I/O RESET_REG. I checked other parts of this API and it was the only error like this. Other places: - iommu_get_extra_reserved_device_memory() -> reserve_e820_ram() - this function expects exclusive range, so the code is correct - add_one_extra_ivmd() - this operates on start address and memory length Fixes: 2d9b3699136d ("IOMMU/VT-d: wire common device reserved memory API") Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné master commit: d41501fcf62457c3df779abda6718c64da8635ae master date: 2026-02-17 08:59:34 +0100 --- xen/drivers/passthrough/vtd/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 91c22b8330..2a756831a6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1065,7 +1065,8 @@ static int __init add_user_rmrr(void) static int __init cf_check add_one_extra_rmrr(xen_pfn_t start, xen_ulong_t nr, u32 id, void *ctxt) { u32 sbdf_array[] = { id }; - return add_one_user_rmrr(start, start+nr, 1, sbdf_array); + + return add_one_user_rmrr(start, start + nr - 1, 1, sbdf_array); } static int __init add_extra_rmrr(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:02:55 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:02:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245430.1544799 (Exim 4.92) (envelope-from ) id 1vxmoR-0002eL-QY; Wed, 04 Mar 2026 14:02:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245430.1544799; Wed, 04 Mar 2026 14:02: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 1vxmoR-0002eE-Nm; Wed, 04 Mar 2026 14:02:55 +0000 Received: by outflank-mailman (input) for mailman id 1245430; Wed, 04 Mar 2026 14:02:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmoQ-0002e1-ON for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmoQ-004uBJ-2M for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmoQ-00Fyqc-2H for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:02:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GI00ODZtJCRKOxJksvhxqXGsDQMdpYRuSVUbjtvPocY=; b=C6ze+yL08RS58Ng/nroLQZeExf Dt5pZj9826CxYjC2QHZWhrVUDcm+0doCmhAQXJvHi2+x5yM39mgUYVb9BiuKkhc1cqjFYQjQDVSdY OlGboFwhsFcDeMHR4+e/3rNLLrzz+DcCNMw6Iw58YfVpldqja3CFm7MXyHF+Ca5WdKvc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Wed, 04 Mar 2026 14:02:54 +0000 commit 24c83081d542a46dcfb9befc0977a8ed4ecd8d14 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:46 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:46 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 74867aae25cb6356b8a7d1140c81666e2a23b818 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 06cfc88d30..f62678fa61 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -115,11 +115,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 14:03:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 14:03:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245432.1544804 (Exim 4.92) (envelope-from ) id 1vxmob-0002gk-S4; Wed, 04 Mar 2026 14:03:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245432.1544804; Wed, 04 Mar 2026 14:03: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 1vxmob-0002gc-PL; Wed, 04 Mar 2026 14:03:05 +0000 Received: by outflank-mailman (input) for mailman id 1245432; Wed, 04 Mar 2026 14:03:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxmoa-0002gV-Qz for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:03:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxmoa-004uBu-2c for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:03:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxmoa-00Fyrk-2W for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 14:03:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=F8oN/VQs4Og5F4K6T8zOshgS1EGHPsM0XBz7dGUEUPc=; b=FQqSd579gote1hvlDFTlX8fRoo Rs9EltGSIR0ukwCKfdo4UpkWIR2nXDopiHDM+GxH03SYzglQ4SXr/oakYaNMb5uaZpwnIt+wiOUvT dBLXt8/36QpN2iYqpmUtxk1OocragFR4gkjxmMLkyQvftZAJsbK2cU2EeDJiUkB/uqAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Wed, 04 Mar 2026 14:03:04 +0000 commit 84b006870c41f94ee99af202d5f0a7b4dcd3cc94 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:55 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:55 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: a0ed5bcfbeee81c91c574ad484faa057054eaf09 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index f62678fa61..9828a40c4b 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -183,7 +183,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -398,6 +399,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:00:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245714.1545049 (Exim 4.92) (envelope-from ) id 1vxodn-0005KK-OD; Wed, 04 Mar 2026 16:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245714.1545049; Wed, 04 Mar 2026 16:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxodn-0005Jt-Kv; Wed, 04 Mar 2026 16:00:03 +0000 Received: by outflank-mailman (input) for mailman id 1245714; Wed, 04 Mar 2026 16:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxodm-0004yH-CU for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxodm-004xXl-0k for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxodm-00G8Xq-0c for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=/eqZWAp08RLfz1nPtV8gO/mEjwLqchhtferV9EZdLR8=; b=Y5Ffx7feJFQvcxjnrR4E1pFsYO qLCFChr8TtdrvmpBPd1NuM7DthZfNXsdkY0yvT1ea6fNsM37FZcwZ7WCp4QmjTUWH7yCzMorOMMtl jWa9sO6ogkzcci96XI3SE7nmNGh4mjBCsJff8aOzk0/KOfjNrjQFdDGULq6exdSJudyo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] EFI: Fix relocating ESRT for dom0 Message-Id: Date: Wed, 04 Mar 2026 16:00:02 +0000 commit 99bd17462dd4b7366bd40d33ffee119d21799da8 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:47:59 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:47:59 2026 +0100 EFI: Fix relocating ESRT for dom0 Fix calculating the table size - it consists of a header + entries, not just entries. This bug caused the last entry to have garbage in its final fields, including LowestSupportedFwVersion and CapsuleFlags, which (usually) made fwupd able to detect firmware update availability, but refuse actually installing it. Fixes: dc7da0874ba4 ("EFI: preserve the System Resource Table for dom0") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Daniel P. Smith master commit: 3ea44aa78c8170ca8010a89d24717d6f6ccfe564 master date: 2026-02-12 11:35:05 +0100 --- xen/common/efi/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index d7f4d0cb22..2047d58e39 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -675,7 +675,8 @@ static size_t __init get_esrt_size(const EFI_MEMORY_DESCRIPTOR *desc) if ( esrt_ptr->FwResourceCount > available_len / sizeof(esrt_ptr->Entries[0]) ) return 0; - return esrt_ptr->FwResourceCount * sizeof(esrt_ptr->Entries[0]); + return offsetof(EFI_SYSTEM_RESOURCE_TABLE, + Entries[esrt_ptr->FwResourceCount]); } static EFI_GUID __initdata esrt_guid = EFI_SYSTEM_RESOURCE_TABLE_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:00:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245715.1545055 (Exim 4.92) (envelope-from ) id 1vxodx-0005ox-Rz; Wed, 04 Mar 2026 16:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245715.1545055; Wed, 04 Mar 2026 16:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxodx-0005om-Mq; Wed, 04 Mar 2026 16:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1245715; Wed, 04 Mar 2026 16:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxodw-0005ob-C3 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxodw-004xdm-14 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxodw-00G8Zg-0v for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=scG43lwVQue95HKOwW1nZ5XdBs0gdf2efvg7gA9948E=; b=dMzCjoXyzubSqwEwPOx7PbxX+H epjUH6coKcsNfnY9+nULXNUQS0g+l2fcrb9VTCVjdbwdaVVc2dViP58nz0fxku1NNy8jY2hs2uWLx 5i4pIDGB6OAtOgWKaDyFth+koxHOd4Y51C2UCjosPTtJ6GlM8QD58xjgS2cVGC3iHfSU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] xen/x86: fix usage of [[:blank:]] with BSD grep Message-Id: Date: Wed, 04 Mar 2026 16:00:12 +0000 commit 14db25be36de437c2603a27ee033658c58fffd1b Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:48:30 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:48:30 2026 +0100 xen/x86: fix usage of [[:blank:]] with BSD grep BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 16368a498b..22fd2bc871 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -98,7 +98,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := : -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:00:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245716.1545057 (Exim 4.92) (envelope-from ) id 1vxoe7-0005zY-R7; Wed, 04 Mar 2026 16:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245716.1545057; Wed, 04 Mar 2026 16:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoe7-0005zQ-OS; Wed, 04 Mar 2026 16:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1245716; Wed, 04 Mar 2026 16:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoe6-0005zI-FA for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoe6-004xj8-1N for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoe6-00G8bI-1E for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=vp0ZK9v/HvIDXaBOiIauoaSBBo7kWo1QEsyBliyrf3o=; b=HgBQ4Gst/Tt5M1YunOZvGE0rmb HYdTGtGnE9OaOc+Tlq6fe7FJ2qZ2ZGLSHcF4K0NdgmFdvuf0fa9Xro0hvqpWyERHs6hmAp53r0mWH kM7LhnjG+Wwl82hae44CSc3xzHGx3F8c4FAthicBMmff5Qdbbej1WdhmM0y++7ZFT2MY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] xen: add non-executable stack note uniformly Message-Id: Date: Wed, 04 Mar 2026 16:00:22 +0000 commit a7380f14379ba79eaf43852b5555ed53a35da9e4 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:48:39 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:48:39 2026 +0100 xen: add non-executable stack note uniformly Currently the -Wa,--noexecstack parameter is only passed to the compiler when building assembly files, as the assembler doesn't add such note for stack attributes. However, the default addition of the .note.GNU-stack section is dependent on the ELF target used. Adjust the passing of -Wa,--noexecstack so it's added to CFLAGS instead of AFLAGS, and hence such section is also added to object files generated from .c sources. This fixes the complains from the linker about missing .note.GNU-stack section when building x86-64 Xen on Darwin platforms. Note we could instead pass `-z noexecstack` to the linker, but that however would mask any possible errors or unintended mismatches from previous steps. Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 3dfd77003c28ff3f6bfbf76a75d40a41ccecb33f master date: 2026-02-13 16:42:42 +0100 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 9ed5853020..1a54194a1e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -415,7 +415,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) +$(call cc-option-add,CFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:00:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245717.1545061 (Exim 4.92) (envelope-from ) id 1vxoeH-00061n-St; Wed, 04 Mar 2026 16:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245717.1545061; Wed, 04 Mar 2026 16:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoeH-00061f-Ps; Wed, 04 Mar 2026 16:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1245717; Wed, 04 Mar 2026 16:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoeG-00061W-JH for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoeG-004xjC-1p for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoeG-00G8cW-1Y for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CjrP+fbDpx1ZZH4ZDsLUBfLhWWfSAD7J7DgDPEt++nI=; b=Q+V2wt3myypCBhtehd8XP927p0 sOjTiA/AJxi40kkL9Omq2MCw2Orv3+4feC29M3BeZ2f11ndYPrDTkvs8+vJckleKA8Y97vRzw1hIS lcD27088QYmps2SuA7N9lvjVgQeWsbjHVxxmfKNk8Txe0iFxCJ62yV2wI1PVQDRe4QTU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] VT-d: fix off-by-one when handling extra RMRR ranges Message-Id: Date: Wed, 04 Mar 2026 16:00:32 +0000 commit 615199f05b43e27b9675c485fb0c5f128603a074 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:48:56 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:48:56 2026 +0100 VT-d: fix off-by-one when handling extra RMRR ranges add_one_user_rmrr() operates on inclusive [start,end] range, which means the end page needs to be calculated as (start + page_count - 1). This off-by-one error resulted in one extra pages being mapped in IOMMU context, but not marked as reserved in the memory map. This in turns confused PVH dom0 code, resulting in the following crash: (XEN) [ 3.934848] d0: GFN 0x5475c (0x5475c,5,3) -> (0x46a0f4,0,7) not permitted (0x20) (XEN) [ 3.969657] domain_crash called from arch/x86/mm/p2m.c:695 (XEN) [ 3.972568] Domain 0 reported crashed by domain 32767 on cpu#0: (XEN) [ 3.975527] Hardware Dom0 crashed: rebooting machine in 5 seconds. (XEN) [ 8.986353] Resetting with ACPI MEMORY or I/O RESET_REG. I checked other parts of this API and it was the only error like this. Other places: - iommu_get_extra_reserved_device_memory() -> reserve_e820_ram() - this function expects exclusive range, so the code is correct - add_one_extra_ivmd() - this operates on start address and memory length Fixes: 2d9b3699136d ("IOMMU/VT-d: wire common device reserved memory API") Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné master commit: d41501fcf62457c3df779abda6718c64da8635ae master date: 2026-02-17 08:59:34 +0100 --- xen/drivers/passthrough/vtd/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 91c22b8330..2a756831a6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1065,7 +1065,8 @@ static int __init add_user_rmrr(void) static int __init cf_check add_one_extra_rmrr(xen_pfn_t start, xen_ulong_t nr, u32 id, void *ctxt) { u32 sbdf_array[] = { id }; - return add_one_user_rmrr(start, start+nr, 1, sbdf_array); + + return add_one_user_rmrr(start, start + nr - 1, 1, sbdf_array); } static int __init add_extra_rmrr(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:00:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245718.1545065 (Exim 4.92) (envelope-from ) id 1vxoeR-00064K-Vq; Wed, 04 Mar 2026 16:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245718.1545065; Wed, 04 Mar 2026 16:00:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoeR-00064C-T0; Wed, 04 Mar 2026 16:00:43 +0000 Received: by outflank-mailman (input) for mailman id 1245718; Wed, 04 Mar 2026 16:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoeQ-00063z-Ma for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoeQ-004xjI-27 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoeQ-00G8eQ-21 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=S53swRa4Cd+QcBt/TFnuNr/mRjr2de0ZoouNw2WVU9w=; b=TyZJRqhxNbMkjP9mSB9EVOomwj w2Bp793OhdGUwCDHNDzP2BXesRQqP47JQ1zIE/GkeNd3JjJob4hJShLhFtz5M56umL4JaE9xaIeQi Rrr8zMD+WA6Ch4L5jnEh9myRFgbkwaqqc2foLB+sx8US/M1wKkU08oQdJa52nsCSFpE8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] common/domctl: xsm update for get_domain_state access Message-Id: Date: Wed, 04 Mar 2026 16:00:42 +0000 commit 4778574053ab2127d1a97a01b9788e786570412c Author: Daniel P. Smith AuthorDate: Wed Mar 4 14:49:47 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:49:47 2026 +0100 common/domctl: xsm update for get_domain_state access When using XSM Flask, passing DOMID_INVALID will result in a NULL pointer reference from the passing of NULL as the target domain to xsm_get_domain_state(). Simply not invoking xsm_get_domain_state() when the target domain is NULL opens the opportunity to circumvent the XSM get_domain_state access check. This is due to the fact that the call to xsm_domctl() for get_domain_state op is a no-op check, deferring to xsm_get_domain_state(). Modify the helper get_domain_state() to ensure the requesting domain has get_domain_state access for the target domain, whether the target domain is explicitly set or implicitly determined with a domain state search. In the case of access not being allowed for a domain found during an implicit search, the search will continue to the next domain whose state has changed. Fixes: 3ad3df1bd0aa ("xen: add new domctl get_domain_state") Reported-by: Chris Rogers Reported-by: Dmytro Firsov Signed-off-by: Daniel P. Smith Reviewed-by: Jan Beulich master commit: 0c79dde780217935a5c320300e381fc797f5fa19 master date: 2026-02-23 08:42:15 +0100 --- xen/common/domain.c | 37 ++++++++++++++++++++++--------------- xen/common/domctl.c | 7 ++----- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 6ae7c46b40..ac06532544 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -209,7 +209,7 @@ static void set_domain_state_info(struct xen_domctl_get_domain_state *info, int get_domain_state(struct xen_domctl_get_domain_state *info, struct domain *d, domid_t *domid) { - unsigned int dom; + unsigned int dom = -1; int rc = -ENOENT; struct domain *hdl; @@ -218,6 +218,10 @@ int get_domain_state(struct xen_domctl_get_domain_state *info, struct domain *d, if ( d ) { + rc = xsm_get_domain_state(XSM_XS_PRIV, d); + if ( rc ) + return rc; + set_domain_state_info(info, d); return 0; @@ -237,28 +241,31 @@ int get_domain_state(struct xen_domctl_get_domain_state *info, struct domain *d, while ( dom_state_changed ) { - dom = find_first_bit(dom_state_changed, DOMID_MASK + 1); + dom = find_next_bit(dom_state_changed, DOMID_MASK + 1, dom + 1); if ( dom >= DOMID_FIRST_RESERVED ) break; - if ( test_and_clear_bit(dom, dom_state_changed) ) - { - *domid = dom; - - d = rcu_lock_domain_by_id(dom); + d = rcu_lock_domain_by_id(dom); + if ( (d && xsm_get_domain_state(XSM_XS_PRIV, d)) || + !test_and_clear_bit(dom, dom_state_changed) ) + { if ( d ) - { - set_domain_state_info(info, d); - rcu_unlock_domain(d); - } - else - memset(info, 0, sizeof(*info)); + continue; + } - rc = 0; + *domid = dom; - break; + if ( d ) + { + set_domain_state_info(info, d); + rcu_unlock_domain(d); } + else + memset(info, 0, sizeof(*info)); + + rc = 0; + break; } out: diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 954d790226..21bbffdc40 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -854,12 +854,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_get_domain_state: - ret = xsm_get_domain_state(XSM_XS_PRIV, d); - if ( ret ) - break; - - copyback = 1; ret = get_domain_state(&op->u.get_domain_state, d, &op->domain); + if ( !ret ) + copyback = true; break; default: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:00:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245719.1545068 (Exim 4.92) (envelope-from ) id 1vxoec-00066f-10; Wed, 04 Mar 2026 16:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245719.1545068; Wed, 04 Mar 2026 16:00: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 1vxoeb-00066W-US; Wed, 04 Mar 2026 16:00:53 +0000 Received: by outflank-mailman (input) for mailman id 1245719; Wed, 04 Mar 2026 16:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoea-00066G-P7 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoea-004xjO-2P for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoea-00G8fW-2I for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:00: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=9Ue2EUwRwN1TV04Vu9zr0WoqGLSscOUP6lBhCjA9W8A=; b=qy4LEkaJxNesleeRZhQ2d+yftT k9vNwMzhjZ9HmC+Bvz05izHHt/bGbYVktJhi7XmC3syjGlIMcprA3DxXZnImZ17sYSDQu9FaqImPh +6pFLYAjgSgLm2dqKn00olu2bVgDkrYOxb40CAXXYiYeZtfBj17xcHl8RCrJjL/lNSfk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Wed, 04 Mar 2026 16:00:52 +0000 commit ae0708e940ea56e7cc4369732310353c4d1790b0 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:50:04 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:50:04 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 74867aae25cb6356b8a7d1140c81666e2a23b818 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 0126a3f5d9..537695eaab 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -117,11 +117,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:01:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245720.1545074 (Exim 4.92) (envelope-from ) id 1vxoem-00068a-2S; Wed, 04 Mar 2026 16:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245720.1545074; Wed, 04 Mar 2026 16:01: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 1vxoel-00068S-Vl; Wed, 04 Mar 2026 16:01:03 +0000 Received: by outflank-mailman (input) for mailman id 1245720; Wed, 04 Mar 2026 16:01:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoek-00068C-SF for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:01:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoek-004xji-2k for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoek-00G8hQ-2Z for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:01: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=/Q9t5BAet3D43FYHBlFCAn3x5s++gFJlfxVsPJMkmYQ=; b=r6Aiof3Wv2j/bBT3MeoBKJkDcE KKDKif1noDHDNSiJxXDkhxL0IdLioWFy9FJJnauOhutUjnL/iSy3tM8I4jgzn9f3283eEe0j6K5bX dxjRHh42iy4d9UMTMjUuN/i6dS4R7rzO1Z93/MdUbNTWWYz+l6D/Mr5COjlvs4hLJJNc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Wed, 04 Mar 2026 16:01:02 +0000 commit 55bb6db0811d590c4d4a16f5be40180e81d3d172 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:50:21 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:50:21 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: a0ed5bcfbeee81c91c574ad484faa057054eaf09 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 537695eaab..0d94c0e464 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -185,7 +185,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -400,6 +401,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:11:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245742.1545097 (Exim 4.92) (envelope-from ) id 1vxooS-00005m-Bt; Wed, 04 Mar 2026 16:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245742.1545097; Wed, 04 Mar 2026 16: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 1vxooS-00005d-93; Wed, 04 Mar 2026 16:11:04 +0000 Received: by outflank-mailman (input) for mailman id 1245742; Wed, 04 Mar 2026 16:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxooQ-00005X-Fc for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxooQ-004xxu-1K for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxooQ-00G9kX-1C for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=qPkLXMbcLkJI/9nuJ8GCtLMJpHqMunQ8X73FIidXTGk=; b=5MssWxiUbXGhCycu6XiktDBgYC bTiMyraPX/N0oSbzQP/2gFEJewMwQCg9lJ8MEHf9fM3puVMWVSOUEw9kY/NbRkdX7Hl66nUfHL29r RFC81RSPf2Q9QmUmhkQhX/aJ/SZ0pfSLURjfzTFMKLXTrAnP1+FN6CLZZaPCAl8BB1pE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] EFI: Fix relocating ESRT for dom0 Message-Id: Date: Wed, 04 Mar 2026 16:11:02 +0000 commit f8944780320d5528af66fb3a6b14b0e8e687c642 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:51:26 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:51:26 2026 +0100 EFI: Fix relocating ESRT for dom0 Fix calculating the table size - it consists of a header + entries, not just entries. This bug caused the last entry to have garbage in its final fields, including LowestSupportedFwVersion and CapsuleFlags, which (usually) made fwupd able to detect firmware update availability, but refuse actually installing it. Fixes: dc7da0874ba4 ("EFI: preserve the System Resource Table for dom0") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Daniel P. Smith master commit: 3ea44aa78c8170ca8010a89d24717d6f6ccfe564 master date: 2026-02-12 11:35:05 +0100 --- xen/common/efi/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 04d4bbd801..b09890cb8f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -624,7 +624,8 @@ static size_t __init get_esrt_size(const EFI_MEMORY_DESCRIPTOR *desc) if ( esrt_ptr->FwResourceCount > available_len / sizeof(esrt_ptr->Entries[0]) ) return 0; - return esrt_ptr->FwResourceCount * sizeof(esrt_ptr->Entries[0]); + return offsetof(EFI_SYSTEM_RESOURCE_TABLE, + Entries[esrt_ptr->FwResourceCount]); } static EFI_GUID __initdata esrt_guid = EFI_SYSTEM_RESOURCE_TABLE_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:11:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245743.1545101 (Exim 4.92) (envelope-from ) id 1vxooc-00007r-D5; Wed, 04 Mar 2026 16:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245743.1545101; Wed, 04 Mar 2026 16:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxooc-00007h-AM; Wed, 04 Mar 2026 16:11:14 +0000 Received: by outflank-mailman (input) for mailman id 1245743; Wed, 04 Mar 2026 16:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxooa-00007R-H2 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxooa-004xyJ-1b for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxooa-00G9lO-1U for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=K8mkBIQU3RW/lprghcquX1Alv2azhU//7Xkkz7sztRA=; b=k0rqA73xzkolac2jzQUmKV2u7H 0Q56ASQkGmXpQeHZe7OVp5VyBZPOuxVXYoPu2g97tFSUKhZ9KAYUFRWzTEiu4m4PiBUqDl2CUygst i0ilmrbMpFCKBKRk7dpIaZvp2pmeCAZkKz10XDsph7+NRYCbMGiZHAPo881mD3MAESz0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xen/x86: fix usage of [[:blank:]] with BSD grep Message-Id: Date: Wed, 04 Mar 2026 16:11:12 +0000 commit f98cee7981dd10b8a9a3e1bb0091e0394148c304 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:52:08 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:08 2026 +0100 xen/x86: fix usage of [[:blank:]] with BSD grep BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index efdbdb6045..b7cb03a9c1 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -112,7 +112,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := : -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:11:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245744.1545105 (Exim 4.92) (envelope-from ) id 1vxool-0000AD-EN; Wed, 04 Mar 2026 16:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245744.1545105; Wed, 04 Mar 2026 16: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 1vxool-0000A2-Bi; Wed, 04 Mar 2026 16:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1245744; Wed, 04 Mar 2026 16:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxook-00009k-LY for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxook-004xyS-23 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxook-00G9mc-1l for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=GHTSzE95Ols6mmrXfwDhJHR8BcASjQM9paLMl7cPJ1s=; b=IqfTKgc3yY+hBFEuwhyD9Sx5CW Q+oYzVxVtmApHS6iYUFWzarBklQeMdceopa8SXI0RA6lNNUQm6oLXX7+hb4fy8aT5ANwdfqPxqYXg nco1opW9EX09OcETNwPhlotr9kZoYMcHLt9ZQE0jtJq8JrtEeUBHCIG1CNc4HWDgEVeo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xen: add non-executable stack note uniformly Message-Id: Date: Wed, 04 Mar 2026 16:11:22 +0000 commit 6a0a1202c69383c0d0ac62019ac41a3a56fd4cea Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:52:21 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:21 2026 +0100 xen: add non-executable stack note uniformly Currently the -Wa,--noexecstack parameter is only passed to the compiler when building assembly files, as the assembler doesn't add such note for stack attributes. However, the default addition of the .note.GNU-stack section is dependent on the ELF target used. Adjust the passing of -Wa,--noexecstack so it's added to CFLAGS instead of AFLAGS, and hence such section is also added to object files generated from .c sources. This fixes the complains from the linker about missing .note.GNU-stack section when building x86-64 Xen on Darwin platforms. Note we could instead pass `-z noexecstack` to the linker, but that however would mask any possible errors or unintended mismatches from previous steps. Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 3dfd77003c28ff3f6bfbf76a75d40a41ccecb33f master date: 2026-02-13 16:42:42 +0100 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index b7b5941159..19d4e56bd2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -415,7 +415,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) +$(call cc-option-add,CFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:11:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245745.1545110 (Exim 4.92) (envelope-from ) id 1vxoov-0000CT-GG; Wed, 04 Mar 2026 16:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245745.1545110; Wed, 04 Mar 2026 16: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 1vxoov-0000CK-DL; Wed, 04 Mar 2026 16:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1245745; Wed, 04 Mar 2026 16:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoou-0000CA-QI for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoou-004xya-2W for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoou-00G9nK-2E for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=7BflSYO7Fnl3IsxjbiumiQE5gOvEDKmsCPp6BZAqv/s=; b=kmJHUUbh+23OAm+TFAZXhutGWp iY1pWG3rJHrxWTW59u6wouOJ7uFUkc6c4TWw2bJbmFximVN3x6wz9vsHtKLGV2WMyY5ehosqZ7DCF XdYACMbPAkYnVjQLyeNf3TqZtL0krKUc+bFVtPkZL3cv6BYKjH4zSBQeyrE4gkUQiKDI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] VT-d: fix off-by-one when handling extra RMRR ranges Message-Id: Date: Wed, 04 Mar 2026 16:11:32 +0000 commit 1aaa2a0097dc8dd7f6ff49c0d0f5965bccf4b492 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:52:30 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:30 2026 +0100 VT-d: fix off-by-one when handling extra RMRR ranges add_one_user_rmrr() operates on inclusive [start,end] range, which means the end page needs to be calculated as (start + page_count - 1). This off-by-one error resulted in one extra pages being mapped in IOMMU context, but not marked as reserved in the memory map. This in turns confused PVH dom0 code, resulting in the following crash: (XEN) [ 3.934848] d0: GFN 0x5475c (0x5475c,5,3) -> (0x46a0f4,0,7) not permitted (0x20) (XEN) [ 3.969657] domain_crash called from arch/x86/mm/p2m.c:695 (XEN) [ 3.972568] Domain 0 reported crashed by domain 32767 on cpu#0: (XEN) [ 3.975527] Hardware Dom0 crashed: rebooting machine in 5 seconds. (XEN) [ 8.986353] Resetting with ACPI MEMORY or I/O RESET_REG. I checked other parts of this API and it was the only error like this. Other places: - iommu_get_extra_reserved_device_memory() -> reserve_e820_ram() - this function expects exclusive range, so the code is correct - add_one_extra_ivmd() - this operates on start address and memory length Fixes: 2d9b3699136d ("IOMMU/VT-d: wire common device reserved memory API") Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné master commit: d41501fcf62457c3df779abda6718c64da8635ae master date: 2026-02-17 08:59:34 +0100 --- xen/drivers/passthrough/vtd/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 91c22b8330..2a756831a6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1065,7 +1065,8 @@ static int __init add_user_rmrr(void) static int __init cf_check add_one_extra_rmrr(xen_pfn_t start, xen_ulong_t nr, u32 id, void *ctxt) { u32 sbdf_array[] = { id }; - return add_one_user_rmrr(start, start+nr, 1, sbdf_array); + + return add_one_user_rmrr(start, start + nr - 1, 1, sbdf_array); } static int __init add_extra_rmrr(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:11:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245746.1545113 (Exim 4.92) (envelope-from ) id 1vxop5-0000FG-Im; Wed, 04 Mar 2026 16:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245746.1545113; Wed, 04 Mar 2026 16: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 1vxop5-0000F7-Fy; Wed, 04 Mar 2026 16:11:43 +0000 Received: by outflank-mailman (input) for mailman id 1245746; Wed, 04 Mar 2026 16:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxop4-0000F1-Sl for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxop4-004xyg-2n for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxop4-00G9of-2h for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=co8oRsQjvAuwAWhegaqu3wOetqDRZCH49DdC2ZEKdQo=; b=D+Y1vRvqgxIXPJs4UrD0HmTWmZ EwD5WAVeQdM+UJ8v7xxcPB0SaUoi4o/kmTZnPkp7rK7dBs9gqf2hv5zpBg8sW5l/O1CVu9ODBSAwP k+rvzIXok+2JpPTgDRrousMT4f3074RqSd/UwIE6rjlMm1toLUB25wfDqBeNkJ64TsRg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Wed, 04 Mar 2026 16:11:42 +0000 commit be58d3002fdc3fb5b24c0bcd2453232d1d911005 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:52:54 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:52:54 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 74867aae25cb6356b8a7d1140c81666e2a23b818 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 06cfc88d30..f62678fa61 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -115,11 +115,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:11:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245747.1545117 (Exim 4.92) (envelope-from ) id 1vxopF-0000Hi-KB; Wed, 04 Mar 2026 16:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245747.1545117; Wed, 04 Mar 2026 16: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 1vxopF-0000Ha-HT; Wed, 04 Mar 2026 16:11:53 +0000 Received: by outflank-mailman (input) for mailman id 1245747; Wed, 04 Mar 2026 16:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxopE-0000HU-VK for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxopE-004xym-33 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxopE-00G9pg-2x for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=PRh95LH7e7k+Ipa6/69BWDUCzvFjJ0t6qm+mgNm8pWg=; b=eKVL+FzWrEFUIoG6HJrOkGec6G 834SW1sWu9SaJvrpwsNCUnC7f+lkvgg3gElK9KSWr3zv1GeAgpdb2W8tzu0z2KZalZMYx8gq3l0/E WiyFdOoi66K3j3jrX3BmN4cSiEvUTaDxc22wnLGUQxhf35yIt5fOxySLElAB8KC1I28Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Wed, 04 Mar 2026 16:11:52 +0000 commit 057f0dd56eea1bde442ca0ebd2d6c3b0c1ad0d05 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:53:05 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:53:05 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: a0ed5bcfbeee81c91c574ad484faa057054eaf09 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index f62678fa61..9828a40c4b 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -183,7 +183,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -398,6 +399,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:12:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245748.1545121 (Exim 4.92) (envelope-from ) id 1vxopQ-0000Jo-LZ; Wed, 04 Mar 2026 16:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245748.1545121; Wed, 04 Mar 2026 16: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 1vxopQ-0000Jg-Iu; Wed, 04 Mar 2026 16:12:04 +0000 Received: by outflank-mailman (input) for mailman id 1245748; Wed, 04 Mar 2026 16:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxopP-0000Ja-DY for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxopP-004xz7-1G for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxopP-00G9ta-19 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uGVQrLo6q6RDBqYoLDMI5k8DtUGFuk2GukmZ1cVjJj4=; b=HcTMrQLWgApIjZR9YJnRfc9ONC bKw53AU1BPIXp9y7UuF2u4m/0hdMHIo8DuNb4UIqulf/qmvF7C35Orh8HaDNtHU0QNpY0fSBpKh+T d1Yn9e9FzwkX7wHw9XlOexF+Dx7zXhREQnqfF/A7z/qWxE6nKcitk1mZLPQupUC3rcns=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] EFI: Fix relocating ESRT for dom0 Message-Id: Date: Wed, 04 Mar 2026 16:12:03 +0000 commit 68044518e078e8475e59b8be10197e3d38a04685 Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:53:37 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:53:37 2026 +0100 EFI: Fix relocating ESRT for dom0 Fix calculating the table size - it consists of a header + entries, not just entries. This bug caused the last entry to have garbage in its final fields, including LowestSupportedFwVersion and CapsuleFlags, which (usually) made fwupd able to detect firmware update availability, but refuse actually installing it. Fixes: dc7da0874ba4 ("EFI: preserve the System Resource Table for dom0") Signed-off-by: Marek Marczykowski-Górecki Acked-by: Daniel P. Smith master commit: 3ea44aa78c8170ca8010a89d24717d6f6ccfe564 master date: 2026-02-12 11:35:05 +0100 --- xen/common/efi/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 04d4bbd801..b09890cb8f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -624,7 +624,8 @@ static size_t __init get_esrt_size(const EFI_MEMORY_DESCRIPTOR *desc) if ( esrt_ptr->FwResourceCount > available_len / sizeof(esrt_ptr->Entries[0]) ) return 0; - return esrt_ptr->FwResourceCount * sizeof(esrt_ptr->Entries[0]); + return offsetof(EFI_SYSTEM_RESOURCE_TABLE, + Entries[esrt_ptr->FwResourceCount]); } static EFI_GUID __initdata esrt_guid = EFI_SYSTEM_RESOURCE_TABLE_GUID; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:12:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245749.1545125 (Exim 4.92) (envelope-from ) id 1vxopa-0000Lq-N1; Wed, 04 Mar 2026 16:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245749.1545125; Wed, 04 Mar 2026 16: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 1vxopa-0000Li-KJ; Wed, 04 Mar 2026 16:12:14 +0000 Received: by outflank-mailman (input) for mailman id 1245749; Wed, 04 Mar 2026 16:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxopZ-0000LY-GJ for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxopZ-004xzX-1X for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxopZ-00G9uo-1Q for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=tM7VCYzVxTpC5a0cBPzGOmN8JlYPpB/GFi24JA4F3G0=; b=Ip47rmq5+2CZit+i6G7OH1L11t rcRxdsKsn/4EdXpbeIVjb4bBN8kwUHVKWyFuXkXYTMr4w23r2YMue2Frk6/+IDOQw0LAwfXUiwOQL cW3Nvn6K/BY4dogzQVLWmo0Y3mojqCK2cSg/rIQQEvyaXxrE6MWRiakh5jfHl3pKuU0s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xen/x86: fix usage of [[:blank:]] with BSD grep Message-Id: Date: Wed, 04 Mar 2026 16:12:13 +0000 commit 2d88bf5b69cbec182e6bc9a5fa4de44215dd620f Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:02 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:02 2026 +0100 xen/x86: fix usage of [[:blank:]] with BSD grep BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 85d3e7cbfe..4924d3c660 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -114,7 +114,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := : -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:12:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245750.1545129 (Exim 4.92) (envelope-from ) id 1vxopk-0000O5-OZ; Wed, 04 Mar 2026 16:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245750.1545129; Wed, 04 Mar 2026 16: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 1vxopk-0000Nx-Ll; Wed, 04 Mar 2026 16:12:24 +0000 Received: by outflank-mailman (input) for mailman id 1245750; Wed, 04 Mar 2026 16:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxopj-0000Nn-Ij for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxopj-004xzi-1m for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxopj-00G9xZ-1h for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=CldqrnXuezV1za51CqhEpQPGqZiXTrNTWk+A2+DtC3Q=; b=SRKPRoEpVX6X5rafiXUbE4XOt+ reZYhIPWzURsCKFMeXbtd63+inEw0UoXLjd34nu2yIc3jyPDwL8b49FbKxBjCqAi7yd2wWBgBC3y2 IqFAyEq5GuLToAQEG+USQ35OT98DMLdCSCKsxROD3x59nlibpjbU6iut+OFRfFeLy70s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xen: add non-executable stack note uniformly Message-Id: Date: Wed, 04 Mar 2026 16:12:23 +0000 commit 744d8cf1991a9b43c5c64ec520121a799cb332b9 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:10 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:10 2026 +0100 xen: add non-executable stack note uniformly Currently the -Wa,--noexecstack parameter is only passed to the compiler when building assembly files, as the assembler doesn't add such note for stack attributes. However, the default addition of the .note.GNU-stack section is dependent on the ELF target used. Adjust the passing of -Wa,--noexecstack so it's added to CFLAGS instead of AFLAGS, and hence such section is also added to object files generated from .c sources. This fixes the complains from the linker about missing .note.GNU-stack section when building x86-64 Xen on Darwin platforms. Note we could instead pass `-z noexecstack` to the linker, but that however would mask any possible errors or unintended mismatches from previous steps. Suggested-by: Jan Beulich Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 3dfd77003c28ff3f6bfbf76a75d40a41ccecb33f master date: 2026-02-13 16:42:42 +0100 --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index b83e8827a4..4d34597522 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -412,7 +412,7 @@ endif AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$$(comma)--noexecstack) +$(call cc-option-add,CFLAGS,CC,-Wa$$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:12:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245752.1545133 (Exim 4.92) (envelope-from ) id 1vxopu-0000QO-Pn; Wed, 04 Mar 2026 16:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245752.1545133; Wed, 04 Mar 2026 16: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 1vxopu-0000QE-NA; Wed, 04 Mar 2026 16:12:34 +0000 Received: by outflank-mailman (input) for mailman id 1245752; Wed, 04 Mar 2026 16:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxopt-0000Q6-LJ for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxopt-004xzm-21 for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxopt-00G9yO-1w for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=UtMj38JDe5dlVBfAl/V1qKlvw0qXlsPokTPLVxaCiFM=; b=zhxSVjwMRhi2x8rMSystDdqAB2 FsabPQWywcMAVzuIcQharNPhsDD8HLQCE2vSjeyyBWaARkN1nJ0P2J9oatQAGScIWQsaXoY3ts4ZD 0jQMfk0ueJHX88xTiDSIERr8eDGRafRGpmsMNgfh/fYPUy7wl8ViZd8jULj4RIcZ8Ptw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] VT-d: fix off-by-one when handling extra RMRR ranges Message-Id: Date: Wed, 04 Mar 2026 16:12:33 +0000 commit aa073513622ab7f4c9b3fda3bbc4d7e9ffa775fd Author: Marek Marczykowski-Górecki AuthorDate: Wed Mar 4 14:54:27 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:27 2026 +0100 VT-d: fix off-by-one when handling extra RMRR ranges add_one_user_rmrr() operates on inclusive [start,end] range, which means the end page needs to be calculated as (start + page_count - 1). This off-by-one error resulted in one extra pages being mapped in IOMMU context, but not marked as reserved in the memory map. This in turns confused PVH dom0 code, resulting in the following crash: (XEN) [ 3.934848] d0: GFN 0x5475c (0x5475c,5,3) -> (0x46a0f4,0,7) not permitted (0x20) (XEN) [ 3.969657] domain_crash called from arch/x86/mm/p2m.c:695 (XEN) [ 3.972568] Domain 0 reported crashed by domain 32767 on cpu#0: (XEN) [ 3.975527] Hardware Dom0 crashed: rebooting machine in 5 seconds. (XEN) [ 8.986353] Resetting with ACPI MEMORY or I/O RESET_REG. I checked other parts of this API and it was the only error like this. Other places: - iommu_get_extra_reserved_device_memory() -> reserve_e820_ram() - this function expects exclusive range, so the code is correct - add_one_extra_ivmd() - this operates on start address and memory length Fixes: 2d9b3699136d ("IOMMU/VT-d: wire common device reserved memory API") Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné master commit: d41501fcf62457c3df779abda6718c64da8635ae master date: 2026-02-17 08:59:34 +0100 --- xen/drivers/passthrough/vtd/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 91c22b8330..2a756831a6 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -1065,7 +1065,8 @@ static int __init add_user_rmrr(void) static int __init cf_check add_one_extra_rmrr(xen_pfn_t start, xen_ulong_t nr, u32 id, void *ctxt) { u32 sbdf_array[] = { id }; - return add_one_user_rmrr(start, start+nr, 1, sbdf_array); + + return add_one_user_rmrr(start, start + nr - 1, 1, sbdf_array); } static int __init add_extra_rmrr(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:12:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245753.1545137 (Exim 4.92) (envelope-from ) id 1vxoq4-0000SU-RI; Wed, 04 Mar 2026 16:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245753.1545137; Wed, 04 Mar 2026 16: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 1vxoq4-0000SM-OU; Wed, 04 Mar 2026 16:12:44 +0000 Received: by outflank-mailman (input) for mailman id 1245753; Wed, 04 Mar 2026 16:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoq3-0000SF-Nl for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoq3-004xzy-2I for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoq3-00G9z2-2C for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=8WNZKB06WPhGXQ9H6fCXSNCtzAaME7SgT0Yy/H4Maa8=; b=u+5jCFhRCTZp3u+CrzSJQ2HtIQ vBggJxvY6pXbef6ZEt//V5s3itE7VeDZ52wOfjHVJk448SdLbFuCWeVqYaS448xbCx1hfGhIkx3WI BjWllprwA0FSYEIwl+Hrbn2j5hXRYCSUh+YiLjR7BUDG5BlahbXoVbmr5T7ZwCGIb0xU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xen/cpufreq: fix adjusting of sampling window on early exit Message-Id: Date: Wed, 04 Mar 2026 16:12:43 +0000 commit 24c83081d542a46dcfb9befc0977a8ed4ecd8d14 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:46 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:46 2026 +0100 xen/cpufreq: fix adjusting of sampling window on early exit The logic in dbs_check_cpu() resets the sampling window even when the sampling period is considered too small. This leads to further calls finding an imbalance between the total window time and the idle time, as the total window time is possibly shorter than the idle time. Fix by resetting the sampling window start time in the same block where the current idle time is stored. While there also prevent a duplicated call to NOW() and instead re-use the previously fetched value. Fixes: d6f001cb91ac ("x86: Implement cpufreq ondemand policy") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 74867aae25cb6356b8a7d1140c81666e2a23b818 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index 06cfc88d30..f62678fa61 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -115,11 +115,12 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_ns = NOW(); total_ns = cur_ns - this_dbs_info->prev_cpu_wall; - this_dbs_info->prev_cpu_wall = NOW(); if (total_ns < MIN_DBS_INTERVAL) return; + this_dbs_info->prev_cpu_wall = cur_ns; + /* Get Idle Time */ for_each_cpu(j, policy->cpus) { uint64_t idle_ns, total_idle_ns; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 04 16:12:55 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 04 Mar 2026 16:12:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1245754.1545141 (Exim 4.92) (envelope-from ) id 1vxoqE-0000Ur-SU; Wed, 04 Mar 2026 16:12:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1245754.1545141; Wed, 04 Mar 2026 16:12: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 1vxoqE-0000Uj-Pr; Wed, 04 Mar 2026 16:12:54 +0000 Received: by outflank-mailman (input) for mailman id 1245754; Wed, 04 Mar 2026 16:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vxoqD-0000Ub-QL for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vxoqD-004y09-2Y for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vxoqD-00GA07-2S for xen-changelog@lists.xenproject.org; Wed, 04 Mar 2026 16: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=AfAxqmYv8qJQdyl2kqVBY13+MKwaBs0e1/QF9gKFNeg=; b=mD84MxNSXiG+WM/PcHoUrl3NQW 7NCBjbb/lw0/jsWlmudsVqUocV2r11qteQilRmi8IqDZMYJOxL5iaiQqjhWXjw2jJ9uuUu81sZM2V IBdQ/1aB+BN7LGV86EtoN4hetmYkXqdMWBWyRYh4hScFCZrOlkFhNE+EJJcyshBzlBCU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] xen/cpufreq: fix usages of align_timer() in the on-demand governor Message-Id: Date: Wed, 04 Mar 2026 16:12:53 +0000 commit 84b006870c41f94ee99af202d5f0a7b4dcd3cc94 Author: Roger Pau Monné AuthorDate: Wed Mar 4 14:54:55 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 4 14:54:55 2026 +0100 xen/cpufreq: fix usages of align_timer() in the on-demand governor The first parameter passed to align_timer() is the timer expiration, not the current time. Adjust the calls to align_timer() in the on-demand governor to pass the expected timer expiration as the first parameter. Fixes: af74e3a15a83 ("cpufreq: align dbs timer for better package C state residency") Fixes: 382b95f627a9 ("Fix cpufreq HW-ALL coordination handle") Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: a0ed5bcfbeee81c91c574ad484faa057054eaf09 master date: 2026-03-02 17:16:26 +0100 --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index f62678fa61..9828a40c4b 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -183,7 +183,8 @@ static void cf_check do_dbs_timer(void *dbs) dbs_check_cpu(dbs_info); set_timer(&per_cpu(dbs_timer, dbs_info->cpu), - align_timer(NOW() , dbs_tuners_ins.sampling_rate)); + align_timer(NOW() + dbs_tuners_ins.sampling_rate, + dbs_tuners_ins.sampling_rate)); } static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) @@ -398,6 +399,6 @@ void cpufreq_dbs_timer_resume(void) (void)cmpxchg(stoppable, -1, 1); } else - set_timer(t, align_timer(now, dbs_tuners_ins.sampling_rate)); + set_timer(t, align_timer(t->expires, dbs_tuners_ins.sampling_rate)); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Mar 05 09:44:08 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2026 09:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1246367.1545558 (Exim 4.92) (envelope-from ) id 1vy5FU-0002pa-3V; Thu, 05 Mar 2026 09:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1246367.1545558; Thu, 05 Mar 2026 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 1vy5FU-0002pR-0p; Thu, 05 Mar 2026 09:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1246367; Thu, 05 Mar 2026 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 1vy5FS-0002pL-8e for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 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 1vy5FS-006V9E-0b for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 09:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vy5FS-00Hang-0P for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 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=FfMPECqs3S42iE1OC7B1IumSwEeITH99dwEYq/y6JB4=; b=X/q94cO8Ua2wJvSP7GAG97l9Pl KYG1Z7AlsY4dO8J+cHKWlYr7vaL0n5dGlEhVLhqiBxHcOZKIwYvJ1EjibSOka1kSYCPZIc4QT7J6H dfkfuw4Hu8Xf9g01s66rI348x5wKUOtRouI3kRLtGwkIweMaPx8YFAhGf1Lmf/6a8thQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI/ReBAR: improve cleanup Message-Id: Date: Thu, 05 Mar 2026 09:44:02 +0000 commit 9ebba62ca8430604b0bf77f05925b40eee2504db Author: Jan Beulich AuthorDate: Thu Mar 5 09:27:08 2026 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 09:27:08 2026 +0100 vPCI/ReBAR: improve cleanup We cannot assume extended config space to (still) be accessible when cleaning up. Necessary values need caching instead. In fact, as the caller also cannot look up extended capabilities, the cleanup function needs to cope with being called when there's no ReBAR capability at all. As kind of a side effect nbars being 0 (which init_rebar() doesn't explicitly reject) no longer results in a bogus call to vpci_remove_registers(). Fixes: ee459aeac096 ("vpci/rebar: Implement cleanup function for Rebar") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/rebar.c | 15 +++++++-------- xen/include/xen/vpci.h | 7 +++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/xen/drivers/vpci/rebar.c b/xen/drivers/vpci/rebar.c index ab5c5453a8..1bb3dd7045 100644 --- a/xen/drivers/vpci/rebar.c +++ b/xen/drivers/vpci/rebar.c @@ -53,17 +53,12 @@ static void cf_check rebar_ctrl_write(const struct pci_dev *pdev, static int cf_check cleanup_rebar(const struct pci_dev *pdev, bool hide) { int rc; - uint32_t ctrl; - unsigned int nbars; - unsigned int rebar_offset = pci_find_ext_capability(pdev, - PCI_EXT_CAP_ID_REBAR); + unsigned int nbars = pdev->vpci->rebar.nbars; + unsigned int rebar_offset = pdev->vpci->rebar.offset; - if ( !hide ) + if ( !rebar_offset || !nbars || !hide ) return 0; - ctrl = pci_conf_read32(pdev->sbdf, rebar_offset + PCI_REBAR_CTRL(0)); - nbars = MASK_EXTR(ctrl, PCI_REBAR_CTRL_NBAR_MASK); - rc = vpci_remove_registers(pdev->vpci, rebar_offset + PCI_REBAR_CAP(0), PCI_REBAR_CTRL(nbars - 1)); if ( rc ) @@ -121,6 +116,10 @@ static int cf_check init_rebar(struct pci_dev *pdev) ctrl = pci_conf_read32(pdev->sbdf, rebar_offset + PCI_REBAR_CTRL(0)); nbars = MASK_EXTR(ctrl, PCI_REBAR_CTRL_NBAR_MASK); + + pdev->vpci->rebar.offset = rebar_offset; + pdev->vpci->rebar.nbars = nbars; + for ( unsigned int i = 0; i < nbars; i++ ) { int rc; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index d104efbce2..83ac41edf8 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -135,6 +135,13 @@ struct vpci { struct vpci_arch_msix_entry arch; } entries[]; } *msix; + + /* Resizable BARs data */ + struct vpci_rebar { + unsigned int offset:12; + unsigned int nbars:3; + } rebar; + #ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT /* Guest SBDF of the device. */ #define INVALID_GUEST_SBDF ((pci_sbdf_t){ .sbdf = ~0U }) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Mar 05 09:44:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2026 09:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1246368.1545562 (Exim 4.92) (envelope-from ) id 1vy5Fe-0002rM-4n; Thu, 05 Mar 2026 09:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1246368.1545562; Thu, 05 Mar 2026 09: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 1vy5Fe-0002rE-28; Thu, 05 Mar 2026 09:44:14 +0000 Received: by outflank-mailman (input) for mailman id 1246368; Thu, 05 Mar 2026 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 1vy5Fc-0002qy-BT for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 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 1vy5Fc-006V9J-0z for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 09:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vy5Fc-00Hapj-0m for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 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=TKRWWplf+gZhF2qJHMk71AB808K3HOhYvu4ATtx/c/U=; b=yKz5HGF+EMxNGs7lk4TpiV1DjZ eYaLKec/1WHlHtrEkHuyzif+PBojMoAQcsAtrnxOe6HZmxzuWfVYX0nhknsxhmfGT57xDsz+ypjIa DpKZXeVsCgcHlG5Ba6GXOH22Nh8DSJ4IZvQkWEtgKYYKb5MaTCRODftI7TgnWHJttZKo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci/msix: check for BARs enabled in vpci_make_msix_hole Message-Id: Date: Thu, 05 Mar 2026 09:44:12 +0000 commit 7c24d58a6e641e2979978c5abb312bff877dede3 Author: Stewart Hildebrand AuthorDate: Thu Mar 5 09:27:50 2026 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 09:27:50 2026 +0100 vpci/msix: check for BARs enabled in vpci_make_msix_hole A hotplugged PCI device may be added uninitialized. In particular, memory decoding might be disabled and the BARs might be zeroed. In this case, the BARs will not be mapped in p2m. However, vpci_make_msix_hole() unconditionally attempts to punch holes in p2m, leading to init_msix() failing: (XEN) d0v0 0000:01:00.0: existing mapping (mfn: 1c1880 type: 0) at 0 clobbers MSIX MMIO area (XEN) d0 0000:01:00.0: init legacy cap 17 fail rc=-17, mask it vpci_make_msix_hole() should only attempt to punch holes if the BARs containing the MSI-X/PBA tables are mapped in p2m. Introduce a helper for checking if a BAR is enabled, and add a check for the situation inside vpci_make_msix_hole(). As a result of the newly introduced checks in vpci_make_msix_hole(), move the call to vpci_make_msix_hole() within modify_decoding() to after setting ->enabled. Fixes: ee2eb6849d50 ("vpci: Refactor REGISTER_VPCI_INIT") Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 26 +++++++++++++------------- xen/drivers/vpci/msix.c | 3 +++ xen/drivers/vpci/private.h | 6 ++++++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 1c0818c2e7..a760d8c32f 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -123,19 +123,6 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bool map = cmd & PCI_COMMAND_MEMORY; unsigned int i; - /* - * Make sure there are no mappings in the MSIX MMIO areas, so that accesses - * can be trapped (and emulated) by Xen when the memory decoding bit is - * enabled. - * - * FIXME: punching holes after the p2m has been set up might be racy for - * DomU usage, needs to be revisited. - */ -#ifdef CONFIG_HAS_PCI_MSI - if ( map && !rom_only && vpci_make_msix_hole(pdev) ) - return; -#endif - for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { struct vpci_bar *bar = &header->bars[i]; @@ -165,6 +152,19 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bar->enabled = map; } + /* + * Make sure there are no mappings in the MSIX MMIO areas, so that accesses + * can be trapped (and emulated) by Xen when the memory decoding bit is + * enabled. + * + * FIXME: punching holes after the p2m has been set up might be racy for + * DomU usage, needs to be revisited. + */ +#ifdef CONFIG_HAS_PCI_MSI + if ( map && !rom_only && vpci_make_msix_hole(pdev) ) + return; +#endif + if ( !rom_only ) { pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd); diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index f87212b46f..bbe4f213ac 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -606,6 +606,9 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) unsigned long end = PFN_DOWN(vmsix_table_addr(pdev->vpci, i) + vmsix_table_size(pdev->vpci, i) - 1); + if ( !vmsix_table_bar_valid(pdev->vpci, i) ) + continue; + for ( ; start <= end; start++ ) { p2m_type_t t; diff --git a/xen/drivers/vpci/private.h b/xen/drivers/vpci/private.h index 140092cc52..fdeeca7aa8 100644 --- a/xen/drivers/vpci/private.h +++ b/xen/drivers/vpci/private.h @@ -119,6 +119,12 @@ static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); } +static inline bool vmsix_table_bar_valid(const struct vpci *vpci, + unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].enabled; +} + /* * Note regarding the size calculation of the PBA: the spec mentions "The last * QWORD will not necessarily be fully populated", so it implies that the PBA -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Mar 05 09:44:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2026 09:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1246369.1545566 (Exim 4.92) (envelope-from ) id 1vy5Fo-0002vD-67; Thu, 05 Mar 2026 09:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1246369.1545566; Thu, 05 Mar 2026 09: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 1vy5Fo-0002v5-3V; Thu, 05 Mar 2026 09:44:24 +0000 Received: by outflank-mailman (input) for mailman id 1246369; Thu, 05 Mar 2026 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 1vy5Fm-0002uw-Dw for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 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 1vy5Fm-006V9g-1H for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 09:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vy5Fm-00HasB-1A for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 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=oerQQpBl3A5gD1YfQo2xqRTJuReAqG7vt2HP1zUHM7U=; b=Yrd+Zo6uAMdkYQNOxRZMCtekGU svF3wcbviGf+p5sRFPJQcjb6/wZONXqooQzwl1Ak1H/ts58qoAY6/Q25zoCr5BTu/35JyeGHI75M/ ASSdNnvUDCQ+PdDYRsKECLxgYblzWCiCMT+3mpY/svQ4hE54Ir4DL3VWEXxpJxprVD7k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] domain: use unsigned loop induction variable in complete_domain_destroy() Message-Id: Date: Thu, 05 Mar 2026 09:44:22 +0000 commit 505b2afae44caa9df189957c6e298017b2ef7988 Author: Jan Beulich AuthorDate: Thu Mar 5 09:28:27 2026 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 09:28:27 2026 +0100 domain: use unsigned loop induction variable in complete_domain_destroy() Using plain (signed) int variables as array indexes can be unhelpful on at least x86, where the compiler may see the need to insert sign-extension insns (strictly speaking it should be able to avoid that when the loop continuation condition says >= 0, but that's not generally the case even with gcc15). Observed effects with gcc15 (will of course vary with compiler version and level of optimization): - on x86, one less preserved register in use, yet due to sub-optimal choice of register variables still a small code size increase (%r12 isn't a good choice when it's used for base-without-index addressing, as it requires a SIB byte which other registers wouldn't require), - on Arm64 code size decreases, albeit that's eaten up by padding which is being inserted ahead of a few labels, - on Arm32 code size increases for a reason I didn't fully understand (my ability to read Arm assembly is still somewhat limited). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/common/domain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index e06174fca7..d24be268ae 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1475,7 +1475,7 @@ static void cf_check complete_domain_destroy(struct rcu_head *head) { struct domain *d = container_of(head, struct domain, rcu); struct vcpu *v; - int i; + unsigned int i; /* * Flush all state for the vCPU previously having run on the current CPU. @@ -1485,7 +1485,11 @@ static void cf_check complete_domain_destroy(struct rcu_head *head) */ sync_local_execstate(); - for ( i = d->max_vcpus - 1; i >= 0; i-- ) + /* + * Iterating downwards is a requirement here, as e.g. sched_destroy_vcpu() + * relies on this. + */ + for ( i = d->max_vcpus; i-- > 0; ) { if ( (v = d->vcpu[i]) == NULL ) continue; @@ -1511,7 +1515,7 @@ static void cf_check complete_domain_destroy(struct rcu_head *head) xfree(d->vm_event_share); #endif - for ( i = d->max_vcpus - 1; i >= 0; i-- ) + for ( i = d->max_vcpus; i-- > 0; ) if ( (v = d->vcpu[i]) != NULL ) vcpu_destroy(v); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Mar 05 11:22:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2026 11:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1246462.1545623 (Exim 4.92) (envelope-from ) id 1vy6mI-0000dA-V8; Thu, 05 Mar 2026 11:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1246462.1545623; Thu, 05 Mar 2026 11: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 1vy6mI-0000d3-SV; Thu, 05 Mar 2026 11:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1246462; Thu, 05 Mar 2026 11:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vy6mH-0000cx-JV for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vy6mH-006X6J-1V for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vy6mH-0007ru-1O for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11: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=aqu6tY4tooHwjd5qO+fh/9TBp9UlDovuzWkedSCFLlM=; b=ISj/fM0ByDL2bywYYym1TLUAeN eWhK+o4Tv4bV/o8/BjgCSgHnkBxrjgXmXSzh0MSA1pjb5/UhTDgPIak7WrUkFMIa1ubkYKm+Rx5sK XptJ/jqd4pEQ9DqChQiuuLIgO1DW9o560tVe1emwrR6eLOF0rJ1xWPRkCgPN60VoXTw8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI/ReBAR: improve cleanup Message-Id: Date: Thu, 05 Mar 2026 11:22:01 +0000 commit 9ebba62ca8430604b0bf77f05925b40eee2504db Author: Jan Beulich AuthorDate: Thu Mar 5 09:27:08 2026 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 09:27:08 2026 +0100 vPCI/ReBAR: improve cleanup We cannot assume extended config space to (still) be accessible when cleaning up. Necessary values need caching instead. In fact, as the caller also cannot look up extended capabilities, the cleanup function needs to cope with being called when there's no ReBAR capability at all. As kind of a side effect nbars being 0 (which init_rebar() doesn't explicitly reject) no longer results in a bogus call to vpci_remove_registers(). Fixes: ee459aeac096 ("vpci/rebar: Implement cleanup function for Rebar") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/rebar.c | 15 +++++++-------- xen/include/xen/vpci.h | 7 +++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/xen/drivers/vpci/rebar.c b/xen/drivers/vpci/rebar.c index ab5c5453a8..1bb3dd7045 100644 --- a/xen/drivers/vpci/rebar.c +++ b/xen/drivers/vpci/rebar.c @@ -53,17 +53,12 @@ static void cf_check rebar_ctrl_write(const struct pci_dev *pdev, static int cf_check cleanup_rebar(const struct pci_dev *pdev, bool hide) { int rc; - uint32_t ctrl; - unsigned int nbars; - unsigned int rebar_offset = pci_find_ext_capability(pdev, - PCI_EXT_CAP_ID_REBAR); + unsigned int nbars = pdev->vpci->rebar.nbars; + unsigned int rebar_offset = pdev->vpci->rebar.offset; - if ( !hide ) + if ( !rebar_offset || !nbars || !hide ) return 0; - ctrl = pci_conf_read32(pdev->sbdf, rebar_offset + PCI_REBAR_CTRL(0)); - nbars = MASK_EXTR(ctrl, PCI_REBAR_CTRL_NBAR_MASK); - rc = vpci_remove_registers(pdev->vpci, rebar_offset + PCI_REBAR_CAP(0), PCI_REBAR_CTRL(nbars - 1)); if ( rc ) @@ -121,6 +116,10 @@ static int cf_check init_rebar(struct pci_dev *pdev) ctrl = pci_conf_read32(pdev->sbdf, rebar_offset + PCI_REBAR_CTRL(0)); nbars = MASK_EXTR(ctrl, PCI_REBAR_CTRL_NBAR_MASK); + + pdev->vpci->rebar.offset = rebar_offset; + pdev->vpci->rebar.nbars = nbars; + for ( unsigned int i = 0; i < nbars; i++ ) { int rc; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index d104efbce2..83ac41edf8 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -135,6 +135,13 @@ struct vpci { struct vpci_arch_msix_entry arch; } entries[]; } *msix; + + /* Resizable BARs data */ + struct vpci_rebar { + unsigned int offset:12; + unsigned int nbars:3; + } rebar; + #ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT /* Guest SBDF of the device. */ #define INVALID_GUEST_SBDF ((pci_sbdf_t){ .sbdf = ~0U }) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Mar 05 11:22:12 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2026 11:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1246463.1545626 (Exim 4.92) (envelope-from ) id 1vy6mS-0000eo-0C; Thu, 05 Mar 2026 11:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1246463.1545626; Thu, 05 Mar 2026 11:22:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vy6mR-0000eg-U0; Thu, 05 Mar 2026 11:22:11 +0000 Received: by outflank-mailman (input) for mailman id 1246463; Thu, 05 Mar 2026 11:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vy6mR-0000eY-Ls for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vy6mR-006X6O-25 for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vy6mR-0007ss-1g for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11: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=uuzjL38/Znwju8DRou8FbHnSt7i00qqWkcMHPkcsmfw=; b=GGK8z7CHpDgc1Q1wgPDcxMpCFe 4NSWYN9GWMJZ68iDQ67LF13UtsFWUlgzQkffvFXBmRXThephfF38sFjW62ftN3bCSlNn7cwOYZRL3 fspkKrrct8Lb0/0+cIqKjjbz8pUgoITyD4pJOnKg/8ei1tJ/7pktMiJRw0pC4ZtiBMQo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci/msix: check for BARs enabled in vpci_make_msix_hole Message-Id: Date: Thu, 05 Mar 2026 11:22:11 +0000 commit 7c24d58a6e641e2979978c5abb312bff877dede3 Author: Stewart Hildebrand AuthorDate: Thu Mar 5 09:27:50 2026 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 09:27:50 2026 +0100 vpci/msix: check for BARs enabled in vpci_make_msix_hole A hotplugged PCI device may be added uninitialized. In particular, memory decoding might be disabled and the BARs might be zeroed. In this case, the BARs will not be mapped in p2m. However, vpci_make_msix_hole() unconditionally attempts to punch holes in p2m, leading to init_msix() failing: (XEN) d0v0 0000:01:00.0: existing mapping (mfn: 1c1880 type: 0) at 0 clobbers MSIX MMIO area (XEN) d0 0000:01:00.0: init legacy cap 17 fail rc=-17, mask it vpci_make_msix_hole() should only attempt to punch holes if the BARs containing the MSI-X/PBA tables are mapped in p2m. Introduce a helper for checking if a BAR is enabled, and add a check for the situation inside vpci_make_msix_hole(). As a result of the newly introduced checks in vpci_make_msix_hole(), move the call to vpci_make_msix_hole() within modify_decoding() to after setting ->enabled. Fixes: ee2eb6849d50 ("vpci: Refactor REGISTER_VPCI_INIT") Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 26 +++++++++++++------------- xen/drivers/vpci/msix.c | 3 +++ xen/drivers/vpci/private.h | 6 ++++++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 1c0818c2e7..a760d8c32f 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -123,19 +123,6 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bool map = cmd & PCI_COMMAND_MEMORY; unsigned int i; - /* - * Make sure there are no mappings in the MSIX MMIO areas, so that accesses - * can be trapped (and emulated) by Xen when the memory decoding bit is - * enabled. - * - * FIXME: punching holes after the p2m has been set up might be racy for - * DomU usage, needs to be revisited. - */ -#ifdef CONFIG_HAS_PCI_MSI - if ( map && !rom_only && vpci_make_msix_hole(pdev) ) - return; -#endif - for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { struct vpci_bar *bar = &header->bars[i]; @@ -165,6 +152,19 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bar->enabled = map; } + /* + * Make sure there are no mappings in the MSIX MMIO areas, so that accesses + * can be trapped (and emulated) by Xen when the memory decoding bit is + * enabled. + * + * FIXME: punching holes after the p2m has been set up might be racy for + * DomU usage, needs to be revisited. + */ +#ifdef CONFIG_HAS_PCI_MSI + if ( map && !rom_only && vpci_make_msix_hole(pdev) ) + return; +#endif + if ( !rom_only ) { pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd); diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index f87212b46f..bbe4f213ac 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -606,6 +606,9 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) unsigned long end = PFN_DOWN(vmsix_table_addr(pdev->vpci, i) + vmsix_table_size(pdev->vpci, i) - 1); + if ( !vmsix_table_bar_valid(pdev->vpci, i) ) + continue; + for ( ; start <= end; start++ ) { p2m_type_t t; diff --git a/xen/drivers/vpci/private.h b/xen/drivers/vpci/private.h index 140092cc52..fdeeca7aa8 100644 --- a/xen/drivers/vpci/private.h +++ b/xen/drivers/vpci/private.h @@ -119,6 +119,12 @@ static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); } +static inline bool vmsix_table_bar_valid(const struct vpci *vpci, + unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].enabled; +} + /* * Note regarding the size calculation of the PBA: the spec mentions "The last * QWORD will not necessarily be fully populated", so it implies that the PBA -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Mar 05 11:22:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 05 Mar 2026 11:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1246464.1545632 (Exim 4.92) (envelope-from ) id 1vy6md-0000hE-32; Thu, 05 Mar 2026 11:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1246464.1545632; Thu, 05 Mar 2026 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 1vy6mc-0000h6-Vi; Thu, 05 Mar 2026 11:22:22 +0000 Received: by outflank-mailman (input) for mailman id 1246464; Thu, 05 Mar 2026 11:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vy6mb-0000gx-QY for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vy6mb-006X6s-2Y for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vy6mb-0007te-2G for xen-changelog@lists.xenproject.org; Thu, 05 Mar 2026 11: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=FhSRBJrhBo4Pbg5LH6qKp9HWHfMPZDEniw09BKUkZRo=; b=dgG+xsukXGUvzV8DiMXzlDFEla x046nkjhWHZon0M3R2Mx1k3b+K6g3y3c4y+OJzdnEb9rtPZmVQl4b4rQC0q5kgDhOvla7qF7fnttC iF8TxWeK0KLFsrZivLV/93hhMAwmlshHWrYYgcljMfejaiWVguCttOMfprOppQes/Rrw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] domain: use unsigned loop induction variable in complete_domain_destroy() Message-Id: Date: Thu, 05 Mar 2026 11:22:21 +0000 commit 505b2afae44caa9df189957c6e298017b2ef7988 Author: Jan Beulich AuthorDate: Thu Mar 5 09:28:27 2026 +0100 Commit: Jan Beulich CommitDate: Thu Mar 5 09:28:27 2026 +0100 domain: use unsigned loop induction variable in complete_domain_destroy() Using plain (signed) int variables as array indexes can be unhelpful on at least x86, where the compiler may see the need to insert sign-extension insns (strictly speaking it should be able to avoid that when the loop continuation condition says >= 0, but that's not generally the case even with gcc15). Observed effects with gcc15 (will of course vary with compiler version and level of optimization): - on x86, one less preserved register in use, yet due to sub-optimal choice of register variables still a small code size increase (%r12 isn't a good choice when it's used for base-without-index addressing, as it requires a SIB byte which other registers wouldn't require), - on Arm64 code size decreases, albeit that's eaten up by padding which is being inserted ahead of a few labels, - on Arm32 code size increases for a reason I didn't fully understand (my ability to read Arm assembly is still somewhat limited). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/common/domain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index e06174fca7..d24be268ae 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1475,7 +1475,7 @@ static void cf_check complete_domain_destroy(struct rcu_head *head) { struct domain *d = container_of(head, struct domain, rcu); struct vcpu *v; - int i; + unsigned int i; /* * Flush all state for the vCPU previously having run on the current CPU. @@ -1485,7 +1485,11 @@ static void cf_check complete_domain_destroy(struct rcu_head *head) */ sync_local_execstate(); - for ( i = d->max_vcpus - 1; i >= 0; i-- ) + /* + * Iterating downwards is a requirement here, as e.g. sched_destroy_vcpu() + * relies on this. + */ + for ( i = d->max_vcpus; i-- > 0; ) { if ( (v = d->vcpu[i]) == NULL ) continue; @@ -1511,7 +1515,7 @@ static void cf_check complete_domain_destroy(struct rcu_head *head) xfree(d->vm_event_share); #endif - for ( i = d->max_vcpus - 1; i >= 0; i-- ) + for ( i = d->max_vcpus; i-- > 0; ) if ( (v = d->vcpu[i]) != NULL ) vcpu_destroy(v); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247854.1546240 (Exim 4.92) (envelope-from ) id 1vyXAl-0002Ra-Hy; Fri, 06 Mar 2026 15:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247854.1546240; Fri, 06 Mar 2026 15:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXAl-0002RS-FK; Fri, 06 Mar 2026 15:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1247854; Fri, 06 Mar 2026 15:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXAj-0002RM-JH for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXAj-008J05-1k for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXAj-0025wf-1d for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LHUZ8cchh5T2i5iKt6AhI/UDKoo5WKEVHkq1BDt0WyE=; b=ViuOeN5WUH3jxbRryfGQ/uJwEh TGmN8cwn+MlLbzJ+H6kMOp9uYIGd9sD+ojcwcHoDitoDk2Z7/gpRKLT7ewyBoCEkdHpsn/9V6P2Y5 F5XMRs3SN13JAyEAmJwMZNCbC8fk1/cZQbAjxDRthpmu4VS7fdW7cePkcdS8DuZN3hqo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Message-Id: Date: Fri, 06 Mar 2026 15:33:01 +0000 commit 6adc1004f7e92374a52d70f08ff60071fb6d7416 Author: Anthony PERARD AuthorDate: Mon Dec 15 14:51:24 2025 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 10:56:40 2026 +0100 libxl: Fix device_add QMP calls with QEMU 9.2 and newer QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Tested-by: Maximilian Engelhardt Reviewed-by: Juergen Gross (cherry picked from commit 85e12104f47276b588d5efd33599c987c545eeb1) --- tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247855.1546244 (Exim 4.92) (envelope-from ) id 1vyXAv-0002TB-JS; Fri, 06 Mar 2026 15:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247855.1546244; Fri, 06 Mar 2026 15:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXAv-0002T3-Gp; Fri, 06 Mar 2026 15:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1247855; Fri, 06 Mar 2026 15:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXAt-0002Sb-Pb for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXAt-008J0M-2H for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXAt-00261d-1w for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D4MP0bAn7Mgg3iWcdrsao006Tdv3yzDElF42gFB7Neo=; b=4T2V6ChEC0ZHRxbZmm6eWSMTcj PjN7wN1zqC7u3es63Sl6Kci3WJc86QIj7K6OUzJdU+h66xquOfMYCo/mR7mgLEWijgWAYcRlU7ef6 CfkPJhW/TLkRJ6KxIdHIOvzOARdV2bidzR/jADvJfbmo6WfaFg1skGCi3Vx+rBG8V804=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] tools/xenstored: fix live update Message-Id: Date: Fri, 06 Mar 2026 15:33:11 +0000 commit 8061625411b4bc921a1701bd09457500713a782b Author: Juergen Gross AuthorDate: Tue Feb 17 11:46:29 2026 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 11:02:35 2026 +0100 tools/xenstored: fix live update Commit e5b0a940557 ("tools/xenstored: Auto-introduce domains") broke xenstored live update, as init_domains() will be skipped when live update is detected to have happened. This will leave priv_domid and store_domid set as invalid. Fix that by calling init_domains() in live update case, too. In case of live update skip introducing any found domains, as this will be done when reading the live update state. Fixes: e5b0a940557 ("tools/xenstored: Auto-introduce domains") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk (cherry picked from commit ebf99a162718c4d858d0c997b9dcf1a502c7256e) --- tools/xenstored/core.c | 3 ++- tools/xenstored/domain.c | 20 +++++++++++++------- tools/xenstored/domain.h | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 64c478a801..d509736c32 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2763,7 +2763,7 @@ int main(int argc, char *argv[]) /* Listen to hypervisor. */ if (!live_update) { domain_init(-1); - init_domains(); + init_domains(false); } /* redirect to /dev/null now we're ready to accept connections */ @@ -3109,6 +3109,7 @@ void read_state_global(const void *ctx, const void *state) set_socket_fd(glb->socket_fd); domain_init(glb->evtchn_fd); + init_domains(true); } static void add_buffered_data(struct buffered_data *bdata, diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 5ce539d640..a53b611d34 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1344,7 +1344,7 @@ static bool init_domain(unsigned int domid) return true; } -void init_domains(void) +void init_domains(bool live_update) { unsigned int *domids = NULL; unsigned int nr_domids = 0; @@ -1356,12 +1356,15 @@ void init_domains(void) while (!xenmanage_poll_changed_domain(xm_handle, &domid, &state, &caps, &unique_id)) { - nr_domids++; - domids = talloc_realloc(NULL, domids, unsigned int, nr_domids); - if (!domids) - barf_perror("Failed to reallocate domids"); - - domids[nr_domids - 1] = domid; + if (!live_update) { + nr_domids++; + domids = talloc_realloc(NULL, domids, + unsigned int, nr_domids); + if (!domids) + barf_perror("Failed to reallocate domids"); + + domids[nr_domids - 1] = domid; + } if (caps & XENMANAGE_GETDOMSTATE_CAP_CONTROL) { /* @@ -1391,6 +1394,9 @@ void init_domains(void) snprintf(store_domain_path, sizeof(store_domain_path), "/local/domain/%u", store_domid); + if (live_update) + return; + /* * Privileged domid must be first to setup structures for firing the * special watches. diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h index 3b1fce74cf..28186ccac0 100644 --- a/tools/xenstored/domain.h +++ b/tools/xenstored/domain.h @@ -92,7 +92,7 @@ int do_set_feature(const void *ctx, struct connection *conn, void domain_early_init(void); void domain_init(int evtfd); -void init_domains(void); +void init_domains(bool live_update); void stubdom_init(bool live_update); void domain_deinit(void); void ignore_connection(struct connection *conn, unsigned int err); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:33:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247856.1546248 (Exim 4.92) (envelope-from ) id 1vyXB5-0002Vp-Kw; Fri, 06 Mar 2026 15:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247856.1546248; Fri, 06 Mar 2026 15:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXB5-0002Vh-IB; Fri, 06 Mar 2026 15:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1247856; Fri, 06 Mar 2026 15:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXB3-0002VQ-Qi for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXB3-008J2n-2Z for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXB3-00262X-2R for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MxGXaLDWv0EWOanBks1g9gGg6He9oo007nM8slxqipU=; b=F3jvn+P0rHSATX0Mw2KOwA1bQv zKERPPm2/HkMVLfg6AEHwj1dDUGG+dMnWk+ixN2TH44eitwLb93bVFwJUJQHvdDpBBOjGo71qng/f +2QA9D4Y3QM0yuSNFpmUhLQZf8L2n6fR5g/L+hAky5d/nvIgTcYwJghA/bab/vMRMQ/o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] libxl: constify some local variables for building with glibc 2.43 Message-Id: Date: Fri, 06 Mar 2026 15:33:21 +0000 commit 4a7d2f18e5668e3060538f492968566b79dc9181 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 26 13:31:48 2026 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 11:03:36 2026 +0100 libxl: constify some local variables for building with glibc 2.43 Archlinux just updated glibc to 2.43+r5+g856c426a7534-1 and that causes libxl build failure: libxl_cpuid.c: In function ‘libxl_cpuid_parse_config_xend’: libxl_cpuid.c:447:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 447 | endptr = strchr(str, '='); | ^ libxl_cpuid.c:452:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 452 | endptr = strchr(str, ','); | ^ libxl_cpuid.c:454:20: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 454 | endptr = strchr(str, 0); | ^ cc1: all warnings being treated as errors Add missing consts. Note in libxl_cpuid_parse_config_xend() non-const endptr still is needed, to be compatible with the second argument to strtoul(). Add second variable for this reason. And while at it, move semicolon to its own line Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Anthony PERARD (cherry picked from commit 44da0e3b4ff7fa15ad28b628f57412a05dae653c) --- tools/libs/light/libxl_cpuid.c | 21 ++++++++++++--------- tools/libs/light/libxl_internal.c | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 8420b2465f..14f08df33a 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -440,29 +440,32 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, str = endptr + 1; entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { + const char *endptrc; + if (str[0] != 'e' || str[2] != 'x') { return 4; } value = str[1] - 'a'; - endptr = strchr(str, '='); - if (value > 3 || endptr == NULL) { + endptrc = strchr(str, '='); + if (value > 3 || endptrc == NULL) { return 4; } - str = endptr + 1; - endptr = strchr(str, ','); - if (endptr == NULL) { - endptr = strchr(str, 0); + str = endptrc + 1; + endptrc = strchr(str, ','); + if (endptrc == NULL) { + endptrc = strchr(str, 0); } - if (endptr - str != 32) { + if (endptrc - str != 32) { return 5; } entry->policy[value] = calloc(32 + 1, 1); strncpy(entry->policy[value], str, 32); entry->policy[value][32] = 0; - if (*endptr == 0) { + if (*endptrc == 0) { break; } - for (str = endptr + 1; *str == ' ' || *str == '\n'; str++); + for (str = endptrc + 1; *str == ' ' || *str == '\n'; str++) + ; } return 0; } diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index 2941ca0bbd..d70cfed7d8 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -204,7 +204,7 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c = strrchr(s, '/'); + const char *c = strrchr(s, '/'); if (!c) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:33:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247857.1546252 (Exim 4.92) (envelope-from ) id 1vyXBF-0002Y0-MB; Fri, 06 Mar 2026 15:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247857.1546252; Fri, 06 Mar 2026 15:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXBF-0002Xt-JZ; Fri, 06 Mar 2026 15:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1247857; Fri, 06 Mar 2026 15:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXBD-0002Xk-VL for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXBD-008J2r-31 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXBD-00263K-2k for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N65wWkrrTJpci6mdEpyC9sujGnoQUN1ingysguSMMGk=; b=d/ePMozzSTI39EiWl9CPWvxRLO WJTLXHGkByVu4GVW5AKIgf619j/yJ0xXMyqMsPn4B98lDGbmX6EM+pO9EMbNsYsvMNDSJN8joik5L ELq5KyYclPP2qb8NY05olYqI0FZ6xtTEtwJQWE9hQmNEr1YpG4ndO7t2vIIfDyYFmQng=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] xenstored: Add newline to error message Message-Id: Date: Fri, 06 Mar 2026 15:33:31 +0000 commit 52356ca6551ec5a952165f2fcdb308f7f897420e Author: Jason Andryuk AuthorDate: Tue Nov 25 10:25:08 2025 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:41:22 2026 +0100 xenstored: Add newline to error message Unlike barf(), xprintf() does not add a newline. Add one. Fixes: e5b0a9405571 ("tools/xenstored: Auto-introduce domains") Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross (cherry picked from commit 9c68f5e90c223d16418aeb3783b2e5123d2071a3) --- tools/xenstored/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index a53b611d34..3641f58be2 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1333,7 +1333,7 @@ static bool init_domain(unsigned int domid) domain = introduce_domain(NULL, domid, port, false); if (!domain) { - xprintf("Could not initialize dom%u", domid); + xprintf("Could not initialize dom%u\n", domid); return false; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:33:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247858.1546256 (Exim 4.92) (envelope-from ) id 1vyXBP-0002a5-NU; Fri, 06 Mar 2026 15:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247858.1546256; Fri, 06 Mar 2026 15: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 1vyXBP-0002Zx-Ky; Fri, 06 Mar 2026 15:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1247858; Fri, 06 Mar 2026 15:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXBO-0002Zp-2M for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXBO-008J2v-08 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXBO-002648-00 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15: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=TG96RUkv5DiQCTe8bEdbQj2Add4m2mqKHYqso/KCMdg=; b=sKeJA2ydkYt4RVD/d2+j9+rR+Y CyWcyRWrm1ItibWFJPoZy0/zHxpfFwFrrEfSjNlyUtL0V4FVO1DLnpHcUc9qKja4eRDnyf7u6SC2a pMcWDxTjhEXOxOGlqQAWJ5A+CoRoLRTxxsyAy/V3VBiiJiU43aFnw32bTKbmmAuRlsAw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] systemd: fall back to default system-sleep dir without systemd-devel Message-Id: Date: Fri, 06 Mar 2026 15:33:42 +0000 commit 76dc2d60719f28714b68c47d0a72c0844fa7b053 Author: Mykola Kvach AuthorDate: Fri Dec 5 18:07:15 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:42:24 2026 +0100 systemd: fall back to default system-sleep dir without systemd-devel Keep the pkg-config lookup for SYSTEMD_SLEEP_DIR, but fall back to "$(prefix)/lib/systemd/system-sleep/" if the variable remains unset. This avoids reintroducing a build-time dependency on systemd-devel while still honoring the path provided by pkg-config when present. Fixes: e54a6cd6a1f3 ("systemd: Add hooks to stop/start xen-watchdog on suspend/resume") Reported-by: Marek Marczykowski-Górecki Suggested-by: Andrew Cooper Signed-off-by: Mykola Kvach Acked-by: Andrew Cooper (cherry picked from commit b34bde262c8cf69fa235045108a0bc0309c63eac) --- m4/systemd.m4 | 2 +- tools/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index c47a25ef93..5fb5a7089e 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ ], []) AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ - AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset]) + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" ], []) ]) diff --git a/tools/configure b/tools/configure index d460f25529..d6b3487737 100755 --- a/tools/configure +++ b/tools/configure @@ -10360,7 +10360,7 @@ fi if test "x$SYSTEMD_SLEEP_DIR" = x then : - as_fn_error $? "SYSTEMD_SLEEP_DIR is unset" "$LINENO" 5 + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" fi -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:33:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247859.1546260 (Exim 4.92) (envelope-from ) id 1vyXBZ-0002cD-Oo; Fri, 06 Mar 2026 15:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247859.1546260; Fri, 06 Mar 2026 15: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 1vyXBZ-0002c5-MJ; Fri, 06 Mar 2026 15:33:53 +0000 Received: by outflank-mailman (input) for mailman id 1247859; Fri, 06 Mar 2026 15:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXBY-0002by-6b for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXBY-008J3H-0Z for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXBY-002655-0J for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15: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=wGj7ZBxqdRkLLDZLFsI+uLGlPABMTHSJaUYlIdZ5cVE=; b=RHWEOAGa928U0Cma3XeMsawl5i aKFk5HKuiyP4HQD0ocDpUni323/PWPnNlvcsu61Xk0rofDug9aZQLQZRBBs+nnMIHPfXjXpz/YbaO z33+ePJ3shFsyWSdhX47OJ9cyEu00iDO8EyHbFUHYUkKfM0Z+ibnE8AlIFDcp39CQfEQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] tools/sd-notify.h: Include string.h too Message-Id: Date: Fri, 06 Mar 2026 15:33:52 +0000 commit 18796375054498bba8a85def2f42876586fc4b8f Author: Andrew Cooper AuthorDate: Fri Dec 5 21:33:25 2025 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:42:52 2026 +0100 tools/sd-notify.h: Include string.h too Alpine Linux, when using --enable-systemd to get the init files, fails with: tools/include/xen-sd-notify.h:69:3: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 69 | memcpy(socket_addr.sun.sun_path, socket_path, path_length); | ^ This will be down to using musl rather than glibc. Include the appropriate header. Fixes: 78510f3a1522 ("tools: Import stand-alone sd_notify() implementation from systemd") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD (cherry picked from commit 8efff5a69ab7596f6c63031d0aef292114948cd9) --- tools/include/xen-sd-notify.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h index 28c9b20f15..20441d0ec9 100644 --- a/tools/include/xen-sd-notify.h +++ b/tools/include/xen-sd-notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:34:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247861.1546264 (Exim 4.92) (envelope-from ) id 1vyXBj-0002eP-Qn; Fri, 06 Mar 2026 15:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247861.1546264; Fri, 06 Mar 2026 15: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 1vyXBj-0002eI-Nh; Fri, 06 Mar 2026 15:34:03 +0000 Received: by outflank-mailman (input) for mailman id 1247861; Fri, 06 Mar 2026 15:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXBi-0002eA-BF for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXBi-008J3W-11 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXBi-00265y-0k for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15: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=UWbNjdc8ylVLIjf4TYaT+pDIPgvJ/FNcw7CTsnWPkYI=; b=Po1rYpuOqIT6b6eUMPMFuqhSp6 95c7QRgcMRLkQdl81GkC9+Ie/DSnvHZlRD+Naj1JDbbPqsOSwkObybnvGK55NhDS8J2zwGYFj00yI 6ySOWJgHPS8yNAK14yjo2gt9uunk+bJzETYDBTGnHNrKw7cG0LvQG1OLWgkQ/2ncRYag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Message-Id: Date: Fri, 06 Mar 2026 15:34:02 +0000 commit e10f3ad8694cde2c0e8a81c3825e32ecc630a51c Author: Edwin Török AuthorDate: Thu Feb 5 13:56:45 2026 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 15:02:01 2026 +0100 tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Observed when attempting to boot a >4TiB VM: After a call to domain_setmaxmem with 6370254848 (KiB), the domain's maxmem got set to 2075287552, which is exactly 2^32 smaller. xc_domain_setmaxmem takes an uint64_t as a parameter, and the OCaml value is 64-bit already, so fix the C variable to match the type and avoid the truncation. Fixes: f5b43e95facd ("libxl: fix "xl mem-set" regression from 0c029c4da2") Signed-off-by: Edwin Török Acked-by: Christian Lindig Reviewed-by: Andrew Cooper (cherry picked from commit 381b4ff16f7ff83a2dc44f16b8dd0208f3255ec7) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ac2a7537d6..c55f73b265 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -947,7 +947,7 @@ CAMLprim value stub_xc_domain_setmaxmem(value xch_val, value domid, int retval; uint32_t c_domid = Int_val(domid); - unsigned int c_max_memkb = Int64_val(max_memkb); + uint64_t c_max_memkb = Int64_val(max_memkb); caml_enter_blocking_section(); retval = xc_domain_setmaxmem(xch, c_domid, c_max_memkb); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:34:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:34:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247862.1546267 (Exim 4.92) (envelope-from ) id 1vyXBt-0002h2-Tc; Fri, 06 Mar 2026 15:34:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247862.1546267; Fri, 06 Mar 2026 15: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 1vyXBt-0002gu-RA; Fri, 06 Mar 2026 15:34:13 +0000 Received: by outflank-mailman (input) for mailman id 1247862; Fri, 06 Mar 2026 15:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXBs-0002gk-Oc for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXBs-008J3a-2M for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXBs-00267Q-2F for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15: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=p0Yb9YSdz2RlwBAbs4D355hvLQ1gJaJzhwI0ZuSHHZc=; b=Rt8ACGwca7+tcnPwnzWjcgihIe 944LeJHh3wUu2/gD+p/gqDcFMlIhKmtUPpz7MVMgbxrDfprSHxKT2Nz4skpB5EB2Jy+pqHwjuD8p6 g1/Uj8MTMRKsBOi3CFN9ZwHdMJYxsyb3nT4qnyZARfBOuc7zEqcm5oIp5FV2N+ClztKM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Message-Id: Date: Fri, 06 Mar 2026 15:34:12 +0000 commit ac333dd662e18e86ffd2afd6c10e04305c9d137b Author: Anthony PERARD AuthorDate: Mon Dec 15 14:51:24 2025 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:47:24 2026 +0100 libxl: Fix device_add QMP calls with QEMU 9.2 and newer QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Tested-by: Maximilian Engelhardt Reviewed-by: Juergen Gross (cherry picked from commit 85e12104f47276b588d5efd33599c987c545eeb1) --- tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:34:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:34:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247863.1546272 (Exim 4.92) (envelope-from ) id 1vyXC3-0002kv-V9; Fri, 06 Mar 2026 15:34:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247863.1546272; Fri, 06 Mar 2026 15: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 1vyXC3-0002kn-Sa; Fri, 06 Mar 2026 15:34:23 +0000 Received: by outflank-mailman (input) for mailman id 1247863; Fri, 06 Mar 2026 15:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXC2-0002kf-Rc for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXC2-008J3g-2f for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXC2-00268B-2X for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15: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=AKNYoNQMoCVT0HpDIf1ycqEeZOBxh3G0xfGRQ4/t1Y0=; b=CfZpogVPmaGK+mG/ptHHG0LhSV t05WVhQNSkzEibmJyeYxYAoO0O7wzlAepyi9izEWSPEPRW9aFfohiKxMfMzkG8DNsoj88OM4z6udJ 4qEueJGYKsHEiKxlHmpY80KQsbayFPXubtiW0o+4uaoEXL7znHIEWckmBgvovUbGxHR4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] libxl: constify some local variables for building with glibc 2.43 Message-Id: Date: Fri, 06 Mar 2026 15:34:22 +0000 commit 7fb8c54d678a511562e5aacf32b69323391270c3 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 26 13:31:48 2026 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:48:02 2026 +0100 libxl: constify some local variables for building with glibc 2.43 Archlinux just updated glibc to 2.43+r5+g856c426a7534-1 and that causes libxl build failure: libxl_cpuid.c: In function ‘libxl_cpuid_parse_config_xend’: libxl_cpuid.c:447:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 447 | endptr = strchr(str, '='); | ^ libxl_cpuid.c:452:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 452 | endptr = strchr(str, ','); | ^ libxl_cpuid.c:454:20: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 454 | endptr = strchr(str, 0); | ^ cc1: all warnings being treated as errors Add missing consts. Note in libxl_cpuid_parse_config_xend() non-const endptr still is needed, to be compatible with the second argument to strtoul(). Add second variable for this reason. And while at it, move semicolon to its own line Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Anthony PERARD (cherry picked from commit 44da0e3b4ff7fa15ad28b628f57412a05dae653c) --- tools/libs/light/libxl_cpuid.c | 21 ++++++++++++--------- tools/libs/light/libxl_internal.c | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index f738e17b19..ba428e5ebb 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -440,29 +440,32 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, str = endptr + 1; entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { + const char *endptrc; + if (str[0] != 'e' || str[2] != 'x') { return 4; } value = str[1] - 'a'; - endptr = strchr(str, '='); - if (value > 3 || endptr == NULL) { + endptrc = strchr(str, '='); + if (value > 3 || endptrc == NULL) { return 4; } - str = endptr + 1; - endptr = strchr(str, ','); - if (endptr == NULL) { - endptr = strchr(str, 0); + str = endptrc + 1; + endptrc = strchr(str, ','); + if (endptrc == NULL) { + endptrc = strchr(str, 0); } - if (endptr - str != 32) { + if (endptrc - str != 32) { return 5; } entry->policy[value] = calloc(32 + 1, 1); strncpy(entry->policy[value], str, 32); entry->policy[value][32] = 0; - if (*endptr == 0) { + if (*endptrc == 0) { break; } - for (str = endptr + 1; *str == ' ' || *str == '\n'; str++); + for (str = endptrc + 1; *str == ' ' || *str == '\n'; str++) + ; } return 0; } diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index c95624933f..7e3c0eaae5 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -204,7 +204,7 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c = strrchr(s, '/'); + const char *c = strrchr(s, '/'); if (!c) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:34:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247864.1546275 (Exim 4.92) (envelope-from ) id 1vyXCE-0002mx-0R; Fri, 06 Mar 2026 15:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247864.1546275; Fri, 06 Mar 2026 15:34: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 1vyXCD-0002mp-U2; Fri, 06 Mar 2026 15:34:33 +0000 Received: by outflank-mailman (input) for mailman id 1247864; Fri, 06 Mar 2026 15:34:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXCC-0002mj-U3 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXCC-008J3k-2v for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXCC-00269H-2p for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34: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=Fhcw5WBc09LreeMJJjzvvBw1PVjw7KaQJ8hROcsMbC0=; b=HeQb127iV31qoxFYqW1U+W5Cp+ xbrkQdc2b2wyWZHcReRveU/yn/qIo3i2kRbHB7KmKQL9g/w8q1QsHkgN0ALyGZIK7owjKv0zLi/i4 nwqofu1dj98sSeV2KuWEVx4qOqbrbO5pJSoCGodLJeTB8CXlFYfPV2z9MRaiLl09NH1U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] tools/sd-notify.h: Include string.h too Message-Id: Date: Fri, 06 Mar 2026 15:34:32 +0000 commit 27bf8182dbec433ecdd9b5e1e580f72b2fae7229 Author: Andrew Cooper AuthorDate: Fri Dec 5 21:33:25 2025 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:49:09 2026 +0100 tools/sd-notify.h: Include string.h too Alpine Linux, when using --enable-systemd to get the init files, fails with: tools/include/xen-sd-notify.h:69:3: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 69 | memcpy(socket_addr.sun.sun_path, socket_path, path_length); | ^ This will be down to using musl rather than glibc. Include the appropriate header. Fixes: 78510f3a1522 ("tools: Import stand-alone sd_notify() implementation from systemd") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD (cherry picked from commit 8efff5a69ab7596f6c63031d0aef292114948cd9) --- tools/include/xen-sd-notify.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h index 28c9b20f15..20441d0ec9 100644 --- a/tools/include/xen-sd-notify.h +++ b/tools/include/xen-sd-notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Fri Mar 06 15:34:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 06 Mar 2026 15:34:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1247865.1546280 (Exim 4.92) (envelope-from ) id 1vyXCO-0002oz-1h; Fri, 06 Mar 2026 15:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1247865.1546280; Fri, 06 Mar 2026 15:34: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 1vyXCN-0002or-VP; Fri, 06 Mar 2026 15:34:43 +0000 Received: by outflank-mailman (input) for mailman id 1247865; Fri, 06 Mar 2026 15:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vyXCN-0002oj-29 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vyXCM-008J3q-3B for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vyXCM-0026Ag-35 for xen-changelog@lists.xenproject.org; Fri, 06 Mar 2026 15:34: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=0xV4rN0EkOU3KnTP/8cvXNMwRCjIQ03uItfiJVXOrcY=; b=HLbNx+WfcBSe/SkxqLrJLwbwWQ cp8xGrIOd3+NEDSVB9FpmNnpYAstMfe0eiHT+ncfIbVi9P0lcLYAhv2F0U3GNJIcrCdQEEMPNivM6 IeNcVtV4uXXKbmE+BzJmKZ7WQ6/6+WN+9G9zAmcTf5xVOO3ApdccSIItglMX0JzTE1hE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Message-Id: Date: Fri, 06 Mar 2026 15:34:42 +0000 commit f833d29a3af7708b30b6076ed5c48c12481914ef Author: Edwin Török AuthorDate: Thu Feb 5 13:56:45 2026 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 15:02:04 2026 +0100 tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Observed when attempting to boot a >4TiB VM: After a call to domain_setmaxmem with 6370254848 (KiB), the domain's maxmem got set to 2075287552, which is exactly 2^32 smaller. xc_domain_setmaxmem takes an uint64_t as a parameter, and the OCaml value is 64-bit already, so fix the C variable to match the type and avoid the truncation. Fixes: f5b43e95facd ("libxl: fix "xl mem-set" regression from 0c029c4da2") Signed-off-by: Edwin Török Acked-by: Christian Lindig Reviewed-by: Andrew Cooper (cherry picked from commit 381b4ff16f7ff83a2dc44f16b8dd0208f3255ec7) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 863ab3c778..90353ec89d 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -934,7 +934,7 @@ CAMLprim value stub_xc_domain_setmaxmem(value xch_val, value domid, int retval; uint32_t c_domid = Int_val(domid); - unsigned int c_max_memkb = Int64_val(max_memkb); + uint64_t c_max_memkb = Int64_val(max_memkb); caml_enter_blocking_section(); retval = xc_domain_setmaxmem(xch, c_domid, c_max_memkb); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249489.1546939 (Exim 4.92) (envelope-from ) id 1vzaYn-0007nr-A3; Mon, 09 Mar 2026 13:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249489.1546939; Mon, 09 Mar 2026 13: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 1vzaYn-0007ng-7J; Mon, 09 Mar 2026 13:22:13 +0000 Received: by outflank-mailman (input) for mailman id 1249489; Mon, 09 Mar 2026 13:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaYm-0007nU-26 for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaYm-0003j5-0Z for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaYl-000BHx-2Z for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=EEO9ZeExsLkZCRujxVcKzUT9iCt1DLrqNHADm7NEt80=; b=beBjwNBCP0hjZmqZkbDV1cyyC0 Hb7qM7m9mukA5Yb9Aoqimsuf6QozuDpH2iRFZdnFudY5XI1/bh45Q4kB/jE+zjeW8JRyd0FAFc9vV CBwF6fcP6Bt+NSFeGJ4pUhzv5pL5ygrb9aDWDC9XPyZw1mdAVPZa7PzMGQ+CAKHKmNIk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] tools/xenstored: fix live update Message-Id: Date: Mon, 09 Mar 2026 13:22:11 +0000 commit 8061625411b4bc921a1701bd09457500713a782b Author: Juergen Gross AuthorDate: Tue Feb 17 11:46:29 2026 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 11:02:35 2026 +0100 tools/xenstored: fix live update Commit e5b0a940557 ("tools/xenstored: Auto-introduce domains") broke xenstored live update, as init_domains() will be skipped when live update is detected to have happened. This will leave priv_domid and store_domid set as invalid. Fix that by calling init_domains() in live update case, too. In case of live update skip introducing any found domains, as this will be done when reading the live update state. Fixes: e5b0a940557 ("tools/xenstored: Auto-introduce domains") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk (cherry picked from commit ebf99a162718c4d858d0c997b9dcf1a502c7256e) --- tools/xenstored/core.c | 3 ++- tools/xenstored/domain.c | 20 +++++++++++++------- tools/xenstored/domain.h | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 64c478a801..d509736c32 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2763,7 +2763,7 @@ int main(int argc, char *argv[]) /* Listen to hypervisor. */ if (!live_update) { domain_init(-1); - init_domains(); + init_domains(false); } /* redirect to /dev/null now we're ready to accept connections */ @@ -3109,6 +3109,7 @@ void read_state_global(const void *ctx, const void *state) set_socket_fd(glb->socket_fd); domain_init(glb->evtchn_fd); + init_domains(true); } static void add_buffered_data(struct buffered_data *bdata, diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 5ce539d640..a53b611d34 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1344,7 +1344,7 @@ static bool init_domain(unsigned int domid) return true; } -void init_domains(void) +void init_domains(bool live_update) { unsigned int *domids = NULL; unsigned int nr_domids = 0; @@ -1356,12 +1356,15 @@ void init_domains(void) while (!xenmanage_poll_changed_domain(xm_handle, &domid, &state, &caps, &unique_id)) { - nr_domids++; - domids = talloc_realloc(NULL, domids, unsigned int, nr_domids); - if (!domids) - barf_perror("Failed to reallocate domids"); - - domids[nr_domids - 1] = domid; + if (!live_update) { + nr_domids++; + domids = talloc_realloc(NULL, domids, + unsigned int, nr_domids); + if (!domids) + barf_perror("Failed to reallocate domids"); + + domids[nr_domids - 1] = domid; + } if (caps & XENMANAGE_GETDOMSTATE_CAP_CONTROL) { /* @@ -1391,6 +1394,9 @@ void init_domains(void) snprintf(store_domain_path, sizeof(store_domain_path), "/local/domain/%u", store_domid); + if (live_update) + return; + /* * Privileged domid must be first to setup structures for firing the * special watches. diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h index 3b1fce74cf..28186ccac0 100644 --- a/tools/xenstored/domain.h +++ b/tools/xenstored/domain.h @@ -92,7 +92,7 @@ int do_set_feature(const void *ctx, struct connection *conn, void domain_early_init(void); void domain_init(int evtfd); -void init_domains(void); +void init_domains(bool live_update); void stubdom_init(bool live_update); void domain_deinit(void); void ignore_connection(struct connection *conn, unsigned int err); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249488.1546934 (Exim 4.92) (envelope-from ) id 1vzaYd-0007mF-8W; Mon, 09 Mar 2026 13:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249488.1546934; Mon, 09 Mar 2026 13:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaYd-0007m7-5y; Mon, 09 Mar 2026 13:22:03 +0000 Received: by outflank-mailman (input) for mailman id 1249488; Mon, 09 Mar 2026 13:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaYb-0007m0-QY for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaYb-0003im-34 for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaYb-000BH4-1j for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=CyxzRJgmE5HZ2K1lah62GLbBCFd8sndsXtfgRL4MWfM=; b=UPKTlbqxYUNvuQP5hsskoOjKWp 2OFoijfcQo23Me9D+VBbHqszVLWuZUCJU9k3S4V9NQ5OcCSCGjBHRDsg8wvOJKEyBO/UMx6WoTOVH 0v8TzNEr3CKr6Yti2G+6JYD2eyGcS4AEfis55AAX+qe2GoZLI+90HFmZpnolKE+IFkBk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Message-Id: Date: Mon, 09 Mar 2026 13:22:01 +0000 commit 6adc1004f7e92374a52d70f08ff60071fb6d7416 Author: Anthony PERARD AuthorDate: Mon Dec 15 14:51:24 2025 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 10:56:40 2026 +0100 libxl: Fix device_add QMP calls with QEMU 9.2 and newer QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Tested-by: Maximilian Engelhardt Reviewed-by: Juergen Gross (cherry picked from commit 85e12104f47276b588d5efd33599c987c545eeb1) --- tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:22:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249490.1546942 (Exim 4.92) (envelope-from ) id 1vzaYy-0007rx-B8; Mon, 09 Mar 2026 13:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249490.1546942; Mon, 09 Mar 2026 13:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaYy-0007rq-8g; Mon, 09 Mar 2026 13:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1249490; Mon, 09 Mar 2026 13:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaYw-0007ra-8h for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaYw-0003jF-16 for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaYw-000BKa-04 for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=VsrANpE6c6M6ObGmGJe6X/2Rbiba295Od4W28Pj7zpc=; b=a17QAmYfcGrTXxIBFjGT+i2v1M p5lBCIYIhGpiolgCMa8/r16AY6xlwKIiQ/ZYolez2j0aO4St/qvCtFIrDj9s5qi/3iibTPDH8QFh4 0InaJR16SHvxeXqrObrZQXbXBwNQfElFfdVWxnHs1ywCqHDq9mBY4j2eyuik9BWMNkfo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] libxl: constify some local variables for building with glibc 2.43 Message-Id: Date: Mon, 09 Mar 2026 13:22:22 +0000 commit 4a7d2f18e5668e3060538f492968566b79dc9181 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 26 13:31:48 2026 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 11:03:36 2026 +0100 libxl: constify some local variables for building with glibc 2.43 Archlinux just updated glibc to 2.43+r5+g856c426a7534-1 and that causes libxl build failure: libxl_cpuid.c: In function ‘libxl_cpuid_parse_config_xend’: libxl_cpuid.c:447:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 447 | endptr = strchr(str, '='); | ^ libxl_cpuid.c:452:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 452 | endptr = strchr(str, ','); | ^ libxl_cpuid.c:454:20: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 454 | endptr = strchr(str, 0); | ^ cc1: all warnings being treated as errors Add missing consts. Note in libxl_cpuid_parse_config_xend() non-const endptr still is needed, to be compatible with the second argument to strtoul(). Add second variable for this reason. And while at it, move semicolon to its own line Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Anthony PERARD (cherry picked from commit 44da0e3b4ff7fa15ad28b628f57412a05dae653c) --- tools/libs/light/libxl_cpuid.c | 21 ++++++++++++--------- tools/libs/light/libxl_internal.c | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 8420b2465f..14f08df33a 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -440,29 +440,32 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, str = endptr + 1; entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { + const char *endptrc; + if (str[0] != 'e' || str[2] != 'x') { return 4; } value = str[1] - 'a'; - endptr = strchr(str, '='); - if (value > 3 || endptr == NULL) { + endptrc = strchr(str, '='); + if (value > 3 || endptrc == NULL) { return 4; } - str = endptr + 1; - endptr = strchr(str, ','); - if (endptr == NULL) { - endptr = strchr(str, 0); + str = endptrc + 1; + endptrc = strchr(str, ','); + if (endptrc == NULL) { + endptrc = strchr(str, 0); } - if (endptr - str != 32) { + if (endptrc - str != 32) { return 5; } entry->policy[value] = calloc(32 + 1, 1); strncpy(entry->policy[value], str, 32); entry->policy[value][32] = 0; - if (*endptr == 0) { + if (*endptrc == 0) { break; } - for (str = endptr + 1; *str == ' ' || *str == '\n'; str++); + for (str = endptrc + 1; *str == ' ' || *str == '\n'; str++) + ; } return 0; } diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index 2941ca0bbd..d70cfed7d8 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -204,7 +204,7 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c = strrchr(s, '/'); + const char *c = strrchr(s, '/'); if (!c) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:22:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249491.1546946 (Exim 4.92) (envelope-from ) id 1vzaZ7-0007u8-Ct; Mon, 09 Mar 2026 13:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249491.1546946; Mon, 09 Mar 2026 13: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 1vzaZ7-0007u1-AE; Mon, 09 Mar 2026 13:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1249491; Mon, 09 Mar 2026 13:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaZ6-0007tt-9a for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaZ6-0003jb-1Y for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaZ6-000BLL-0a for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=PSI63XK0YMz01U/+W93WpTTIlVpuz8ZpuO6WOcUwEj0=; b=eXSQhrAdx0EhbZXRR7yEw2bYLv gsqxSlcoP6tZ/HDhoEA4TgoS3SaCVV6zaBAm1+wTdTNX7HEVBUGFV0OVCSTsj7CMQYmOkwXrKtkYi h99BFq4u2npHgm30KsWZit5yTyp4hH2llJ2DueR2N+stx4vXEfYisiXckDTxQkS9vdAg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] xenstored: Add newline to error message Message-Id: Date: Mon, 09 Mar 2026 13:22:32 +0000 commit 52356ca6551ec5a952165f2fcdb308f7f897420e Author: Jason Andryuk AuthorDate: Tue Nov 25 10:25:08 2025 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:41:22 2026 +0100 xenstored: Add newline to error message Unlike barf(), xprintf() does not add a newline. Add one. Fixes: e5b0a9405571 ("tools/xenstored: Auto-introduce domains") Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross (cherry picked from commit 9c68f5e90c223d16418aeb3783b2e5123d2071a3) --- tools/xenstored/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index a53b611d34..3641f58be2 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1333,7 +1333,7 @@ static bool init_domain(unsigned int domid) domain = introduce_domain(NULL, domid, port, false); if (!domain) { - xprintf("Could not initialize dom%u", domid); + xprintf("Could not initialize dom%u\n", domid); return false; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:22:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249492.1546951 (Exim 4.92) (envelope-from ) id 1vzaZH-0007wG-Ek; Mon, 09 Mar 2026 13:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249492.1546951; Mon, 09 Mar 2026 13: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 1vzaZH-0007w9-Bk; Mon, 09 Mar 2026 13:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1249492; Mon, 09 Mar 2026 13:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaZG-0007w1-EY for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaZG-0003jg-1s for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaZG-000BM1-15 for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=vXazqUrCFKBEt2rgJBVfiOobuNQ9hw4PCDCglZtcNGc=; b=66bZI3mGt8GoU7KUbSaL+DTeN4 WV9C054IrBnOafPOqGY/5FuXEr7z9hozkSowS7MXkJJGareQMS9+PLhPYsMs0S/8bAbfFba1F10Vx NygJSOG2jfM9iRsC3DKSisagikOY4qEKNVM1H9psw8y1y15zt60qzLnuWO7XO4SGD8tE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] systemd: fall back to default system-sleep dir without systemd-devel Message-Id: Date: Mon, 09 Mar 2026 13:22:42 +0000 commit 76dc2d60719f28714b68c47d0a72c0844fa7b053 Author: Mykola Kvach AuthorDate: Fri Dec 5 18:07:15 2025 +0200 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:42:24 2026 +0100 systemd: fall back to default system-sleep dir without systemd-devel Keep the pkg-config lookup for SYSTEMD_SLEEP_DIR, but fall back to "$(prefix)/lib/systemd/system-sleep/" if the variable remains unset. This avoids reintroducing a build-time dependency on systemd-devel while still honoring the path provided by pkg-config when present. Fixes: e54a6cd6a1f3 ("systemd: Add hooks to stop/start xen-watchdog on suspend/resume") Reported-by: Marek Marczykowski-Górecki Suggested-by: Andrew Cooper Signed-off-by: Mykola Kvach Acked-by: Andrew Cooper (cherry picked from commit b34bde262c8cf69fa235045108a0bc0309c63eac) --- m4/systemd.m4 | 2 +- tools/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index c47a25ef93..5fb5a7089e 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ ], []) AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ - AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset]) + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" ], []) ]) diff --git a/tools/configure b/tools/configure index d460f25529..d6b3487737 100755 --- a/tools/configure +++ b/tools/configure @@ -10360,7 +10360,7 @@ fi if test "x$SYSTEMD_SLEEP_DIR" = x then : - as_fn_error $? "SYSTEMD_SLEEP_DIR is unset" "$LINENO" 5 + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" fi -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:22:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249493.1546956 (Exim 4.92) (envelope-from ) id 1vzaZR-0007yM-Ga; Mon, 09 Mar 2026 13:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249493.1546956; Mon, 09 Mar 2026 13: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 1vzaZR-0007yE-DJ; Mon, 09 Mar 2026 13:22:53 +0000 Received: by outflank-mailman (input) for mailman id 1249493; Mon, 09 Mar 2026 13:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaZQ-0007y6-Fc for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaZQ-0003jo-2A for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaZQ-000BMi-1M for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=D3A/c7+h/KI2LzNYwrvWnwrgfxkteJKL6tAxKa5gVYw=; b=rSn2kCr8bVXwa/ERlJtlh+a22Y sEhYDd9YJw7Y6tsALeSyPQY6dVWO8U+LbO26GpjLbD0h/GBZvSbE8lklGH/cf2EO7iDis8uHhvPMG 6YjSeNmMkWjtYgfxEEqGd60D8skYXZ5plNPsVbT+hxXBnhFLzDgJtMnoXLFqo0WRuYrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] tools/sd-notify.h: Include string.h too Message-Id: Date: Mon, 09 Mar 2026 13:22:52 +0000 commit 18796375054498bba8a85def2f42876586fc4b8f Author: Andrew Cooper AuthorDate: Fri Dec 5 21:33:25 2025 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:42:52 2026 +0100 tools/sd-notify.h: Include string.h too Alpine Linux, when using --enable-systemd to get the init files, fails with: tools/include/xen-sd-notify.h:69:3: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 69 | memcpy(socket_addr.sun.sun_path, socket_path, path_length); | ^ This will be down to using musl rather than glibc. Include the appropriate header. Fixes: 78510f3a1522 ("tools: Import stand-alone sd_notify() implementation from systemd") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD (cherry picked from commit 8efff5a69ab7596f6c63031d0aef292114948cd9) --- tools/include/xen-sd-notify.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h index 28c9b20f15..20441d0ec9 100644 --- a/tools/include/xen-sd-notify.h +++ b/tools/include/xen-sd-notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 13:23:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 13:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249494.1546959 (Exim 4.92) (envelope-from ) id 1vzaZb-00080S-HP; Mon, 09 Mar 2026 13:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249494.1546959; Mon, 09 Mar 2026 13: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 1vzaZb-00080K-Ej; Mon, 09 Mar 2026 13:23:03 +0000 Received: by outflank-mailman (input) for mailman id 1249494; Mon, 09 Mar 2026 13:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzaZa-000808-IO for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzaZa-0003k6-2Q for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzaZa-000BNQ-1e for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 13: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=oiu/R5exxYWmi7QAsQG6J9OY0ukDvn3oYw1apfkIDBc=; b=oAb7UVUewFeLYqxMYxNbISWZyk ANmkv2DQLZKfAOn0+IbgSi3yjq6pDZfjnUOO7Zt7rOc3LFZrD9o6qNd3U4CYXBQ3ZFp5TSnAKM71q MLT/J8JrJqX8nSO4nZsFvXMBXYCbmzJPfuy9NaN3WYHVLNusb9IcWUlNZ0yAlAETwFlE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Message-Id: Date: Mon, 09 Mar 2026 13:23:02 +0000 commit e10f3ad8694cde2c0e8a81c3825e32ecc630a51c Author: Edwin Török AuthorDate: Thu Feb 5 13:56:45 2026 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 15:02:01 2026 +0100 tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Observed when attempting to boot a >4TiB VM: After a call to domain_setmaxmem with 6370254848 (KiB), the domain's maxmem got set to 2075287552, which is exactly 2^32 smaller. xc_domain_setmaxmem takes an uint64_t as a parameter, and the OCaml value is 64-bit already, so fix the C variable to match the type and avoid the truncation. Fixes: f5b43e95facd ("libxl: fix "xl mem-set" regression from 0c029c4da2") Signed-off-by: Edwin Török Acked-by: Christian Lindig Reviewed-by: Andrew Cooper (cherry picked from commit 381b4ff16f7ff83a2dc44f16b8dd0208f3255ec7) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ac2a7537d6..c55f73b265 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -947,7 +947,7 @@ CAMLprim value stub_xc_domain_setmaxmem(value xch_val, value domid, int retval; uint32_t c_domid = Int_val(domid); - unsigned int c_max_memkb = Int64_val(max_memkb); + uint64_t c_max_memkb = Int64_val(max_memkb); caml_enter_blocking_section(); retval = xc_domain_setmaxmem(xch, c_domid, c_max_memkb); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 14:11:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 14:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249521.1546984 (Exim 4.92) (envelope-from ) id 1vzbK4-0006Uc-Dh; Mon, 09 Mar 2026 14:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249521.1546984; Mon, 09 Mar 2026 14: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 1vzbK4-0006UU-Au; Mon, 09 Mar 2026 14:11:04 +0000 Received: by outflank-mailman (input) for mailman id 1249521; Mon, 09 Mar 2026 14:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzbK2-0006UO-EQ for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzbK2-0004k2-1i for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzbK2-000EnE-0t for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TyWzy6Cdukg4FZvjm8J0dlIbS/4yESSIrraIShAsv0Y=; b=62sPaSmAxp+HW0E1pAbssXnfV+ Yq9Vbj2nFwjsZffuGwMJQWURgv8Z59py8IiPbVwZDRqU7o1czP7PWTGKeCYDx1mZdKJHpqPHTB7QK 9jVmRbly9M+7pJoCxfkXszMFTof96Ju2fR4yaLMrYJwfN5bGJvL4DjyjUYLcpXe+qVVs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Message-Id: Date: Mon, 09 Mar 2026 14:11:02 +0000 commit ac333dd662e18e86ffd2afd6c10e04305c9d137b Author: Anthony PERARD AuthorDate: Mon Dec 15 14:51:24 2025 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:47:24 2026 +0100 libxl: Fix device_add QMP calls with QEMU 9.2 and newer QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Tested-by: Maximilian Engelhardt Reviewed-by: Juergen Gross (cherry picked from commit 85e12104f47276b588d5efd33599c987c545eeb1) --- tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 14:11:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 14:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249522.1546988 (Exim 4.92) (envelope-from ) id 1vzbKE-0006Ws-FK; Mon, 09 Mar 2026 14:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249522.1546988; Mon, 09 Mar 2026 14:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzbKE-0006Wk-CL; Mon, 09 Mar 2026 14:11:14 +0000 Received: by outflank-mailman (input) for mailman id 1249522; Mon, 09 Mar 2026 14:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzbKC-0006WW-G0 for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzbKC-0004kC-2B for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzbKC-000EoH-1C for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YFEpcSPkYjSWx/6xzQVulfTwqxD4FglhYoZ3KSTYCtE=; b=WWpkjFxp02q6rB6zdidJr+h+as oDo2TFti10JLj+gv0/rkoqv3wnAZvlzMh8+ZPWudDBKq+OxxAcafjK1w84X6tNEtHd8qeONuIMpGd Z5aa3k6J9NoqSj8cpXfgA21L4PoDphWr5ixcOexuYhrlu7agflSm76IYnzGxV58JYhm8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] libxl: constify some local variables for building with glibc 2.43 Message-Id: Date: Mon, 09 Mar 2026 14:11:12 +0000 commit 7fb8c54d678a511562e5aacf32b69323391270c3 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 26 13:31:48 2026 +0100 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:48:02 2026 +0100 libxl: constify some local variables for building with glibc 2.43 Archlinux just updated glibc to 2.43+r5+g856c426a7534-1 and that causes libxl build failure: libxl_cpuid.c: In function ‘libxl_cpuid_parse_config_xend’: libxl_cpuid.c:447:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 447 | endptr = strchr(str, '='); | ^ libxl_cpuid.c:452:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 452 | endptr = strchr(str, ','); | ^ libxl_cpuid.c:454:20: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 454 | endptr = strchr(str, 0); | ^ cc1: all warnings being treated as errors Add missing consts. Note in libxl_cpuid_parse_config_xend() non-const endptr still is needed, to be compatible with the second argument to strtoul(). Add second variable for this reason. And while at it, move semicolon to its own line Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Anthony PERARD (cherry picked from commit 44da0e3b4ff7fa15ad28b628f57412a05dae653c) --- tools/libs/light/libxl_cpuid.c | 21 ++++++++++++--------- tools/libs/light/libxl_internal.c | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index f738e17b19..ba428e5ebb 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -440,29 +440,32 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, str = endptr + 1; entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { + const char *endptrc; + if (str[0] != 'e' || str[2] != 'x') { return 4; } value = str[1] - 'a'; - endptr = strchr(str, '='); - if (value > 3 || endptr == NULL) { + endptrc = strchr(str, '='); + if (value > 3 || endptrc == NULL) { return 4; } - str = endptr + 1; - endptr = strchr(str, ','); - if (endptr == NULL) { - endptr = strchr(str, 0); + str = endptrc + 1; + endptrc = strchr(str, ','); + if (endptrc == NULL) { + endptrc = strchr(str, 0); } - if (endptr - str != 32) { + if (endptrc - str != 32) { return 5; } entry->policy[value] = calloc(32 + 1, 1); strncpy(entry->policy[value], str, 32); entry->policy[value][32] = 0; - if (*endptr == 0) { + if (*endptrc == 0) { break; } - for (str = endptr + 1; *str == ' ' || *str == '\n'; str++); + for (str = endptrc + 1; *str == ' ' || *str == '\n'; str++) + ; } return 0; } diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index c95624933f..7e3c0eaae5 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -204,7 +204,7 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c = strrchr(s, '/'); + const char *c = strrchr(s, '/'); if (!c) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 14:11:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 14:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249523.1546992 (Exim 4.92) (envelope-from ) id 1vzbKO-0006Yz-GO; Mon, 09 Mar 2026 14:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249523.1546992; Mon, 09 Mar 2026 14: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 1vzbKO-0006Ys-Dg; Mon, 09 Mar 2026 14:11:24 +0000 Received: by outflank-mailman (input) for mailman id 1249523; Mon, 09 Mar 2026 14:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzbKM-0006Yk-Iy for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzbKM-0004kG-2R for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzbKM-000Epr-1g for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aVI6zUMHsGLYlFwPHzsSbsMykaJQmhyWfwe3aLdzKLQ=; b=MZLBfbcFYv0owXgn9eVH80zrj/ K2lUBh6+puXmzKUwmKtcWIdZ7fxuJy+ziVjcuxwfQNOMm/g+q8u1yft4AWfm+McG8MahkF35nEdGL /HLqgypewdVI7P7e3M1/pQSAHEy5VsUYrI//ryNWmBSxTpTis6rnyNvXY2QXP7xghuT8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] tools/sd-notify.h: Include string.h too Message-Id: Date: Mon, 09 Mar 2026 14:11:22 +0000 commit 27bf8182dbec433ecdd9b5e1e580f72b2fae7229 Author: Andrew Cooper AuthorDate: Fri Dec 5 21:33:25 2025 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 14:49:09 2026 +0100 tools/sd-notify.h: Include string.h too Alpine Linux, when using --enable-systemd to get the init files, fails with: tools/include/xen-sd-notify.h:69:3: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 69 | memcpy(socket_addr.sun.sun_path, socket_path, path_length); | ^ This will be down to using musl rather than glibc. Include the appropriate header. Fixes: 78510f3a1522 ("tools: Import stand-alone sd_notify() implementation from systemd") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD (cherry picked from commit 8efff5a69ab7596f6c63031d0aef292114948cd9) --- tools/include/xen-sd-notify.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h index 28c9b20f15..20441d0ec9 100644 --- a/tools/include/xen-sd-notify.h +++ b/tools/include/xen-sd-notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Mon Mar 09 14:11:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 09 Mar 2026 14:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249524.1546995 (Exim 4.92) (envelope-from ) id 1vzbKY-0006b4-Hk; Mon, 09 Mar 2026 14:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249524.1546995; Mon, 09 Mar 2026 14: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 1vzbKY-0006aw-FB; Mon, 09 Mar 2026 14:11:34 +0000 Received: by outflank-mailman (input) for mailman id 1249524; Mon, 09 Mar 2026 14:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzbKW-0006ao-LA for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzbKW-0004ki-2h for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzbKW-000Eqf-1w for xen-changelog@lists.xenproject.org; Mon, 09 Mar 2026 14:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=h+1BOCzv4tSblXGqBr/8u4cYTti5ACrbDbpMUxYO2Pc=; b=5BjFc2FwYbM77VofjgcqLQq2nA mijpDQ7O2fO85LZwraly1MWRXg4ElEbYlkxmF1ysTB4JZAOoqTucTxwsuCLMTxBs5/GLZSvgdrC4D vkLGoZEyiatTZRqjutyQWc7ArI5Ts2GIJHS9lIxmHJmezRBXREgYgL6sn0P8+pdiKGT0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Message-Id: Date: Mon, 09 Mar 2026 14:11:32 +0000 commit f833d29a3af7708b30b6076ed5c48c12481914ef Author: Edwin Török AuthorDate: Thu Feb 5 13:56:45 2026 +0000 Commit: Anthony PERARD CommitDate: Fri Mar 6 15:02:04 2026 +0100 tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Observed when attempting to boot a >4TiB VM: After a call to domain_setmaxmem with 6370254848 (KiB), the domain's maxmem got set to 2075287552, which is exactly 2^32 smaller. xc_domain_setmaxmem takes an uint64_t as a parameter, and the OCaml value is 64-bit already, so fix the C variable to match the type and avoid the truncation. Fixes: f5b43e95facd ("libxl: fix "xl mem-set" regression from 0c029c4da2") Signed-off-by: Edwin Török Acked-by: Christian Lindig Reviewed-by: Andrew Cooper (cherry picked from commit 381b4ff16f7ff83a2dc44f16b8dd0208f3255ec7) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 863ab3c778..90353ec89d 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -934,7 +934,7 @@ CAMLprim value stub_xc_domain_setmaxmem(value xch_val, value domid, int retval; uint32_t c_domid = Int_val(domid); - unsigned int c_max_memkb = Int64_val(max_memkb); + uint64_t c_max_memkb = Int64_val(max_memkb); caml_enter_blocking_section(); retval = xc_domain_setmaxmem(xch, c_domid, c_max_memkb); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:33:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249961.1547321 (Exim 4.92) (envelope-from ) id 1vzuOd-0005Pw-Dd; Tue, 10 Mar 2026 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249961.1547321; Tue, 10 Mar 2026 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 1vzuOd-0005Po-Av; Tue, 10 Mar 2026 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1249961; Tue, 10 Mar 2026 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 1vzuOb-0005Pi-Qk for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzuOb-001aDs-35 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuOb-001ds0-2H for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=5GcYwzDSN1GHu4ETVe3fMxCQya9894kNqYpGbGyuj0c=; b=RWwVprHrwWOpmlnlmfEF3Ksqac B53Au/MOnT6eNFcGNcKancYPhN2cu42detyYA+sjJbv4+mMnL85PMjEc7xwA1aXHSCMqetLkLXJ8z B9QLcyMgqTALdRFVsqQscGgDjXwnwAFPCueAzWa3i5Ar56Ocu9CsDfMaEYd6Ifkscs8I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 10:33:01 +0000 commit adfbdaa347d05e53c8c61ad00a6851bd5b82c760 Author: Jan Beulich AuthorDate: Tue Mar 10 09:23:25 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:23:25 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d24be268ae..ab910fcf93 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -500,14 +500,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249962.1547325 (Exim 4.92) (envelope-from ) id 1vzuOn-0005Rm-F0; Tue, 10 Mar 2026 10:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249962.1547325; Tue, 10 Mar 2026 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 1vzuOn-0005Re-CL; Tue, 10 Mar 2026 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1249962; Tue, 10 Mar 2026 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 1vzuOl-0005RL-Rv for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzuOm-001aE9-09 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuOl-001dt1-2a for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=WMIBxl8IAnDfL5MDXsdyFTyv8atOPkS3r8GJ0Pyj3Y0=; b=ESnuRHXuOqEAPDueIv4P42q/ZA jR4Oik0FWT2w2vvEk+m1LHUxyLXjn44CyGnJ7fpleHzdGgZ+HGc8zoWkB57EjjVAYnOth9UWNiVCt 373uWEI7K/4LHQvHTVOMN/H/a7JX67djjtqSaA3eYdk64gb9O9zeDBflElCVDyeUebVw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vPCI: re-init extended-capabilities when MMCFG availability changed Message-Id: Date: Tue, 10 Mar 2026 10:33:11 +0000 commit d734babf8bc3407919cfd023e2c58bcce24eccfb Author: Jan Beulich AuthorDate: Tue Mar 10 09:24:00 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:24:00 2026 +0100 vPCI: re-init extended-capabilities when MMCFG availability changed When Dom0 informs us about MMCFG usability, this may change whether extended capabilities are available (accessible) for devices. Zap what might be on record, and re-initialize things. No synchronization is added for the case where devices may already be in use. That'll need sorting when (a) DomU support was added and (b) DomU-s may run already while Dom0 / hwdom still boots (dom0less, Hyperlaunch). vpci_cleanup_capabilities() also shouldn't have used pci_find_ext_capability(), as already when the function was introduced extended config space may not have been (properly) accessible anymore, no matter whether it was during init. Extended capability cleanup hooks need to cope with being called when the respective capability doesn't exist (and hence the corresponding ->init() hook was never called). Fixes: 70e6dace747e ("vpci: Use cleanup to free capability resource during deassign") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/physdev.c | 13 ++++++++++ xen/drivers/vpci/cap.c | 64 +++++++++++++++++++++++++++++++++++----------- xen/drivers/vpci/private.h | 4 +-- xen/drivers/vpci/vpci.c | 4 +-- xen/include/xen/vpci.h | 7 +++++ 5 files changed, 73 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 8496011b59..5bbcf3b530 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -8,6 +8,8 @@ #include #include #include +#include + #include #include #include @@ -169,8 +171,19 @@ int cf_check physdev_check_pci_extcfg(struct pci_dev *pdev, void *arg) ASSERT(pdev->seg == info->segment); if ( pdev->bus >= info->start_bus && pdev->bus <= info->end_bus ) + { pci_check_extcfg(pdev); + /* + * The re-init failing doesn't mean the device becomes entirely non- + * functional. In case of failure, a message was already logged. + * Hence don't otherwise act upon failure. + * + * FIXME: Re-visit when DomU support is added to vPCI. + */ + vpci_reinit_ext_capabilities(pdev); + } + return 0; } #endif /* COMPAT */ diff --git a/xen/drivers/vpci/cap.c b/xen/drivers/vpci/cap.c index e26a2f95da..3c3e6ce1d3 100644 --- a/xen/drivers/vpci/cap.c +++ b/xen/drivers/vpci/cap.c @@ -285,13 +285,16 @@ static int vpci_init_ext_capability_list(const struct pci_dev *pdev) return 0; } -int vpci_init_capabilities(struct pci_dev *pdev) +int vpci_init_capabilities(struct pci_dev *pdev, bool ext_only) { - int rc; + int rc, accum_rc = 0; - rc = vpci_init_capability_list(pdev); - if ( rc ) - return rc; + if ( !ext_only ) + { + rc = vpci_init_capability_list(pdev); + if ( rc ) + return rc; + } rc = vpci_init_ext_capability_list(pdev); if ( rc ) @@ -305,7 +308,7 @@ int vpci_init_capabilities(struct pci_dev *pdev) unsigned int pos = 0; if ( !is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); + pos = !ext_only ? pci_find_cap_offset(pdev->sbdf, cap) : 0; else if ( is_hardware_domain(pdev->domain) ) pos = pci_find_ext_capability(pdev, cap); @@ -341,30 +344,40 @@ int vpci_init_capabilities(struct pci_dev *pdev) { printk(XENLOG_ERR "%pd %pp: hide %s cap %u fail rc=%d\n", pdev->domain, &pdev->sbdf, type, cap, rc); - return rc; + + /* Best effort for the re-init case. */ + if ( !ext_only ) + return rc; + + if ( !accum_rc ) + accum_rc = rc; } } } - return 0; + return accum_rc; } -void vpci_cleanup_capabilities(struct pci_dev *pdev) +void vpci_cleanup_capabilities(struct pci_dev *pdev, bool ext_only) { for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) { const vpci_capability_t *capability = &__start_vpci_array[i]; const unsigned int cap = capability->id; - unsigned int pos = 0; if ( !capability->cleanup ) continue; - if ( !capability->is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); - else if ( is_hardware_domain(pdev->domain) ) - pos = pci_find_ext_capability(pdev, cap); - if ( pos ) + /* + * Cannot call pci_find_ext_capability() here, as extended config space + * may (no longer) be accessible. As a result, extended capability + * ->cleanup() handlers need to cope with being called despite ->init() + * never having been called. Which in turn allows calling them even + * for DomU-s, no matter that vpci_init_capabilities() excludes them + * there for now. + */ + if ( capability->is_ext + || (!ext_only && pci_find_cap_offset(pdev->sbdf, cap)) ) { int rc = capability->cleanup(pdev, false); @@ -376,6 +389,27 @@ void vpci_cleanup_capabilities(struct pci_dev *pdev) } } +int vpci_reinit_ext_capabilities(struct pci_dev *pdev) +{ + if ( !pdev->vpci ) + return 0; + + /* + * FIXME: DomU support is missing. For already running domains we may + * need to pause them around the entire re-evaluation of extended config + * space accessibility. + */ + ASSERT(pdev->domain == hardware_domain); + + if ( vpci_remove_registers(pdev->vpci, PCI_CFG_SPACE_SIZE, + PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) ) + ASSERT_UNREACHABLE(); + + vpci_cleanup_capabilities(pdev, true); + + return vpci_init_capabilities(pdev, true); +} + /* * Local variables: * mode: C diff --git a/xen/drivers/vpci/private.h b/xen/drivers/vpci/private.h index fdeeca7aa8..2907f6b40f 100644 --- a/xen/drivers/vpci/private.h +++ b/xen/drivers/vpci/private.h @@ -46,8 +46,8 @@ typedef struct { int __must_check vpci_init_header(struct pci_dev *pdev); -int vpci_init_capabilities(struct pci_dev *pdev); -void vpci_cleanup_capabilities(struct pci_dev *pdev); +int vpci_init_capabilities(struct pci_dev *pdev, bool ext_only); +void vpci_cleanup_capabilities(struct pci_dev *pdev, bool ext_only); /* Add/remove a register handler. */ int __must_check vpci_add_register_mask(struct vpci *vpci, diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 683d5fc36c..0ac9ec8b04 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -102,7 +102,7 @@ void vpci_deassign_device(struct pci_dev *pdev) &pdev->domain->vpci_dev_assigned_map); #endif - vpci_cleanup_capabilities(pdev); + vpci_cleanup_capabilities(pdev, false); spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) @@ -159,7 +159,7 @@ int vpci_assign_device(struct pci_dev *pdev) if ( rc ) goto out; - rc = vpci_init_capabilities(pdev); + rc = vpci_init_capabilities(pdev, false); out: if ( rc ) diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 83ac41edf8..877aa391d1 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -25,6 +25,8 @@ int __must_check vpci_assign_device(struct pci_dev *pdev); /* Remove all handlers and free vpci related structures. */ void vpci_deassign_device(struct pci_dev *pdev); +int vpci_reinit_ext_capabilities(struct pci_dev *pdev); + /* Generic read/write handlers for the PCI config space. */ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size); void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, @@ -202,6 +204,11 @@ bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, #else /* !CONFIG_HAS_VPCI */ struct vpci_vcpu {}; +static inline int vpci_reinit_ext_capabilities(struct pci_dev *pdev) +{ + return 0; +} + static inline int vpci_assign_device(struct pci_dev *pdev) { return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:33:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249963.1547329 (Exim 4.92) (envelope-from ) id 1vzuOx-0005Un-Ia; Tue, 10 Mar 2026 10:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249963.1547329; Tue, 10 Mar 2026 10:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuOx-0005Ue-Fj; Tue, 10 Mar 2026 10:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1249963; Tue, 10 Mar 2026 10:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuOv-0005UX-UY for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuOw-001aED-0P for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuOv-001duH-2s for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=M7vWFtmKu3pj5oxbjyOthbuFKQhHVKp98TKdkNm+svA=; b=24tAxzbGwOVbOLCrUDQ2/tAyKM zzaik3qADGUirHUDIJ2QUhXRqMnJo8RK/0odSmfmNlJzfrA4Jtq8IS697JBlA56oonHS4CXpa3DHf dMFWODMFjU3RcrxixPeTZxmoRIBz5/ydDLLKbd9ugNz6GrHEAD44yyYpPk1gTITZhQ6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: detect and store supported hypervisor CSR bits at boot Message-Id: Date: Tue, 10 Mar 2026 10:33:21 +0000 commit 8149f72c0cbf6f1e8903b4a50101f806ff0630de Author: Oleksii Kurochko AuthorDate: Tue Mar 10 09:24:35 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:24:35 2026 +0100 xen/riscv: detect and store supported hypervisor CSR bits at boot Some hypervisor CSRs expose optional functionality and may not implement all architectural bits. Writing unsupported bits can either be ignored or raise an exception depending on the platform. Detect the set of writable bits for selected hypervisor CSRs at boot and store the resulting masks for later use. This allows safely programming these CSRs during vCPU context switching and avoids relying on hardcoded architectural assumptions. Use csr_read()&csr_write() instead of csr_swap()+all ones mask as some CSR registers have WPRI fields which should be preserved during write operation. Also, ro_one struct is introduced to cover the cases when a bit in CSR register (at the momemnt, it is only hstateen0) may be r/o-one to have hypervisor view of register seen by guest correct. Masks are calculated at the moment only for hedeleg, henvcfg, hideleg, hstateen0 registers as only them are going to be used in the follow up patch. If the Smstateen extension is not implemented, hstateen0 cannot be read because the register is considered non-existent. Instructions that attempt to access a CSR that is not implemented or not visible in the current mode are reserved and will raise an illegal-instruction exception. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 57 ++++++++++++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/setup.h | 2 ++ xen/arch/riscv/setup.c | 2 ++ 3 files changed, 61 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index b60320b90d..a5450a6d1b 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -2,9 +2,66 @@ #include #include +#include #include #include +#include +#include + +struct csr_masks { + register_t hedeleg; + register_t henvcfg; + register_t hideleg; + register_t hstateen0; + + struct { + register_t hstateen0; + } ro_one; +}; + +static struct csr_masks __ro_after_init csr_masks; + +#define HEDELEG_AVAIL_MASK ULONG_MAX +#define HIDELEG_AVAIL_MASK ULONG_MAX +#define HENVCFG_AVAIL_MASK _UL(0xE0000003000000FF) +#define HSTATEEN0_AVAIL_MASK _UL(0xDE00000000000007) + +void __init init_csr_masks(void) +{ + /* + * The mask specifies the bits that may be safely modified without + * causing side effects. + * + * For example, registers such as henvcfg or hstateen0 contain WPRI + * fields that must be preserved. Any write to the full register must + * therefore retain the original values of those fields. + */ +#define INIT_CSR_MASK(csr, field, mask) do { \ + register_t old = csr_read_set(CSR_ ## csr, mask); \ + csr_masks.field = csr_swap(CSR_ ## csr, old); \ + } while (0) + +#define INIT_RO_ONE_MASK(csr, field, mask) do { \ + register_t old = csr_read_clear(CSR_ ## csr, mask); \ + csr_masks.ro_one.field = csr_swap(CSR_ ## csr, old) & mask; \ + } while (0) + + INIT_CSR_MASK(HEDELEG, hedeleg, HEDELEG_AVAIL_MASK); + INIT_CSR_MASK(HIDELEG, hideleg, HIDELEG_AVAIL_MASK); + + INIT_CSR_MASK(HENVCFG, henvcfg, HENVCFG_AVAIL_MASK); + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_smstateen) ) + { + INIT_CSR_MASK(HSTATEEN0, hstateen0, HSTATEEN0_AVAIL_MASK); + INIT_RO_ONE_MASK(HSTATEEN0, hstateen0, HSTATEEN0_AVAIL_MASK); + } + +#undef INIT_CSR_MASK +#undef INIT_RO_ONE_MASK +} + static void continue_new_vcpu(struct vcpu *prev) { BUG_ON("unimplemented\n"); diff --git a/xen/arch/riscv/include/asm/setup.h b/xen/arch/riscv/include/asm/setup.h index c9d69cdf51..2215894cfb 100644 --- a/xen/arch/riscv/include/asm/setup.h +++ b/xen/arch/riscv/include/asm/setup.h @@ -11,6 +11,8 @@ void setup_mm(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); +void init_csr_masks(void); + #endif /* ASM__RISCV__SETUP_H */ /* diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 9b4835960d..bca6ca09ed 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -137,6 +137,8 @@ void __init noreturn start_xen(unsigned long bootcpu_id, riscv_fill_hwcap(); + init_csr_masks(); + preinit_xen_time(); intc_preinit(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:33:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249964.1547333 (Exim 4.92) (envelope-from ) id 1vzuP7-0005Wt-Jr; Tue, 10 Mar 2026 10:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249964.1547333; Tue, 10 Mar 2026 10:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuP7-0005Wl-HA; Tue, 10 Mar 2026 10:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1249964; Tue, 10 Mar 2026 10:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuP6-0005Wd-2x for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuP6-001aEH-0s for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuP5-001duf-38 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LdwbbbECGJvs8vDCLm3gAl2EaUSN6DocSb9dOwTjpIE=; b=Y0VWa6v8aOQ3Zi1nwc0Tgbn5O2 jD5FSA8Lw6veFnR4Dt68Hjr6nmtoLJmRLFyu/maxz/Fi/UbOjHq38G/+Ht/A01ij5oB67qbt6PTeI 6n7NIMMIIIJ40ac677TSlZ6PxbPIiu3qvh0jVvMq00TJLpas82QnIG5+wjTZPsmDPZSk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: implement vcpu_csr_init() Message-Id: Date: Tue, 10 Mar 2026 10:33:31 +0000 commit 02b3a1b0e53c6ebb03d7c07e2c5272cd5652b384 Author: Oleksii Kurochko AuthorDate: Tue Mar 10 09:25:01 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:01 2026 +0100 xen/riscv: implement vcpu_csr_init() Introduce vcpu_csr_init() to initialise hypervisor CSRs that control vCPU execution and virtualization behaviour before the vCPU is first scheduled. The function configures trap and interrupt delegation to VS-mode by setting the appropriate bits in the hedeleg and hideleg registers, initializes hstatus so that execution enters VS-mode when control is passed to the guest, and restricts guest access to hardware performance counters by initializing hcounteren, as unrestricted access would require additional handling in Xen. When the Smstateen and SSAIA extensions are available, access to AIA CSRs and IMSIC guest interrupt files is enabled by setting the corresponding bits in hstateen0, avoiding unnecessary traps into Xen (note that SVSLCT(Supervisor Virtual Select) name is used intead of CSRIND as OpenSBI uses such name and riscv_encoding.h is mostly based on it). If the Svpbmt extension is supported, the PBMTE bit is set in henvcfg to allow its use for VS-stage address translation. Guest access to the ENVCFG CSR is also enabled by setting ENVCFG bit in hstateen0, as a guest may need to control certain characteristics of the U-mode (VU-mode when V=1) execution environment. For CSRs that may contain read-only bits (e.g. hedeleg, hideleg, hstateen0), to the written value a correspondent mask is applied to avoid divergence between the software state and the actual CSR contents. As hstatus is not part of struct arch_vcpu (it already resides in struct cpu_user_regs), introduce vcpu_guest_cpu_user_regs() to provide a uniform way to access hstatus and other guest CPU user registers. This establishes a consistent and well-defined initial CSR state for vCPUs prior to their first context switch. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 63 +++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/current.h | 2 + xen/arch/riscv/include/asm/domain.h | 6 +++ xen/arch/riscv/include/asm/riscv_encoding.h | 2 + 4 files changed, 73 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index a5450a6d1b..14cc85093b 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -8,6 +8,7 @@ #include #include +#include struct csr_masks { register_t hedeleg; @@ -20,6 +21,21 @@ struct csr_masks { } ro_one; }; +#define HEDELEG_DEFAULT (BIT(CAUSE_MISALIGNED_FETCH, U) | \ + BIT(CAUSE_FETCH_ACCESS, U) | \ + BIT(CAUSE_ILLEGAL_INSTRUCTION, U) | \ + BIT(CAUSE_BREAKPOINT, U) | \ + BIT(CAUSE_MISALIGNED_LOAD, U) | \ + BIT(CAUSE_LOAD_ACCESS, U) | \ + BIT(CAUSE_MISALIGNED_STORE, U) | \ + BIT(CAUSE_STORE_ACCESS, U) | \ + BIT(CAUSE_USER_ECALL, U) | \ + BIT(CAUSE_FETCH_PAGE_FAULT, U) | \ + BIT(CAUSE_LOAD_PAGE_FAULT, U) | \ + BIT(CAUSE_STORE_PAGE_FAULT, U)) + +#define HIDELEG_DEFAULT (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP) + static struct csr_masks __ro_after_init csr_masks; #define HEDELEG_AVAIL_MASK ULONG_MAX @@ -62,6 +78,51 @@ void __init init_csr_masks(void) #undef INIT_RO_ONE_MASK } +static void vcpu_csr_init(struct vcpu *v) +{ + v->arch.hedeleg = HEDELEG_DEFAULT & csr_masks.hedeleg; + + vcpu_guest_cpu_user_regs(v)->hstatus = HSTATUS_SPV | HSTATUS_SPVP; + + v->arch.hideleg = HIDELEG_DEFAULT & csr_masks.hideleg; + + /* + * VS should access only the time counter directly. + * Everything else should trap. + */ + v->arch.hcounteren = HCOUNTEREN_TM; + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_svpbmt) ) + v->arch.henvcfg = ENVCFG_PBMTE & csr_masks.henvcfg; + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_smstateen) ) + { + /* Allow guest to access CSR_SENVCFG */ + register_t hstateen0 = SMSTATEEN0_HSENVCFG; + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_ssaia) ) + /* + * If the hypervisor extension is implemented, the same three + * bits are defined also in hypervisor CSR hstateen0 but concern + * only the state potentially accessible to a virtual machine + * executing in privilege modes VS and VU: + * bit 60 CSRs siselect and sireg (really vsiselect and + * vsireg) + * bit 59 CSRs siph and sieh (RV32 only) and stopi (really + * vsiph, vsieh, and vstopi) + * bit 58 all state of IMSIC guest interrupt files, including + * CSR stopei (really vstopei) + * If one of these bits is zero in hstateen0, and the same bit is + * one in mstateen0, then an attempt to access the corresponding + * state from VS or VU-mode raises a virtual instruction exception. + */ + hstateen0 |= SMSTATEEN0_AIA | SMSTATEEN0_IMSIC | SMSTATEEN0_SVSLCT; + + v->arch.hstateen0 = (hstateen0 & csr_masks.hstateen0) | + csr_masks.ro_one.hstateen0; + } +} + static void continue_new_vcpu(struct vcpu *prev) { BUG_ON("unimplemented\n"); @@ -84,6 +145,8 @@ int arch_vcpu_create(struct vcpu *v) if ( is_idle_vcpu(v) ) return 0; + vcpu_csr_init(v); + /* * As the vtimer and interrupt controller (IC) are not yet implemented, * return an error. diff --git a/xen/arch/riscv/include/asm/current.h b/xen/arch/riscv/include/asm/current.h index 58c9f1506b..5fbee8182c 100644 --- a/xen/arch/riscv/include/asm/current.h +++ b/xen/arch/riscv/include/asm/current.h @@ -48,6 +48,8 @@ DECLARE_PER_CPU(struct vcpu *, curr_vcpu); #define get_cpu_current(cpu) per_cpu(curr_vcpu, cpu) #define guest_cpu_user_regs() ({ BUG_ON("unimplemented"); NULL; }) +#define vcpu_guest_cpu_user_regs(vcpu) \ + (&(vcpu)->arch.cpu_info->guest_cpu_user_regs) #define switch_stack_and_jump(stack, fn) do { \ asm volatile ( \ diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 5aec627a7a..17be792afe 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -49,6 +49,12 @@ struct arch_vcpu { struct cpu_info *cpu_info; + register_t hcounteren; + register_t hedeleg; + register_t hideleg; + register_t henvcfg; + register_t hstateen0; + register_t vsatp; }; diff --git a/xen/arch/riscv/include/asm/riscv_encoding.h b/xen/arch/riscv/include/asm/riscv_encoding.h index 1f7e612366..dd15731a86 100644 --- a/xen/arch/riscv/include/asm/riscv_encoding.h +++ b/xen/arch/riscv/include/asm/riscv_encoding.h @@ -228,6 +228,8 @@ #define ENVCFG_CBIE_INV _UL(0x3) #define ENVCFG_FIOM _UL(0x1) +#define HCOUNTEREN_TM BIT(1, U) + /* ===== User-level CSRs ===== */ /* User Trap Setup (N-extension) */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:33:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249965.1547336 (Exim 4.92) (envelope-from ) id 1vzuPH-0005Yu-LB; Tue, 10 Mar 2026 10:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249965.1547336; Tue, 10 Mar 2026 10:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuPH-0005Ym-Id; Tue, 10 Mar 2026 10:33:43 +0000 Received: by outflank-mailman (input) for mailman id 1249965; Tue, 10 Mar 2026 10:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuPG-0005Yc-5w for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuPG-001aEe-1B for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuPG-001dxB-0N for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7Jfq5dZHJ0W+RxCDDsSsldEPHZy6wDIilveKg0A1lo8=; b=wq6x5ubYSSOHtWboUOTi6zrRNt +beRtvRWrUZrZE24YuzlHX+kwKRECu4YzFG+lNK1gWObiDye3rLJ4+uF8g6WaDM8n5HvWddbC47kx 7x67GuQ1FFrd+6nXxhNsUCEXWGMYx2LpcruiNCiN07V8Q7750ajzl3e/PW9cBxY+BPUQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce tracking of pending vCPU interrupts, part 1 Message-Id: Date: Tue, 10 Mar 2026 10:33:42 +0000 commit c537959a5cb0178b0a34333892a8c0b47b69274f Author: Oleksii Kurochko AuthorDate: Tue Mar 10 09:25:16 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:16 2026 +0100 xen/riscv: introduce tracking of pending vCPU interrupts, part 1 Based on Linux kernel v6.16.0. Note that smp_wmb() is used instead of smp_mb__before_atomic() as what we want to guarantee that if a bit in irqs_pending_mask is obversable that the correspondent bit in irqs_pending is observable too. Add lockless tracking of pending vCPU interrupts using atomic bitops. Two bitmaps are introduced: - irqs_pending — interrupts currently pending for the vCPU - irqs_pending_mask — bits that have changed in irqs_pending The design follows a multi-producer, single-consumer model, where the consumer is the vCPU itself. Producers may set bits in irqs_pending_mask without a lock. Clearing bits in irqs_pending_mask is performed only by the consumer via xchg(). The consumer must not write to irqs_pending and must not act on bits that are not set in the mask. Otherwise, extra synchronization should be provided. On RISC-V interrupts are not injected via guest registers, so pending interrupts must be recorded in irqs_pending (using the new vcpu_{un}set_interrupt() helpers) and flushed to the guest by updating HVIP before returning control to the guest. The consumer side is implemented in a follow-up patch. A barrier between updating irqs_pending and setting the corresponding mask bit in vcpu_set_interrupt()/vcpu_unset_interrupt() guarantees that if the consumer observes a mask bit set, the corresponding pending bit is also visible. This prevents missed interrupts during the flush. It is possible that a guest could have pending bit in the hardware register without being marked pending in irq_pending bitmap as: According to the RISC-V ISA specification: Bits hip.VSSIP and hie.VSSIE are the interrupt-pending and interrupt-enable bits for VS-level software interrupts. VSSIP in hip is an alias (writable) of the same bit in hvip. Additionally: When bit 2 of hideleg is zero, vsip.SSIP and vsie.SSIE are read-only zeros. Else, vsip.SSIP and vsie.SSIE are aliases of hip.VSSIP and hie.VSSIE. This means the guest may modify vsip.SSIP, which implicitly updates hip.VSSIP and the bit being written with 1 would also trigger an interrupt as according to the RISC-V spec: These conditions for an interrupt trap to occur must be evaluated in a bounded amount of time from when an interrupt becomes, or ceases to be, pending in sip, and must also be evaluated immediately following the execution of an SRET instruction or an explicit write to a CSR on which these interrupt trap conditions expressly depend (including sip, sie and sstatus). What means that IRQ_VS_SOFT must be synchronized separately, what is done in vcpu_sync_interrupts(). Note, also, that IRQ_PMU_OVF would want to be synced for the similar reason as IRQ_VS_SOFT, but isn't sync-ed now as PMU isn't supported now. For the remaining VS-level interrupt types (IRQ_VS_TIMER and IRQ_VS_EXT), the specification states they cannot be modified by the guest and are read-only because of: Bits hip.VSEIP and hie.VSEIE are the interrupt-pending and interrupt-enable bits for VS-level external interrupts. VSEIP is read-only in hip, and is the logical-OR of these interrupt sources: • bit VSEIP of hvip; • the bit of hgeip selected by hstatus.VGEIN; and • any other platform-specific external interrupt signal directed to VS-level. Bits hip.VSTIP and hie.VSTIE are the interrupt-pending and interrupt-enable bits for VS-level timer interrupts. VSTIP is read-only in hip, and is the logical-OR of hvip.VSTIP and any other platform-specific timer interrupt signal directed to VS-level. and When bit 10 of hideleg is zero, vsip.SEIP and vsie.SEIE are read-only zeros. Else, vsip.SEIP and vsie.SEIE are aliases of hip.VSEIP and hie.VSEIE. When bit 6 of hideleg is zero, vsip.STIP and vsie.STIE are read-only zeros. Else, vsip.STIP and vsie.STIE are aliases of hip.VSTIP and hie.VSTIE. and also, Bits sip.SEIP and sie.SEIE are the interrupt-pending and interrupt-enable bits for supervisor-level external interrupts. If implemented, SEIP is read-only in sip, and is set and cleared by the execution environment, typically through a platform-specific interrupt controller. Bits sip.STIP and sie.STIE are the interrupt-pending and interrupt-enable bits for supervisor-level timer interrupts. If implemented, STIP is read-only in sip, and is set and cleared by the execution environment Thus, for these interrupt types, it is sufficient to use vcpu_set_interrupt() and vcpu_unset_interrupt(), and flush them during the call of vcpu_flush_interrupts() (which is introduced in follow up patch). vcpu_sync_interrupts(), which is called just before entering the VM, slightly bends the rule that the irqs_pending bit must be written first, followed by updating the corresponding bit in irqs_pending_mask. However, it still respects the core guarantee that the producer never clears the mask and only writes to irqs_pending if it is the one that flipped the corresponding mask bit from 0 to 1. Moreover, since the consumer won't run concurrently because vcpu_sync_interrupts() and the consumer path are going to be invoked sequentially immediately before VM entry, it is safe to slightly relax this ordering rule in vcpu_sync_interrupts(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 63 +++++++++++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/domain.h | 22 +++++++++++++ xen/arch/riscv/traps.c | 4 +++ 3 files changed, 89 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 14cc85093b..694a03ab74 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -168,6 +169,68 @@ void arch_vcpu_destroy(struct vcpu *v) vfree((void *)&v->arch.cpu_info[1] - STACK_SIZE); } +int vcpu_set_interrupt(struct vcpu *v, unsigned int irq) +{ + bool kick_vcpu; + + /* We only allow VS-mode software, timer, and external interrupts */ + if ( irq != IRQ_VS_SOFT && + irq != IRQ_VS_TIMER && + irq != IRQ_VS_EXT ) + return -EINVAL; + + kick_vcpu = !test_and_set_bit(irq, v->arch.irqs_pending); + + /* + * The counterpart of this barrier is the one encoded implicitly in xchg() + * which is used in consumer part (vcpu_flush_interrupts()). + */ + smp_wmb(); + + kick_vcpu |= !test_and_set_bit(irq, v->arch.irqs_pending_mask); + + if ( kick_vcpu ) + vcpu_kick(v); + + return 0; +} + +int vcpu_unset_interrupt(struct vcpu *v, unsigned int irq) +{ + /* We only allow VS-mode software, timer, external interrupts */ + if ( irq != IRQ_VS_SOFT && + irq != IRQ_VS_TIMER && + irq != IRQ_VS_EXT ) + return -EINVAL; + + clear_bit(irq, v->arch.irqs_pending); + /* + * The counterpart of this barrier is the one encoded implicitly in xchg() + * which is used in consumer part (vcpu_flush_interrupts()). + */ + smp_wmb(); + set_bit(irq, v->arch.irqs_pending_mask); + + return 0; +} + +void vcpu_sync_interrupts(struct vcpu *curr) +{ + unsigned long hvip = csr_read(CSR_HVIP); + + ASSERT(curr == current); + + /* Sync-up HVIP.VSSIP bit changes done by Guest */ + if ( ((curr->arch.hvip ^ hvip) & BIT(IRQ_VS_SOFT, UL)) && + !test_and_set_bit(IRQ_VS_SOFT, &curr->arch.irqs_pending_mask) ) + { + if ( hvip & BIT(IRQ_VS_SOFT, UL) ) + set_bit(IRQ_VS_SOFT, &curr->arch.irqs_pending); + else + clear_bit(IRQ_VS_SOFT, &curr->arch.irqs_pending); + } +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 17be792afe..1ecfe18c85 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -54,8 +54,25 @@ struct arch_vcpu { register_t hideleg; register_t henvcfg; register_t hstateen0; + register_t hvip; register_t vsatp; + + /* + * VCPU interrupts + * + * We have a lockless approach for tracking pending VCPU interrupts + * implemented using atomic bitops. The irqs_pending bitmap represent + * pending interrupts whereas irqs_pending_mask represent bits changed + * in irqs_pending. Our approach is modeled around multiple producer + * and single consumer problem where the consumer is the VCPU itself. + * + * DECLARE_BITMAP() is needed here to support 64 vCPU local interrupts + * on RV32 host. + */ +#define RISCV_VCPU_NR_IRQS MAX(BITS_PER_LONG, 64) + DECLARE_BITMAP(irqs_pending, RISCV_VCPU_NR_IRQS); + DECLARE_BITMAP(irqs_pending_mask, RISCV_VCPU_NR_IRQS); }; struct paging_domain { @@ -94,6 +111,11 @@ static inline void update_guest_memory_policy(struct vcpu *v, static inline void arch_vcpu_block(struct vcpu *v) {} +int vcpu_set_interrupt(struct vcpu *v, unsigned int irq); +int vcpu_unset_interrupt(struct vcpu *v, unsigned int irq); + +void vcpu_sync_interrupts(struct vcpu *curr); + #endif /* ASM__RISCV__DOMAIN_H */ /* diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index 9fca941526..551f886e3a 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -171,6 +171,10 @@ static void do_unexpected_trap(const struct cpu_user_regs *regs) static void check_for_pcpu_work(void) { + struct vcpu *curr = current; + + vcpu_sync_interrupts(curr); + p2m_handle_vmenter(); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:33:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249966.1547341 (Exim 4.92) (envelope-from ) id 1vzuPR-0005b3-ND; Tue, 10 Mar 2026 10:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249966.1547341; Tue, 10 Mar 2026 10: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 1vzuPR-0005av-K5; Tue, 10 Mar 2026 10:33:53 +0000 Received: by outflank-mailman (input) for mailman id 1249966; Tue, 10 Mar 2026 10:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuPQ-0005an-92 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuPQ-001aEj-1T for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuPQ-001dys-0f for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10: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=KDswTQcYrRgBX8MuXqJO1yexqIyUB6zPfyN3vIuyyzM=; b=0xM4fxqLgKzoVvdqcwKd6T8AtQ 96rIUWXG4K0yHdFbkwOJ/Hd2JZdHV52+jIb6jT4pQllbuUJ8udA7Iq06yKM8D/hHi9WgI+kWMBCpg 9MD3rstawG7OlNNPi7JeImmBQ/GATC21IePjeri2LCCytqpY/GEJNo9v9r7eXJZa7epU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce tracking of pending vCPU interrupts, part 2 Message-Id: Date: Tue, 10 Mar 2026 10:33:52 +0000 commit 7379853e0cc91fd760ef3247fc352f7610f16eda Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:21 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:45 2026 +0100 xen/riscv: introduce tracking of pending vCPU interrupts, part 2 This patch is based on Linux kernel 6.16.0. Add the consumer side (vcpu_flush_interrupts()) of the lockless pending interrupt tracking introduced in part 1 (for producers). According, to the design only one consumer is possible, and it is vCPU itself. vcpu_flush_interrupts() is expected to be ran (as guests aren't ran now due to the lack of functionality) before the hypervisor returns control to the guest. Producers may set bits in irqs_pending_mask without a lock. Clearing bits in irqs_pending_mask is performed only by the consumer via xchg() (with aquire semantics). The consumer must not write to irqs_pending and must not act on bits that are not set in the mask. Otherwise, extra synchronization should be provided. The worst thing which could happen with such approach is that a new pending bit will be set to irqs_pending bitmap during update of hvip variable in vcpu_flush_interrupt() but it isn't problem as the new pending bit won't be lost and just be proceded during the next flush. As AIA specs introduced hviph register which would want to be updated when guest related AIA code vcpu_update_hvip() is introduced instead of just open-code it in vcpu_flush_interrupts(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 27 +++++++++++++++++++++++++++ xen/arch/riscv/include/asm/domain.h | 1 + xen/arch/riscv/traps.c | 2 ++ 3 files changed, 30 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 694a03ab74..9c86581ea2 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -231,6 +231,33 @@ void vcpu_sync_interrupts(struct vcpu *curr) } } +void vcpu_flush_interrupts(struct vcpu *curr) +{ + ASSERT(curr == current); + + if ( ACCESS_ONCE(curr->arch.irqs_pending_mask[0]) ) + { + unsigned long mask = xchg(&curr->arch.irqs_pending_mask[0], 0UL); + unsigned long val = ACCESS_ONCE(curr->arch.irqs_pending[0]) & mask; + register_t *hvip = &curr->arch.hvip; + + *hvip &= ~mask; + *hvip |= val; + + csr_write(CSR_HVIP, *hvip); + } + +#ifdef CONFIG_RISCV_32 + /* + * Flush AIA high interrupts. + * + * It is necessary to do only for CONFIG_RISCV_32 which isn't + * supported now. + */ +# error "Update v->arch.hviph" +#endif +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 1ecfe18c85..59d23e4f92 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -115,6 +115,7 @@ int vcpu_set_interrupt(struct vcpu *v, unsigned int irq); int vcpu_unset_interrupt(struct vcpu *v, unsigned int irq); void vcpu_sync_interrupts(struct vcpu *curr); +void vcpu_flush_interrupts(struct vcpu *curr); #endif /* ASM__RISCV__DOMAIN_H */ diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index 551f886e3a..244264c92a 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -175,6 +175,8 @@ static void check_for_pcpu_work(void) vcpu_sync_interrupts(curr); + vcpu_flush_interrupts(curr); + p2m_handle_vmenter(); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:34:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249967.1547345 (Exim 4.92) (envelope-from ) id 1vzuPb-0005db-RG; Tue, 10 Mar 2026 10:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249967.1547345; Tue, 10 Mar 2026 10: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 1vzuPb-0005dT-Nx; Tue, 10 Mar 2026 10:34:03 +0000 Received: by outflank-mailman (input) for mailman id 1249967; Tue, 10 Mar 2026 10:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuPa-0005dK-DJ for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuPa-001aF0-1j for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuPa-001e0A-0y for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10: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=T79t40oPy9jJCn5CiMiF6nHAmkWawXjXohGMaUtae/o=; b=rXAxRCErN8qdSpAEyWopH6d36Y zkutVd5z6wYh/BHklxcZ2VsYY5xausRjujftuKqVpAlHLV0czOKA3+y8FOBVIA+hQqI8IUPu/E1Zy fOKXelkGBUkxA9RmJXZIYnOILpau1lXGDFqYKvwumxRV6FtoN7PuQiofdH6/xtmh2esQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce basic vtimer infrastructure for guests Message-Id: Date: Tue, 10 Mar 2026 10:34:02 +0000 commit 2473ddf9b4f991859353a2a9641ff19af1dffd93 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:22 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:59 2026 +0100 xen/riscv: introduce basic vtimer infrastructure for guests Lay the groundwork for guest timer support by introducing a per-vCPU virtual timer backed by Xen’s common timer infrastructure. The virtual timer is programmed in response to the guest SBI sbi_set_timer() call and injects a virtual supervisor timer interrupt into the vCPU when it expires. While a dedicated struct vtimer is not strictly required at present, it is expected to become necessary once SSTC support is introduced. In particular, it will need to carry additional state such as whether SSTC is enabled, the next compare value (e.g. for the VSTIMECMP CSR) to be saved and restored across context switches, and time delta state (e.g. HTIMEDELTA) required for use cases such as migration. Introducing struct vtimer now avoids a later refactoring. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/domain.c | 10 ++++-- xen/arch/riscv/include/asm/domain.h | 3 ++ xen/arch/riscv/include/asm/vtimer.h | 17 +++++++++ xen/arch/riscv/vtimer.c | 71 +++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+), 2 deletions(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index bc47e83b26..ffbd7062e2 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -22,6 +22,7 @@ obj-y += traps.o obj-y += vmid.o obj-y += vm_event.o obj-y += vsbi/ +obj-y += vtimer.o $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 9c86581ea2..d25938200f 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -10,6 +10,7 @@ #include #include #include +#include struct csr_masks { register_t hedeleg; @@ -148,11 +149,14 @@ int arch_vcpu_create(struct vcpu *v) vcpu_csr_init(v); + if ( (rc = vcpu_vtimer_init(v)) ) + goto fail; + /* - * As the vtimer and interrupt controller (IC) are not yet implemented, + * As interrupt controller (IC) is not yet implemented, * return an error. * - * TODO: Drop this once the vtimer and IC are implemented. + * TODO: Drop this once IC is implemented. */ rc = -EOPNOTSUPP; goto fail; @@ -166,6 +170,8 @@ int arch_vcpu_create(struct vcpu *v) void arch_vcpu_destroy(struct vcpu *v) { + vcpu_timer_destroy(v); + vfree((void *)&v->arch.cpu_info[1] - STACK_SIZE); } diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 59d23e4f92..6c48bf1311 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -8,6 +8,7 @@ #include #include +#include struct vcpu_vmid { uint64_t generation; @@ -49,6 +50,8 @@ struct arch_vcpu { struct cpu_info *cpu_info; + struct vtimer vtimer; + register_t hcounteren; register_t hedeleg; register_t hideleg; diff --git a/xen/arch/riscv/include/asm/vtimer.h b/xen/arch/riscv/include/asm/vtimer.h new file mode 100644 index 0000000000..111863610a --- /dev/null +++ b/xen/arch/riscv/include/asm/vtimer.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ASM__RISCV__VTIMER_H +#define ASM__RISCV__VTIMER_H + +#include + +struct vtimer { + struct timer timer; +}; + +int vcpu_vtimer_init(struct vcpu *v); +void vcpu_timer_destroy(struct vcpu *v); + +void vtimer_set_timer(struct vtimer *t, uint64_t ticks); + +#endif /* ASM__RISCV__VTIMER_H */ diff --git a/xen/arch/riscv/vtimer.c b/xen/arch/riscv/vtimer.c new file mode 100644 index 0000000000..32d142bcdf --- /dev/null +++ b/xen/arch/riscv/vtimer.c @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#include + +static void vtimer_expired(void *data) +{ + struct vtimer *t = data; + struct vcpu *v = container_of(t, struct vcpu, arch.vtimer); + + vcpu_set_interrupt(v, IRQ_VS_TIMER); +} + +int vcpu_vtimer_init(struct vcpu *v) +{ + struct vtimer *t = &v->arch.vtimer; + + init_timer(&t->timer, vtimer_expired, t, v->processor); + + return 0; +} + +void vcpu_timer_destroy(struct vcpu *v) +{ + struct vtimer *t = &v->arch.vtimer; + + if ( t->timer.status == TIMER_STATUS_invalid ) + return; + + kill_timer(&v->arch.vtimer.timer); +} + +void vtimer_set_timer(struct vtimer *t, const uint64_t ticks) +{ + struct vcpu *v = container_of(t, struct vcpu, arch.vtimer); + s_time_t expires = ticks_to_ns(ticks - boot_clock_cycles); + + vcpu_unset_interrupt(v, IRQ_VS_TIMER); + + /* + * According to the RISC-V sbi spec: + * If the supervisor wishes to clear the timer interrupt without + * scheduling the next timer event, it can either request a timer + * interrupt infinitely far into the future (i.e., (uint64_t)-1), + * or it can instead mask the timer interrupt by clearing sie.STIE CSR + * bit. + */ + if ( ticks == ((uint64_t)~0) ) + { + stop_timer(&t->timer); + + return; + } + + if ( expires < NOW() ) + { + /* + * Simplify the logic if the timeout has already expired and just + * inject the event. + */ + stop_timer(&t->timer); + vcpu_set_interrupt(v, IRQ_VS_TIMER); + + return; + } + + migrate_timer(&t->timer, smp_processor_id()); + set_timer(&t->timer, expires); +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:34:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:34:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249968.1547349 (Exim 4.92) (envelope-from ) id 1vzuPl-0005fd-Sj; Tue, 10 Mar 2026 10:34:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249968.1547349; Tue, 10 Mar 2026 10: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 1vzuPl-0005fS-Pe; Tue, 10 Mar 2026 10:34:13 +0000 Received: by outflank-mailman (input) for mailman id 1249968; Tue, 10 Mar 2026 10:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuPk-0005fI-EP for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuPk-001aF6-21 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuPk-001e1L-1E for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10: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=MLFzwZX3Uf69Xkgevl/vgxCV9az7QlJ+1O0a7jpEvnM=; b=hw31Lk1lP+7Bo0MTjmRv74R21L +g7TLve0BXJRjAneXrLx+CGUXIrsNuKxhYwYechjz/ETquC6Ihxbe36/lBHTIG8KNtCeEmhgjm4GB aIPMDEEoqjBbAulx1TGkWPdYLElex1w9EtAtDFms1XtrieZgO/pL8il7jk4PFmh2VAL8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce vcpu_kick() implementation Message-Id: Date: Tue, 10 Mar 2026 10:34:12 +0000 commit d81a91b0e4dde994c5ebb0e4d199f7bc44358aec Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:23 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:13 2026 +0100 xen/riscv: introduce vcpu_kick() implementation Add a RISC-V implementation of vcpu_kick(), which unblocks the target vCPU and sends an event check IPI if the vCPU was running on another processor. This mirrors the behavior of Arm and enables proper vCPU wakeup handling on RISC-V. Remove the stub implementation from stubs.c, as it is now provided by arch/riscv/domain.c. Since vcpu_kick() calls perfc_incr(vcpu_kick), add perfcounter for vcpu_kick to handle the case when CONFIG_PERF_COUNTERS=y. Although CONFIG_PERF_COUNTERS is not enabled by default, it can be enabled, for example, by randconfig what will lead to CI build issues. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 14 ++++++++++++++ xen/arch/riscv/include/asm/Makefile | 1 - xen/arch/riscv/include/asm/perfc_defn.h | 3 +++ xen/arch/riscv/stubs.c | 5 ----- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index d25938200f..470eca3ad7 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -1,9 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include #include #include +#include #include #include @@ -264,6 +266,18 @@ void vcpu_flush_interrupts(struct vcpu *curr) #endif } +void vcpu_kick(struct vcpu *v) +{ + bool running = v->is_running; + + vcpu_unblock(v); + if ( running && v != current ) + { + perfc_incr(vcpu_kick); + smp_send_event_check_mask(cpumask_of(v->processor)); + } +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/include/asm/Makefile b/xen/arch/riscv/include/asm/Makefile index 3824f31c39..86c56251d5 100644 --- a/xen/arch/riscv/include/asm/Makefile +++ b/xen/arch/riscv/include/asm/Makefile @@ -7,7 +7,6 @@ generic-y += hypercall.h generic-y += iocap.h generic-y += irq-dt.h generic-y += percpu.h -generic-y += perfc_defn.h generic-y += random.h generic-y += softirq.h generic-y += vm_event.h diff --git a/xen/arch/riscv/include/asm/perfc_defn.h b/xen/arch/riscv/include/asm/perfc_defn.h new file mode 100644 index 0000000000..8a4b945df6 --- /dev/null +++ b/xen/arch/riscv/include/asm/perfc_defn.h @@ -0,0 +1,3 @@ +/* This file is intended to be included multiple times. */ + +PERFCOUNTER(vcpu_kick, "vcpu: notify other vcpu") diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index daadff0138..eedf8bf935 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -203,11 +203,6 @@ void vcpu_block_unless_event_pending(struct vcpu *v) BUG_ON("unimplemented"); } -void vcpu_kick(struct vcpu *v) -{ - BUG_ON("unimplemented"); -} - unsigned long hypercall_create_continuation(unsigned int op, const char *format, ...) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:34:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:34:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249969.1547352 (Exim 4.92) (envelope-from ) id 1vzuPv-0005i2-Tb; Tue, 10 Mar 2026 10:34:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249969.1547352; Tue, 10 Mar 2026 10: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 1vzuPv-0005hu-Qz; Tue, 10 Mar 2026 10:34:23 +0000 Received: by outflank-mailman (input) for mailman id 1249969; Tue, 10 Mar 2026 10:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuPu-0005hm-H7 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuPu-001aFA-2I for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuPu-001e2G-1W for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10: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=etXQKi3Lh5r8Oszv8CTtt6tb5pNaWbSRHSKiACSuOSw=; b=Crf8+2twSeEN/a7mLL0lRv6PUk hx9sjWFuDzSkAjwAoPGqCVZAnyy3vuq/GSOaU6sn8xs2Mw+MgdxGVfVvfBeYojYp3N+V57Zxvkyry tETdzweWAHnQgtBalBZ4eBP6Hr2GIugdQjuhSlPr/cDt9Jl1osmVqkBxD8rascNUGyJw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: add vtimer context switch helpers Message-Id: Date: Tue, 10 Mar 2026 10:34:22 +0000 commit 4313feae90068fb8fccafe401dd7976cbe117db8 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:24 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:24 2026 +0100 xen/riscv: add vtimer context switch helpers Introduce vtimer_ctxt_switch_from() and vtimer_ctxt_switch_to() to handle virtual timer state across vCPU context switches. At present, vtimer_ctxt_switch_from() is a no-op because the RISC-V SSTC extension, which provides a virtualization-aware timer, is not yet supported. Xen therefore relies the virtual (SBI-based) timer. The virtual timer uses Xen's internal timer infrastructure and must be associated with the pCPU on which the vCPU is currently running so that timer events can be delivered efficiently. As a result, vtimer_ctxt_switch_to() migrates the timer to the target pCPU when a vCPU is scheduled in. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/vtimer.h | 3 +++ xen/arch/riscv/vtimer.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/xen/arch/riscv/include/asm/vtimer.h b/xen/arch/riscv/include/asm/vtimer.h index 111863610a..b4d48d1a17 100644 --- a/xen/arch/riscv/include/asm/vtimer.h +++ b/xen/arch/riscv/include/asm/vtimer.h @@ -14,4 +14,7 @@ void vcpu_timer_destroy(struct vcpu *v); void vtimer_set_timer(struct vtimer *t, uint64_t ticks); +void vtimer_ctxt_switch_from(struct vcpu *p); +void vtimer_ctxt_switch_to(struct vcpu *n); + #endif /* ASM__RISCV__VTIMER_H */ diff --git a/xen/arch/riscv/vtimer.c b/xen/arch/riscv/vtimer.c index 32d142bcdf..afd8a53a73 100644 --- a/xen/arch/riscv/vtimer.c +++ b/xen/arch/riscv/vtimer.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include @@ -69,3 +70,17 @@ void vtimer_set_timer(struct vtimer *t, const uint64_t ticks) migrate_timer(&t->timer, smp_processor_id()); set_timer(&t->timer, expires); } + +void vtimer_ctxt_switch_from(struct vcpu *p) +{ + ASSERT(!is_idle_vcpu(p)); + + /* Nothing to do at the moment as SSTC isn't supported now. */ +} + +void vtimer_ctxt_switch_to(struct vcpu *n) +{ + ASSERT(!is_idle_vcpu(n)); + + migrate_timer(&n->arch.vtimer.timer, n->processor); +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:34:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:34:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249970.1547356 (Exim 4.92) (envelope-from ) id 1vzuQ5-0005li-V9; Tue, 10 Mar 2026 10:34:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249970.1547356; Tue, 10 Mar 2026 10:34: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 1vzuQ5-0005la-SZ; Tue, 10 Mar 2026 10:34:33 +0000 Received: by outflank-mailman (input) for mailman id 1249970; Tue, 10 Mar 2026 10:34:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuQ4-0005lT-JQ for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuQ4-001aFH-2Y for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuQ4-001e2r-1n for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34: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=Jx4Kf2YCLxy93DNs5beLlCDbR7qduOFsC3FqS31quBk=; b=VSLL2m33r2MxRY/tqrnu9/nWlw k8YtdUCxE9hxTVKh23MNftz0PLOZg8FLhq8p5CRP/7h5PpSM2gLS5tISXoeLR78dMXywbmoX7/vZ7 ZfELHFdsDk/wGyXJJnXalJnKhgUgFzteQR6cq/3KJGZOtVQ3pZFCbNMp1nuHlcUgwNsE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: implement SBI legacy SET_TIMER support for guests Message-Id: Date: Tue, 10 Mar 2026 10:34:32 +0000 commit 647542cdf13ee31e7d32dcaddba8899cfdc98747 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:25 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:41 2026 +0100 xen/riscv: implement SBI legacy SET_TIMER support for guests Add handling of the SBI_EXT_0_1_SET_TIMER function ID to the legacy extension ecall handler. The handler now programs the vCPU’s virtual timer via vtimer_set_timer() and returns SBI_SUCCESS. This enables guests using the legacy SBI timer interface to schedule timer events correctly. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/vsbi/legacy-extension.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/riscv/vsbi/legacy-extension.c b/xen/arch/riscv/vsbi/legacy-extension.c index 2e8df191c2..090c23440c 100644 --- a/xen/arch/riscv/vsbi/legacy-extension.c +++ b/xen/arch/riscv/vsbi/legacy-extension.c @@ -7,6 +7,7 @@ #include #include +#include static void vsbi_print_char(char c) { @@ -44,6 +45,11 @@ static int vsbi_legacy_ecall_handler(unsigned long eid, unsigned long fid, ret = SBI_ERR_NOT_SUPPORTED; break; + case SBI_EXT_0_1_SET_TIMER: + vtimer_set_timer(¤t->arch.vtimer, regs->a0); + regs->a0 = SBI_SUCCESS; + break; + default: /* * TODO: domain_crash() is acceptable here while things are still under -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:34:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:34:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249971.1547361 (Exim 4.92) (envelope-from ) id 1vzuQG-0005nb-0T; Tue, 10 Mar 2026 10:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249971.1547361; Tue, 10 Mar 2026 10:34: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 1vzuQF-0005nT-U9; Tue, 10 Mar 2026 10:34:43 +0000 Received: by outflank-mailman (input) for mailman id 1249971; Tue, 10 Mar 2026 10:34:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuQE-0005nL-ME for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuQE-001aFb-2o for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuQE-001e3O-22 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34: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=JtiD6s+Ejq8RO+5O9eSPe1dl3ZMzIj0EDdQvLk9R/os=; b=eQ3qxw7sglZWP82y/jb6ryX7S/ qgy3wdGxtz9JakKxs5yCrZPfvEoD0wNHsztAaF7pDxClYEz5ox10tTyX695kLp78UB+jNren4HTcw UFsjnnrywvwUWB5bJk5mKLiyMHi6s/v6+xzGNjZyeffF0UpUuta4HTJv+J6Y03yhMAeY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce sbi_set_timer() Message-Id: Date: Tue, 10 Mar 2026 10:34:42 +0000 commit e56decd0a2ccd5c64c05dbead05c78c36815e126 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:26 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:58 2026 +0100 xen/riscv: introduce sbi_set_timer() Introduce a function pointer for sbi_set_timer(), since different OpenSBI versions may implement the TIME extension with different extension IDs and/or function IDs. If the TIME extension is not available, fall back to the legacy timer mechanism. This is useful when Xen runs as a guest under another Xen, because the TIME extension is not currently virtualised and therefore will not appear as available. Despite of the fact that sbi_set_timer_v01 is introduced and used as fall back, SBI v0.1 still isn't fully supported (with the current SBI calls usage, sbi_rfence_v01 should be introduced too), so panic() in sbi_init() isn't removed. The sbi_set_timer() pointer will be used by reprogram_timer() to program Xen’s physical timer as without SSTC extension there is no any other option except SBI call to do that as only M-timer is available for us. Use dprintk() for all the cases to print that a speicifc SBI extension is available as it isn't really necessary in case of release builds. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/sbi.h | 22 ++++++++++++++++++++++ xen/arch/riscv/sbi.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h index 79f7ff5c55..ed7af20028 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -13,6 +13,7 @@ #define ASM__RISCV__SBI_H #include +#include /* SBI-defined implementation ID */ #define SBI_XEN_IMPID 7 @@ -29,6 +30,7 @@ #define SBI_EXT_BASE 0x10 #define SBI_EXT_RFENCE 0x52464E43 +#define SBI_EXT_TIME 0x54494D45 /* SBI function IDs for BASE extension */ #define SBI_EXT_BASE_GET_SPEC_VERSION 0x0 @@ -48,6 +50,9 @@ #define SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA 0x5 #define SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID 0x6 +/* SBI function IDs for TIME extension */ +#define SBI_EXT_TIME_SET_TIMER 0x0 + #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f000000 #define SBI_SPEC_VERSION_MINOR_MASK 0x00ffffff @@ -134,6 +139,23 @@ int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, int sbi_remote_hfence_gvma_vmid(const cpumask_t *cpu_mask, vaddr_t start, size_t size, unsigned long vmid); +/* + * Programs the clock for next event at (or after) stime_value. stime_value is + * in absolute time. This function must clear the pending timer interrupt bit + * as well. + * + * If the supervisor wishes to clear the timer interrupt without scheduling the + * next timer event, it can either request a timer interrupt infinitely far + * into the future (i.e., (uint64_t)-1), or it can instead mask the timer + * interrupt by clearing sie.STIE CSR bit. + * + * The stime_value parameter represents absolute time measured in ticks. + * + * This SBI call returns 0 upon success or an implementation specific negative + * error code. + */ +extern int (* __ro_after_init sbi_set_timer)(uint64_t stime_value); + /* * Initialize SBI library * diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 425dce44c6..b4a7ae6940 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -249,6 +249,38 @@ static int (* __ro_after_init sbi_rfence)(unsigned long fid, unsigned long arg4, unsigned long arg5); +static int cf_check sbi_set_timer_v02(uint64_t stime_value) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_TIME, SBI_EXT_TIME_SET_TIMER, stime_value, +#ifdef CONFIG_RISCV_32 + stime_value >> 32, +#else + 0, +#endif + 0, 0, 0, 0); + + return sbi_err_map_xen_errno(ret.error); +} + +static int cf_check sbi_set_timer_v01(uint64_t stime_value) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_0_1_SET_TIMER, 0, stime_value, +#ifdef CONFIG_RISCV_32 + stime_value >> 32, +#else + 0, +#endif + 0, 0, 0, 0); + + return sbi_err_map_xen_errno(ret.error); +} + +int (* __ro_after_init sbi_set_timer)(uint64_t stime_value) = sbi_set_timer_v01; + int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, size_t size) { @@ -324,7 +356,13 @@ int __init sbi_init(void) if ( sbi_probe_extension(SBI_EXT_RFENCE) > 0 ) { sbi_rfence = sbi_rfence_v02; - printk("SBI v0.2 RFENCE extension detected\n"); + dprintk(XENLOG_INFO, "SBI v0.2 RFENCE extension detected\n"); + } + + if ( sbi_probe_extension(SBI_EXT_TIME) > 0 ) + { + sbi_set_timer = sbi_set_timer_v02; + dprintk(XENLOG_INFO, "SBI v0.2 TIME extension detected\n"); } } else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:34:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:34:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249972.1547365 (Exim 4.92) (envelope-from ) id 1vzuQQ-0005pt-2l; Tue, 10 Mar 2026 10:34:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249972.1547365; Tue, 10 Mar 2026 10:34: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 1vzuQP-0005pl-Vh; Tue, 10 Mar 2026 10:34:53 +0000 Received: by outflank-mailman (input) for mailman id 1249972; Tue, 10 Mar 2026 10:34:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuQO-0005pe-Ok for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuQO-001aFh-34 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuQO-001e4I-2I for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:34: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=3McMa3IVf7sMA2wRIltHVYBuRRB7N2G4zoovatxkg0o=; b=GDoIDznmYdTT0L9xrEZtom+W8c ULKtq/LtOKLaaieUezLLJoFmnBQEaOnAtYZObadVJ0f3pZ82nb9pV+/E3BBzS7EJ+u5tMvPur0fgI 6aCqozt7wdX3lsMTWmPVymCaaI7tc5U17NMVq9cpTIWZ8EUCRwXXOnu/0s0UcS4fO73w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: implement reprogram_timer() via SBI Message-Id: Date: Tue, 10 Mar 2026 10:34:52 +0000 commit f3f7359b617c659d4f526d70a6d405ed12e4021d Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:27 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:10 2026 +0100 xen/riscv: implement reprogram_timer() via SBI Implement reprogram_timer() on RISC-V using the standard SBI timer call. The privileged architecture only defines machine-mode timer interrupts (using mtime/mtimecmp). Therefore, timer services for S/HS/VS mode must be provided by M-mode via SBI calls. SSTC (Supervisor-mode Timer Control) is optional and is not supported on the boards available to me, so the only viable approach today is to program the timer through SBI. reprogram_timer() enables/disables the supervisor timer interrupt and programs the next timer deadline using sbi_set_timer(). If the SBI call fails, the code panics, because sbi_set_timer() is expected to return either 0 or -ENOSUPP (this has been stable from early OpenSBI versions to the latest ones). The SBI spec does not define a standard negative error code for this call, and without SSTC there is no alternative method to program the timer, so the SBI timer call must be available. reprogram_timer() currently returns int for compatibility with the existing prototype. While it might be cleaner to return bool, keeping the existing signature avoids premature changes in case sbi_set_timer() ever needs to return other values (based on which we could try to avoid panic-ing) in the future. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/stubs.c | 5 ----- xen/arch/riscv/time.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index eedf8bf935..2f3a0ce76a 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -21,11 +21,6 @@ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; /* time.c */ -int reprogram_timer(s_time_t timeout) -{ - BUG_ON("unimplemented"); -} - void send_timer_event(struct vcpu *v) { BUG_ON("unimplemented"); diff --git a/xen/arch/riscv/time.c b/xen/arch/riscv/time.c index 2c7af0a5d6..7efa76fdbc 100644 --- a/xen/arch/riscv/time.c +++ b/xen/arch/riscv/time.c @@ -7,6 +7,9 @@ #include #include +#include +#include + unsigned long __ro_after_init cpu_khz; /* CPU clock frequency in kHz. */ uint64_t __ro_after_init boot_clock_cycles; @@ -40,6 +43,46 @@ static void __init preinit_dt_xen_time(void) cpu_khz = rate / 1000; } +int reprogram_timer(s_time_t timeout) +{ + uint64_t deadline, now; + int rc; + + if ( timeout == 0 ) + { + /* Disable timer interrupt */ + csr_clear(CSR_SIE, BIT(IRQ_S_TIMER, UL)); + + return 1; + } + + deadline = ns_to_ticks(timeout) + boot_clock_cycles; + now = get_cycles(); + if ( deadline <= now ) + return 0; + + /* + * TODO: When the SSTC extension is supported, it would be preferable to + * use the supervisor timer registers directly here for better + * performance, since an SBI call and mode switch would no longer + * be required. + * + * This would also reduce reliance on a specific SBI implementation. + * For example, it is not ideal to panic() if sbi_set_timer() returns + * a non-zero value. Currently it can return 0 or -ENOSUPP, and + * without SSTC we still need an implementation because only the + * M-mode timer is available, and it can only be programmed in + * M-mode. + */ + if ( (rc = sbi_set_timer(deadline)) ) + panic("%s: timer wasn't set because: %d\n", __func__, rc); + + /* Enable timer interrupt */ + csr_set(CSR_SIE, BIT(IRQ_S_TIMER, UL)); + + return 1; +} + void __init preinit_xen_time(void) { if ( acpi_disabled ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:35:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:35:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249973.1547368 (Exim 4.92) (envelope-from ) id 1vzuQa-0005sX-4a; Tue, 10 Mar 2026 10:35:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249973.1547368; Tue, 10 Mar 2026 10:35: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 1vzuQa-0005sP-23; Tue, 10 Mar 2026 10:35:04 +0000 Received: by outflank-mailman (input) for mailman id 1249973; Tue, 10 Mar 2026 10:35:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuQY-0005sH-RQ for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuQZ-001aFw-07 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuQY-001e53-2Z for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35: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=XCZIGmBZGF0c0KEpHC9gEnYJpSOKpnwypKTg4O6tAyo=; b=4mgU3Mx+xPhLA4plz7OXZ4Mz8A WTUBXcgMuS/NvsnDsGOTAPzZei86kLW/sDsraRHOYyqjpxaL9GBx9JWyr0pt9GyCJ3SpMA3VQEKNJ FfbX6I51iBHAp4f79x7IXThRR/VZKf5jW+RvOBdDHsgfukv8baNrV/QvtN8Mb8vSkagw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: handle hypervisor timer interrupts Message-Id: Date: Tue, 10 Mar 2026 10:35:02 +0000 commit cfef4ba93980d9da0f1d97224b233fe988639ddb Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:28 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:22 2026 +0100 xen/riscv: handle hypervisor timer interrupts Introduce timer_interrupt() to process IRQ_S_TIMER interrupts. The handler disables further timer interrupts by clearing SIE.STIE and raises TIMER_SOFTIRQ so the generic timer subsystem can perform its processing. Update do_trap() to dispatch IRQ_S_TIMER to this new handler. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/traps.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index 244264c92a..326f2be628 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -180,6 +181,15 @@ static void check_for_pcpu_work(void) p2m_handle_vmenter(); } +static void timer_interrupt(void) +{ + /* Disable the timer to avoid more interrupts */ + csr_clear(CSR_SIE, BIT(IRQ_S_TIMER, UL)); + + /* Signal the generic timer code to do its work */ + raise_softirq(TIMER_SOFTIRQ); +} + void do_trap(struct cpu_user_regs *cpu_regs) { register_t pc = cpu_regs->sepc; @@ -221,6 +231,10 @@ void do_trap(struct cpu_user_regs *cpu_regs) intc_handle_external_irqs(cpu_regs); break; + case IRQ_S_TIMER: + timer_interrupt(); + break; + default: intr_handled = false; break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:35:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:35:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249974.1547372 (Exim 4.92) (envelope-from ) id 1vzuQk-0005uZ-69; Tue, 10 Mar 2026 10:35:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249974.1547372; Tue, 10 Mar 2026 10:35: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 1vzuQk-0005uR-3V; Tue, 10 Mar 2026 10:35:14 +0000 Received: by outflank-mailman (input) for mailman id 1249974; Tue, 10 Mar 2026 10:35:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuQi-0005uH-Ua for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuQj-001aG0-0Q for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuQi-001e5x-2p for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35: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=lGw3kVpOhRD2U/a2j/32nrcv9sL+hQ9hWsdXHMIGK/Y=; b=Hy3ThdZxiqIiaTVTZAaHWdUph2 gkqh2BRN5XbLqbWacIil/eJ4Ul4jq5z+bGdBeek3Wm6ku7XP2q4mSwIM87HMQ5oBljhKQQqt8ei4g g6MH7thKjwT4ti5swItMqn8pjc2eLrQbYSfMnWTjsnxVr7nyzgaP0ZOO6C/Z9UQTC2P0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: init tasklet subsystem Message-Id: Date: Tue, 10 Mar 2026 10:35:12 +0000 commit 18964d1bf544129c5fb0f04c96b8502b0f203755 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:29 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:35 2026 +0100 xen/riscv: init tasklet subsystem As the tasklet subsystem is now initialized, it is necessary to implement sync_local_execstate(), since it is invoked when something calls tasklet_softirq_action(), which is registered in tasklet_subsys_init(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/setup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index bca6ca09ed..cae49bb296 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -133,6 +134,8 @@ void __init noreturn start_xen(unsigned long bootcpu_id, panic("Booting using ACPI isn't supported\n"); } + tasklet_subsys_init(); + init_IRQ(); riscv_fill_hwcap(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:35:25 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:35:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249975.1547377 (Exim 4.92) (envelope-from ) id 1vzuQv-0005x3-7l; Tue, 10 Mar 2026 10:35:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249975.1547377; Tue, 10 Mar 2026 10:35: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 1vzuQv-0005wv-53; Tue, 10 Mar 2026 10:35:25 +0000 Received: by outflank-mailman (input) for mailman id 1249975; Tue, 10 Mar 2026 10:35:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuQt-0005wn-2k for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuQt-001aG4-0g for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuQs-001e6h-39 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35: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=x7C6Fmn9oTmDu8vEcuoEmapVawwDdceNP+UIN506U4g=; b=7Np4XwQUe4vKFhku/5L5xY/fc8 rd6vPjXeYzP9jkyfgGHUAKTNm0m0mk0Eex579EOrShIwPg5vkhLUgZdfJUIdfSEie16QjliSVZN4E SY4r6speVOA+KnLRWd6AY8VYqIMJMfx70a9IifiGgk3hq8Sy8ra9hm4gUUz90k491XyI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: implement sync_vcpu_execstate() Message-Id: Date: Tue, 10 Mar 2026 10:35:22 +0000 commit 256479ba567766609435c83b5d5d5596c1c606e0 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:30 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:47 2026 +0100 xen/riscv: implement sync_vcpu_execstate() The scheduler may call this function to force synchronization of given vCPU's state. RISC-V does not support lazy context switching, so nothing is done in sync_vcpu_execstate() and sync_local_execstate(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 10 ++++++++++ xen/arch/riscv/stubs.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 470eca3ad7..c327f44d07 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -278,6 +278,16 @@ void vcpu_kick(struct vcpu *v) } } +void sync_local_execstate(void) +{ + /* Nothing to do -- no lazy switching */ +} + +void sync_vcpu_execstate(struct vcpu *v) +{ + /* Nothing to do -- no lazy switching */ +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 2f3a0ce76a..acbb5b9123 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -91,16 +91,6 @@ void continue_running(struct vcpu *same) BUG_ON("unimplemented"); } -void sync_local_execstate(void) -{ - BUG_ON("unimplemented"); -} - -void sync_vcpu_execstate(struct vcpu *v) -{ - BUG_ON("unimplemented"); -} - void startup_cpu_idle_loop(void) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 10:35:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 10:35:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1249976.1547380 (Exim 4.92) (envelope-from ) id 1vzuR4-0005zE-8x; Tue, 10 Mar 2026 10:35:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1249976.1547380; Tue, 10 Mar 2026 10:35: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 1vzuR4-0005z7-6P; Tue, 10 Mar 2026 10:35:34 +0000 Received: by outflank-mailman (input) for mailman id 1249976; Tue, 10 Mar 2026 10:35:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzuR3-0005yz-3X for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzuR3-001aG8-0w for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzuR3-001e76-0A for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 10:35: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=k7JvdVw+Fsd9Ye+IUXdy0JPA809/A2SS5yTm2p9OfDg=; b=U5YlpA62J1Ndr44IWMLsfMS99C ZAxx6wxQnj2UiUno6iNrT4HIGfgGboLUV5xdjSfVDZw5dOLhKlC7elefsoy77WTszqWTC32Qmw4Gx q6jz2yeyn6/a5T/FmZUH7RuyE+7YtXw/+eJ1sbmoZTXlNWExWeFMTNKYyQeTZWTSdXKc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests/x86_emulator: avoid duplicate symbol error with clang: use -Og Message-Id: Date: Tue, 10 Mar 2026 10:35:33 +0000 commit 442f3481fe3979e3e563bd7d221498a3d52133cc Author: Edwin Török AuthorDate: Tue Mar 10 09:28:09 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:28:09 2026 +0100 tools/tests/x86_emulator: avoid duplicate symbol error with clang: use -Og clang would duplicate the loop body and end up with a double definition of the symbol: ``` /tmp/test_x86_emulator-0f3576.s:27823: Error: symbol `vmovsh_to_mem' is already defined /tmp/test_x86_emulator-0f3576.s:27825: Error: symbol `.Lvmovsh_to_mem_end' is already defined ``` Until a better solution is found: reduce optimizations in the test runner. Using -Os might also work, but we can't rely on the size optimization always avoiding the duplication of asm blocks. This is test code, not performance critical code, and -O0 is more future proof. However for debugging -Og is recommended over -O0, and this still avoids the duplicate label problem. Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 5003c464f3..8210e83345 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -323,4 +323,11 @@ x86-emulate.o x86_emulate/%.o: HOSTCFLAGS += -D__XEN_TOOLS__ $(call cc-option-add,HOSTCFLAGS-toplevel,HOSTCC,-fno-toplevel-reorder) test_x86_emulator.o: HOSTCFLAGS += $(HOSTCFLAGS-toplevel) +# When unrolling loops, compilers may duplicate inline assembly. put_insn() +# emits labels, which may not be emitted multiple times. +# The default HOSTCFLAGS from $(XEN_ROOT)/Config.mk would set a non-zero +# optimisation level. +# Until a better solution is found: reduce optimizations in the test runner. +test_x86_emulator.o: HOSTCFLAGS += -Og + test_x86_emulator.o: $(addsuffix .h,$(TESTCASES)) $(addsuffix -opmask.h,$(OPMASK)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:44:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250039.1547439 (Exim 4.92) (envelope-from ) id 1vzvVL-0000Mt-AQ; Tue, 10 Mar 2026 11:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250039.1547439; Tue, 10 Mar 2026 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 1vzvVL-0000Ml-7D; Tue, 10 Mar 2026 11:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1250039; Tue, 10 Mar 2026 11:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvVJ-0000Mf-Qq for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvVJ-001bV9-37 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvVJ-001iXR-2J for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11: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=YpjM732++95BBSVdpgobDIYfcm24pP3zmI3ycVGQFeY=; b=DmLsrT0N8drZW4Rt09oqCGRl4a fXc81IrelzFdVQii051uEMufEzIb+gA66DCPybzEvKOGr8Ksn35o1/wpwsaW8yPnVOt7sFMSRkGhl KuLzaLSzAZveXpTW1Os0HVG4wI5XHPlHBUKNoDGcjGWPkQa81zcPsQNso8g3zeWrjswg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 11:44:01 +0000 commit adfbdaa347d05e53c8c61ad00a6851bd5b82c760 Author: Jan Beulich AuthorDate: Tue Mar 10 09:23:25 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:23:25 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d24be268ae..ab910fcf93 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -500,14 +500,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:44:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250040.1547443 (Exim 4.92) (envelope-from ) id 1vzvVV-0000P1-Bb; Tue, 10 Mar 2026 11:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250040.1547443; Tue, 10 Mar 2026 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 1vzvVV-0000Ot-8k; Tue, 10 Mar 2026 11:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1250040; Tue, 10 Mar 2026 11:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvVT-0000Oh-TM for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvVU-001bVH-0I for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvVT-001iZ9-2d for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11: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=7sBKU3P3BZzGnH/UMhcKaX+aA7AVgOY9ORIy9GRpL40=; b=kd3ywDuB+gbFWV+q/5WFko5edd 6xNCmwK5E+brWtLbIqQMQa03a7K3taKpck3JVe/H1G7JaLhUEeUF6y6d3VjWoT/yNrYkXFrq1aJ67 qb6wzz/xSJJxZ7YXzlfiTpAMpMvfMuKMN2ZLTCSqzUyfOAxSn/EkvT7iy0nVLHq/FF9w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: re-init extended-capabilities when MMCFG availability changed Message-Id: Date: Tue, 10 Mar 2026 11:44:11 +0000 commit d734babf8bc3407919cfd023e2c58bcce24eccfb Author: Jan Beulich AuthorDate: Tue Mar 10 09:24:00 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:24:00 2026 +0100 vPCI: re-init extended-capabilities when MMCFG availability changed When Dom0 informs us about MMCFG usability, this may change whether extended capabilities are available (accessible) for devices. Zap what might be on record, and re-initialize things. No synchronization is added for the case where devices may already be in use. That'll need sorting when (a) DomU support was added and (b) DomU-s may run already while Dom0 / hwdom still boots (dom0less, Hyperlaunch). vpci_cleanup_capabilities() also shouldn't have used pci_find_ext_capability(), as already when the function was introduced extended config space may not have been (properly) accessible anymore, no matter whether it was during init. Extended capability cleanup hooks need to cope with being called when the respective capability doesn't exist (and hence the corresponding ->init() hook was never called). Fixes: 70e6dace747e ("vpci: Use cleanup to free capability resource during deassign") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/physdev.c | 13 ++++++++++ xen/drivers/vpci/cap.c | 64 +++++++++++++++++++++++++++++++++++----------- xen/drivers/vpci/private.h | 4 +-- xen/drivers/vpci/vpci.c | 4 +-- xen/include/xen/vpci.h | 7 +++++ 5 files changed, 73 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 8496011b59..5bbcf3b530 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -8,6 +8,8 @@ #include #include #include +#include + #include #include #include @@ -169,8 +171,19 @@ int cf_check physdev_check_pci_extcfg(struct pci_dev *pdev, void *arg) ASSERT(pdev->seg == info->segment); if ( pdev->bus >= info->start_bus && pdev->bus <= info->end_bus ) + { pci_check_extcfg(pdev); + /* + * The re-init failing doesn't mean the device becomes entirely non- + * functional. In case of failure, a message was already logged. + * Hence don't otherwise act upon failure. + * + * FIXME: Re-visit when DomU support is added to vPCI. + */ + vpci_reinit_ext_capabilities(pdev); + } + return 0; } #endif /* COMPAT */ diff --git a/xen/drivers/vpci/cap.c b/xen/drivers/vpci/cap.c index e26a2f95da..3c3e6ce1d3 100644 --- a/xen/drivers/vpci/cap.c +++ b/xen/drivers/vpci/cap.c @@ -285,13 +285,16 @@ static int vpci_init_ext_capability_list(const struct pci_dev *pdev) return 0; } -int vpci_init_capabilities(struct pci_dev *pdev) +int vpci_init_capabilities(struct pci_dev *pdev, bool ext_only) { - int rc; + int rc, accum_rc = 0; - rc = vpci_init_capability_list(pdev); - if ( rc ) - return rc; + if ( !ext_only ) + { + rc = vpci_init_capability_list(pdev); + if ( rc ) + return rc; + } rc = vpci_init_ext_capability_list(pdev); if ( rc ) @@ -305,7 +308,7 @@ int vpci_init_capabilities(struct pci_dev *pdev) unsigned int pos = 0; if ( !is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); + pos = !ext_only ? pci_find_cap_offset(pdev->sbdf, cap) : 0; else if ( is_hardware_domain(pdev->domain) ) pos = pci_find_ext_capability(pdev, cap); @@ -341,30 +344,40 @@ int vpci_init_capabilities(struct pci_dev *pdev) { printk(XENLOG_ERR "%pd %pp: hide %s cap %u fail rc=%d\n", pdev->domain, &pdev->sbdf, type, cap, rc); - return rc; + + /* Best effort for the re-init case. */ + if ( !ext_only ) + return rc; + + if ( !accum_rc ) + accum_rc = rc; } } } - return 0; + return accum_rc; } -void vpci_cleanup_capabilities(struct pci_dev *pdev) +void vpci_cleanup_capabilities(struct pci_dev *pdev, bool ext_only) { for ( unsigned int i = 0; i < NUM_VPCI_INIT; i++ ) { const vpci_capability_t *capability = &__start_vpci_array[i]; const unsigned int cap = capability->id; - unsigned int pos = 0; if ( !capability->cleanup ) continue; - if ( !capability->is_ext ) - pos = pci_find_cap_offset(pdev->sbdf, cap); - else if ( is_hardware_domain(pdev->domain) ) - pos = pci_find_ext_capability(pdev, cap); - if ( pos ) + /* + * Cannot call pci_find_ext_capability() here, as extended config space + * may (no longer) be accessible. As a result, extended capability + * ->cleanup() handlers need to cope with being called despite ->init() + * never having been called. Which in turn allows calling them even + * for DomU-s, no matter that vpci_init_capabilities() excludes them + * there for now. + */ + if ( capability->is_ext + || (!ext_only && pci_find_cap_offset(pdev->sbdf, cap)) ) { int rc = capability->cleanup(pdev, false); @@ -376,6 +389,27 @@ void vpci_cleanup_capabilities(struct pci_dev *pdev) } } +int vpci_reinit_ext_capabilities(struct pci_dev *pdev) +{ + if ( !pdev->vpci ) + return 0; + + /* + * FIXME: DomU support is missing. For already running domains we may + * need to pause them around the entire re-evaluation of extended config + * space accessibility. + */ + ASSERT(pdev->domain == hardware_domain); + + if ( vpci_remove_registers(pdev->vpci, PCI_CFG_SPACE_SIZE, + PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) ) + ASSERT_UNREACHABLE(); + + vpci_cleanup_capabilities(pdev, true); + + return vpci_init_capabilities(pdev, true); +} + /* * Local variables: * mode: C diff --git a/xen/drivers/vpci/private.h b/xen/drivers/vpci/private.h index fdeeca7aa8..2907f6b40f 100644 --- a/xen/drivers/vpci/private.h +++ b/xen/drivers/vpci/private.h @@ -46,8 +46,8 @@ typedef struct { int __must_check vpci_init_header(struct pci_dev *pdev); -int vpci_init_capabilities(struct pci_dev *pdev); -void vpci_cleanup_capabilities(struct pci_dev *pdev); +int vpci_init_capabilities(struct pci_dev *pdev, bool ext_only); +void vpci_cleanup_capabilities(struct pci_dev *pdev, bool ext_only); /* Add/remove a register handler. */ int __must_check vpci_add_register_mask(struct vpci *vpci, diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 683d5fc36c..0ac9ec8b04 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -102,7 +102,7 @@ void vpci_deassign_device(struct pci_dev *pdev) &pdev->domain->vpci_dev_assigned_map); #endif - vpci_cleanup_capabilities(pdev); + vpci_cleanup_capabilities(pdev, false); spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) @@ -159,7 +159,7 @@ int vpci_assign_device(struct pci_dev *pdev) if ( rc ) goto out; - rc = vpci_init_capabilities(pdev); + rc = vpci_init_capabilities(pdev, false); out: if ( rc ) diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 83ac41edf8..877aa391d1 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -25,6 +25,8 @@ int __must_check vpci_assign_device(struct pci_dev *pdev); /* Remove all handlers and free vpci related structures. */ void vpci_deassign_device(struct pci_dev *pdev); +int vpci_reinit_ext_capabilities(struct pci_dev *pdev); + /* Generic read/write handlers for the PCI config space. */ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size); void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, @@ -202,6 +204,11 @@ bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, #else /* !CONFIG_HAS_VPCI */ struct vpci_vcpu {}; +static inline int vpci_reinit_ext_capabilities(struct pci_dev *pdev) +{ + return 0; +} + static inline int vpci_assign_device(struct pci_dev *pdev) { return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:44:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250042.1547447 (Exim 4.92) (envelope-from ) id 1vzvVf-0000Ri-D0; Tue, 10 Mar 2026 11:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250042.1547447; Tue, 10 Mar 2026 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 1vzvVf-0000Ra-AC; Tue, 10 Mar 2026 11:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1250042; Tue, 10 Mar 2026 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 1vzvVd-0000RT-W3 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvVe-001bVL-0Z for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvVd-001ial-30 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11: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=UjgGHJlvbIQNN9CQk7dj+8jXH0SFmBCqwsoTHB2dbvI=; b=jtHho90UVUGCtHMzJeKO7VoJym VztJjMkdxMzlAxUKvzil6ykGnDQgfKCdY58rh7xwR7I8lXhuXb1q0jHidn9TXPyzTFLCnWGYeFzm1 Hj8TgaT26wFAV/8jbb+uPSwUVVnXYKaM6tKFiSGFPOmltRCgDDSGwMGtuw2nD8p8/1+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: detect and store supported hypervisor CSR bits at boot Message-Id: Date: Tue, 10 Mar 2026 11:44:21 +0000 commit 8149f72c0cbf6f1e8903b4a50101f806ff0630de Author: Oleksii Kurochko AuthorDate: Tue Mar 10 09:24:35 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:24:35 2026 +0100 xen/riscv: detect and store supported hypervisor CSR bits at boot Some hypervisor CSRs expose optional functionality and may not implement all architectural bits. Writing unsupported bits can either be ignored or raise an exception depending on the platform. Detect the set of writable bits for selected hypervisor CSRs at boot and store the resulting masks for later use. This allows safely programming these CSRs during vCPU context switching and avoids relying on hardcoded architectural assumptions. Use csr_read()&csr_write() instead of csr_swap()+all ones mask as some CSR registers have WPRI fields which should be preserved during write operation. Also, ro_one struct is introduced to cover the cases when a bit in CSR register (at the momemnt, it is only hstateen0) may be r/o-one to have hypervisor view of register seen by guest correct. Masks are calculated at the moment only for hedeleg, henvcfg, hideleg, hstateen0 registers as only them are going to be used in the follow up patch. If the Smstateen extension is not implemented, hstateen0 cannot be read because the register is considered non-existent. Instructions that attempt to access a CSR that is not implemented or not visible in the current mode are reserved and will raise an illegal-instruction exception. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 57 ++++++++++++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/setup.h | 2 ++ xen/arch/riscv/setup.c | 2 ++ 3 files changed, 61 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index b60320b90d..a5450a6d1b 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -2,9 +2,66 @@ #include #include +#include #include #include +#include +#include + +struct csr_masks { + register_t hedeleg; + register_t henvcfg; + register_t hideleg; + register_t hstateen0; + + struct { + register_t hstateen0; + } ro_one; +}; + +static struct csr_masks __ro_after_init csr_masks; + +#define HEDELEG_AVAIL_MASK ULONG_MAX +#define HIDELEG_AVAIL_MASK ULONG_MAX +#define HENVCFG_AVAIL_MASK _UL(0xE0000003000000FF) +#define HSTATEEN0_AVAIL_MASK _UL(0xDE00000000000007) + +void __init init_csr_masks(void) +{ + /* + * The mask specifies the bits that may be safely modified without + * causing side effects. + * + * For example, registers such as henvcfg or hstateen0 contain WPRI + * fields that must be preserved. Any write to the full register must + * therefore retain the original values of those fields. + */ +#define INIT_CSR_MASK(csr, field, mask) do { \ + register_t old = csr_read_set(CSR_ ## csr, mask); \ + csr_masks.field = csr_swap(CSR_ ## csr, old); \ + } while (0) + +#define INIT_RO_ONE_MASK(csr, field, mask) do { \ + register_t old = csr_read_clear(CSR_ ## csr, mask); \ + csr_masks.ro_one.field = csr_swap(CSR_ ## csr, old) & mask; \ + } while (0) + + INIT_CSR_MASK(HEDELEG, hedeleg, HEDELEG_AVAIL_MASK); + INIT_CSR_MASK(HIDELEG, hideleg, HIDELEG_AVAIL_MASK); + + INIT_CSR_MASK(HENVCFG, henvcfg, HENVCFG_AVAIL_MASK); + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_smstateen) ) + { + INIT_CSR_MASK(HSTATEEN0, hstateen0, HSTATEEN0_AVAIL_MASK); + INIT_RO_ONE_MASK(HSTATEEN0, hstateen0, HSTATEEN0_AVAIL_MASK); + } + +#undef INIT_CSR_MASK +#undef INIT_RO_ONE_MASK +} + static void continue_new_vcpu(struct vcpu *prev) { BUG_ON("unimplemented\n"); diff --git a/xen/arch/riscv/include/asm/setup.h b/xen/arch/riscv/include/asm/setup.h index c9d69cdf51..2215894cfb 100644 --- a/xen/arch/riscv/include/asm/setup.h +++ b/xen/arch/riscv/include/asm/setup.h @@ -11,6 +11,8 @@ void setup_mm(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); +void init_csr_masks(void); + #endif /* ASM__RISCV__SETUP_H */ /* diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 9b4835960d..bca6ca09ed 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -137,6 +137,8 @@ void __init noreturn start_xen(unsigned long bootcpu_id, riscv_fill_hwcap(); + init_csr_masks(); + preinit_xen_time(); intc_preinit(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:44:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250043.1547451 (Exim 4.92) (envelope-from ) id 1vzvVp-0000Vi-Fg; Tue, 10 Mar 2026 11:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250043.1547451; Tue, 10 Mar 2026 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 1vzvVp-0000Va-D0; Tue, 10 Mar 2026 11:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1250043; Tue, 10 Mar 2026 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 1vzvVo-0000VR-3W for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzvVo-001bVR-0v for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvVo-001icP-05 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=uCF8cyXnubeOjbgNiGTVhpZ6S/HANcQxdnZ/rhZnWVE=; b=d6wonBdWoo18zk/DTDyxnv3Cwa MlW1UembhOnD4L83Ou5hRmJr5azpNKtEZu8+yz11k4qAOP0SKaxDijipcMYZYsvULULWzkz22mh65 JsyVD2yY7TkZyG8J7X3lDjXxe9I/F48TWs+Ow+f3q/awjpqXEQduBH4oDagcNZ70rX6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: implement vcpu_csr_init() Message-Id: Date: Tue, 10 Mar 2026 11:44:32 +0000 commit 02b3a1b0e53c6ebb03d7c07e2c5272cd5652b384 Author: Oleksii Kurochko AuthorDate: Tue Mar 10 09:25:01 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:01 2026 +0100 xen/riscv: implement vcpu_csr_init() Introduce vcpu_csr_init() to initialise hypervisor CSRs that control vCPU execution and virtualization behaviour before the vCPU is first scheduled. The function configures trap and interrupt delegation to VS-mode by setting the appropriate bits in the hedeleg and hideleg registers, initializes hstatus so that execution enters VS-mode when control is passed to the guest, and restricts guest access to hardware performance counters by initializing hcounteren, as unrestricted access would require additional handling in Xen. When the Smstateen and SSAIA extensions are available, access to AIA CSRs and IMSIC guest interrupt files is enabled by setting the corresponding bits in hstateen0, avoiding unnecessary traps into Xen (note that SVSLCT(Supervisor Virtual Select) name is used intead of CSRIND as OpenSBI uses such name and riscv_encoding.h is mostly based on it). If the Svpbmt extension is supported, the PBMTE bit is set in henvcfg to allow its use for VS-stage address translation. Guest access to the ENVCFG CSR is also enabled by setting ENVCFG bit in hstateen0, as a guest may need to control certain characteristics of the U-mode (VU-mode when V=1) execution environment. For CSRs that may contain read-only bits (e.g. hedeleg, hideleg, hstateen0), to the written value a correspondent mask is applied to avoid divergence between the software state and the actual CSR contents. As hstatus is not part of struct arch_vcpu (it already resides in struct cpu_user_regs), introduce vcpu_guest_cpu_user_regs() to provide a uniform way to access hstatus and other guest CPU user registers. This establishes a consistent and well-defined initial CSR state for vCPUs prior to their first context switch. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 63 +++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/current.h | 2 + xen/arch/riscv/include/asm/domain.h | 6 +++ xen/arch/riscv/include/asm/riscv_encoding.h | 2 + 4 files changed, 73 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index a5450a6d1b..14cc85093b 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -8,6 +8,7 @@ #include #include +#include struct csr_masks { register_t hedeleg; @@ -20,6 +21,21 @@ struct csr_masks { } ro_one; }; +#define HEDELEG_DEFAULT (BIT(CAUSE_MISALIGNED_FETCH, U) | \ + BIT(CAUSE_FETCH_ACCESS, U) | \ + BIT(CAUSE_ILLEGAL_INSTRUCTION, U) | \ + BIT(CAUSE_BREAKPOINT, U) | \ + BIT(CAUSE_MISALIGNED_LOAD, U) | \ + BIT(CAUSE_LOAD_ACCESS, U) | \ + BIT(CAUSE_MISALIGNED_STORE, U) | \ + BIT(CAUSE_STORE_ACCESS, U) | \ + BIT(CAUSE_USER_ECALL, U) | \ + BIT(CAUSE_FETCH_PAGE_FAULT, U) | \ + BIT(CAUSE_LOAD_PAGE_FAULT, U) | \ + BIT(CAUSE_STORE_PAGE_FAULT, U)) + +#define HIDELEG_DEFAULT (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP) + static struct csr_masks __ro_after_init csr_masks; #define HEDELEG_AVAIL_MASK ULONG_MAX @@ -62,6 +78,51 @@ void __init init_csr_masks(void) #undef INIT_RO_ONE_MASK } +static void vcpu_csr_init(struct vcpu *v) +{ + v->arch.hedeleg = HEDELEG_DEFAULT & csr_masks.hedeleg; + + vcpu_guest_cpu_user_regs(v)->hstatus = HSTATUS_SPV | HSTATUS_SPVP; + + v->arch.hideleg = HIDELEG_DEFAULT & csr_masks.hideleg; + + /* + * VS should access only the time counter directly. + * Everything else should trap. + */ + v->arch.hcounteren = HCOUNTEREN_TM; + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_svpbmt) ) + v->arch.henvcfg = ENVCFG_PBMTE & csr_masks.henvcfg; + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_smstateen) ) + { + /* Allow guest to access CSR_SENVCFG */ + register_t hstateen0 = SMSTATEEN0_HSENVCFG; + + if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_ssaia) ) + /* + * If the hypervisor extension is implemented, the same three + * bits are defined also in hypervisor CSR hstateen0 but concern + * only the state potentially accessible to a virtual machine + * executing in privilege modes VS and VU: + * bit 60 CSRs siselect and sireg (really vsiselect and + * vsireg) + * bit 59 CSRs siph and sieh (RV32 only) and stopi (really + * vsiph, vsieh, and vstopi) + * bit 58 all state of IMSIC guest interrupt files, including + * CSR stopei (really vstopei) + * If one of these bits is zero in hstateen0, and the same bit is + * one in mstateen0, then an attempt to access the corresponding + * state from VS or VU-mode raises a virtual instruction exception. + */ + hstateen0 |= SMSTATEEN0_AIA | SMSTATEEN0_IMSIC | SMSTATEEN0_SVSLCT; + + v->arch.hstateen0 = (hstateen0 & csr_masks.hstateen0) | + csr_masks.ro_one.hstateen0; + } +} + static void continue_new_vcpu(struct vcpu *prev) { BUG_ON("unimplemented\n"); @@ -84,6 +145,8 @@ int arch_vcpu_create(struct vcpu *v) if ( is_idle_vcpu(v) ) return 0; + vcpu_csr_init(v); + /* * As the vtimer and interrupt controller (IC) are not yet implemented, * return an error. diff --git a/xen/arch/riscv/include/asm/current.h b/xen/arch/riscv/include/asm/current.h index 58c9f1506b..5fbee8182c 100644 --- a/xen/arch/riscv/include/asm/current.h +++ b/xen/arch/riscv/include/asm/current.h @@ -48,6 +48,8 @@ DECLARE_PER_CPU(struct vcpu *, curr_vcpu); #define get_cpu_current(cpu) per_cpu(curr_vcpu, cpu) #define guest_cpu_user_regs() ({ BUG_ON("unimplemented"); NULL; }) +#define vcpu_guest_cpu_user_regs(vcpu) \ + (&(vcpu)->arch.cpu_info->guest_cpu_user_regs) #define switch_stack_and_jump(stack, fn) do { \ asm volatile ( \ diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 5aec627a7a..17be792afe 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -49,6 +49,12 @@ struct arch_vcpu { struct cpu_info *cpu_info; + register_t hcounteren; + register_t hedeleg; + register_t hideleg; + register_t henvcfg; + register_t hstateen0; + register_t vsatp; }; diff --git a/xen/arch/riscv/include/asm/riscv_encoding.h b/xen/arch/riscv/include/asm/riscv_encoding.h index 1f7e612366..dd15731a86 100644 --- a/xen/arch/riscv/include/asm/riscv_encoding.h +++ b/xen/arch/riscv/include/asm/riscv_encoding.h @@ -228,6 +228,8 @@ #define ENVCFG_CBIE_INV _UL(0x3) #define ENVCFG_FIOM _UL(0x1) +#define HCOUNTEREN_TM BIT(1, U) + /* ===== User-level CSRs ===== */ /* User Trap Setup (N-extension) */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:44:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250044.1547455 (Exim 4.92) (envelope-from ) id 1vzvVz-0000Xv-Gz; Tue, 10 Mar 2026 11:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250044.1547455; Tue, 10 Mar 2026 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 1vzvVz-0000Xm-EJ; Tue, 10 Mar 2026 11:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1250044; Tue, 10 Mar 2026 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 1vzvVy-0000Xa-6C for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzvVy-001bVV-1C for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvVy-001idd-0P for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=G+sPPJDsLm0ZUrhG3o3AEIYtmVPi8w5gHwRCpe7NCkQ=; b=lCSIdTgwhdYludoZQADmWsEQLi hjwqz3tNjIBRa6ApxGxTBN2OMQoPaSrJa9qrVpbfNfC/LJ8XjFsQE3DXrUwi0iTH+M4gRPiCEq+uV QFa/4n8sNi8vajNsrvpnCfOgfny7G2ALf8cYKfw3ECEaRClvYddK3Xhgctgzzbr5kAJQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce tracking of pending vCPU interrupts, part 1 Message-Id: Date: Tue, 10 Mar 2026 11:44:42 +0000 commit c537959a5cb0178b0a34333892a8c0b47b69274f Author: Oleksii Kurochko AuthorDate: Tue Mar 10 09:25:16 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:16 2026 +0100 xen/riscv: introduce tracking of pending vCPU interrupts, part 1 Based on Linux kernel v6.16.0. Note that smp_wmb() is used instead of smp_mb__before_atomic() as what we want to guarantee that if a bit in irqs_pending_mask is obversable that the correspondent bit in irqs_pending is observable too. Add lockless tracking of pending vCPU interrupts using atomic bitops. Two bitmaps are introduced: - irqs_pending — interrupts currently pending for the vCPU - irqs_pending_mask — bits that have changed in irqs_pending The design follows a multi-producer, single-consumer model, where the consumer is the vCPU itself. Producers may set bits in irqs_pending_mask without a lock. Clearing bits in irqs_pending_mask is performed only by the consumer via xchg(). The consumer must not write to irqs_pending and must not act on bits that are not set in the mask. Otherwise, extra synchronization should be provided. On RISC-V interrupts are not injected via guest registers, so pending interrupts must be recorded in irqs_pending (using the new vcpu_{un}set_interrupt() helpers) and flushed to the guest by updating HVIP before returning control to the guest. The consumer side is implemented in a follow-up patch. A barrier between updating irqs_pending and setting the corresponding mask bit in vcpu_set_interrupt()/vcpu_unset_interrupt() guarantees that if the consumer observes a mask bit set, the corresponding pending bit is also visible. This prevents missed interrupts during the flush. It is possible that a guest could have pending bit in the hardware register without being marked pending in irq_pending bitmap as: According to the RISC-V ISA specification: Bits hip.VSSIP and hie.VSSIE are the interrupt-pending and interrupt-enable bits for VS-level software interrupts. VSSIP in hip is an alias (writable) of the same bit in hvip. Additionally: When bit 2 of hideleg is zero, vsip.SSIP and vsie.SSIE are read-only zeros. Else, vsip.SSIP and vsie.SSIE are aliases of hip.VSSIP and hie.VSSIE. This means the guest may modify vsip.SSIP, which implicitly updates hip.VSSIP and the bit being written with 1 would also trigger an interrupt as according to the RISC-V spec: These conditions for an interrupt trap to occur must be evaluated in a bounded amount of time from when an interrupt becomes, or ceases to be, pending in sip, and must also be evaluated immediately following the execution of an SRET instruction or an explicit write to a CSR on which these interrupt trap conditions expressly depend (including sip, sie and sstatus). What means that IRQ_VS_SOFT must be synchronized separately, what is done in vcpu_sync_interrupts(). Note, also, that IRQ_PMU_OVF would want to be synced for the similar reason as IRQ_VS_SOFT, but isn't sync-ed now as PMU isn't supported now. For the remaining VS-level interrupt types (IRQ_VS_TIMER and IRQ_VS_EXT), the specification states they cannot be modified by the guest and are read-only because of: Bits hip.VSEIP and hie.VSEIE are the interrupt-pending and interrupt-enable bits for VS-level external interrupts. VSEIP is read-only in hip, and is the logical-OR of these interrupt sources: • bit VSEIP of hvip; • the bit of hgeip selected by hstatus.VGEIN; and • any other platform-specific external interrupt signal directed to VS-level. Bits hip.VSTIP and hie.VSTIE are the interrupt-pending and interrupt-enable bits for VS-level timer interrupts. VSTIP is read-only in hip, and is the logical-OR of hvip.VSTIP and any other platform-specific timer interrupt signal directed to VS-level. and When bit 10 of hideleg is zero, vsip.SEIP and vsie.SEIE are read-only zeros. Else, vsip.SEIP and vsie.SEIE are aliases of hip.VSEIP and hie.VSEIE. When bit 6 of hideleg is zero, vsip.STIP and vsie.STIE are read-only zeros. Else, vsip.STIP and vsie.STIE are aliases of hip.VSTIP and hie.VSTIE. and also, Bits sip.SEIP and sie.SEIE are the interrupt-pending and interrupt-enable bits for supervisor-level external interrupts. If implemented, SEIP is read-only in sip, and is set and cleared by the execution environment, typically through a platform-specific interrupt controller. Bits sip.STIP and sie.STIE are the interrupt-pending and interrupt-enable bits for supervisor-level timer interrupts. If implemented, STIP is read-only in sip, and is set and cleared by the execution environment Thus, for these interrupt types, it is sufficient to use vcpu_set_interrupt() and vcpu_unset_interrupt(), and flush them during the call of vcpu_flush_interrupts() (which is introduced in follow up patch). vcpu_sync_interrupts(), which is called just before entering the VM, slightly bends the rule that the irqs_pending bit must be written first, followed by updating the corresponding bit in irqs_pending_mask. However, it still respects the core guarantee that the producer never clears the mask and only writes to irqs_pending if it is the one that flipped the corresponding mask bit from 0 to 1. Moreover, since the consumer won't run concurrently because vcpu_sync_interrupts() and the consumer path are going to be invoked sequentially immediately before VM entry, it is safe to slightly relax this ordering rule in vcpu_sync_interrupts(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 63 +++++++++++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/domain.h | 22 +++++++++++++ xen/arch/riscv/traps.c | 4 +++ 3 files changed, 89 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 14cc85093b..694a03ab74 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -168,6 +169,68 @@ void arch_vcpu_destroy(struct vcpu *v) vfree((void *)&v->arch.cpu_info[1] - STACK_SIZE); } +int vcpu_set_interrupt(struct vcpu *v, unsigned int irq) +{ + bool kick_vcpu; + + /* We only allow VS-mode software, timer, and external interrupts */ + if ( irq != IRQ_VS_SOFT && + irq != IRQ_VS_TIMER && + irq != IRQ_VS_EXT ) + return -EINVAL; + + kick_vcpu = !test_and_set_bit(irq, v->arch.irqs_pending); + + /* + * The counterpart of this barrier is the one encoded implicitly in xchg() + * which is used in consumer part (vcpu_flush_interrupts()). + */ + smp_wmb(); + + kick_vcpu |= !test_and_set_bit(irq, v->arch.irqs_pending_mask); + + if ( kick_vcpu ) + vcpu_kick(v); + + return 0; +} + +int vcpu_unset_interrupt(struct vcpu *v, unsigned int irq) +{ + /* We only allow VS-mode software, timer, external interrupts */ + if ( irq != IRQ_VS_SOFT && + irq != IRQ_VS_TIMER && + irq != IRQ_VS_EXT ) + return -EINVAL; + + clear_bit(irq, v->arch.irqs_pending); + /* + * The counterpart of this barrier is the one encoded implicitly in xchg() + * which is used in consumer part (vcpu_flush_interrupts()). + */ + smp_wmb(); + set_bit(irq, v->arch.irqs_pending_mask); + + return 0; +} + +void vcpu_sync_interrupts(struct vcpu *curr) +{ + unsigned long hvip = csr_read(CSR_HVIP); + + ASSERT(curr == current); + + /* Sync-up HVIP.VSSIP bit changes done by Guest */ + if ( ((curr->arch.hvip ^ hvip) & BIT(IRQ_VS_SOFT, UL)) && + !test_and_set_bit(IRQ_VS_SOFT, &curr->arch.irqs_pending_mask) ) + { + if ( hvip & BIT(IRQ_VS_SOFT, UL) ) + set_bit(IRQ_VS_SOFT, &curr->arch.irqs_pending); + else + clear_bit(IRQ_VS_SOFT, &curr->arch.irqs_pending); + } +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 17be792afe..1ecfe18c85 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -54,8 +54,25 @@ struct arch_vcpu { register_t hideleg; register_t henvcfg; register_t hstateen0; + register_t hvip; register_t vsatp; + + /* + * VCPU interrupts + * + * We have a lockless approach for tracking pending VCPU interrupts + * implemented using atomic bitops. The irqs_pending bitmap represent + * pending interrupts whereas irqs_pending_mask represent bits changed + * in irqs_pending. Our approach is modeled around multiple producer + * and single consumer problem where the consumer is the VCPU itself. + * + * DECLARE_BITMAP() is needed here to support 64 vCPU local interrupts + * on RV32 host. + */ +#define RISCV_VCPU_NR_IRQS MAX(BITS_PER_LONG, 64) + DECLARE_BITMAP(irqs_pending, RISCV_VCPU_NR_IRQS); + DECLARE_BITMAP(irqs_pending_mask, RISCV_VCPU_NR_IRQS); }; struct paging_domain { @@ -94,6 +111,11 @@ static inline void update_guest_memory_policy(struct vcpu *v, static inline void arch_vcpu_block(struct vcpu *v) {} +int vcpu_set_interrupt(struct vcpu *v, unsigned int irq); +int vcpu_unset_interrupt(struct vcpu *v, unsigned int irq); + +void vcpu_sync_interrupts(struct vcpu *curr); + #endif /* ASM__RISCV__DOMAIN_H */ /* diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index 9fca941526..551f886e3a 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -171,6 +171,10 @@ static void do_unexpected_trap(const struct cpu_user_regs *regs) static void check_for_pcpu_work(void) { + struct vcpu *curr = current; + + vcpu_sync_interrupts(curr); + p2m_handle_vmenter(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:44:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250045.1547460 (Exim 4.92) (envelope-from ) id 1vzvW9-0000a3-Iw; Tue, 10 Mar 2026 11:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250045.1547460; Tue, 10 Mar 2026 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 1vzvW9-0000Zr-Fh; Tue, 10 Mar 2026 11:44:53 +0000 Received: by outflank-mailman (input) for mailman id 1250045; Tue, 10 Mar 2026 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 1vzvW8-0000Zh-8m for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzvW8-001bVt-1T for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvW8-001ifN-0h for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=/7eBuiZHI3cedkojzPfjkfiC/U++hYDdtJx3+j2/SXc=; b=gXlT8UkumvAnx6PTpw5pCdE8S+ X0ZikOfarPosrDiSS8d2BnCgrX8hENR+upY1PCWNIhDBxQNGP1WMifVIRn5L7nzEcwfw+rxlY7MLA Ryco5nirf1DwjiSG7/P2lMzw7OFDg7SxNe0svgiKaIs/YOUI3He5YuhSi2EJsI6C96N0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce tracking of pending vCPU interrupts, part 2 Message-Id: Date: Tue, 10 Mar 2026 11:44:52 +0000 commit 7379853e0cc91fd760ef3247fc352f7610f16eda Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:21 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:45 2026 +0100 xen/riscv: introduce tracking of pending vCPU interrupts, part 2 This patch is based on Linux kernel 6.16.0. Add the consumer side (vcpu_flush_interrupts()) of the lockless pending interrupt tracking introduced in part 1 (for producers). According, to the design only one consumer is possible, and it is vCPU itself. vcpu_flush_interrupts() is expected to be ran (as guests aren't ran now due to the lack of functionality) before the hypervisor returns control to the guest. Producers may set bits in irqs_pending_mask without a lock. Clearing bits in irqs_pending_mask is performed only by the consumer via xchg() (with aquire semantics). The consumer must not write to irqs_pending and must not act on bits that are not set in the mask. Otherwise, extra synchronization should be provided. The worst thing which could happen with such approach is that a new pending bit will be set to irqs_pending bitmap during update of hvip variable in vcpu_flush_interrupt() but it isn't problem as the new pending bit won't be lost and just be proceded during the next flush. As AIA specs introduced hviph register which would want to be updated when guest related AIA code vcpu_update_hvip() is introduced instead of just open-code it in vcpu_flush_interrupts(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 27 +++++++++++++++++++++++++++ xen/arch/riscv/include/asm/domain.h | 1 + xen/arch/riscv/traps.c | 2 ++ 3 files changed, 30 insertions(+) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 694a03ab74..9c86581ea2 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -231,6 +231,33 @@ void vcpu_sync_interrupts(struct vcpu *curr) } } +void vcpu_flush_interrupts(struct vcpu *curr) +{ + ASSERT(curr == current); + + if ( ACCESS_ONCE(curr->arch.irqs_pending_mask[0]) ) + { + unsigned long mask = xchg(&curr->arch.irqs_pending_mask[0], 0UL); + unsigned long val = ACCESS_ONCE(curr->arch.irqs_pending[0]) & mask; + register_t *hvip = &curr->arch.hvip; + + *hvip &= ~mask; + *hvip |= val; + + csr_write(CSR_HVIP, *hvip); + } + +#ifdef CONFIG_RISCV_32 + /* + * Flush AIA high interrupts. + * + * It is necessary to do only for CONFIG_RISCV_32 which isn't + * supported now. + */ +# error "Update v->arch.hviph" +#endif +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 1ecfe18c85..59d23e4f92 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -115,6 +115,7 @@ int vcpu_set_interrupt(struct vcpu *v, unsigned int irq); int vcpu_unset_interrupt(struct vcpu *v, unsigned int irq); void vcpu_sync_interrupts(struct vcpu *curr); +void vcpu_flush_interrupts(struct vcpu *curr); #endif /* ASM__RISCV__DOMAIN_H */ diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index 551f886e3a..244264c92a 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -175,6 +175,8 @@ static void check_for_pcpu_work(void) vcpu_sync_interrupts(curr); + vcpu_flush_interrupts(curr); + p2m_handle_vmenter(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:45:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250046.1547462 (Exim 4.92) (envelope-from ) id 1vzvWJ-0000bv-Jv; Tue, 10 Mar 2026 11:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250046.1547462; Tue, 10 Mar 2026 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 1vzvWJ-0000bo-HC; Tue, 10 Mar 2026 11:45:03 +0000 Received: by outflank-mailman (input) for mailman id 1250046; Tue, 10 Mar 2026 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 1vzvWI-0000bi-Bn for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzvWI-001bWJ-1l for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvWI-001igO-0x for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=TMGAiGN5tzTovxo9j2W20nEP6wbYnXCexdATbrzJr6E=; b=W6wn5ytW5g15JVVKiy0pmhEokD r00PPMsuZcYee6OJYxu/xGX0S9FAdaXn1vD1VguZFrUHFy7UIOi/lhXd5t+LZ+HXdRFS5FNNgSHjy l/JC9ij5ARP9plEuZhpF3fiz5Dt22ICg1iMZaGMBRQML/3fhItUMzLpM7RbsYpCrrAFc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce basic vtimer infrastructure for guests Message-Id: Date: Tue, 10 Mar 2026 11:45:02 +0000 commit 2473ddf9b4f991859353a2a9641ff19af1dffd93 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:22 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:25:59 2026 +0100 xen/riscv: introduce basic vtimer infrastructure for guests Lay the groundwork for guest timer support by introducing a per-vCPU virtual timer backed by Xen’s common timer infrastructure. The virtual timer is programmed in response to the guest SBI sbi_set_timer() call and injects a virtual supervisor timer interrupt into the vCPU when it expires. While a dedicated struct vtimer is not strictly required at present, it is expected to become necessary once SSTC support is introduced. In particular, it will need to carry additional state such as whether SSTC is enabled, the next compare value (e.g. for the VSTIMECMP CSR) to be saved and restored across context switches, and time delta state (e.g. HTIMEDELTA) required for use cases such as migration. Introducing struct vtimer now avoids a later refactoring. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/domain.c | 10 ++++-- xen/arch/riscv/include/asm/domain.h | 3 ++ xen/arch/riscv/include/asm/vtimer.h | 17 +++++++++ xen/arch/riscv/vtimer.c | 71 +++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+), 2 deletions(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index bc47e83b26..ffbd7062e2 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -22,6 +22,7 @@ obj-y += traps.o obj-y += vmid.o obj-y += vm_event.o obj-y += vsbi/ +obj-y += vtimer.o $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 9c86581ea2..d25938200f 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -10,6 +10,7 @@ #include #include #include +#include struct csr_masks { register_t hedeleg; @@ -148,11 +149,14 @@ int arch_vcpu_create(struct vcpu *v) vcpu_csr_init(v); + if ( (rc = vcpu_vtimer_init(v)) ) + goto fail; + /* - * As the vtimer and interrupt controller (IC) are not yet implemented, + * As interrupt controller (IC) is not yet implemented, * return an error. * - * TODO: Drop this once the vtimer and IC are implemented. + * TODO: Drop this once IC is implemented. */ rc = -EOPNOTSUPP; goto fail; @@ -166,6 +170,8 @@ int arch_vcpu_create(struct vcpu *v) void arch_vcpu_destroy(struct vcpu *v) { + vcpu_timer_destroy(v); + vfree((void *)&v->arch.cpu_info[1] - STACK_SIZE); } diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index 59d23e4f92..6c48bf1311 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -8,6 +8,7 @@ #include #include +#include struct vcpu_vmid { uint64_t generation; @@ -49,6 +50,8 @@ struct arch_vcpu { struct cpu_info *cpu_info; + struct vtimer vtimer; + register_t hcounteren; register_t hedeleg; register_t hideleg; diff --git a/xen/arch/riscv/include/asm/vtimer.h b/xen/arch/riscv/include/asm/vtimer.h new file mode 100644 index 0000000000..111863610a --- /dev/null +++ b/xen/arch/riscv/include/asm/vtimer.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef ASM__RISCV__VTIMER_H +#define ASM__RISCV__VTIMER_H + +#include + +struct vtimer { + struct timer timer; +}; + +int vcpu_vtimer_init(struct vcpu *v); +void vcpu_timer_destroy(struct vcpu *v); + +void vtimer_set_timer(struct vtimer *t, uint64_t ticks); + +#endif /* ASM__RISCV__VTIMER_H */ diff --git a/xen/arch/riscv/vtimer.c b/xen/arch/riscv/vtimer.c new file mode 100644 index 0000000000..32d142bcdf --- /dev/null +++ b/xen/arch/riscv/vtimer.c @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +#include + +static void vtimer_expired(void *data) +{ + struct vtimer *t = data; + struct vcpu *v = container_of(t, struct vcpu, arch.vtimer); + + vcpu_set_interrupt(v, IRQ_VS_TIMER); +} + +int vcpu_vtimer_init(struct vcpu *v) +{ + struct vtimer *t = &v->arch.vtimer; + + init_timer(&t->timer, vtimer_expired, t, v->processor); + + return 0; +} + +void vcpu_timer_destroy(struct vcpu *v) +{ + struct vtimer *t = &v->arch.vtimer; + + if ( t->timer.status == TIMER_STATUS_invalid ) + return; + + kill_timer(&v->arch.vtimer.timer); +} + +void vtimer_set_timer(struct vtimer *t, const uint64_t ticks) +{ + struct vcpu *v = container_of(t, struct vcpu, arch.vtimer); + s_time_t expires = ticks_to_ns(ticks - boot_clock_cycles); + + vcpu_unset_interrupt(v, IRQ_VS_TIMER); + + /* + * According to the RISC-V sbi spec: + * If the supervisor wishes to clear the timer interrupt without + * scheduling the next timer event, it can either request a timer + * interrupt infinitely far into the future (i.e., (uint64_t)-1), + * or it can instead mask the timer interrupt by clearing sie.STIE CSR + * bit. + */ + if ( ticks == ((uint64_t)~0) ) + { + stop_timer(&t->timer); + + return; + } + + if ( expires < NOW() ) + { + /* + * Simplify the logic if the timeout has already expired and just + * inject the event. + */ + stop_timer(&t->timer); + vcpu_set_interrupt(v, IRQ_VS_TIMER); + + return; + } + + migrate_timer(&t->timer, smp_processor_id()); + set_timer(&t->timer, expires); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:45:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250047.1547468 (Exim 4.92) (envelope-from ) id 1vzvWT-0000eh-Ny; Tue, 10 Mar 2026 11:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250047.1547468; Tue, 10 Mar 2026 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 1vzvWT-0000eZ-KJ; Tue, 10 Mar 2026 11:45:13 +0000 Received: by outflank-mailman (input) for mailman id 1250047; Tue, 10 Mar 2026 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 1vzvWS-0000eQ-ER for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzvWS-001bWO-22 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvWS-001ih4-1G for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=snZ2RLySoaJnGIq5zq0A7NSXImbSp2rQShj36eaaAiQ=; b=pNFaXULSWryEnHxLpZlBjL/sjm Jdw7QQSeNPZ0CpjXOOn8NXHEFr6VdX/8cttsNTWZQ/gJoTypcMgTtkWfwjPOFSJEuGP9l0hWQZzP1 ahsjkw5/djK8eh8QuNMWzlV2gyfEL1NyN+yqTG+PMDUSe0aW+OW/I8vWML6IU+Ig8JZM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce vcpu_kick() implementation Message-Id: Date: Tue, 10 Mar 2026 11:45:12 +0000 commit d81a91b0e4dde994c5ebb0e4d199f7bc44358aec Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:23 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:13 2026 +0100 xen/riscv: introduce vcpu_kick() implementation Add a RISC-V implementation of vcpu_kick(), which unblocks the target vCPU and sends an event check IPI if the vCPU was running on another processor. This mirrors the behavior of Arm and enables proper vCPU wakeup handling on RISC-V. Remove the stub implementation from stubs.c, as it is now provided by arch/riscv/domain.c. Since vcpu_kick() calls perfc_incr(vcpu_kick), add perfcounter for vcpu_kick to handle the case when CONFIG_PERF_COUNTERS=y. Although CONFIG_PERF_COUNTERS is not enabled by default, it can be enabled, for example, by randconfig what will lead to CI build issues. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 14 ++++++++++++++ xen/arch/riscv/include/asm/Makefile | 1 - xen/arch/riscv/include/asm/perfc_defn.h | 3 +++ xen/arch/riscv/stubs.c | 5 ----- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index d25938200f..470eca3ad7 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -1,9 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include #include #include +#include #include #include @@ -264,6 +266,18 @@ void vcpu_flush_interrupts(struct vcpu *curr) #endif } +void vcpu_kick(struct vcpu *v) +{ + bool running = v->is_running; + + vcpu_unblock(v); + if ( running && v != current ) + { + perfc_incr(vcpu_kick); + smp_send_event_check_mask(cpumask_of(v->processor)); + } +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/include/asm/Makefile b/xen/arch/riscv/include/asm/Makefile index 3824f31c39..86c56251d5 100644 --- a/xen/arch/riscv/include/asm/Makefile +++ b/xen/arch/riscv/include/asm/Makefile @@ -7,7 +7,6 @@ generic-y += hypercall.h generic-y += iocap.h generic-y += irq-dt.h generic-y += percpu.h -generic-y += perfc_defn.h generic-y += random.h generic-y += softirq.h generic-y += vm_event.h diff --git a/xen/arch/riscv/include/asm/perfc_defn.h b/xen/arch/riscv/include/asm/perfc_defn.h new file mode 100644 index 0000000000..8a4b945df6 --- /dev/null +++ b/xen/arch/riscv/include/asm/perfc_defn.h @@ -0,0 +1,3 @@ +/* This file is intended to be included multiple times. */ + +PERFCOUNTER(vcpu_kick, "vcpu: notify other vcpu") diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index daadff0138..eedf8bf935 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -203,11 +203,6 @@ void vcpu_block_unless_event_pending(struct vcpu *v) BUG_ON("unimplemented"); } -void vcpu_kick(struct vcpu *v) -{ - BUG_ON("unimplemented"); -} - unsigned long hypercall_create_continuation(unsigned int op, const char *format, ...) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:45:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:45:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250048.1547472 (Exim 4.92) (envelope-from ) id 1vzvWd-0000h4-PD; Tue, 10 Mar 2026 11:45:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250048.1547472; Tue, 10 Mar 2026 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 1vzvWd-0000gw-Lm; Tue, 10 Mar 2026 11:45:23 +0000 Received: by outflank-mailman (input) for mailman id 1250048; Tue, 10 Mar 2026 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 1vzvWc-0000gq-HS for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzvWc-001bWV-2L for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvWc-001ihp-1X for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=v0t4heAVjK14M4VAGo2wJiEtJPXPgijyd42+M06qZGw=; b=vc/fvrHCUFB0O2A+cdnGX7O0yR KUgsJF6VtkcOfyNNe+j0SQCsRWghVk+rPF9GA9oQwZ4oCdnP8w2Ojwl88C9HwYQSCgcQaBaos7xSk Oi+xkSlP+edUI8ocGP5yFpKOMw8qeg2pCot/GQJAsorM3BJNsi6avTE5kt+0RpzsfTX0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add vtimer context switch helpers Message-Id: Date: Tue, 10 Mar 2026 11:45:22 +0000 commit 4313feae90068fb8fccafe401dd7976cbe117db8 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:24 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:24 2026 +0100 xen/riscv: add vtimer context switch helpers Introduce vtimer_ctxt_switch_from() and vtimer_ctxt_switch_to() to handle virtual timer state across vCPU context switches. At present, vtimer_ctxt_switch_from() is a no-op because the RISC-V SSTC extension, which provides a virtualization-aware timer, is not yet supported. Xen therefore relies the virtual (SBI-based) timer. The virtual timer uses Xen's internal timer infrastructure and must be associated with the pCPU on which the vCPU is currently running so that timer events can be delivered efficiently. As a result, vtimer_ctxt_switch_to() migrates the timer to the target pCPU when a vCPU is scheduled in. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/vtimer.h | 3 +++ xen/arch/riscv/vtimer.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/xen/arch/riscv/include/asm/vtimer.h b/xen/arch/riscv/include/asm/vtimer.h index 111863610a..b4d48d1a17 100644 --- a/xen/arch/riscv/include/asm/vtimer.h +++ b/xen/arch/riscv/include/asm/vtimer.h @@ -14,4 +14,7 @@ void vcpu_timer_destroy(struct vcpu *v); void vtimer_set_timer(struct vtimer *t, uint64_t ticks); +void vtimer_ctxt_switch_from(struct vcpu *p); +void vtimer_ctxt_switch_to(struct vcpu *n); + #endif /* ASM__RISCV__VTIMER_H */ diff --git a/xen/arch/riscv/vtimer.c b/xen/arch/riscv/vtimer.c index 32d142bcdf..afd8a53a73 100644 --- a/xen/arch/riscv/vtimer.c +++ b/xen/arch/riscv/vtimer.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include @@ -69,3 +70,17 @@ void vtimer_set_timer(struct vtimer *t, const uint64_t ticks) migrate_timer(&t->timer, smp_processor_id()); set_timer(&t->timer, expires); } + +void vtimer_ctxt_switch_from(struct vcpu *p) +{ + ASSERT(!is_idle_vcpu(p)); + + /* Nothing to do at the moment as SSTC isn't supported now. */ +} + +void vtimer_ctxt_switch_to(struct vcpu *n) +{ + ASSERT(!is_idle_vcpu(n)); + + migrate_timer(&n->arch.vtimer.timer, n->processor); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:45:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:45:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250049.1547474 (Exim 4.92) (envelope-from ) id 1vzvWn-0000j3-Pn; Tue, 10 Mar 2026 11:45:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250049.1547474; Tue, 10 Mar 2026 11:45: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 1vzvWn-0000iv-NC; Tue, 10 Mar 2026 11:45:33 +0000 Received: by outflank-mailman (input) for mailman id 1250049; Tue, 10 Mar 2026 11:45:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvWm-0000in-KC for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvWm-001bWa-2b for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvWm-001iid-1q for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=KKnTgmLJxzoQAkOZ17Gx2d/WVORi4GoVqDCmh7rJQmY=; b=vhZux/h2IJlrYCR4t4Y5SMapwS dA6OQ2Yas60t4AhMRFvXCbi9eKm/Lhk2hm5ExbcAvF2tunhBcSQudmFOOdxwMp34QTw3Xd0Fnzjpd urW+laz6HqljWZVzNkgYBJJ8/HEZnOasNdP9DE9/PEIL1k5QPz7gRPKxWB+ZqWpxysUs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: implement SBI legacy SET_TIMER support for guests Message-Id: Date: Tue, 10 Mar 2026 11:45:32 +0000 commit 647542cdf13ee31e7d32dcaddba8899cfdc98747 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:25 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:41 2026 +0100 xen/riscv: implement SBI legacy SET_TIMER support for guests Add handling of the SBI_EXT_0_1_SET_TIMER function ID to the legacy extension ecall handler. The handler now programs the vCPU’s virtual timer via vtimer_set_timer() and returns SBI_SUCCESS. This enables guests using the legacy SBI timer interface to schedule timer events correctly. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/vsbi/legacy-extension.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/riscv/vsbi/legacy-extension.c b/xen/arch/riscv/vsbi/legacy-extension.c index 2e8df191c2..090c23440c 100644 --- a/xen/arch/riscv/vsbi/legacy-extension.c +++ b/xen/arch/riscv/vsbi/legacy-extension.c @@ -7,6 +7,7 @@ #include #include +#include static void vsbi_print_char(char c) { @@ -44,6 +45,11 @@ static int vsbi_legacy_ecall_handler(unsigned long eid, unsigned long fid, ret = SBI_ERR_NOT_SUPPORTED; break; + case SBI_EXT_0_1_SET_TIMER: + vtimer_set_timer(¤t->arch.vtimer, regs->a0); + regs->a0 = SBI_SUCCESS; + break; + default: /* * TODO: domain_crash() is acceptable here while things are still under -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:45:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:45:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250050.1547479 (Exim 4.92) (envelope-from ) id 1vzvWx-0000lG-RB; Tue, 10 Mar 2026 11:45:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250050.1547479; Tue, 10 Mar 2026 11:45: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 1vzvWx-0000l8-Od; Tue, 10 Mar 2026 11:45:43 +0000 Received: by outflank-mailman (input) for mailman id 1250050; Tue, 10 Mar 2026 11:45:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvWw-0000l2-Mc for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvWw-001bYf-2r for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvWw-001il2-26 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11: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=vhtgOt+60ZeBLavrw7iKuPvmq/6HEiVKhi2eqr+QOlk=; b=F7b4II/a9T90Ocsw08ZSlCbjqi 9bnuPS4Dze6uHzoN5WGbefdf9Nfrm9tc3hrJbdX/dEmSf/QIeJ9jvB+sfyGCUXztcTaai4ybRKMp/ K1K5P8GnmQSSrfmtmMV6yeg8ePxp/bATs0HBFYoWNz7WXEUiryssu3MshmlnblbnuJOI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce sbi_set_timer() Message-Id: Date: Tue, 10 Mar 2026 11:45:42 +0000 commit e56decd0a2ccd5c64c05dbead05c78c36815e126 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:26 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:26:58 2026 +0100 xen/riscv: introduce sbi_set_timer() Introduce a function pointer for sbi_set_timer(), since different OpenSBI versions may implement the TIME extension with different extension IDs and/or function IDs. If the TIME extension is not available, fall back to the legacy timer mechanism. This is useful when Xen runs as a guest under another Xen, because the TIME extension is not currently virtualised and therefore will not appear as available. Despite of the fact that sbi_set_timer_v01 is introduced and used as fall back, SBI v0.1 still isn't fully supported (with the current SBI calls usage, sbi_rfence_v01 should be introduced too), so panic() in sbi_init() isn't removed. The sbi_set_timer() pointer will be used by reprogram_timer() to program Xen’s physical timer as without SSTC extension there is no any other option except SBI call to do that as only M-timer is available for us. Use dprintk() for all the cases to print that a speicifc SBI extension is available as it isn't really necessary in case of release builds. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/sbi.h | 22 ++++++++++++++++++++++ xen/arch/riscv/sbi.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h index 79f7ff5c55..ed7af20028 100644 --- a/xen/arch/riscv/include/asm/sbi.h +++ b/xen/arch/riscv/include/asm/sbi.h @@ -13,6 +13,7 @@ #define ASM__RISCV__SBI_H #include +#include /* SBI-defined implementation ID */ #define SBI_XEN_IMPID 7 @@ -29,6 +30,7 @@ #define SBI_EXT_BASE 0x10 #define SBI_EXT_RFENCE 0x52464E43 +#define SBI_EXT_TIME 0x54494D45 /* SBI function IDs for BASE extension */ #define SBI_EXT_BASE_GET_SPEC_VERSION 0x0 @@ -48,6 +50,9 @@ #define SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA 0x5 #define SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID 0x6 +/* SBI function IDs for TIME extension */ +#define SBI_EXT_TIME_SET_TIMER 0x0 + #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f000000 #define SBI_SPEC_VERSION_MINOR_MASK 0x00ffffff @@ -134,6 +139,23 @@ int sbi_remote_hfence_gvma(const cpumask_t *cpu_mask, vaddr_t start, int sbi_remote_hfence_gvma_vmid(const cpumask_t *cpu_mask, vaddr_t start, size_t size, unsigned long vmid); +/* + * Programs the clock for next event at (or after) stime_value. stime_value is + * in absolute time. This function must clear the pending timer interrupt bit + * as well. + * + * If the supervisor wishes to clear the timer interrupt without scheduling the + * next timer event, it can either request a timer interrupt infinitely far + * into the future (i.e., (uint64_t)-1), or it can instead mask the timer + * interrupt by clearing sie.STIE CSR bit. + * + * The stime_value parameter represents absolute time measured in ticks. + * + * This SBI call returns 0 upon success or an implementation specific negative + * error code. + */ +extern int (* __ro_after_init sbi_set_timer)(uint64_t stime_value); + /* * Initialize SBI library * diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c index 425dce44c6..b4a7ae6940 100644 --- a/xen/arch/riscv/sbi.c +++ b/xen/arch/riscv/sbi.c @@ -249,6 +249,38 @@ static int (* __ro_after_init sbi_rfence)(unsigned long fid, unsigned long arg4, unsigned long arg5); +static int cf_check sbi_set_timer_v02(uint64_t stime_value) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_TIME, SBI_EXT_TIME_SET_TIMER, stime_value, +#ifdef CONFIG_RISCV_32 + stime_value >> 32, +#else + 0, +#endif + 0, 0, 0, 0); + + return sbi_err_map_xen_errno(ret.error); +} + +static int cf_check sbi_set_timer_v01(uint64_t stime_value) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_0_1_SET_TIMER, 0, stime_value, +#ifdef CONFIG_RISCV_32 + stime_value >> 32, +#else + 0, +#endif + 0, 0, 0, 0); + + return sbi_err_map_xen_errno(ret.error); +} + +int (* __ro_after_init sbi_set_timer)(uint64_t stime_value) = sbi_set_timer_v01; + int sbi_remote_sfence_vma(const cpumask_t *cpu_mask, vaddr_t start, size_t size) { @@ -324,7 +356,13 @@ int __init sbi_init(void) if ( sbi_probe_extension(SBI_EXT_RFENCE) > 0 ) { sbi_rfence = sbi_rfence_v02; - printk("SBI v0.2 RFENCE extension detected\n"); + dprintk(XENLOG_INFO, "SBI v0.2 RFENCE extension detected\n"); + } + + if ( sbi_probe_extension(SBI_EXT_TIME) > 0 ) + { + sbi_set_timer = sbi_set_timer_v02; + dprintk(XENLOG_INFO, "SBI v0.2 TIME extension detected\n"); } } else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:45:53 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:45:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250051.1547483 (Exim 4.92) (envelope-from ) id 1vzvX7-0000nN-SO; Tue, 10 Mar 2026 11:45:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250051.1547483; Tue, 10 Mar 2026 11:45: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 1vzvX7-0000nF-Po; Tue, 10 Mar 2026 11:45:53 +0000 Received: by outflank-mailman (input) for mailman id 1250051; Tue, 10 Mar 2026 11:45:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvX6-0000n9-PJ for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvX6-001bZ3-37 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvX6-001iln-2L for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:45: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=50r/GYg97bGaA1dV/F1KS+AKi/QV5+VJR2lFGwEYm48=; b=hXp7PwSONgSiPnJJWU10gCuNI9 zLBGwp0Ov1cRwhrzmpG5aWYkrYK2rw9H38FsFo4pBRY/J32nVNcc1TRel7+c7z2P3bypIoreYiexh bsRlD+4eEG4mRz3vWqkrMQFp8kAVlE3X1FkvIBJEYOTXqh8ukGChwGLYOTjxj9Ra/Bm0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: implement reprogram_timer() via SBI Message-Id: Date: Tue, 10 Mar 2026 11:45:52 +0000 commit f3f7359b617c659d4f526d70a6d405ed12e4021d Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:27 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:10 2026 +0100 xen/riscv: implement reprogram_timer() via SBI Implement reprogram_timer() on RISC-V using the standard SBI timer call. The privileged architecture only defines machine-mode timer interrupts (using mtime/mtimecmp). Therefore, timer services for S/HS/VS mode must be provided by M-mode via SBI calls. SSTC (Supervisor-mode Timer Control) is optional and is not supported on the boards available to me, so the only viable approach today is to program the timer through SBI. reprogram_timer() enables/disables the supervisor timer interrupt and programs the next timer deadline using sbi_set_timer(). If the SBI call fails, the code panics, because sbi_set_timer() is expected to return either 0 or -ENOSUPP (this has been stable from early OpenSBI versions to the latest ones). The SBI spec does not define a standard negative error code for this call, and without SSTC there is no alternative method to program the timer, so the SBI timer call must be available. reprogram_timer() currently returns int for compatibility with the existing prototype. While it might be cleaner to return bool, keeping the existing signature avoids premature changes in case sbi_set_timer() ever needs to return other values (based on which we could try to avoid panic-ing) in the future. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/stubs.c | 5 ----- xen/arch/riscv/time.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index eedf8bf935..2f3a0ce76a 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -21,11 +21,6 @@ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; /* time.c */ -int reprogram_timer(s_time_t timeout) -{ - BUG_ON("unimplemented"); -} - void send_timer_event(struct vcpu *v) { BUG_ON("unimplemented"); diff --git a/xen/arch/riscv/time.c b/xen/arch/riscv/time.c index 2c7af0a5d6..7efa76fdbc 100644 --- a/xen/arch/riscv/time.c +++ b/xen/arch/riscv/time.c @@ -7,6 +7,9 @@ #include #include +#include +#include + unsigned long __ro_after_init cpu_khz; /* CPU clock frequency in kHz. */ uint64_t __ro_after_init boot_clock_cycles; @@ -40,6 +43,46 @@ static void __init preinit_dt_xen_time(void) cpu_khz = rate / 1000; } +int reprogram_timer(s_time_t timeout) +{ + uint64_t deadline, now; + int rc; + + if ( timeout == 0 ) + { + /* Disable timer interrupt */ + csr_clear(CSR_SIE, BIT(IRQ_S_TIMER, UL)); + + return 1; + } + + deadline = ns_to_ticks(timeout) + boot_clock_cycles; + now = get_cycles(); + if ( deadline <= now ) + return 0; + + /* + * TODO: When the SSTC extension is supported, it would be preferable to + * use the supervisor timer registers directly here for better + * performance, since an SBI call and mode switch would no longer + * be required. + * + * This would also reduce reliance on a specific SBI implementation. + * For example, it is not ideal to panic() if sbi_set_timer() returns + * a non-zero value. Currently it can return 0 or -ENOSUPP, and + * without SSTC we still need an implementation because only the + * M-mode timer is available, and it can only be programmed in + * M-mode. + */ + if ( (rc = sbi_set_timer(deadline)) ) + panic("%s: timer wasn't set because: %d\n", __func__, rc); + + /* Enable timer interrupt */ + csr_set(CSR_SIE, BIT(IRQ_S_TIMER, UL)); + + return 1; +} + void __init preinit_xen_time(void) { if ( acpi_disabled ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:46:03 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:46:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250052.1547487 (Exim 4.92) (envelope-from ) id 1vzvXH-0000pX-U3; Tue, 10 Mar 2026 11:46:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250052.1547487; Tue, 10 Mar 2026 11:46: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 1vzvXH-0000pP-RE; Tue, 10 Mar 2026 11:46:03 +0000 Received: by outflank-mailman (input) for mailman id 1250052; Tue, 10 Mar 2026 11:46:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvXG-0000pG-Rm for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvXH-001bZI-09 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvXG-001ims-2b for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46: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=hKNpDmws8VGseEEDBhCXoZbP2v3XM2XeQTU4DqXdzD8=; b=onw7AY1uVSaH8j6swyndr3F7Pv rDOlj503cdN8yYNeEVW4R1OqXcNwAYsXuppdrglrt3mL1WsUsIxmlNfIHIHo/seSVhQDy4FCciKJi hsRr9bQnxv1cCHtt9Js4O6El1leLz8rDny2VSrF0XXVw+BI9RiXxgOZz1FNaN0jVAwqU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: handle hypervisor timer interrupts Message-Id: Date: Tue, 10 Mar 2026 11:46:02 +0000 commit cfef4ba93980d9da0f1d97224b233fe988639ddb Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:28 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:22 2026 +0100 xen/riscv: handle hypervisor timer interrupts Introduce timer_interrupt() to process IRQ_S_TIMER interrupts. The handler disables further timer interrupts by clearing SIE.STIE and raises TIMER_SOFTIRQ so the generic timer subsystem can perform its processing. Update do_trap() to dispatch IRQ_S_TIMER to this new handler. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/traps.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/riscv/traps.c b/xen/arch/riscv/traps.c index 244264c92a..326f2be628 100644 --- a/xen/arch/riscv/traps.c +++ b/xen/arch/riscv/traps.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -180,6 +181,15 @@ static void check_for_pcpu_work(void) p2m_handle_vmenter(); } +static void timer_interrupt(void) +{ + /* Disable the timer to avoid more interrupts */ + csr_clear(CSR_SIE, BIT(IRQ_S_TIMER, UL)); + + /* Signal the generic timer code to do its work */ + raise_softirq(TIMER_SOFTIRQ); +} + void do_trap(struct cpu_user_regs *cpu_regs) { register_t pc = cpu_regs->sepc; @@ -221,6 +231,10 @@ void do_trap(struct cpu_user_regs *cpu_regs) intc_handle_external_irqs(cpu_regs); break; + case IRQ_S_TIMER: + timer_interrupt(); + break; + default: intr_handled = false; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:46:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:46:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250053.1547491 (Exim 4.92) (envelope-from ) id 1vzvXS-0000s6-0J; Tue, 10 Mar 2026 11:46:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250053.1547491; Tue, 10 Mar 2026 11:46: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 1vzvXR-0000ry-U4; Tue, 10 Mar 2026 11:46:13 +0000 Received: by outflank-mailman (input) for mailman id 1250053; Tue, 10 Mar 2026 11:46:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvXQ-0000rq-UF for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvXR-001bZS-0O for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvXQ-001inm-2r for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46: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=M90IyQo9JHe36WbAXZBrHzLM4dVFwciEqgz6yvRNeyM=; b=yNv4QTZdoqsNSJBCjlMq7PL5Wf GHhW/Fg56mzM3dSJzoW6n4hdsP6sVRIwdvClUnHJGVFRDJlF+M/AS7uoZA7uGpeXoWnyRQKta9Ak9 MiUg9DK4CIIwWrxf9EgFv7AkMbQPLEL4pQda8YGuxCjrRNz8au1LBEYbU3kr04BR03dE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: init tasklet subsystem Message-Id: Date: Tue, 10 Mar 2026 11:46:12 +0000 commit 18964d1bf544129c5fb0f04c96b8502b0f203755 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:29 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:35 2026 +0100 xen/riscv: init tasklet subsystem As the tasklet subsystem is now initialized, it is necessary to implement sync_local_execstate(), since it is invoked when something calls tasklet_softirq_action(), which is registered in tasklet_subsys_init(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/setup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index bca6ca09ed..cae49bb296 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -133,6 +134,8 @@ void __init noreturn start_xen(unsigned long bootcpu_id, panic("Booting using ACPI isn't supported\n"); } + tasklet_subsys_init(); + init_IRQ(); riscv_fill_hwcap(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:46:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:46:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250054.1547494 (Exim 4.92) (envelope-from ) id 1vzvXc-0000uP-1j; Tue, 10 Mar 2026 11:46:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250054.1547494; Tue, 10 Mar 2026 11:46: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 1vzvXb-0000uH-VT; Tue, 10 Mar 2026 11:46:23 +0000 Received: by outflank-mailman (input) for mailman id 1250054; Tue, 10 Mar 2026 11:46:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvXb-0000uB-0R for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvXb-001bZX-0e for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvXa-001ioq-35 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46: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=hQMzAZnGwZ/KaSDAW/1aE0G/tWKCh0hNv3ZIyjOiyLs=; b=ea5ZwTQTk7PQIdbmJJHRTHA2Lq h8nTIadExVgpEOk1xwBo67fJ6pnv4g7S83tjjiQ0yRfjBBEL+ev7Orrg09b6q1Zuvnwz8nSb0Dpqo EOYHGHIKimfoX6BpA1q0euw5fYms8GdSMPDiiOcEyv6BwI0YT+CwHg+6WXqYsyp7y8Tc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: implement sync_vcpu_execstate() Message-Id: Date: Tue, 10 Mar 2026 11:46:22 +0000 commit 256479ba567766609435c83b5d5d5596c1c606e0 Author: Oleksii Kurochko AuthorDate: Fri Mar 6 17:33:30 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:27:47 2026 +0100 xen/riscv: implement sync_vcpu_execstate() The scheduler may call this function to force synchronization of given vCPU's state. RISC-V does not support lazy context switching, so nothing is done in sync_vcpu_execstate() and sync_local_execstate(). Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/domain.c | 10 ++++++++++ xen/arch/riscv/stubs.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 470eca3ad7..c327f44d07 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -278,6 +278,16 @@ void vcpu_kick(struct vcpu *v) } } +void sync_local_execstate(void) +{ + /* Nothing to do -- no lazy switching */ +} + +void sync_vcpu_execstate(struct vcpu *v) +{ + /* Nothing to do -- no lazy switching */ +} + static void __init __maybe_unused build_assertions(void) { /* diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 2f3a0ce76a..acbb5b9123 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -91,16 +91,6 @@ void continue_running(struct vcpu *same) BUG_ON("unimplemented"); } -void sync_local_execstate(void) -{ - BUG_ON("unimplemented"); -} - -void sync_vcpu_execstate(struct vcpu *v) -{ - BUG_ON("unimplemented"); -} - void startup_cpu_idle_loop(void) { BUG_ON("unimplemented"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 11:46:35 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 11:46:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250055.1547499 (Exim 4.92) (envelope-from ) id 1vzvXn-0000wK-3A; Tue, 10 Mar 2026 11:46:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250055.1547499; Tue, 10 Mar 2026 11:46:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvXn-0000wC-0b; Tue, 10 Mar 2026 11:46:35 +0000 Received: by outflank-mailman (input) for mailman id 1250055; Tue, 10 Mar 2026 11:46:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzvXl-0000w4-38 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzvXl-001bZh-0t for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzvXl-001ipz-08 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 11:46: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=vScXFk1tMSboMgPLu2nFFYTjQPphagf1q1FXEF1pyiY=; b=NxCqlID0V3MRVGegF7hfQzdqhf qCmbPHrhf5AqSp5vUzWKSfo43UOarW1kApmpClSAf6gs3qHVerShQev/Ew8KTm3giOj7nj1rjIpm+ hFG735wb8JSpTISRPbXmEVqEsCGrn93qsmL4a0EhAnLE23tXd3dUdeoVlh2btNHN/zAU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests/x86_emulator: avoid duplicate symbol error with clang: use -Og Message-Id: Date: Tue, 10 Mar 2026 11:46:33 +0000 commit 442f3481fe3979e3e563bd7d221498a3d52133cc Author: Edwin Török AuthorDate: Tue Mar 10 09:28:09 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 09:28:09 2026 +0100 tools/tests/x86_emulator: avoid duplicate symbol error with clang: use -Og clang would duplicate the loop body and end up with a double definition of the symbol: ``` /tmp/test_x86_emulator-0f3576.s:27823: Error: symbol `vmovsh_to_mem' is already defined /tmp/test_x86_emulator-0f3576.s:27825: Error: symbol `.Lvmovsh_to_mem_end' is already defined ``` Until a better solution is found: reduce optimizations in the test runner. Using -Os might also work, but we can't rely on the size optimization always avoiding the duplication of asm blocks. This is test code, not performance critical code, and -O0 is more future proof. However for debugging -Og is recommended over -O0, and this still avoids the duplicate label problem. Signed-off-by: Edwin Török Acked-by: Jan Beulich --- tools/tests/x86_emulator/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 5003c464f3..8210e83345 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -323,4 +323,11 @@ x86-emulate.o x86_emulate/%.o: HOSTCFLAGS += -D__XEN_TOOLS__ $(call cc-option-add,HOSTCFLAGS-toplevel,HOSTCC,-fno-toplevel-reorder) test_x86_emulator.o: HOSTCFLAGS += $(HOSTCFLAGS-toplevel) +# When unrolling loops, compilers may duplicate inline assembly. put_insn() +# emits labels, which may not be emitted multiple times. +# The default HOSTCFLAGS from $(XEN_ROOT)/Config.mk would set a non-zero +# optimisation level. +# Until a better solution is found: reduce optimizations in the test runner. +test_x86_emulator.o: HOSTCFLAGS += -Og + test_x86_emulator.o: $(addsuffix .h,$(TESTCASES)) $(addsuffix -opmask.h,$(OPMASK)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 12:44:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 12:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250091.1547521 (Exim 4.92) (envelope-from ) id 1vzwRP-0000gS-Eh; Tue, 10 Mar 2026 12:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250091.1547521; Tue, 10 Mar 2026 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 1vzwRP-0000gK-CB; Tue, 10 Mar 2026 12:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1250091; Tue, 10 Mar 2026 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 1vzwRO-0000gE-4S for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzwRO-001cae-0m for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 12:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzwRN-001mhx-3C for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 12:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zro5BT5GDL7Tf9qHb4pc46961B5R939jl4wsxlGFUFQ=; b=x9Z0ElssYT8SG84hpm+F+sZDI0 wVpvmdmO6yqFzU3jIlb8VSo3kbWtqDFBCKNZvHNAK26tZOM3gOAWr8YS0M/lrUQWjpzJTpPkSEX+l 0iFtksi9Jrn/8CTBi9uJZyr0fGunpESSrWbHQyXA4W/YklC2GovgQarr19i3HEHQrq90=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: Adjust GS handling for FRED mode Message-Id: Date: Tue, 10 Mar 2026 12:44:01 +0000 commit 9ea7d7f9393c52de36ee9c42b52c235949453a2a Author: Andrew Cooper AuthorDate: Mon Aug 11 23:46:01 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:57:31 2026 +0000 x86/pv: Adjust GS handling for FRED mode When FRED is active, hardware automatically swaps GS when changing privilege, and the SWAPGS instruction is disallowed. For native OSes using GS as the thread local pointer this is a massive improvement on the pre-FRED architecture, but under Xen it makes handling PV guests more complicated. Specifically, it means that GS_BASE and GS_SHADOW are the opposite way around in FRED mode, as opposed to IDT mode. This leads to the following changes: * In load_segments(), we already load both GSes. Account for FRED in the SWAP() condition and avoid the path with SWAGS. * In save_segments(), we need to read GS_SHADOW rather than GS_BASE. * In toggle_guest_mode(), we need to emulate SWAPGS. * In {read,write}_msr() which access the live registers, GS_SHADOW and GS_BASE need swapping. * In do_set_segment_base(), merge the SEGBASE_GS_{USER,KERNEL} cases and take FRED into account when choosing which base to update. SEGBASE_GS_USER_SEL was already an LKGS invocation (decades before FRED) so under FRED needs to be just a MOV %gs. Simply skip the SWAPGSes. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 16 +++++++++++----- xen/arch/x86/pv/domain.c | 22 ++++++++++++++++++++-- xen/arch/x86/pv/emul-priv-op.c | 26 +++++++++++++++++--------- xen/arch/x86/pv/misc-hypercalls.c | 23 +++++++++++++++-------- 4 files changed, 63 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index e658c2d647..9c1f6ef76d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1791,9 +1791,10 @@ static void load_segments(struct vcpu *n) /* * Figure out which way around gsb/gss want to be. gsb needs to be - * the active context, and gss needs to be the inactive context. + * the active context, and gss needs to be the inactive context, + * unless we're in FRED mode where they're reversed. */ - if ( !(n->arch.flags & TF_kernel_mode) ) + if ( !(n->arch.flags & TF_kernel_mode) ^ opt_fred ) SWAP(gsb, gss); if ( using_svm() && (n->arch.pv.fs | n->arch.pv.gs) <= 3 ) @@ -1814,7 +1815,9 @@ static void load_segments(struct vcpu *n) if ( !fs_gs_done && !compat ) { - if ( read_cr4() & X86_CR4_FSGSBASE ) + unsigned long cr4 = read_cr4(); + + if ( !(cr4 & X86_CR4_FRED) && (cr4 & X86_CR4_FSGSBASE) ) { __wrgsbase(gss); __wrfsbase(n->arch.pv.fs_base); @@ -1931,6 +1934,9 @@ static void load_segments(struct vcpu *n) * Guests however cannot use SWAPGS, so there is no mechanism to modify the * inactive GS base behind Xen's back. Therefore, Xen's copy of the inactive * GS base is still accurate, and doesn't need reading back from hardware. + * + * Under FRED, hardware automatically swaps GS for us, so SHADOW_GS is the + * active GS from the guest's point of view. */ static void save_segments(struct vcpu *v) { @@ -1946,12 +1952,12 @@ static void save_segments(struct vcpu *v) if ( read_cr4() & X86_CR4_FSGSBASE ) { fs_base = __rdfsbase(); - gs_base = __rdgsbase(); + gs_base = opt_fred ? rdmsr(MSR_SHADOW_GS_BASE) : __rdgsbase(); } else { fs_base = rdmsr(MSR_FS_BASE); - gs_base = rdmsr(MSR_GS_BASE); + gs_base = opt_fred ? rdmsr(MSR_SHADOW_GS_BASE) : rdmsr(MSR_GS_BASE); } v->arch.pv.fs_base = fs_base; diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index d16583a745..b85abb5ed9 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -14,9 +14,10 @@ #include #include #include -#include #include #include +#include +#include #ifdef CONFIG_PV32 int8_t __read_mostly opt_pv32 = -1; @@ -514,11 +515,28 @@ void toggle_guest_mode(struct vcpu *v) * subsequent context switch won't bother re-reading it. */ gs_base = read_gs_base(); + + /* + * In FRED mode, not only are the two GSes the other way around (i.e. we + * want to read GS_SHADOW here), the SWAPGS instruction is disallowed so + * we have to emulate it. + */ + if ( opt_fred ) + { + unsigned long gs_shadow = rdmsr(MSR_SHADOW_GS_BASE); + + wrmsrns(MSR_SHADOW_GS_BASE, gs_base); + write_gs_base(gs_shadow); + + gs_base = gs_shadow; + } + else + asm volatile ( "swapgs" ); + if ( v->arch.flags & TF_kernel_mode ) v->arch.pv.gs_base_kernel = gs_base; else v->arch.pv.gs_base_user = gs_base; - asm volatile ( "swapgs" ); _toggle_guest_pt(v); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 64d47ab677..53676b3021 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -926,7 +927,8 @@ static int cf_check read_msr( case MSR_GS_BASE: if ( !cp->extd.lm ) break; - *val = read_gs_base(); + /* Under FRED, GS is automatically swapped on privilege change. */ + *val = opt_fred ? rdmsr(MSR_SHADOW_GS_BASE) : read_gs_base(); return X86EMUL_OKAY; case MSR_SHADOW_GS_BASE: @@ -1066,17 +1068,23 @@ static int cf_check write_msr( if ( !cp->extd.lm || !is_canonical_address(val) ) break; - if ( reg == MSR_FS_BASE ) - write_fs_base(val); - else if ( reg == MSR_GS_BASE ) - write_gs_base(val); - else if ( reg == MSR_SHADOW_GS_BASE ) + switch ( reg ) { - write_gs_shadow(val); + case MSR_FS_BASE: + write_fs_base(val); + break; + + case MSR_SHADOW_GS_BASE: curr->arch.pv.gs_base_user = val; + fallthrough; + case MSR_GS_BASE: + /* Under FRED, GS is automatically swapped on privilege change. */ + if ( (reg == MSR_GS_BASE) ^ opt_fred ) + write_gs_base(val); + else + write_gs_shadow(val); + break; } - else - ASSERT_UNREACHABLE(); return X86EMUL_OKAY; case MSR_EFER: diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index 4c2abeb4ad..7e915d86b7 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -11,6 +11,7 @@ #include #include +#include long do_set_debugreg(int reg, unsigned long value) { @@ -192,11 +193,13 @@ long do_set_segment_base(unsigned int which, unsigned long base) case SEGBASE_GS_USER: v->arch.pv.gs_base_user = base; - write_gs_shadow(base); - break; - + fallthrough; case SEGBASE_GS_KERNEL: - write_gs_base(base); + /* Under FRED, GS is automatically swapped on privilege change. */ + if ( (which == SEGBASE_GS_KERNEL) ^ opt_fred ) + write_gs_base(base); + else + write_gs_shadow(base); break; } break; @@ -206,10 +209,13 @@ long do_set_segment_base(unsigned int which, unsigned long base) unsigned int sel = (uint16_t)base; /* - * We wish to update the user %gs from the GDT/LDT. Currently, the - * guest kernel's GS_BASE is in context. + * We wish to update the user %gs from the GDT/LDT. Currently, we are + * in guest kernel context. + * + * Under IDT, this means updating GS_SHADOW. Under FRED, plain GS. */ - asm volatile ( "swapgs" ); + if ( !opt_fred ) + asm volatile ( "swapgs" ); if ( sel > 3 ) /* Fix up RPL for non-NUL selectors. */ @@ -247,7 +253,8 @@ long do_set_segment_base(unsigned int which, unsigned long base) /* Update the cache of the inactive base, as read from the GDT/LDT. */ v->arch.pv.gs_base_user = read_gs_base(); - asm volatile ( safe_swapgs ); + if ( !opt_fred ) + asm volatile ( safe_swapgs ); break; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 12:44:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 12:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250092.1547525 (Exim 4.92) (envelope-from ) id 1vzwRZ-0000i5-GP; Tue, 10 Mar 2026 12:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250092.1547525; Tue, 10 Mar 2026 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 1vzwRZ-0000hx-Da; Tue, 10 Mar 2026 12:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1250092; Tue, 10 Mar 2026 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 1vzwRY-0000hf-53 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzwRY-001cal-14 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 12:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzwRY-001mjX-0H for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=mP1yLM8MzRa4yocVPorNKTAzKf45kCDRU7D9jobiWQ4=; b=Rra46Wh6VxhzfZ1cPp3kQJjc0d V7vhoIBePK2dj6hhpip80g4fZHL7sxKTOKAwhuqXkl3UBDFbwSTVUIXKvO5Qo6PgNjzzhUgdVOtM2 95az5NyHBYIRu4z+p3oj103X6t12H0DaWvjGPA/1hrbTWevW+s15nR8gAA90mvVC56EU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: Guest exception handling in FRED mode Message-Id: Date: Tue, 10 Mar 2026 12:44:12 +0000 commit 87cfcbe9f0b522f9498101b6a698dd8fbf6509b7 Author: Andrew Cooper AuthorDate: Mon Aug 11 15:55:24 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:57:53 2026 +0000 x86/pv: Guest exception handling in FRED mode Under FRED, entry_from_pv() handles everything. To start with, implement exception handling in the same manner as entry_from_xen(), although we can unconditionally enable interrupts after the async/fatal events. After entry_from_pv() returns, test_all_events() needs to run to perform exception and interrupt injection. Split entry_FRED_R3() into two and introduce eretu_exit_to_guest() as the latter half, coming unilaterally from restore_all_guest(). For all of this, there is a slightly complicated relationship with CONFIG_PV. entry_FRED_R3() must exist irrespective of CONFIG_PV, because it's the entrypoint registered with hardware. For simplicity, entry_from_pv() is always called, but it collapses into fatal_trap() in the !PV case. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 78 +++++++++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/entry-fred.S | 13 ++++++- xen/arch/x86/x86_64/entry.S | 4 ++- 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e40b51d693..77af9b90f1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2267,9 +2267,85 @@ void asmlinkage check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) void asmlinkage entry_from_pv(struct cpu_user_regs *regs) { + struct fred_info *fi = cpu_regs_fred_info(regs); + uint8_t type = regs->fred_ss.type; + uint8_t vec = regs->fred_ss.vector; + /* Copy fred_ss.vector into entry_vector as IDT delivery would have done. */ - regs->entry_vector = regs->fred_ss.vector; + regs->entry_vector = vec; + + if ( !IS_ENABLED(CONFIG_PV) ) + goto fatal; + + /* + * First, handle the asynchronous or fatal events. These are either + * unrelated to the interrupted context, or may not have valid context + * recorded, and all have special rules on how/whether to re-enable IRQs. + */ + if ( regs->fred_ss.nested ) + goto fatal; + + switch ( type ) + { + case X86_ET_EXT_INTR: + return do_IRQ(regs); + + case X86_ET_NMI: + return do_nmi(regs); + + case X86_ET_HW_EXC: + switch ( vec ) + { + case X86_EXC_DF: return do_double_fault(regs); + case X86_EXC_MC: return do_machine_check(regs); + } + break; + } + /* + * With the asynchronous events handled, what remains are the synchronous + * ones. PV guest context always had interrupts enabled. + */ + local_irq_enable(); + + switch ( type ) + { + case X86_ET_HW_EXC: + case X86_ET_PRIV_SW_EXC: + case X86_ET_SW_EXC: + switch ( vec ) + { + case X86_EXC_PF: handle_PF(regs, fi->edata); break; + case X86_EXC_GP: do_general_protection(regs); break; + case X86_EXC_UD: do_invalid_op(regs); break; + case X86_EXC_NM: do_device_not_available(regs); break; + case X86_EXC_BP: do_int3(regs); break; + case X86_EXC_DB: handle_DB(regs, fi->edata); break; + case X86_EXC_CP: do_entry_CP(regs); break; + + case X86_EXC_DE: + case X86_EXC_OF: + case X86_EXC_BR: + case X86_EXC_NP: + case X86_EXC_SS: + case X86_EXC_MF: + case X86_EXC_AC: + case X86_EXC_XM: + do_trap(regs); + break; + + default: + goto fatal; + } + break; + + default: + goto fatal; + } + + return; + + fatal: fatal_trap(regs, false); } diff --git a/xen/arch/x86/x86_64/entry-fred.S b/xen/arch/x86/x86_64/entry-fred.S index 3c3320df22..a1ff9a4a97 100644 --- a/xen/arch/x86/x86_64/entry-fred.S +++ b/xen/arch/x86/x86_64/entry-fred.S @@ -15,9 +15,20 @@ FUNC(entry_FRED_R3, 4096) mov %rsp, %rdi call entry_from_pv +#ifdef CONFIG_PV + GET_STACK_END(14) + movq STACK_CPUINFO_FIELD(current_vcpu)(%r14), %rbx + + jmp test_all_events +#else + BUG /* Not Reached */ +#endif +END(entry_FRED_R3) + +FUNC(eretu_exit_to_guest) POP_GPRS eretu -END(entry_FRED_R3) +END(eretu_exit_to_guest) /* The Ring0 entrypoint is at Ring3 + 0x100. */ .org entry_FRED_R3 + 0x100, 0xcc diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 8b83082413..17ca6a4939 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -63,7 +63,7 @@ UNLIKELY_END(syscall_no_callback) /* Conditionally clear DF */ and %esi, UREGS_eflags(%rsp) /* %rbx: struct vcpu */ -test_all_events: +LABEL(test_all_events, 0) ASSERT_NOT_IN_ATOMIC cli # tests must not race interrupts /*test_softirqs:*/ @@ -152,6 +152,8 @@ END(switch_to_kernel) FUNC_LOCAL(restore_all_guest) ASSERT_INTERRUPTS_DISABLED + ALTERNATIVE "", "jmp eretu_exit_to_guest", X86_FEATURE_XEN_FRED + /* Stash guest SPEC_CTRL value while we can read struct vcpu. */ mov VCPU_arch_msrs(%rbx), %rdx mov VCPUMSR_spec_ctrl_raw(%rdx), %r15d -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 12:44:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 12:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250093.1547529 (Exim 4.92) (envelope-from ) id 1vzwRj-0000kc-Hm; Tue, 10 Mar 2026 12:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250093.1547529; Tue, 10 Mar 2026 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 1vzwRj-0000kU-Ev; Tue, 10 Mar 2026 12:44:23 +0000 Received: by outflank-mailman (input) for mailman id 1250093; Tue, 10 Mar 2026 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 1vzwRi-0000kJ-8V for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzwRi-001car-1R for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 12:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzwRi-001ml1-0Z for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=FBJZuZ412AfJg4JbwjDRF8SgUKbP/fmqDSLMquisIs8=; b=j+yRTn5TFeRT/cpLI5VYzJy03L NYLc+UFxGo4Rw6U9V628ijM+13Qp+TDiiGtCA2mL8KeDKyBY3TXsHZc3eXDYJ+UqbPkEIHL35dIvi 69YVhhdXeodzUCItLWtQ9ELni/EsFN1r4wm+qOvwy5BdbKN428Vnt9OmpcQDkPvrygDo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: ERETU error handling Message-Id: Date: Tue, 10 Mar 2026 12:44:22 +0000 commit 99edc6c2a0f5886474e017dd0bdd5829e0605455 Author: Andrew Cooper AuthorDate: Wed Aug 13 15:02:26 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:58:07 2026 +0000 x86/pv: ERETU error handling ERETU can fault for guest reasons, and like IRET needs special handling to forward the error into the guest. As this is largely written in C, take the opportunity to better classify the sources of error, and in particular, not forward errors that are actually Xen's fault into the guest, opting for a domain crash instead. Because ERETU does not enable NMIs if it faults, a corner case exists if an NMI was taken while in guest context, and the ERETU back out faults. Recovery must involve an ERETS with the interrupted context's NMI flag. See the comments for full details. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 115 +++++++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/entry-fred.S | 13 +++++ 2 files changed, 128 insertions(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 77af9b90f1..e85c9198cd 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2349,6 +2349,113 @@ void asmlinkage entry_from_pv(struct cpu_user_regs *regs) fatal_trap(regs, false); } +void nocall eretu_error_dom_crash(void); + +/* + * Classify an event at the ERETU instruction, and handle if possible. + * Returns @true if handled, @false if the event should continue down the + * normal handlers. + */ +static bool handle_eretu_event(struct cpu_user_regs *regs) +{ + unsigned long recover; + + /* + * WARNING: The GPRs in gregs overlaps with regs. Only gregs->error_code + * and later are legitimate to access. + */ + struct cpu_user_regs *gregs = + _p(regs->rsp - offsetof(struct cpu_user_regs, error_code)); + + /* + * The asynchronous or fatal events (INTR, NMI, #MC, #DF) have been dealt + * with, meaning we only have synchronous ones to consider. Anything + * which isn't a hardware exception (e.g. #BP) wants handling normally. + */ + if ( regs->fred_ss.type != X86_ET_HW_EXC ) + return false; + + /* + * Guests are permitted to write non-present GDT/LDT entries. Therefore + * #NP[sel] (%cs) and #SS[sel] (%ss) must be handled as guest errors. The + * only other source of #SS is for a bad %ss-relative memory access in + * Xen, and if the stack is that bad, we'll have escalated to #DF. + * + * #PF can happen from ERETU accessing the GDT/LDT. Xen may translate + * these into #GP for the guest, so must be handled as guest errors. In + * theory we can get #PF for a bad instruction fetch or bad stack access, + * but either of these will be fatal and not end up here. + */ + switch ( regs->fred_ss.vector ) + { + case X86_EXC_GP: + /* + * #GP[0] can occur because of a NULL %cs or %ss (which are a guest + * error), but some #GP[0]'s are errors in Xen (ERETU at SL != 0), or + * errors of Xen's handling of guest state (bad metadata). + * + * These magic numbers came from the FRED Spec; they check that ERETU + * is trying to return to Ring 3, and that reserved or inapplicable + * bits are 0. + */ + if ( regs->error_code == 0 && (gregs->cs & ~3) && (gregs->ss & ~3) && + (regs->fred_cs.sl != 0 || + (gregs->csx & 0xffffffffffff0003UL) != 3 || + (gregs->rflags & 0xffffffffffc2b02aUL) != 2 || + (gregs->ssx & 0xfff80003UL) != 3) ) + { + recover = (unsigned long)eretu_error_dom_crash; + + if ( regs->fred_cs.sl ) + gprintk(XENLOG_ERR, "ERETU at SL %u\n", regs->fred_cs.sl); + else + gprintk(XENLOG_ERR, "Bad return state: csx %#lx, rflags %#lx, ssx %#x\n", + gregs->csx, gregs->rflags, (unsigned int)gregs->ssx); + break; + } + fallthrough; + case X86_EXC_NP: + case X86_EXC_SS: + case X86_EXC_PF: + recover = (unsigned long)entry_FRED_R3; + break; + + /* + * Handle everything else normally. e.g. #DB would be debugging + * activities in Xen. In theory we can get #UD if CR4.FRED gets + * cleared, but in practice if that were the case we wouldn't be here + * handling the result. + */ + default: + return false; + } + + this_cpu(last_extable_addr) = regs->rip; + + /* + * If an NMI was taken in guest context and the ERETU faulted, NMIs will + * still be blocked. Therefore we copy the interrupted frame's NMI status + * into our own, and must ERETS as part of recovery. + */ + regs->fred_ss.nmi = gregs->fred_ss.nmi; + + /* + * Next, copy the exception information from the current frame back onto + * the interrupted frame, preserving the interrupted frame's %cs and %ss. + */ + *cpu_regs_fred_info(regs) = *cpu_regs_fred_info(gregs); + gregs->ssx = (regs->ssx & ~0xffff) | gregs->ss; + gregs->csx = (regs->csx & ~0xffff) | gregs->cs; + gregs->error_code = regs->error_code; + gregs->entry_vector = regs->entry_vector; + + fixup_exception_return(regs, recover, 0); + + return true; +} + +void nocall eretu(void); + void asmlinkage entry_from_xen(struct cpu_user_regs *regs) { struct fred_info *fi = cpu_regs_fred_info(regs); @@ -2390,6 +2497,14 @@ void asmlinkage entry_from_xen(struct cpu_user_regs *regs) if ( regs->eflags & X86_EFLAGS_IF ) local_irq_enable(); + /* + * An event taken at the ERETU instruction may be because of bad guest + * state. If so, it will need special handling. + */ + if ( unlikely(regs->rip == (unsigned long)eretu) && + handle_eretu_event(regs) ) + return; + switch ( type ) { case X86_ET_HW_EXC: diff --git a/xen/arch/x86/x86_64/entry-fred.S b/xen/arch/x86/x86_64/entry-fred.S index a1ff9a4a97..2fa57beb93 100644 --- a/xen/arch/x86/x86_64/entry-fred.S +++ b/xen/arch/x86/x86_64/entry-fred.S @@ -27,9 +27,22 @@ END(entry_FRED_R3) FUNC(eretu_exit_to_guest) POP_GPRS + + /* + * Exceptions here are handled by redirecting either to + * entry_FRED_R3() (for an error to be passed to the guest), or to + * eretu_error_dom_crash() (for a Xen error handling guest state). + */ +LABEL(eretu, 0) eretu END(eretu_exit_to_guest) +FUNC(eretu_error_dom_crash) + PUSH_AND_CLEAR_GPRS + sti + call asm_domain_crash_synchronous /* Does not return */ +END(eretu_error_dom_crash) + /* The Ring0 entrypoint is at Ring3 + 0x100. */ .org entry_FRED_R3 + 0x100, 0xcc -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 12:44:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 12:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250094.1547533 (Exim 4.92) (envelope-from ) id 1vzwRt-0000oL-J1; Tue, 10 Mar 2026 12:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250094.1547533; Tue, 10 Mar 2026 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 1vzwRt-0000oD-GG; Tue, 10 Mar 2026 12:44:33 +0000 Received: by outflank-mailman (input) for mailman id 1250094; Tue, 10 Mar 2026 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 1vzwRs-0000o1-Bh for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzwRs-001cav-1k for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 12:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzwRs-001mmF-0w for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=nYjQapH8TSxDP9cBCPH5EM3ZCasBh/gsmPa2tHGNy/A=; b=ylO0BOL5WhUK2BbZALHiG7Zszk bAve89OOG4EbzkBjVEzRmusf5m5c5W1WFJKR4F6MbiAUDd1mtgUdpX4WLy11fAcSf5paDnpLlJS8Y cnS+7qu2Isblj7f4HfeoUSFhfG0s5u1gNPU4lnbEWMNOnYPM/QKXb1A7kwEG09UJx1Xk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: System call handling in FRED mode Message-Id: Date: Tue, 10 Mar 2026 12:44:32 +0000 commit 76193ef47d9165a2c85b1f0c9e40c6018c5ef943 Author: Andrew Cooper AuthorDate: Mon Aug 11 15:55:24 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:58:23 2026 +0000 x86/pv: System call handling in FRED mode Under FRED, entry_from_pv() handles everything, even system call instructions. This means more of our logic is written in C now, rather than assembly. In order to facilitate this, introduce pv_inject_callback(), which reuses struct trap_bounce infrastructure to inject the syscall/sysenter callbacks. This in turns requires some !PV compatibility for pv_inject_callback() and pv_hypercall() which can both be ASSERT_UNREACHABLE(). For each of INT $N, SYSCALL and SYSENTER, FRED gives us interrupted context which was previously lost. As the guest can't see FRED, Xen has to lose state in the same way to maintain the prior behaviour. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/domain.h | 2 + xen/arch/x86/include/asm/hypercall.h | 2 - xen/arch/x86/pv/traps.c | 39 +++++++++++ xen/arch/x86/traps.c | 126 +++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index 94b0cf7f1d..ad7f6adb2c 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -725,6 +725,8 @@ void arch_vcpu_regs_init(struct vcpu *v); struct vcpu_hvm_context; int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx); +void pv_inject_callback(unsigned int type); + #ifdef CONFIG_PV void pv_inject_event(const struct x86_event *event); #else diff --git a/xen/arch/x86/include/asm/hypercall.h b/xen/arch/x86/include/asm/hypercall.h index bf2f0e169a..d042a61d17 100644 --- a/xen/arch/x86/include/asm/hypercall.h +++ b/xen/arch/x86/include/asm/hypercall.h @@ -18,9 +18,7 @@ #define __HYPERVISOR_paging_domctl_cont __HYPERVISOR_arch_1 -#ifdef CONFIG_PV void pv_hypercall(struct cpu_user_regs *regs); -#endif void pv_ring1_init_hypercall_page(void *p); void pv_ring3_init_hypercall_page(void *p); diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index b0395b9914..c863ab9d37 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -20,6 +20,8 @@ #include #include +#include + void pv_inject_event(const struct x86_event *event) { struct vcpu *curr = current; @@ -96,6 +98,43 @@ void pv_inject_event(const struct x86_event *event) } } +void pv_inject_callback(unsigned int type) +{ + struct vcpu *curr = current; + struct trap_bounce *tb = &curr->arch.pv.trap_bounce; + unsigned long rip; + bool irq; + + ASSERT(is_pv_64bit_vcpu(curr)); + + switch ( type ) + { + case CALLBACKTYPE_syscall: + rip = curr->arch.pv.syscall_callback_eip; + irq = curr->arch.pv.vgc_flags & VGCF_syscall_disables_events; + break; + + case CALLBACKTYPE_syscall32: + rip = curr->arch.pv.syscall32_callback_eip; + irq = curr->arch.pv.syscall32_disables_events; + break; + + case CALLBACKTYPE_sysenter: + rip = curr->arch.pv.sysenter_callback_eip; + irq = curr->arch.pv.sysenter_disables_events; + break; + + default: + ASSERT_UNREACHABLE(); + rip = 0; + irq = false; + break; + } + + tb->flags = TBF_EXCEPTION | (irq ? TBF_INTERRUPT : 0); + tb->eip = rip; +} + /* * Called from asm to set up the MCE trapbounce info. * Returns false no callback is set up, else true. diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e85c9198cd..f5523fec0a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,8 @@ #include #include +#include + /* * opt_nmi: one of 'ignore', 'dom0', or 'fatal'. * fatal: Xen prints diagnostic message and then hangs. @@ -2268,6 +2271,7 @@ void asmlinkage check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) void asmlinkage entry_from_pv(struct cpu_user_regs *regs) { struct fred_info *fi = cpu_regs_fred_info(regs); + struct vcpu *curr = current; uint8_t type = regs->fred_ss.type; uint8_t vec = regs->fred_ss.vector; @@ -2310,6 +2314,38 @@ void asmlinkage entry_from_pv(struct cpu_user_regs *regs) switch ( type ) { + case X86_ET_SW_INT: + /* + * For better or worse, Xen writes IDT vectors 3 and 4 with DPL3 (so + * INT3/INTO work), making INT $3/4 indistinguishable, and the guest + * choice of DPL for these vectors is ignored. + * + * Have them fall through into X86_ET_HW_EXC, as #BP in particular + * needs handling by do_int3() in case an external debugger is + * attached. + * + * As the event type is provided, INT $N instructions don't need #GP + * tricks to spot, and INT $0x80 doesn't need a fastpath. As the + * guest is necessary PV64, INT $0x82 has no special meaning either. + * + * When converting to a fault, hardware finally gives us enough + * information to account for prefixes, so provide the more correct + * behaviour rather than assuming the instruction was two bytes long. + */ + if ( vec != X86_EXC_BP && vec != X86_EXC_OF ) + { + const struct trap_info *ti = &curr->arch.pv.trap_ctxt[vec]; + + if ( permit_softint(TI_GET_DPL(ti), curr, regs) ) + pv_inject_sw_interrupt(vec); + else + { + regs->rip -= regs->fred_ss.insnlen; + pv_inject_hw_exception(X86_EXC_GP, (vec << 3) | X86_XEC_IDT); + } + break; + } + fallthrough; case X86_ET_HW_EXC: case X86_ET_PRIV_SW_EXC: case X86_ET_SW_EXC: @@ -2339,6 +2375,96 @@ void asmlinkage entry_from_pv(struct cpu_user_regs *regs) } break; + case X86_ET_OTHER: + switch ( regs->fred_ss.vector ) + { + case 1: /* SYSCALL */ + { + /* + * FRED delivery preserves the interrupted %cs/%ss, but previously + * SYSCALL lost the interrupted selectors, and SYSRET forced the + * use of the ones in MSR_STAR. + * + * The guest isn't aware of FRED, so recreate the legacy + * behaviour. + * + * The non-FRED SYSCALL path sets TRAP_syscall in entry_vector to + * signal that SYSRET can be used, but this isn't relevant in FRED + * mode. + * + * When setting the selectors, clear all upper metadata again for + * backwards compatibility. In particular fred_ss.swint becomes + * pend_DB on ERETx, and nothing else in the pv_hypercall() would + * clean up. + * + * When converting to a fault, hardware finally gives us enough + * information to account for prefixes, so provide the more + * correct behaviour rather than assuming the instruction was two + * bytes long. + */ + bool l = regs->fred_ss.l; + unsigned int len = regs->fred_ss.insnlen; + + regs->ssx = l ? FLAT_KERNEL_SS : FLAT_USER_SS32; + regs->csx = l ? FLAT_KERNEL_CS64 : FLAT_USER_CS32; + + if ( guest_kernel_mode(curr, regs) ) + pv_hypercall(regs); + else if ( (l ? curr->arch.pv.syscall_callback_eip + : curr->arch.pv.syscall32_callback_eip) == 0 ) + { + regs->rip -= len; + pv_inject_hw_exception(X86_EXC_UD, X86_EVENT_NO_EC); + } + else + { + /* + * The PV ABI, given no virtual SYSCALL_MASK, hardcodes that + * DF is cleared. Other flags are handled in the same way as + * interrupts and exceptions in create_bounce_frame(). + */ + regs->eflags &= ~X86_EFLAGS_DF; + pv_inject_callback(l ? CALLBACKTYPE_syscall + : CALLBACKTYPE_syscall32); + } + break; + } + + case 2: /* SYSENTER */ + { + /* + * FRED delivery preserves the interrupted state, but previously + * SYSENTER discarded almost everything. + * + * The guest isn't aware of FRED, so recreate the legacy + * behaviour. + * + * When setting the selectors, clear all upper metadata. In + * particular fred_ss.swint becomes pend_DB on ERETx. + * + * When converting to a fault, hardware finally gives us enough + * information to account for prefixes, so provide the more + * correct behaviour rather than assuming the instruction was two + * bytes long. + */ + regs->ssx = FLAT_USER_SS; + regs->rsp = 0; + regs->eflags &= ~(X86_EFLAGS_VM | X86_EFLAGS_IF); + regs->csx = 3; + regs->rip = 0; + + if ( !curr->arch.pv.sysenter_callback_eip ) + pv_inject_hw_exception(X86_EXC_GP, 0); + else + pv_inject_callback(CALLBACKTYPE_sysenter); + break; + } + + default: + goto fatal; + } + break; + default: goto fatal; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 12:44:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 12:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250095.1547537 (Exim 4.92) (envelope-from ) id 1vzwS3-0000qy-Ls; Tue, 10 Mar 2026 12:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250095.1547537; Tue, 10 Mar 2026 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 1vzwS3-0000qq-JD; Tue, 10 Mar 2026 12:44:43 +0000 Received: by outflank-mailman (input) for mailman id 1250095; Tue, 10 Mar 2026 12:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzwS2-0000qj-FK for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzwS2-001cb0-27 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 12:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzwS2-001moH-1G for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=KikQ+fhRYR6Vt5ezFMspT8Z1TMow3SrtTfRHJRX2tmY=; b=luL2JzcktESGC6Z4E4fsjHfgBt 4F4bETbnbxabNLv9rXSsYHkapa8beytHjE02zbhkDbP9EHqW/uEv2sDwnvGurXkrtqzr7TsQNqtYr LZitYqVLOPeCp+6HlvPGGjfdfMaFcauJZE4ptrAx+P5B9JR34VBNEBwPgG1yLTAMAGPQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Use fatal_trap() for #UD and #GP Message-Id: Date: Tue, 10 Mar 2026 12:44:42 +0000 commit 705784e51212cd77031e95ee4ec8799c25e69fb5 Author: Andrew Cooper AuthorDate: Tue Feb 10 14:50:56 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:58:33 2026 +0000 x86/traps: Use fatal_trap() for #UD and #GP This renders the diagnostics in a more uniform way. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f5523fec0a..b6b1197697 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1375,8 +1375,7 @@ void asmlinkage do_invalid_op(struct cpu_user_regs *regs) if ( likely(extable_fixup(regs, true)) ) return; - show_execution_state(regs); - panic("FATAL TRAP: vector = %d (invalid opcode)\n", X86_EXC_UD); + fatal_trap(regs, false); } void asmlinkage do_int3(struct cpu_user_regs *regs) @@ -1475,8 +1474,7 @@ void do_general_protection(struct cpu_user_regs *regs) return; hardware_gp: - show_execution_state(regs); - panic("GENERAL PROTECTION FAULT\n[error_code=%04x]\n", regs->error_code); + fatal_trap(regs, false); } #ifdef CONFIG_PV -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:55:10 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250123.1547549 (Exim 4.92) (envelope-from ) id 1vzxY7-0000pg-Lj; Tue, 10 Mar 2026 13:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250123.1547549; Tue, 10 Mar 2026 13:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxY7-0000pY-JE; Tue, 10 Mar 2026 13:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1250123; Tue, 10 Mar 2026 13:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxY6-0000pS-KG for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxY6-001dqB-2W for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxY6-001rFI-1V for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13: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=RWE27cVrmyPfkeTBUDgp8kREhe4JY68EDNn4TvUOrTE=; b=uLm6ot8wnKouFwa+WNye+f+Qav dWS9QfgFu4KEOwJ5gy7tg3I1VaLx+Kdeey9LBogw/TGrjLw9vCxhcFj56J8xrbw4qcL0cai2hbXe8 QQetWo+6NPbbqwrDtEVQ3dZr2H3gbReTEg1PpsxO36XZwV6IwS5n21lw/FHMqugMr6ag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] x86/MCE: restore CPU vendor reporting to the outside world Message-Id: Date: Tue, 10 Mar 2026 13:55:02 +0000 commit 93614ffa48f2577f5a9bb3043884ebc7432d0b8e Author: Jan Beulich AuthorDate: Tue Mar 10 14:36:11 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:36:11 2026 +0100 x86/MCE: restore CPU vendor reporting to the outside world The records reported used to contain Linux enumerators. We first broke that connection when purging unused ones, and then again when switching to the bit mask forms. Fixes: 408413051144 ("x86/cpu: Drop unused X86_VENDOR_* values") Fixes: 0cd074144cbb ("x86/cpu: Renumber X86_VENDOR_* to form a bitmap") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: a94c5fd8290a55461c599b8baad309df0d929f1f master date: 2026-02-23 08:39:58 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 9277781bff..9a91807cfb 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -858,6 +858,22 @@ void *x86_mcinfo_reserve(struct mc_info *mi, return mic_index; } +/* Linux values need using when reporting CPU vendors to the outside. */ +static unsigned int xen2linux_vendor(unsigned int vendor) +{ + switch ( vendor ) + { + case X86_VENDOR_INTEL: return 0; + case X86_VENDOR_AMD: return 2; + case X86_VENDOR_CENTAUR: return 5; + case X86_VENDOR_HYGON: return 9; + case X86_VENDOR_SHANGHAI: return 10; /* X86_VENDOR_ZHAOXIN */ + default: break; + } + + return 0xff; /* X86_VENDOR_UNKNOWN */ +} + static void x86_mcinfo_apei_save( struct mcinfo_global *mc_global, struct mcinfo_bank *mc_bank) { @@ -866,7 +882,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); m.cpu = mc_global->mc_coreid; - m.cpuvendor = boot_cpu_data.x86_vendor; + m.cpuvendor = xen2linux_vendor(boot_cpu_data.x86_vendor); m.cpuid = cpuid_eax(1); m.socketid = mc_global->mc_socketid; m.apicid = mc_global->mc_apicid; @@ -968,7 +984,7 @@ static void cf_check __maybe_unused do_mc_get_cpu_info(void *v) &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level = c->cpuid_level; xcp->mc_family = c->x86; - xcp->mc_vendor = c->x86_vendor; + xcp->mc_vendor = xen2linux_vendor(c->x86_vendor); xcp->mc_model = c->x86_model; xcp->mc_step = c->x86_mask; xcp->mc_cache_size = c->x86_cache_size; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:55:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250124.1547554 (Exim 4.92) (envelope-from ) id 1vzxYI-0000rC-NF; Tue, 10 Mar 2026 13:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250124.1547554; Tue, 10 Mar 2026 13: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 1vzxYI-0000r4-Kc; Tue, 10 Mar 2026 13:55:14 +0000 Received: by outflank-mailman (input) for mailman id 1250124; Tue, 10 Mar 2026 13:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxYG-0000qr-MU for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxYG-001dqJ-2p for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxYG-001rGE-21 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13: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=7LE42ebxdyXe00fg1ryER4aO9Qv7Fz8ehhDcVzK3HFE=; b=z+5LzK7qWRb1QxFwBFoIQe+sVa kNYayKNlGZMKo7qTh0bFtZpElk04wsilQT9IzdklfMhE70v/fC6z5d8pxkAg4VNTAlDPIdN1nKSYO YpZIWNKZWYlBDBdAu6rlBttddtyTXfiZciinpCaHTeTTIilFrUfUOt3Q5lXWOwWg337M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 10 Mar 2026 13:55:12 +0000 commit 805e2b8ada7c4e44a08e9c36117fc1b2180df675 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:36:41 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:36:41 2026 +0100 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a934a600c45486b7acfe8abc3658e284e64e5dd5 master date: 2026-03-03 15:15:53 +0000 --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 8c31d5a793..dbfb22e6d2 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -17,6 +17,7 @@ int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -33,6 +34,7 @@ static inline bool pv_trap_callback_registered(const struct vcpu *v, static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 225d4cff03..0ba446d812 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1384,6 +1385,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0c5393cb21..6f6ce387a1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1365,8 +1365,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:55:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250126.1547558 (Exim 4.92) (envelope-from ) id 1vzxYS-0000u0-Od; Tue, 10 Mar 2026 13:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250126.1547558; Tue, 10 Mar 2026 13: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 1vzxYS-0000ts-Ly; Tue, 10 Mar 2026 13:55:24 +0000 Received: by outflank-mailman (input) for mailman id 1250126; Tue, 10 Mar 2026 13:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxYQ-0000tf-Pw for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxYQ-001dqN-38 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxYQ-001rHd-2K for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=efg9y6IDFZwmGye5bOzlnsfupS+K/VfVRyvEIkfW5oQ=; b=Sl1nXsdnrbgiCE8PfjrRZAFYzj 29I95hLYIlly0hI9+hJN/fjSAj5+dKjrz/v0UGST/uwJq6DeVfY8hksrG2jWIro95rUlzRV9W7c96 9ajSWs4wRQ9TQMeQtxY/G1BLoIjrD7yJTQtsqKbgM2H9JBnpTDVIMhPiLAZXeRr76Kz4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] x86/ucode: Support discrete modules being CPIO archives Message-Id: Date: Tue, 10 Mar 2026 13:55:22 +0000 commit 8f3b6375919a6e99b5259457df5d760c2eed61e0 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:37:00 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:37:00 2026 +0100 x86/ucode: Support discrete modules being CPIO archives Multiple downstream distros have tried passing discrete CPIO archives and tripped over this not working. It turns out to be easy to support, so do so. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Tested-by: Teddy Astie [jb: doc change dropped as inapplicable to the older form] master commit: 878a9cfa451878dcba6108ae5b7879c80f049661 master date: 2026-03-03 15:15:53 +0000 --- CHANGELOG.md | 6 ++++++ xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 572f985685..527a51ec13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [4.21.1](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.21.1) + +### Added + - On x86: + - Support for CPIO microcode in discrete multiboot modules. + ## [4.21.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.21.0) - 2025-11-19 ### Changed diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index ecee400f28..17540fc2e6 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -749,6 +749,7 @@ static int __init early_microcode_load(struct boot_info *bi) void *data = NULL; size_t size; struct microcode_patch *patch; + struct cpio_data cd; int idx = opt_mod_idx; int rc; @@ -765,7 +766,6 @@ static int __init early_microcode_load(struct boot_info *bi) for ( idx = 0; idx < bi->nr_modules; ++idx ) { const struct boot_module *bm = &bi->mods[idx]; - struct cpio_data cd; /* Search anything unclaimed or likely to be a CPIO archive. */ if ( bm->kind != BOOTMOD_UNKNOWN && bm->kind != BOOTMOD_RAMDISK ) @@ -833,6 +833,24 @@ static int __init early_microcode_load(struct boot_info *bi) idx, size); return -ENODEV; } + + /* + * If this blob appears to be a CPIO archive, try interpreting it as + * one. Otherwise treat it as a raw vendor blob. + */ + cd = find_cpio_data(ucode_ops.cpio_path, data, size); + if ( cd.data ) + { + data = cd.data; + size = cd.size; + + /* + * (Ab)use opt_scan to inform microcode_init_cache() that + * early_mod_idx refers to a CPIO archive. + */ + opt_scan = true; + } + goto found; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:55:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250128.1547561 (Exim 4.92) (envelope-from ) id 1vzxYc-0000wP-Py; Tue, 10 Mar 2026 13:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250128.1547561; Tue, 10 Mar 2026 13: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 1vzxYc-0000wH-NL; Tue, 10 Mar 2026 13:55:34 +0000 Received: by outflank-mailman (input) for mailman id 1250128; Tue, 10 Mar 2026 13:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxYa-0000w5-SS for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxYb-001dqS-0C for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxYa-001rIc-2c for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bbKfnyocyWqHYonWqFsjD2grK5k22CUyPyaKXWIRvkE=; b=0W8o5Fjlrjiq5BfqHwmsXeXtha s2IPV0m0L4zo6Ts/e3le7weH3FjiqLszzldKUPwFQl4eZvF7UEIExcpOcOSeekMhWcu2N9XONa2E4 eGQ9uljh/SXu6P1VLwWB11qythSMw1xnMb0fqa2GOAuMHnEl+8Nw+2NfIsRGiwgLCzT4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] vpci/msix: check for BARs enabled in vpci_make_msix_hole Message-Id: Date: Tue, 10 Mar 2026 13:55:32 +0000 commit 999c6fadf71485ea070add4cdb76926b6a9574ff Author: Stewart Hildebrand AuthorDate: Tue Mar 10 14:37:20 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:37:20 2026 +0100 vpci/msix: check for BARs enabled in vpci_make_msix_hole A hotplugged PCI device may be added uninitialized. In particular, memory decoding might be disabled and the BARs might be zeroed. In this case, the BARs will not be mapped in p2m. However, vpci_make_msix_hole() unconditionally attempts to punch holes in p2m, leading to init_msix() failing: (XEN) d0v0 0000:01:00.0: existing mapping (mfn: 1c1880 type: 0) at 0 clobbers MSIX MMIO area (XEN) d0 0000:01:00.0: init legacy cap 17 fail rc=-17, mask it vpci_make_msix_hole() should only attempt to punch holes if the BARs containing the MSI-X/PBA tables are mapped in p2m. Introduce a helper for checking if a BAR is enabled, and add a check for the situation inside vpci_make_msix_hole(). As a result of the newly introduced checks in vpci_make_msix_hole(), move the call to vpci_make_msix_hole() within modify_decoding() to after setting ->enabled. Fixes: ee2eb6849d50 ("vpci: Refactor REGISTER_VPCI_INIT") Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné master commit: 7c24d58a6e641e2979978c5abb312bff877dede3 master date: 2026-03-05 09:27:50 +0100 --- xen/drivers/vpci/header.c | 26 +++++++++++++------------- xen/drivers/vpci/msix.c | 3 +++ xen/include/xen/vpci.h | 6 ++++++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index aae663bbf5..a3e8d0ec82 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -122,19 +122,6 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bool map = cmd & PCI_COMMAND_MEMORY; unsigned int i; - /* - * Make sure there are no mappings in the MSIX MMIO areas, so that accesses - * can be trapped (and emulated) by Xen when the memory decoding bit is - * enabled. - * - * FIXME: punching holes after the p2m has been set up might be racy for - * DomU usage, needs to be revisited. - */ -#ifdef CONFIG_HAS_PCI_MSI - if ( map && !rom_only && vpci_make_msix_hole(pdev) ) - return; -#endif - for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { struct vpci_bar *bar = &header->bars[i]; @@ -164,6 +151,19 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bar->enabled = map; } + /* + * Make sure there are no mappings in the MSIX MMIO areas, so that accesses + * can be trapped (and emulated) by Xen when the memory decoding bit is + * enabled. + * + * FIXME: punching holes after the p2m has been set up might be racy for + * DomU usage, needs to be revisited. + */ +#ifdef CONFIG_HAS_PCI_MSI + if ( map && !rom_only && vpci_make_msix_hole(pdev) ) + return; +#endif + if ( !rom_only ) { pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd); diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 032e471bb1..955fad3304 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -605,6 +605,9 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) unsigned long end = PFN_DOWN(vmsix_table_addr(pdev->vpci, i) + vmsix_table_size(pdev->vpci, i) - 1); + if ( !vmsix_table_bar_valid(pdev->vpci, i) ) + continue; + for ( ; start <= end; start++ ) { p2m_type_t t; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 9ae75d946a..50d0ad05a6 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -271,6 +271,12 @@ static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); } +static inline bool vmsix_table_bar_valid(const struct vpci *vpci, + unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].enabled; +} + /* * Note regarding the size calculation of the PBA: the spec mentions "The last * QWORD will not necessarily be fully populated", so it implies that the PBA -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:55:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250129.1547566 (Exim 4.92) (envelope-from ) id 1vzxYm-0000yc-Re; Tue, 10 Mar 2026 13:55:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250129.1547566; Tue, 10 Mar 2026 13: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 1vzxYm-0000yU-Om; Tue, 10 Mar 2026 13:55:44 +0000 Received: by outflank-mailman (input) for mailman id 1250129; Tue, 10 Mar 2026 13:55:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxYk-0000yG-V4 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxYl-001dsV-0T for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxYk-001rLG-2u for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/04C/Sm5GcvTz7eaiL2J8UwICg/7PnmX7EdxFCCTI3k=; b=B6T9DqO5MqbAap1d7UTo7HciJJ TdCuM3yDJtqvvrPx7rFn+7SSWk6rThS2k5VzCvUUjQTgEYV4YDrT/0N4Ge1Pq2GGCXNRd6Rdq2IpL q5AQgsZU+bnaimyXshOXZr9fZfZkRMuBubaTYhVozh979TZo3Qv40dIPrVPS09AzDmYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.21] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 13:55:42 +0000 commit 1c72306b1f0b4dc533954f678361044f8083dccc Author: Jan Beulich AuthorDate: Tue Mar 10 14:37:45 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:37:45 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: adfbdaa347d05e53c8c61ad00a6851bd5b82c760 master date: 2026-03-10 09:23:25 +0100 --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index ac06532544..75c7da16e2 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -452,14 +452,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:55:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250130.1547570 (Exim 4.92) (envelope-from ) id 1vzxYw-000118-U1; Tue, 10 Mar 2026 13:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250130.1547570; Tue, 10 Mar 2026 13: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 1vzxYw-00010y-RN; Tue, 10 Mar 2026 13:55:54 +0000 Received: by outflank-mailman (input) for mailman id 1250130; Tue, 10 Mar 2026 13:55:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxYv-00010m-C9 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxYv-001dsv-1o for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxYv-001rMq-12 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:55: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=Q27qbkAaHx31sbEzjWXU1YQAnkmIRTHGz7yjJnULN38=; b=TAnlKs94AnSfGCdBRPWSxu9Sta QvNcls6MYOusDuOXE5V3b0uWMtaQ19iWzTYKd1eXzYPSRO2K6t/5zLDY7w21Noo/iNJ5iX/KW9PqH HSad7oQ6MlajFOSkzwZ34kUwfqjG5vpsDsGkVUo0N+VP/Xb6Ja4lb2OefkHcR3VEXCZc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/MCE: restore CPU vendor reporting to the outside world Message-Id: Date: Tue, 10 Mar 2026 13:55:53 +0000 commit 1c762d6c46a12fc24a1febe4b0d7055f781cd775 Author: Jan Beulich AuthorDate: Tue Mar 10 14:38:36 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:38:36 2026 +0100 x86/MCE: restore CPU vendor reporting to the outside world The records reported used to contain Linux enumerators. We first broke that connection when purging unused ones, and then again when switching to the bit mask forms. Fixes: 408413051144 ("x86/cpu: Drop unused X86_VENDOR_* values") Fixes: 0cd074144cbb ("x86/cpu: Renumber X86_VENDOR_* to form a bitmap") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: a94c5fd8290a55461c599b8baad309df0d929f1f master date: 2026-02-23 08:39:58 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 84238cd0ef..1ccb96958e 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -854,6 +854,22 @@ void *x86_mcinfo_reserve(struct mc_info *mi, return mic_index; } +/* Linux values need using when reporting CPU vendors to the outside. */ +static unsigned int xen2linux_vendor(unsigned int vendor) +{ + switch ( vendor ) + { + case X86_VENDOR_INTEL: return 0; + case X86_VENDOR_AMD: return 2; + case X86_VENDOR_CENTAUR: return 5; + case X86_VENDOR_HYGON: return 9; + case X86_VENDOR_SHANGHAI: return 10; /* X86_VENDOR_ZHAOXIN */ + default: break; + } + + return 0xff; /* X86_VENDOR_UNKNOWN */ +} + static void x86_mcinfo_apei_save( struct mcinfo_global *mc_global, struct mcinfo_bank *mc_bank) { @@ -862,7 +878,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); m.cpu = mc_global->mc_coreid; - m.cpuvendor = boot_cpu_data.x86_vendor; + m.cpuvendor = xen2linux_vendor(boot_cpu_data.x86_vendor); m.cpuid = cpuid_eax(1); m.socketid = mc_global->mc_socketid; m.apicid = mc_global->mc_apicid; @@ -964,7 +980,7 @@ static void cf_check __maybe_unused do_mc_get_cpu_info(void *v) &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level = c->cpuid_level; xcp->mc_family = c->x86; - xcp->mc_vendor = c->x86_vendor; + xcp->mc_vendor = xen2linux_vendor(c->x86_vendor); xcp->mc_model = c->x86_model; xcp->mc_step = c->x86_mask; xcp->mc_cache_size = c->x86_cache_size; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:56:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250131.1547574 (Exim 4.92) (envelope-from ) id 1vzxZ6-00013F-VI; Tue, 10 Mar 2026 13:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250131.1547574; Tue, 10 Mar 2026 13: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 1vzxZ6-000137-Sg; Tue, 10 Mar 2026 13:56:04 +0000 Received: by outflank-mailman (input) for mailman id 1250131; Tue, 10 Mar 2026 13:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZ5-00012z-F9 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxZ5-001dtA-24 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxZ5-001rOd-1I for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13: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=beuMM+ttAqChZM1VSM6DEOMIg+vNDrnhpxNX4llIKHQ=; b=i4Y7IYjv52tKUVZ4ydCkcuYjZE LRiD7QZtI7VdLdRneNZc4v0PQEMbN/qsHxfHHfpP2YUxPnltye3li2K0o3ts0jATV2qorJPKvtfKL Iymg1N+YQxrqKzoOeHAEdbJ23Li1RUOdtR6xwLeGzqXguj3N3xh5pHLxcvxWKqGbbqdM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/ucode: Support discrete modules being CPIO archives Message-Id: Date: Tue, 10 Mar 2026 13:56:03 +0000 commit 51eb3e246e33bfa3d55f750283eedb267e72ed5e Author: Andrew Cooper AuthorDate: Tue Mar 10 14:38:59 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:38:59 2026 +0100 x86/ucode: Support discrete modules being CPIO archives Multiple downstream distros have tried passing discrete CPIO archives and tripped over this not working. It turns out to be easy to support, so do so. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Tested-by: Teddy Astie [jb: doc change dropped as inapplicable to the older form] master commit: 878a9cfa451878dcba6108ae5b7879c80f049661 master date: 2026-03-03 15:15:53 +0000 --- CHANGELOG.md | 6 ++++++ xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d098e7c5ac..8324c5c5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [4.20.3](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.3) + +### Added + - On x86: + - Support for CPIO microcode in discrete multiboot modules. + ## [4.20.1](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.1) ### Added diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index dc913ff333..d565fa3e48 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -749,6 +749,7 @@ static int __init early_microcode_load(struct boot_info *bi) void *data = NULL; size_t size; struct microcode_patch *patch; + struct cpio_data cd; int idx = opt_mod_idx; int rc; @@ -765,7 +766,6 @@ static int __init early_microcode_load(struct boot_info *bi) for ( idx = 0; idx < bi->nr_modules; ++idx ) { const struct boot_module *bm = &bi->mods[idx]; - struct cpio_data cd; /* Search anything unclaimed or likely to be a CPIO archive. */ if ( bm->type != BOOTMOD_UNKNOWN && @@ -834,6 +834,24 @@ static int __init early_microcode_load(struct boot_info *bi) idx, size); return -ENODEV; } + + /* + * If this blob appears to be a CPIO archive, try interpreting it as + * one. Otherwise treat it as a raw vendor blob. + */ + cd = find_cpio_data(ucode_ops.cpio_path, data, size); + if ( cd.data ) + { + data = cd.data; + size = cd.size; + + /* + * (Ab)use opt_scan to inform microcode_init_cache() that + * early_mod_idx refers to a CPIO archive. + */ + opt_scan = true; + } + goto found; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:56:15 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:56:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250132.1547578 (Exim 4.92) (envelope-from ) id 1vzxZH-00015I-0X; Tue, 10 Mar 2026 13:56:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250132.1547578; Tue, 10 Mar 2026 13: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 1vzxZG-00015A-U7; Tue, 10 Mar 2026 13:56:14 +0000 Received: by outflank-mailman (input) for mailman id 1250132; Tue, 10 Mar 2026 13:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZF-000152-Hi for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxZF-001dtU-2L for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxZF-001rQy-1Z for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13: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=dR26jCyaDpUa2Tg/UL4CaXwPZw7P8xcCCqf/NVluQCU=; b=ONgTgTO4LgNnHvUkychspSQUxt dJXOXhgW3TvY5zzn10A0mIeCLkmLJmSxtS3TCgpa3bDP+ZjQGIkCVrvboaEMxfQzMU2JLCobi/LnT j/MfWMHleifiRLNlwMgf9oC1eB3qd2mwHR2MRu9uKA87Mt/heqnIIQ7VZqDHsLTSDpb4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 10 Mar 2026 13:56:13 +0000 commit 45d18b05c09b412fa53142cadf4ddd2275283564 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:39:14 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:39:14 2026 +0100 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a934a600c45486b7acfe8abc3658e284e64e5dd5 master date: 2026-03-03 15:15:53 +0000 --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 404f5b169c..5892dc9ef8 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -19,6 +19,7 @@ void pv_trap_init(void); int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -37,6 +38,7 @@ static inline void pv_trap_init(void) {} static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index a21d499519..7753e44477 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1381,6 +1382,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9eb7bd2e07..b6d2c5b3ea 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1298,8 +1298,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:56:25 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:56:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250133.1547583 (Exim 4.92) (envelope-from ) id 1vzxZR-00017V-27; Tue, 10 Mar 2026 13:56:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250133.1547583; Tue, 10 Mar 2026 13:56: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 1vzxZQ-00017N-VY; Tue, 10 Mar 2026 13:56:24 +0000 Received: by outflank-mailman (input) for mailman id 1250133; Tue, 10 Mar 2026 13:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZP-00017D-K8 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxZP-001dtc-2b for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxZP-001rSC-1q for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13: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=aMnftDiADu1GKcp548f1V4Cm8+/u4ePrIIUq/+apo/8=; b=rUS9tmvJhqTF4VnZIA7Fk3HlSh +Fhu0LgBxSNWbQ2DW9iNIw2x/rtjpHyxNSQRkQ/nVtGG2eVRb8NYfyOBogSgF7JWQD8IQ0+M3P1PI bXlYLSU52ghrZ6d1l7KhLb3WokOhV/tMglUVdoUfHoMCyGEPIpCXEBi0R+zww+oRB8nM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.20] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 13:56:23 +0000 commit ab68afe62d09df65df7f980fa3ba33770ef3b12b Author: Jan Beulich AuthorDate: Tue Mar 10 14:39:52 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:43:47 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: adfbdaa347d05e53c8c61ad00a6851bd5b82c760 master date: 2026-03-10 09:23:25 +0100 --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 68e8677962..1a5a7d15bf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -316,14 +316,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:56:35 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:56:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250134.1547586 (Exim 4.92) (envelope-from ) id 1vzxZb-00019e-3L; Tue, 10 Mar 2026 13:56:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250134.1547586; Tue, 10 Mar 2026 13:56:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZb-00019W-0b; Tue, 10 Mar 2026 13:56:35 +0000 Received: by outflank-mailman (input) for mailman id 1250134; Tue, 10 Mar 2026 13:56:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZa-00019M-11 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxZa-001dtp-0g for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxZZ-001rT7-39 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13: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=/Fu9bTaAI6hQpByiHyH0SClsSdw9dXIXH+13MNrzCKM=; b=cAMV0orsrjdmEbGjRHAkRKxpxe /9O9JqVc85hV3ET9UYezYyZnO2BT2VJRMV4OANLN0T5XsuElmDZOsNrVU6YgsE34+JrAGY17J1oKE w1F7cT4oStKjg5Qy51QK6qzGYhhBl8L8TYRMoNG8Rjl7+E/924K/GNSvptp658lcqETU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/MCE: restore CPU vendor reporting to the outside world Message-Id: Date: Tue, 10 Mar 2026 13:56:33 +0000 commit b74f88c938f928278575bb674df4daac9d6ff5a8 Author: Jan Beulich AuthorDate: Tue Mar 10 14:45:02 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:45:02 2026 +0100 x86/MCE: restore CPU vendor reporting to the outside world The records reported used to contain Linux enumerators. We first broke that connection when purging unused ones, and then again when switching to the bit mask forms. Fixes: 408413051144 ("x86/cpu: Drop unused X86_VENDOR_* values") Fixes: 0cd074144cbb ("x86/cpu: Renumber X86_VENDOR_* to form a bitmap") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: a94c5fd8290a55461c599b8baad309df0d929f1f master date: 2026-02-23 08:39:58 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 5a59e79cbc..533425cf51 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -854,6 +854,22 @@ void *x86_mcinfo_reserve(struct mc_info *mi, return mic_index; } +/* Linux values need using when reporting CPU vendors to the outside. */ +static unsigned int xen2linux_vendor(unsigned int vendor) +{ + switch ( vendor ) + { + case X86_VENDOR_INTEL: return 0; + case X86_VENDOR_AMD: return 2; + case X86_VENDOR_CENTAUR: return 5; + case X86_VENDOR_HYGON: return 9; + case X86_VENDOR_SHANGHAI: return 10; /* X86_VENDOR_ZHAOXIN */ + default: break; + } + + return 0xff; /* X86_VENDOR_UNKNOWN */ +} + static void x86_mcinfo_apei_save( struct mcinfo_global *mc_global, struct mcinfo_bank *mc_bank) { @@ -862,7 +878,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); m.cpu = mc_global->mc_coreid; - m.cpuvendor = boot_cpu_data.x86_vendor; + m.cpuvendor = xen2linux_vendor(boot_cpu_data.x86_vendor); m.cpuid = cpuid_eax(1); m.socketid = mc_global->mc_socketid; m.apicid = mc_global->mc_apicid; @@ -964,7 +980,7 @@ static void cf_check do_mc_get_cpu_info(void *v) &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level = c->cpuid_level; xcp->mc_family = c->x86; - xcp->mc_vendor = c->x86_vendor; + xcp->mc_vendor = xen2linux_vendor(c->x86_vendor); xcp->mc_model = c->x86_model; xcp->mc_step = c->x86_mask; xcp->mc_cache_size = c->x86_cache_size; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:56:45 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:56:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250135.1547590 (Exim 4.92) (envelope-from ) id 1vzxZl-0001C9-4o; Tue, 10 Mar 2026 13:56:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250135.1547590; Tue, 10 Mar 2026 13:56:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZl-0001C0-24; Tue, 10 Mar 2026 13:56:45 +0000 Received: by outflank-mailman (input) for mailman id 1250135; Tue, 10 Mar 2026 13:56:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZk-0001Bu-3a for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxZk-001du2-0x for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxZk-001rUP-0B for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DTJdpS767Vt95qCfZlnKsHOPz7OFah3z+rbXZStEGVY=; b=2+T9ZFo4GJkku90Dpq22qV8REU dYRzwkdbmGPFrbqDcIrKUXNZRqoCFN4enWVisE/RsXS/fQVyRgi3itrxvOav0O8bvnnbm9Pec23e9 52XdUKY/KBPoScenk3SkL9OHML2cbxj4vuYfrTeGuLFgPIzQVt248JS6fbM3rFcbo6Aw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 10 Mar 2026 13:56:44 +0000 commit 260740e1aa1ff414dab65798e2d2d698c5e78b03 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:45:29 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:45:29 2026 +0100 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a934a600c45486b7acfe8abc3658e284e64e5dd5 master date: 2026-03-03 15:15:53 +0000 --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 404f5b169c..5892dc9ef8 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -19,6 +19,7 @@ void pv_trap_init(void); int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -37,6 +38,7 @@ static inline void pv_trap_init(void) {} static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index a21d499519..7753e44477 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1381,6 +1382,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index af90d8b27d..0c8c935ee9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1300,8 +1300,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 13:56:55 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 13:56:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250136.1547594 (Exim 4.92) (envelope-from ) id 1vzxZv-0001Ea-7O; Tue, 10 Mar 2026 13:56:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250136.1547594; Tue, 10 Mar 2026 13:56: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 1vzxZv-0001ES-4k; Tue, 10 Mar 2026 13:56:55 +0000 Received: by outflank-mailman (input) for mailman id 1250136; Tue, 10 Mar 2026 13:56:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxZu-0001EJ-68 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxZu-001duP-1C for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxZu-001rUs-0R for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 13:56:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MJaJpJLp7srS0lEDA9OUTO9Rs8/Mo99Gk0qyZXPTdOI=; b=hi52RKrqbeJfBhASGiA7SGFUdM anNRsLywNVXGkL+8wgULRdc0QLmAlDAGK21x1DsSdiNzl6Shdiv4bFz9+3rRh15FuIYji5Mf//xQA lZMBfyhAaDbY4/Fq8UwWUK3ACyVn/1p49wrikStjx+DGUMPDLXWOh2J01gpP48MTHy9c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 13:56:54 +0000 commit a38f51516848c86fae75f295af8be1a50f96cabd Author: Jan Beulich AuthorDate: Tue Mar 10 14:45:42 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:45:42 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: adfbdaa347d05e53c8c61ad00a6851bd5b82c760 master date: 2026-03-10 09:23:25 +0100 --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 168f709423..77dacffd22 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -262,14 +262,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:00:02 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:00:02 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250149.1547607 (Exim 4.92) (envelope-from ) id 1vzxcw-00025Z-Nl; Tue, 10 Mar 2026 14:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250149.1547607; Tue, 10 Mar 2026 14:00:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxcw-00025J-Kv; Tue, 10 Mar 2026 14:00:02 +0000 Received: by outflank-mailman (input) for mailman id 1250149; Tue, 10 Mar 2026 14:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxcw-0001y3-3W for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxcw-001dzM-0w for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxcw-001rnR-08 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=H+9JSfv8Uhud1ExVM7Pvm8JiCmbNekMsKVgJzmQssus=; b=1ok9kLdVmNlUAznyswr7HZjp8R eZ5A3Fci56hqVAJi8GHTt9l7jvNmSN2/0hSRo3KC8VtkbDf+C61/dDnjCLI2bVyWTMATp4BsvV36L RYvk/u7dNvzHBAen/qUOGj4gnYp+ztHn/Pc7rkVON933+1P1pKTHS0d2s8qaEjAILqiQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Adjust GS handling for FRED mode Message-Id: Date: Tue, 10 Mar 2026 14:00:02 +0000 commit 9ea7d7f9393c52de36ee9c42b52c235949453a2a Author: Andrew Cooper AuthorDate: Mon Aug 11 23:46:01 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:57:31 2026 +0000 x86/pv: Adjust GS handling for FRED mode When FRED is active, hardware automatically swaps GS when changing privilege, and the SWAPGS instruction is disallowed. For native OSes using GS as the thread local pointer this is a massive improvement on the pre-FRED architecture, but under Xen it makes handling PV guests more complicated. Specifically, it means that GS_BASE and GS_SHADOW are the opposite way around in FRED mode, as opposed to IDT mode. This leads to the following changes: * In load_segments(), we already load both GSes. Account for FRED in the SWAP() condition and avoid the path with SWAGS. * In save_segments(), we need to read GS_SHADOW rather than GS_BASE. * In toggle_guest_mode(), we need to emulate SWAPGS. * In {read,write}_msr() which access the live registers, GS_SHADOW and GS_BASE need swapping. * In do_set_segment_base(), merge the SEGBASE_GS_{USER,KERNEL} cases and take FRED into account when choosing which base to update. SEGBASE_GS_USER_SEL was already an LKGS invocation (decades before FRED) so under FRED needs to be just a MOV %gs. Simply skip the SWAPGSes. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 16 +++++++++++----- xen/arch/x86/pv/domain.c | 22 ++++++++++++++++++++-- xen/arch/x86/pv/emul-priv-op.c | 26 +++++++++++++++++--------- xen/arch/x86/pv/misc-hypercalls.c | 23 +++++++++++++++-------- 4 files changed, 63 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index e658c2d647..9c1f6ef76d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1791,9 +1791,10 @@ static void load_segments(struct vcpu *n) /* * Figure out which way around gsb/gss want to be. gsb needs to be - * the active context, and gss needs to be the inactive context. + * the active context, and gss needs to be the inactive context, + * unless we're in FRED mode where they're reversed. */ - if ( !(n->arch.flags & TF_kernel_mode) ) + if ( !(n->arch.flags & TF_kernel_mode) ^ opt_fred ) SWAP(gsb, gss); if ( using_svm() && (n->arch.pv.fs | n->arch.pv.gs) <= 3 ) @@ -1814,7 +1815,9 @@ static void load_segments(struct vcpu *n) if ( !fs_gs_done && !compat ) { - if ( read_cr4() & X86_CR4_FSGSBASE ) + unsigned long cr4 = read_cr4(); + + if ( !(cr4 & X86_CR4_FRED) && (cr4 & X86_CR4_FSGSBASE) ) { __wrgsbase(gss); __wrfsbase(n->arch.pv.fs_base); @@ -1931,6 +1934,9 @@ static void load_segments(struct vcpu *n) * Guests however cannot use SWAPGS, so there is no mechanism to modify the * inactive GS base behind Xen's back. Therefore, Xen's copy of the inactive * GS base is still accurate, and doesn't need reading back from hardware. + * + * Under FRED, hardware automatically swaps GS for us, so SHADOW_GS is the + * active GS from the guest's point of view. */ static void save_segments(struct vcpu *v) { @@ -1946,12 +1952,12 @@ static void save_segments(struct vcpu *v) if ( read_cr4() & X86_CR4_FSGSBASE ) { fs_base = __rdfsbase(); - gs_base = __rdgsbase(); + gs_base = opt_fred ? rdmsr(MSR_SHADOW_GS_BASE) : __rdgsbase(); } else { fs_base = rdmsr(MSR_FS_BASE); - gs_base = rdmsr(MSR_GS_BASE); + gs_base = opt_fred ? rdmsr(MSR_SHADOW_GS_BASE) : rdmsr(MSR_GS_BASE); } v->arch.pv.fs_base = fs_base; diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index d16583a745..b85abb5ed9 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -14,9 +14,10 @@ #include #include #include -#include #include #include +#include +#include #ifdef CONFIG_PV32 int8_t __read_mostly opt_pv32 = -1; @@ -514,11 +515,28 @@ void toggle_guest_mode(struct vcpu *v) * subsequent context switch won't bother re-reading it. */ gs_base = read_gs_base(); + + /* + * In FRED mode, not only are the two GSes the other way around (i.e. we + * want to read GS_SHADOW here), the SWAPGS instruction is disallowed so + * we have to emulate it. + */ + if ( opt_fred ) + { + unsigned long gs_shadow = rdmsr(MSR_SHADOW_GS_BASE); + + wrmsrns(MSR_SHADOW_GS_BASE, gs_base); + write_gs_base(gs_shadow); + + gs_base = gs_shadow; + } + else + asm volatile ( "swapgs" ); + if ( v->arch.flags & TF_kernel_mode ) v->arch.pv.gs_base_kernel = gs_base; else v->arch.pv.gs_base_user = gs_base; - asm volatile ( "swapgs" ); _toggle_guest_pt(v); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 64d47ab677..53676b3021 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -926,7 +927,8 @@ static int cf_check read_msr( case MSR_GS_BASE: if ( !cp->extd.lm ) break; - *val = read_gs_base(); + /* Under FRED, GS is automatically swapped on privilege change. */ + *val = opt_fred ? rdmsr(MSR_SHADOW_GS_BASE) : read_gs_base(); return X86EMUL_OKAY; case MSR_SHADOW_GS_BASE: @@ -1066,17 +1068,23 @@ static int cf_check write_msr( if ( !cp->extd.lm || !is_canonical_address(val) ) break; - if ( reg == MSR_FS_BASE ) - write_fs_base(val); - else if ( reg == MSR_GS_BASE ) - write_gs_base(val); - else if ( reg == MSR_SHADOW_GS_BASE ) + switch ( reg ) { - write_gs_shadow(val); + case MSR_FS_BASE: + write_fs_base(val); + break; + + case MSR_SHADOW_GS_BASE: curr->arch.pv.gs_base_user = val; + fallthrough; + case MSR_GS_BASE: + /* Under FRED, GS is automatically swapped on privilege change. */ + if ( (reg == MSR_GS_BASE) ^ opt_fred ) + write_gs_base(val); + else + write_gs_shadow(val); + break; } - else - ASSERT_UNREACHABLE(); return X86EMUL_OKAY; case MSR_EFER: diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index 4c2abeb4ad..7e915d86b7 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -11,6 +11,7 @@ #include #include +#include long do_set_debugreg(int reg, unsigned long value) { @@ -192,11 +193,13 @@ long do_set_segment_base(unsigned int which, unsigned long base) case SEGBASE_GS_USER: v->arch.pv.gs_base_user = base; - write_gs_shadow(base); - break; - + fallthrough; case SEGBASE_GS_KERNEL: - write_gs_base(base); + /* Under FRED, GS is automatically swapped on privilege change. */ + if ( (which == SEGBASE_GS_KERNEL) ^ opt_fred ) + write_gs_base(base); + else + write_gs_shadow(base); break; } break; @@ -206,10 +209,13 @@ long do_set_segment_base(unsigned int which, unsigned long base) unsigned int sel = (uint16_t)base; /* - * We wish to update the user %gs from the GDT/LDT. Currently, the - * guest kernel's GS_BASE is in context. + * We wish to update the user %gs from the GDT/LDT. Currently, we are + * in guest kernel context. + * + * Under IDT, this means updating GS_SHADOW. Under FRED, plain GS. */ - asm volatile ( "swapgs" ); + if ( !opt_fred ) + asm volatile ( "swapgs" ); if ( sel > 3 ) /* Fix up RPL for non-NUL selectors. */ @@ -247,7 +253,8 @@ long do_set_segment_base(unsigned int which, unsigned long base) /* Update the cache of the inactive base, as read from the GDT/LDT. */ v->arch.pv.gs_base_user = read_gs_base(); - asm volatile ( safe_swapgs ); + if ( !opt_fred ) + asm volatile ( safe_swapgs ); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:00:15 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250150.1547611 (Exim 4.92) (envelope-from ) id 1vzxd7-0002sc-PK; Tue, 10 Mar 2026 14:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250150.1547611; Tue, 10 Mar 2026 14: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 1vzxd7-0002sU-Mb; Tue, 10 Mar 2026 14:00:13 +0000 Received: by outflank-mailman (input) for mailman id 1250150; Tue, 10 Mar 2026 14:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxd6-0002sK-7y for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxd6-001e3C-1E for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxd6-001roi-0S for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=+FL5JzuubvDaDkYyl+41rouZNdckiw6nwj6ndPPReeI=; b=R5eQj2guP6/rjMbbrkutdIunYj 5bubyjmHHy1ViTBXTdvTp+5of11bOgpRmPYVbCE8FR2/+CtuNRfr87QvIAEcPoo1a/W+MvwJhKDtM s+uJ6o4So2sxYU3lj+DHbD1EzLIRji3TouSNRnwHaYzU8Kr+CwTW9lXeRFXOxKWipqUQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Guest exception handling in FRED mode Message-Id: Date: Tue, 10 Mar 2026 14:00:12 +0000 commit 87cfcbe9f0b522f9498101b6a698dd8fbf6509b7 Author: Andrew Cooper AuthorDate: Mon Aug 11 15:55:24 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:57:53 2026 +0000 x86/pv: Guest exception handling in FRED mode Under FRED, entry_from_pv() handles everything. To start with, implement exception handling in the same manner as entry_from_xen(), although we can unconditionally enable interrupts after the async/fatal events. After entry_from_pv() returns, test_all_events() needs to run to perform exception and interrupt injection. Split entry_FRED_R3() into two and introduce eretu_exit_to_guest() as the latter half, coming unilaterally from restore_all_guest(). For all of this, there is a slightly complicated relationship with CONFIG_PV. entry_FRED_R3() must exist irrespective of CONFIG_PV, because it's the entrypoint registered with hardware. For simplicity, entry_from_pv() is always called, but it collapses into fatal_trap() in the !PV case. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 78 +++++++++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/entry-fred.S | 13 ++++++- xen/arch/x86/x86_64/entry.S | 4 ++- 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e40b51d693..77af9b90f1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2267,9 +2267,85 @@ void asmlinkage check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) void asmlinkage entry_from_pv(struct cpu_user_regs *regs) { + struct fred_info *fi = cpu_regs_fred_info(regs); + uint8_t type = regs->fred_ss.type; + uint8_t vec = regs->fred_ss.vector; + /* Copy fred_ss.vector into entry_vector as IDT delivery would have done. */ - regs->entry_vector = regs->fred_ss.vector; + regs->entry_vector = vec; + + if ( !IS_ENABLED(CONFIG_PV) ) + goto fatal; + + /* + * First, handle the asynchronous or fatal events. These are either + * unrelated to the interrupted context, or may not have valid context + * recorded, and all have special rules on how/whether to re-enable IRQs. + */ + if ( regs->fred_ss.nested ) + goto fatal; + + switch ( type ) + { + case X86_ET_EXT_INTR: + return do_IRQ(regs); + + case X86_ET_NMI: + return do_nmi(regs); + + case X86_ET_HW_EXC: + switch ( vec ) + { + case X86_EXC_DF: return do_double_fault(regs); + case X86_EXC_MC: return do_machine_check(regs); + } + break; + } + /* + * With the asynchronous events handled, what remains are the synchronous + * ones. PV guest context always had interrupts enabled. + */ + local_irq_enable(); + + switch ( type ) + { + case X86_ET_HW_EXC: + case X86_ET_PRIV_SW_EXC: + case X86_ET_SW_EXC: + switch ( vec ) + { + case X86_EXC_PF: handle_PF(regs, fi->edata); break; + case X86_EXC_GP: do_general_protection(regs); break; + case X86_EXC_UD: do_invalid_op(regs); break; + case X86_EXC_NM: do_device_not_available(regs); break; + case X86_EXC_BP: do_int3(regs); break; + case X86_EXC_DB: handle_DB(regs, fi->edata); break; + case X86_EXC_CP: do_entry_CP(regs); break; + + case X86_EXC_DE: + case X86_EXC_OF: + case X86_EXC_BR: + case X86_EXC_NP: + case X86_EXC_SS: + case X86_EXC_MF: + case X86_EXC_AC: + case X86_EXC_XM: + do_trap(regs); + break; + + default: + goto fatal; + } + break; + + default: + goto fatal; + } + + return; + + fatal: fatal_trap(regs, false); } diff --git a/xen/arch/x86/x86_64/entry-fred.S b/xen/arch/x86/x86_64/entry-fred.S index 3c3320df22..a1ff9a4a97 100644 --- a/xen/arch/x86/x86_64/entry-fred.S +++ b/xen/arch/x86/x86_64/entry-fred.S @@ -15,9 +15,20 @@ FUNC(entry_FRED_R3, 4096) mov %rsp, %rdi call entry_from_pv +#ifdef CONFIG_PV + GET_STACK_END(14) + movq STACK_CPUINFO_FIELD(current_vcpu)(%r14), %rbx + + jmp test_all_events +#else + BUG /* Not Reached */ +#endif +END(entry_FRED_R3) + +FUNC(eretu_exit_to_guest) POP_GPRS eretu -END(entry_FRED_R3) +END(eretu_exit_to_guest) /* The Ring0 entrypoint is at Ring3 + 0x100. */ .org entry_FRED_R3 + 0x100, 0xcc diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 8b83082413..17ca6a4939 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -63,7 +63,7 @@ UNLIKELY_END(syscall_no_callback) /* Conditionally clear DF */ and %esi, UREGS_eflags(%rsp) /* %rbx: struct vcpu */ -test_all_events: +LABEL(test_all_events, 0) ASSERT_NOT_IN_ATOMIC cli # tests must not race interrupts /*test_softirqs:*/ @@ -152,6 +152,8 @@ END(switch_to_kernel) FUNC_LOCAL(restore_all_guest) ASSERT_INTERRUPTS_DISABLED + ALTERNATIVE "", "jmp eretu_exit_to_guest", X86_FEATURE_XEN_FRED + /* Stash guest SPEC_CTRL value while we can read struct vcpu. */ mov VCPU_arch_msrs(%rbx), %rdx mov VCPUMSR_spec_ctrl_raw(%rdx), %r15d -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:00:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250151.1547614 (Exim 4.92) (envelope-from ) id 1vzxdH-0002uv-Qc; Tue, 10 Mar 2026 14:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250151.1547614; Tue, 10 Mar 2026 14: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 1vzxdH-0002un-O4; Tue, 10 Mar 2026 14:00:23 +0000 Received: by outflank-mailman (input) for mailman id 1250151; Tue, 10 Mar 2026 14:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxdG-0002uh-98 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxdG-001e3I-1V for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxdG-001rqK-0j for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=nIrZHt6EdiF6LgN5Q9Ge7hFas6lJ0/L9bCunI2QkaWk=; b=QJwRscxep1qhqr4+jwTB68W0Jq bmYeKv96cqsQQYhfL30sJKtQ/P9r5NVSttee20a1sGNvwc8kloy16OGa49igOYnOT2OBX7zp8RpQP PJ+kGIuCcOZuClNGd28ubMdWN9Ndk/gGATwDvfRq+Alb8+ropxEcmUH4OpGwmtb250m0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: ERETU error handling Message-Id: Date: Tue, 10 Mar 2026 14:00:22 +0000 commit 99edc6c2a0f5886474e017dd0bdd5829e0605455 Author: Andrew Cooper AuthorDate: Wed Aug 13 15:02:26 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:58:07 2026 +0000 x86/pv: ERETU error handling ERETU can fault for guest reasons, and like IRET needs special handling to forward the error into the guest. As this is largely written in C, take the opportunity to better classify the sources of error, and in particular, not forward errors that are actually Xen's fault into the guest, opting for a domain crash instead. Because ERETU does not enable NMIs if it faults, a corner case exists if an NMI was taken while in guest context, and the ERETU back out faults. Recovery must involve an ERETS with the interrupted context's NMI flag. See the comments for full details. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 115 +++++++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/entry-fred.S | 13 +++++ 2 files changed, 128 insertions(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 77af9b90f1..e85c9198cd 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2349,6 +2349,113 @@ void asmlinkage entry_from_pv(struct cpu_user_regs *regs) fatal_trap(regs, false); } +void nocall eretu_error_dom_crash(void); + +/* + * Classify an event at the ERETU instruction, and handle if possible. + * Returns @true if handled, @false if the event should continue down the + * normal handlers. + */ +static bool handle_eretu_event(struct cpu_user_regs *regs) +{ + unsigned long recover; + + /* + * WARNING: The GPRs in gregs overlaps with regs. Only gregs->error_code + * and later are legitimate to access. + */ + struct cpu_user_regs *gregs = + _p(regs->rsp - offsetof(struct cpu_user_regs, error_code)); + + /* + * The asynchronous or fatal events (INTR, NMI, #MC, #DF) have been dealt + * with, meaning we only have synchronous ones to consider. Anything + * which isn't a hardware exception (e.g. #BP) wants handling normally. + */ + if ( regs->fred_ss.type != X86_ET_HW_EXC ) + return false; + + /* + * Guests are permitted to write non-present GDT/LDT entries. Therefore + * #NP[sel] (%cs) and #SS[sel] (%ss) must be handled as guest errors. The + * only other source of #SS is for a bad %ss-relative memory access in + * Xen, and if the stack is that bad, we'll have escalated to #DF. + * + * #PF can happen from ERETU accessing the GDT/LDT. Xen may translate + * these into #GP for the guest, so must be handled as guest errors. In + * theory we can get #PF for a bad instruction fetch or bad stack access, + * but either of these will be fatal and not end up here. + */ + switch ( regs->fred_ss.vector ) + { + case X86_EXC_GP: + /* + * #GP[0] can occur because of a NULL %cs or %ss (which are a guest + * error), but some #GP[0]'s are errors in Xen (ERETU at SL != 0), or + * errors of Xen's handling of guest state (bad metadata). + * + * These magic numbers came from the FRED Spec; they check that ERETU + * is trying to return to Ring 3, and that reserved or inapplicable + * bits are 0. + */ + if ( regs->error_code == 0 && (gregs->cs & ~3) && (gregs->ss & ~3) && + (regs->fred_cs.sl != 0 || + (gregs->csx & 0xffffffffffff0003UL) != 3 || + (gregs->rflags & 0xffffffffffc2b02aUL) != 2 || + (gregs->ssx & 0xfff80003UL) != 3) ) + { + recover = (unsigned long)eretu_error_dom_crash; + + if ( regs->fred_cs.sl ) + gprintk(XENLOG_ERR, "ERETU at SL %u\n", regs->fred_cs.sl); + else + gprintk(XENLOG_ERR, "Bad return state: csx %#lx, rflags %#lx, ssx %#x\n", + gregs->csx, gregs->rflags, (unsigned int)gregs->ssx); + break; + } + fallthrough; + case X86_EXC_NP: + case X86_EXC_SS: + case X86_EXC_PF: + recover = (unsigned long)entry_FRED_R3; + break; + + /* + * Handle everything else normally. e.g. #DB would be debugging + * activities in Xen. In theory we can get #UD if CR4.FRED gets + * cleared, but in practice if that were the case we wouldn't be here + * handling the result. + */ + default: + return false; + } + + this_cpu(last_extable_addr) = regs->rip; + + /* + * If an NMI was taken in guest context and the ERETU faulted, NMIs will + * still be blocked. Therefore we copy the interrupted frame's NMI status + * into our own, and must ERETS as part of recovery. + */ + regs->fred_ss.nmi = gregs->fred_ss.nmi; + + /* + * Next, copy the exception information from the current frame back onto + * the interrupted frame, preserving the interrupted frame's %cs and %ss. + */ + *cpu_regs_fred_info(regs) = *cpu_regs_fred_info(gregs); + gregs->ssx = (regs->ssx & ~0xffff) | gregs->ss; + gregs->csx = (regs->csx & ~0xffff) | gregs->cs; + gregs->error_code = regs->error_code; + gregs->entry_vector = regs->entry_vector; + + fixup_exception_return(regs, recover, 0); + + return true; +} + +void nocall eretu(void); + void asmlinkage entry_from_xen(struct cpu_user_regs *regs) { struct fred_info *fi = cpu_regs_fred_info(regs); @@ -2390,6 +2497,14 @@ void asmlinkage entry_from_xen(struct cpu_user_regs *regs) if ( regs->eflags & X86_EFLAGS_IF ) local_irq_enable(); + /* + * An event taken at the ERETU instruction may be because of bad guest + * state. If so, it will need special handling. + */ + if ( unlikely(regs->rip == (unsigned long)eretu) && + handle_eretu_event(regs) ) + return; + switch ( type ) { case X86_ET_HW_EXC: diff --git a/xen/arch/x86/x86_64/entry-fred.S b/xen/arch/x86/x86_64/entry-fred.S index a1ff9a4a97..2fa57beb93 100644 --- a/xen/arch/x86/x86_64/entry-fred.S +++ b/xen/arch/x86/x86_64/entry-fred.S @@ -27,9 +27,22 @@ END(entry_FRED_R3) FUNC(eretu_exit_to_guest) POP_GPRS + + /* + * Exceptions here are handled by redirecting either to + * entry_FRED_R3() (for an error to be passed to the guest), or to + * eretu_error_dom_crash() (for a Xen error handling guest state). + */ +LABEL(eretu, 0) eretu END(eretu_exit_to_guest) +FUNC(eretu_error_dom_crash) + PUSH_AND_CLEAR_GPRS + sti + call asm_domain_crash_synchronous /* Does not return */ +END(eretu_error_dom_crash) + /* The Ring0 entrypoint is at Ring3 + 0x100. */ .org entry_FRED_R3 + 0x100, 0xcc -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:00:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250152.1547619 (Exim 4.92) (envelope-from ) id 1vzxdR-0002xr-TS; Tue, 10 Mar 2026 14:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250152.1547619; Tue, 10 Mar 2026 14: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 1vzxdR-0002xj-Ql; Tue, 10 Mar 2026 14:00:33 +0000 Received: by outflank-mailman (input) for mailman id 1250152; Tue, 10 Mar 2026 14:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxdQ-0002xT-C6 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxdQ-001e3P-1n for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxdQ-001rqp-10 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=hlW8vIi+7VcuhaMFL3KxfPviwrfdBb4EUoQqTmTmdPM=; b=OskznhedNAzHy5KNgbQsYm0VYN EpKWZ8BcFjxkbIXBuu2TuM5lDnZEMpjqefLqWt4d7EtIgPXBMgdgiumgzkdob1JZn4g2dY9tyDApU Wrgg0IT5hPbXVtQRW+jTB6oiBUtyJxVSxdGSf0HDPCrgisLBysf2fKr6h5feewnB2W8M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: System call handling in FRED mode Message-Id: Date: Tue, 10 Mar 2026 14:00:32 +0000 commit 76193ef47d9165a2c85b1f0c9e40c6018c5ef943 Author: Andrew Cooper AuthorDate: Mon Aug 11 15:55:24 2025 +0100 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:58:23 2026 +0000 x86/pv: System call handling in FRED mode Under FRED, entry_from_pv() handles everything, even system call instructions. This means more of our logic is written in C now, rather than assembly. In order to facilitate this, introduce pv_inject_callback(), which reuses struct trap_bounce infrastructure to inject the syscall/sysenter callbacks. This in turns requires some !PV compatibility for pv_inject_callback() and pv_hypercall() which can both be ASSERT_UNREACHABLE(). For each of INT $N, SYSCALL and SYSENTER, FRED gives us interrupted context which was previously lost. As the guest can't see FRED, Xen has to lose state in the same way to maintain the prior behaviour. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/domain.h | 2 + xen/arch/x86/include/asm/hypercall.h | 2 - xen/arch/x86/pv/traps.c | 39 +++++++++++ xen/arch/x86/traps.c | 126 +++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index 94b0cf7f1d..ad7f6adb2c 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -725,6 +725,8 @@ void arch_vcpu_regs_init(struct vcpu *v); struct vcpu_hvm_context; int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx); +void pv_inject_callback(unsigned int type); + #ifdef CONFIG_PV void pv_inject_event(const struct x86_event *event); #else diff --git a/xen/arch/x86/include/asm/hypercall.h b/xen/arch/x86/include/asm/hypercall.h index bf2f0e169a..d042a61d17 100644 --- a/xen/arch/x86/include/asm/hypercall.h +++ b/xen/arch/x86/include/asm/hypercall.h @@ -18,9 +18,7 @@ #define __HYPERVISOR_paging_domctl_cont __HYPERVISOR_arch_1 -#ifdef CONFIG_PV void pv_hypercall(struct cpu_user_regs *regs); -#endif void pv_ring1_init_hypercall_page(void *p); void pv_ring3_init_hypercall_page(void *p); diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index b0395b9914..c863ab9d37 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -20,6 +20,8 @@ #include #include +#include + void pv_inject_event(const struct x86_event *event) { struct vcpu *curr = current; @@ -96,6 +98,43 @@ void pv_inject_event(const struct x86_event *event) } } +void pv_inject_callback(unsigned int type) +{ + struct vcpu *curr = current; + struct trap_bounce *tb = &curr->arch.pv.trap_bounce; + unsigned long rip; + bool irq; + + ASSERT(is_pv_64bit_vcpu(curr)); + + switch ( type ) + { + case CALLBACKTYPE_syscall: + rip = curr->arch.pv.syscall_callback_eip; + irq = curr->arch.pv.vgc_flags & VGCF_syscall_disables_events; + break; + + case CALLBACKTYPE_syscall32: + rip = curr->arch.pv.syscall32_callback_eip; + irq = curr->arch.pv.syscall32_disables_events; + break; + + case CALLBACKTYPE_sysenter: + rip = curr->arch.pv.sysenter_callback_eip; + irq = curr->arch.pv.sysenter_disables_events; + break; + + default: + ASSERT_UNREACHABLE(); + rip = 0; + irq = false; + break; + } + + tb->flags = TBF_EXCEPTION | (irq ? TBF_INTERRUPT : 0); + tb->eip = rip; +} + /* * Called from asm to set up the MCE trapbounce info. * Returns false no callback is set up, else true. diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e85c9198cd..f5523fec0a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,8 @@ #include #include +#include + /* * opt_nmi: one of 'ignore', 'dom0', or 'fatal'. * fatal: Xen prints diagnostic message and then hangs. @@ -2268,6 +2271,7 @@ void asmlinkage check_ist_exit(const struct cpu_user_regs *regs, bool ist_exit) void asmlinkage entry_from_pv(struct cpu_user_regs *regs) { struct fred_info *fi = cpu_regs_fred_info(regs); + struct vcpu *curr = current; uint8_t type = regs->fred_ss.type; uint8_t vec = regs->fred_ss.vector; @@ -2310,6 +2314,38 @@ void asmlinkage entry_from_pv(struct cpu_user_regs *regs) switch ( type ) { + case X86_ET_SW_INT: + /* + * For better or worse, Xen writes IDT vectors 3 and 4 with DPL3 (so + * INT3/INTO work), making INT $3/4 indistinguishable, and the guest + * choice of DPL for these vectors is ignored. + * + * Have them fall through into X86_ET_HW_EXC, as #BP in particular + * needs handling by do_int3() in case an external debugger is + * attached. + * + * As the event type is provided, INT $N instructions don't need #GP + * tricks to spot, and INT $0x80 doesn't need a fastpath. As the + * guest is necessary PV64, INT $0x82 has no special meaning either. + * + * When converting to a fault, hardware finally gives us enough + * information to account for prefixes, so provide the more correct + * behaviour rather than assuming the instruction was two bytes long. + */ + if ( vec != X86_EXC_BP && vec != X86_EXC_OF ) + { + const struct trap_info *ti = &curr->arch.pv.trap_ctxt[vec]; + + if ( permit_softint(TI_GET_DPL(ti), curr, regs) ) + pv_inject_sw_interrupt(vec); + else + { + regs->rip -= regs->fred_ss.insnlen; + pv_inject_hw_exception(X86_EXC_GP, (vec << 3) | X86_XEC_IDT); + } + break; + } + fallthrough; case X86_ET_HW_EXC: case X86_ET_PRIV_SW_EXC: case X86_ET_SW_EXC: @@ -2339,6 +2375,96 @@ void asmlinkage entry_from_pv(struct cpu_user_regs *regs) } break; + case X86_ET_OTHER: + switch ( regs->fred_ss.vector ) + { + case 1: /* SYSCALL */ + { + /* + * FRED delivery preserves the interrupted %cs/%ss, but previously + * SYSCALL lost the interrupted selectors, and SYSRET forced the + * use of the ones in MSR_STAR. + * + * The guest isn't aware of FRED, so recreate the legacy + * behaviour. + * + * The non-FRED SYSCALL path sets TRAP_syscall in entry_vector to + * signal that SYSRET can be used, but this isn't relevant in FRED + * mode. + * + * When setting the selectors, clear all upper metadata again for + * backwards compatibility. In particular fred_ss.swint becomes + * pend_DB on ERETx, and nothing else in the pv_hypercall() would + * clean up. + * + * When converting to a fault, hardware finally gives us enough + * information to account for prefixes, so provide the more + * correct behaviour rather than assuming the instruction was two + * bytes long. + */ + bool l = regs->fred_ss.l; + unsigned int len = regs->fred_ss.insnlen; + + regs->ssx = l ? FLAT_KERNEL_SS : FLAT_USER_SS32; + regs->csx = l ? FLAT_KERNEL_CS64 : FLAT_USER_CS32; + + if ( guest_kernel_mode(curr, regs) ) + pv_hypercall(regs); + else if ( (l ? curr->arch.pv.syscall_callback_eip + : curr->arch.pv.syscall32_callback_eip) == 0 ) + { + regs->rip -= len; + pv_inject_hw_exception(X86_EXC_UD, X86_EVENT_NO_EC); + } + else + { + /* + * The PV ABI, given no virtual SYSCALL_MASK, hardcodes that + * DF is cleared. Other flags are handled in the same way as + * interrupts and exceptions in create_bounce_frame(). + */ + regs->eflags &= ~X86_EFLAGS_DF; + pv_inject_callback(l ? CALLBACKTYPE_syscall + : CALLBACKTYPE_syscall32); + } + break; + } + + case 2: /* SYSENTER */ + { + /* + * FRED delivery preserves the interrupted state, but previously + * SYSENTER discarded almost everything. + * + * The guest isn't aware of FRED, so recreate the legacy + * behaviour. + * + * When setting the selectors, clear all upper metadata. In + * particular fred_ss.swint becomes pend_DB on ERETx. + * + * When converting to a fault, hardware finally gives us enough + * information to account for prefixes, so provide the more + * correct behaviour rather than assuming the instruction was two + * bytes long. + */ + regs->ssx = FLAT_USER_SS; + regs->rsp = 0; + regs->eflags &= ~(X86_EFLAGS_VM | X86_EFLAGS_IF); + regs->csx = 3; + regs->rip = 0; + + if ( !curr->arch.pv.sysenter_callback_eip ) + pv_inject_hw_exception(X86_EXC_GP, 0); + else + pv_inject_callback(CALLBACKTYPE_sysenter); + break; + } + + default: + goto fatal; + } + break; + default: goto fatal; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:00:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:00:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250154.1547623 (Exim 4.92) (envelope-from ) id 1vzxdb-000307-Uq; Tue, 10 Mar 2026 14:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250154.1547623; Tue, 10 Mar 2026 14: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 1vzxdb-0002zz-SB; Tue, 10 Mar 2026 14:00:43 +0000 Received: by outflank-mailman (input) for mailman id 1250154; Tue, 10 Mar 2026 14:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzxda-0002zn-Ex for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzxda-001e5T-25 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzxda-001rtX-1J for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=AIW4JW+X0dSzCuoS+RyCklsE8gAa+3XoVdsD1p6ct/c=; b=Lc2E2/EKoJnWuiezMC0hD5IAlL /nzaz793HGgQ+Cl6Xebye7s/Vga/IWSlfF1BQwXmY7qXNJsDMyjN5DR0my0seMVftNx6Pn+QwVXJX EHDf6C+F1pEV1nnvgYXZTvcnRQnPbqL6qGYnI2sfzPyNgpWxNTfDAkuF1mbZAuYDjv4s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Use fatal_trap() for #UD and #GP Message-Id: Date: Tue, 10 Mar 2026 14:00:42 +0000 commit 705784e51212cd77031e95ee4ec8799c25e69fb5 Author: Andrew Cooper AuthorDate: Tue Feb 10 14:50:56 2026 +0000 Commit: Andrew Cooper CommitDate: Tue Mar 10 11:58:33 2026 +0000 x86/traps: Use fatal_trap() for #UD and #GP This renders the diagnostics in a more uniform way. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index f5523fec0a..b6b1197697 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1375,8 +1375,7 @@ void asmlinkage do_invalid_op(struct cpu_user_regs *regs) if ( likely(extable_fixup(regs, true)) ) return; - show_execution_state(regs); - panic("FATAL TRAP: vector = %d (invalid opcode)\n", X86_EXC_UD); + fatal_trap(regs, false); } void asmlinkage do_int3(struct cpu_user_regs *regs) @@ -1475,8 +1474,7 @@ void do_general_protection(struct cpu_user_regs *regs) return; hardware_gp: - show_execution_state(regs); - panic("GENERAL PROTECTION FAULT\n[error_code=%04x]\n", regs->error_code); + fatal_trap(regs, false); } #ifdef CONFIG_PV -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:55:08 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250187.1547645 (Exim 4.92) (envelope-from ) id 1vzyUC-0001St-1x; Tue, 10 Mar 2026 14:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250187.1547645; Tue, 10 Mar 2026 14: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 1vzyUB-0001Sl-VG; Tue, 10 Mar 2026 14:55:03 +0000 Received: by outflank-mailman (input) for mailman id 1250187; Tue, 10 Mar 2026 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 1vzyUA-0001Sf-6J for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzyUA-001f09-0o for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzyU9-001vaM-32 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=2OUD/fTBA/CZWFpF8NvpfL0YTmeR+P8LTkj795JFDZw=; b=iLrEnd7BcJ/mf70XE8DwOd4WP6 UGCOZbdPKqCXMw0ZSz+WeNLTmS40Ke3JkhAAqd2G4cWcM5AzrTdjf+hD0RJKVgd/GLAJYAcaxHS3n NKeYVYGnqpIcRgouQ0ryLcR3gha/qaw5sj138G/M+XE4/5bVreGg2rN+Tplb26J3W0PQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] x86/MCE: restore CPU vendor reporting to the outside world Message-Id: Date: Tue, 10 Mar 2026 14:55:01 +0000 commit 93614ffa48f2577f5a9bb3043884ebc7432d0b8e Author: Jan Beulich AuthorDate: Tue Mar 10 14:36:11 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:36:11 2026 +0100 x86/MCE: restore CPU vendor reporting to the outside world The records reported used to contain Linux enumerators. We first broke that connection when purging unused ones, and then again when switching to the bit mask forms. Fixes: 408413051144 ("x86/cpu: Drop unused X86_VENDOR_* values") Fixes: 0cd074144cbb ("x86/cpu: Renumber X86_VENDOR_* to form a bitmap") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: a94c5fd8290a55461c599b8baad309df0d929f1f master date: 2026-02-23 08:39:58 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 9277781bff..9a91807cfb 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -858,6 +858,22 @@ void *x86_mcinfo_reserve(struct mc_info *mi, return mic_index; } +/* Linux values need using when reporting CPU vendors to the outside. */ +static unsigned int xen2linux_vendor(unsigned int vendor) +{ + switch ( vendor ) + { + case X86_VENDOR_INTEL: return 0; + case X86_VENDOR_AMD: return 2; + case X86_VENDOR_CENTAUR: return 5; + case X86_VENDOR_HYGON: return 9; + case X86_VENDOR_SHANGHAI: return 10; /* X86_VENDOR_ZHAOXIN */ + default: break; + } + + return 0xff; /* X86_VENDOR_UNKNOWN */ +} + static void x86_mcinfo_apei_save( struct mcinfo_global *mc_global, struct mcinfo_bank *mc_bank) { @@ -866,7 +882,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); m.cpu = mc_global->mc_coreid; - m.cpuvendor = boot_cpu_data.x86_vendor; + m.cpuvendor = xen2linux_vendor(boot_cpu_data.x86_vendor); m.cpuid = cpuid_eax(1); m.socketid = mc_global->mc_socketid; m.apicid = mc_global->mc_apicid; @@ -968,7 +984,7 @@ static void cf_check __maybe_unused do_mc_get_cpu_info(void *v) &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level = c->cpuid_level; xcp->mc_family = c->x86; - xcp->mc_vendor = c->x86_vendor; + xcp->mc_vendor = xen2linux_vendor(c->x86_vendor); xcp->mc_model = c->x86_model; xcp->mc_step = c->x86_mask; xcp->mc_cache_size = c->x86_cache_size; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:55:22 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:55:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250188.1547648 (Exim 4.92) (envelope-from ) id 1vzyUM-0001Uk-36; Tue, 10 Mar 2026 14:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250188.1547648; Tue, 10 Mar 2026 14: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 1vzyUM-0001Uc-0V; Tue, 10 Mar 2026 14:55:14 +0000 Received: by outflank-mailman (input) for mailman id 1250188; Tue, 10 Mar 2026 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 1vzyUK-0001UJ-67 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzyUK-001f0D-19 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzyUK-001vbI-0J for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=4QyY+jT40rXb8i5zaivnu+GnPtCcayZpYSMKc07wIrM=; b=4jF6+CtZlwYE31mR8/LrwgXoSE /pdLvw6uu+Uz/IkK73jclevW0SjJF/mDXV+JZa/Ta1E4UVZtuQICEcVa1ECoQAla7bNkSdjgnPkt0 a63vq29av8IBdhOyhcMVkvBFbigtqrd2pEaCdH0Kzn8DsIdF7k7oKA0cLN2SSLMtOnNs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 10 Mar 2026 14:55:12 +0000 commit 805e2b8ada7c4e44a08e9c36117fc1b2180df675 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:36:41 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:36:41 2026 +0100 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a934a600c45486b7acfe8abc3658e284e64e5dd5 master date: 2026-03-03 15:15:53 +0000 --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 8c31d5a793..dbfb22e6d2 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -17,6 +17,7 @@ int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -33,6 +34,7 @@ static inline bool pv_trap_callback_registered(const struct vcpu *v, static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 225d4cff03..0ba446d812 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1384,6 +1385,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0c5393cb21..6f6ce387a1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1365,8 +1365,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:55:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250189.1547654 (Exim 4.92) (envelope-from ) id 1vzyUW-0001X5-5Y; Tue, 10 Mar 2026 14:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250189.1547654; Tue, 10 Mar 2026 14: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 1vzyUW-0001Wv-1w; Tue, 10 Mar 2026 14:55:24 +0000 Received: by outflank-mailman (input) for mailman id 1250189; Tue, 10 Mar 2026 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 1vzyUU-0001Wa-8n for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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 1vzyUU-001f0H-1T for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzyUU-001vcH-0e for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 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=REZbuZhxWz7c6YUUrI04sagyDiwc+bC/3MI/dxCYYIw=; b=4KCNH2hkeegC8kzUvagJyLcnQP XdOjKOzZxlUEWGJBFC29B/OpG7O2PVY0jSKR2TXAgZqeQFRofEL+q1HBDQ31iJwX6BeQ5ib7RzfGy cAjd0/FW3SuLv0frzfCBu8QeaYKUVeRlJNB3vNVB7/WNmO+oVKuBY9y2hogJTgiF+Sy8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] x86/ucode: Support discrete modules being CPIO archives Message-Id: Date: Tue, 10 Mar 2026 14:55:22 +0000 commit 8f3b6375919a6e99b5259457df5d760c2eed61e0 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:37:00 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:37:00 2026 +0100 x86/ucode: Support discrete modules being CPIO archives Multiple downstream distros have tried passing discrete CPIO archives and tripped over this not working. It turns out to be easy to support, so do so. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Tested-by: Teddy Astie [jb: doc change dropped as inapplicable to the older form] master commit: 878a9cfa451878dcba6108ae5b7879c80f049661 master date: 2026-03-03 15:15:53 +0000 --- CHANGELOG.md | 6 ++++++ xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 572f985685..527a51ec13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [4.21.1](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.21.1) + +### Added + - On x86: + - Support for CPIO microcode in discrete multiboot modules. + ## [4.21.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.21.0) - 2025-11-19 ### Changed diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index ecee400f28..17540fc2e6 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -749,6 +749,7 @@ static int __init early_microcode_load(struct boot_info *bi) void *data = NULL; size_t size; struct microcode_patch *patch; + struct cpio_data cd; int idx = opt_mod_idx; int rc; @@ -765,7 +766,6 @@ static int __init early_microcode_load(struct boot_info *bi) for ( idx = 0; idx < bi->nr_modules; ++idx ) { const struct boot_module *bm = &bi->mods[idx]; - struct cpio_data cd; /* Search anything unclaimed or likely to be a CPIO archive. */ if ( bm->kind != BOOTMOD_UNKNOWN && bm->kind != BOOTMOD_RAMDISK ) @@ -833,6 +833,24 @@ static int __init early_microcode_load(struct boot_info *bi) idx, size); return -ENODEV; } + + /* + * If this blob appears to be a CPIO archive, try interpreting it as + * one. Otherwise treat it as a raw vendor blob. + */ + cd = find_cpio_data(ucode_ops.cpio_path, data, size); + if ( cd.data ) + { + data = cd.data; + size = cd.size; + + /* + * (Ab)use opt_scan to inform microcode_init_cache() that + * early_mod_idx refers to a CPIO archive. + */ + opt_scan = true; + } + goto found; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:55:34 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250190.1547657 (Exim 4.92) (envelope-from ) id 1vzyUg-0001Zx-7Z; Tue, 10 Mar 2026 14:55:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250190.1547657; Tue, 10 Mar 2026 14:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzyUg-0001Zp-4m; Tue, 10 Mar 2026 14:55:34 +0000 Received: by outflank-mailman (input) for mailman id 1250190; Tue, 10 Mar 2026 14:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzyUe-0001Za-BY for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzyUe-001f0M-1l for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzyUe-001vdH-0y for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Rr7lkcKVo8it0lkqJMvXzJPEG6GTaIlqvhIR359jMaU=; b=VUFXKtQXwnHdeTMHvwCBWODfAT Rr1ZJqWfMm8zXQL2+U0610oeSoS/mZp2mSM9okIxJEPKYM7uJTHKts2Vsoj2pRISysahm+OBbMJPk i5ASu6X8EmyCQ5nAFhhqpEdn3VW4wYN+CdSv2mwJUIMKNEZzSZkzoXjECIrnp9lMXwu0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] vpci/msix: check for BARs enabled in vpci_make_msix_hole Message-Id: Date: Tue, 10 Mar 2026 14:55:32 +0000 commit 999c6fadf71485ea070add4cdb76926b6a9574ff Author: Stewart Hildebrand AuthorDate: Tue Mar 10 14:37:20 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:37:20 2026 +0100 vpci/msix: check for BARs enabled in vpci_make_msix_hole A hotplugged PCI device may be added uninitialized. In particular, memory decoding might be disabled and the BARs might be zeroed. In this case, the BARs will not be mapped in p2m. However, vpci_make_msix_hole() unconditionally attempts to punch holes in p2m, leading to init_msix() failing: (XEN) d0v0 0000:01:00.0: existing mapping (mfn: 1c1880 type: 0) at 0 clobbers MSIX MMIO area (XEN) d0 0000:01:00.0: init legacy cap 17 fail rc=-17, mask it vpci_make_msix_hole() should only attempt to punch holes if the BARs containing the MSI-X/PBA tables are mapped in p2m. Introduce a helper for checking if a BAR is enabled, and add a check for the situation inside vpci_make_msix_hole(). As a result of the newly introduced checks in vpci_make_msix_hole(), move the call to vpci_make_msix_hole() within modify_decoding() to after setting ->enabled. Fixes: ee2eb6849d50 ("vpci: Refactor REGISTER_VPCI_INIT") Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné master commit: 7c24d58a6e641e2979978c5abb312bff877dede3 master date: 2026-03-05 09:27:50 +0100 --- xen/drivers/vpci/header.c | 26 +++++++++++++------------- xen/drivers/vpci/msix.c | 3 +++ xen/include/xen/vpci.h | 6 ++++++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index aae663bbf5..a3e8d0ec82 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -122,19 +122,6 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bool map = cmd & PCI_COMMAND_MEMORY; unsigned int i; - /* - * Make sure there are no mappings in the MSIX MMIO areas, so that accesses - * can be trapped (and emulated) by Xen when the memory decoding bit is - * enabled. - * - * FIXME: punching holes after the p2m has been set up might be racy for - * DomU usage, needs to be revisited. - */ -#ifdef CONFIG_HAS_PCI_MSI - if ( map && !rom_only && vpci_make_msix_hole(pdev) ) - return; -#endif - for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { struct vpci_bar *bar = &header->bars[i]; @@ -164,6 +151,19 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, bar->enabled = map; } + /* + * Make sure there are no mappings in the MSIX MMIO areas, so that accesses + * can be trapped (and emulated) by Xen when the memory decoding bit is + * enabled. + * + * FIXME: punching holes after the p2m has been set up might be racy for + * DomU usage, needs to be revisited. + */ +#ifdef CONFIG_HAS_PCI_MSI + if ( map && !rom_only && vpci_make_msix_hole(pdev) ) + return; +#endif + if ( !rom_only ) { pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd); diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 032e471bb1..955fad3304 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -605,6 +605,9 @@ int vpci_make_msix_hole(const struct pci_dev *pdev) unsigned long end = PFN_DOWN(vmsix_table_addr(pdev->vpci, i) + vmsix_table_size(pdev->vpci, i) - 1); + if ( !vmsix_table_bar_valid(pdev->vpci, i) ) + continue; + for ( ; start <= end; start++ ) { p2m_type_t t; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 9ae75d946a..50d0ad05a6 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -271,6 +271,12 @@ static inline paddr_t vmsix_table_addr(const struct vpci *vpci, unsigned int nr) (vpci->msix->tables[nr] & ~PCI_MSIX_BIRMASK); } +static inline bool vmsix_table_bar_valid(const struct vpci *vpci, + unsigned int nr) +{ + return vpci->header.bars[vpci->msix->tables[nr] & PCI_MSIX_BIRMASK].enabled; +} + /* * Note regarding the size calculation of the PBA: the spec mentions "The last * QWORD will not necessarily be fully populated", so it implies that the PBA -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 14:55:43 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 14:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250191.1547661 (Exim 4.92) (envelope-from ) id 1vzyUp-0001bw-8x; Tue, 10 Mar 2026 14:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250191.1547661; Tue, 10 Mar 2026 14: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 1vzyUp-0001bo-6E; Tue, 10 Mar 2026 14:55:43 +0000 Received: by outflank-mailman (input) for mailman id 1250191; Tue, 10 Mar 2026 14:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzyUo-0001bi-Eo for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzyUo-001f2P-23 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzyUo-001vgN-1F for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 14: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=YerWGwctrl15OaHt6QItrEQAMyrQus4KinZWgY/QChM=; b=dZ6xXuk1cK+i4xz9cjeTqCxnIx CmZ7JE2A2PkkIlLmyz6dNR3sjPaIJzdWHngyds5PGnlsmsm2J8QQ3U6zli6GPwq8veOp+XO44Ep0b ROyrT2oOQSjHxXpmIior/edQzmjnqkBbd+HWQyzlQ+ZJph9SI3rS98OfkVVMLbIPvO+M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.21] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 14:55:42 +0000 commit 1c72306b1f0b4dc533954f678361044f8083dccc Author: Jan Beulich AuthorDate: Tue Mar 10 14:37:45 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:37:45 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: adfbdaa347d05e53c8c61ad00a6851bd5b82c760 master date: 2026-03-10 09:23:25 +0100 --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index ac06532544..75c7da16e2 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -452,14 +452,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.21 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 15:33:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 15:33:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250207.1547674 (Exim 4.92) (envelope-from ) id 1vzz4w-0006YI-Vp; Tue, 10 Mar 2026 15:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250207.1547674; Tue, 10 Mar 2026 15:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz4w-0006YA-T8; Tue, 10 Mar 2026 15:33:02 +0000 Received: by outflank-mailman (input) for mailman id 1250207; Tue, 10 Mar 2026 15:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz4v-0006Y4-QY for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzz4v-001fyc-33 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzz4v-001xa4-2E for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wEZbJs6sLZBc/tz/5btzepabBa1PsOYzDy8Ju4WfLfQ=; b=hDQta/3EF4f5lyp0ajl7/quDcz 79+8+UyhNC2/o+XyY+8k1uR2f/JBsrysFaHd2dokCkX6tSUcGBmnIhxlD9aMa926E3eVuYWuswP4o 9X5nKdy0+aRujzFpCerOSuF+IsGU0muB2n/aRN6qgQjuuCjGyVXVAV9Znw5rP9HZLxDg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/MCE: restore CPU vendor reporting to the outside world Message-Id: Date: Tue, 10 Mar 2026 15:33:01 +0000 commit 1c762d6c46a12fc24a1febe4b0d7055f781cd775 Author: Jan Beulich AuthorDate: Tue Mar 10 14:38:36 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:38:36 2026 +0100 x86/MCE: restore CPU vendor reporting to the outside world The records reported used to contain Linux enumerators. We first broke that connection when purging unused ones, and then again when switching to the bit mask forms. Fixes: 408413051144 ("x86/cpu: Drop unused X86_VENDOR_* values") Fixes: 0cd074144cbb ("x86/cpu: Renumber X86_VENDOR_* to form a bitmap") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: a94c5fd8290a55461c599b8baad309df0d929f1f master date: 2026-02-23 08:39:58 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 84238cd0ef..1ccb96958e 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -854,6 +854,22 @@ void *x86_mcinfo_reserve(struct mc_info *mi, return mic_index; } +/* Linux values need using when reporting CPU vendors to the outside. */ +static unsigned int xen2linux_vendor(unsigned int vendor) +{ + switch ( vendor ) + { + case X86_VENDOR_INTEL: return 0; + case X86_VENDOR_AMD: return 2; + case X86_VENDOR_CENTAUR: return 5; + case X86_VENDOR_HYGON: return 9; + case X86_VENDOR_SHANGHAI: return 10; /* X86_VENDOR_ZHAOXIN */ + default: break; + } + + return 0xff; /* X86_VENDOR_UNKNOWN */ +} + static void x86_mcinfo_apei_save( struct mcinfo_global *mc_global, struct mcinfo_bank *mc_bank) { @@ -862,7 +878,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); m.cpu = mc_global->mc_coreid; - m.cpuvendor = boot_cpu_data.x86_vendor; + m.cpuvendor = xen2linux_vendor(boot_cpu_data.x86_vendor); m.cpuid = cpuid_eax(1); m.socketid = mc_global->mc_socketid; m.apicid = mc_global->mc_apicid; @@ -964,7 +980,7 @@ static void cf_check __maybe_unused do_mc_get_cpu_info(void *v) &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level = c->cpuid_level; xcp->mc_family = c->x86; - xcp->mc_vendor = c->x86_vendor; + xcp->mc_vendor = xen2linux_vendor(c->x86_vendor); xcp->mc_model = c->x86_model; xcp->mc_step = c->x86_mask; xcp->mc_cache_size = c->x86_cache_size; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 15:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 15:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250208.1547678 (Exim 4.92) (envelope-from ) id 1vzz57-0006aM-13; Tue, 10 Mar 2026 15:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250208.1547678; Tue, 10 Mar 2026 15:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz56-0006aC-UY; Tue, 10 Mar 2026 15:33:12 +0000 Received: by outflank-mailman (input) for mailman id 1250208; Tue, 10 Mar 2026 15:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz55-0006Zu-Rw for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzz56-001fyg-07 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzz55-001xab-2Y for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=n5kMr4MtMerboRew43OdsvmJOh4FUkQIViV7w/e/oxI=; b=qvTTafUahuuWE0EOyTmyOrr0Jj xMyf/o5NNaZqT7L2FoRNB2l2IY+CIJvQUZb8wsfOJ6O9TemG29/RoCnW360XJ1CkL5HwvsOEvjjEO tL/z1OUXzxGt+HwvmRpPOdty839pLMZhpoXESimmJIyahXUwID5jHmE4PNLXhppU9k5Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/ucode: Support discrete modules being CPIO archives Message-Id: Date: Tue, 10 Mar 2026 15:33:11 +0000 commit 51eb3e246e33bfa3d55f750283eedb267e72ed5e Author: Andrew Cooper AuthorDate: Tue Mar 10 14:38:59 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:38:59 2026 +0100 x86/ucode: Support discrete modules being CPIO archives Multiple downstream distros have tried passing discrete CPIO archives and tripped over this not working. It turns out to be easy to support, so do so. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Tested-by: Teddy Astie [jb: doc change dropped as inapplicable to the older form] master commit: 878a9cfa451878dcba6108ae5b7879c80f049661 master date: 2026-03-03 15:15:53 +0000 --- CHANGELOG.md | 6 ++++++ xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d098e7c5ac..8324c5c5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [4.20.3](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.3) + +### Added + - On x86: + - Support for CPIO microcode in discrete multiboot modules. + ## [4.20.1](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.20.1) ### Added diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index dc913ff333..d565fa3e48 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -749,6 +749,7 @@ static int __init early_microcode_load(struct boot_info *bi) void *data = NULL; size_t size; struct microcode_patch *patch; + struct cpio_data cd; int idx = opt_mod_idx; int rc; @@ -765,7 +766,6 @@ static int __init early_microcode_load(struct boot_info *bi) for ( idx = 0; idx < bi->nr_modules; ++idx ) { const struct boot_module *bm = &bi->mods[idx]; - struct cpio_data cd; /* Search anything unclaimed or likely to be a CPIO archive. */ if ( bm->type != BOOTMOD_UNKNOWN && @@ -834,6 +834,24 @@ static int __init early_microcode_load(struct boot_info *bi) idx, size); return -ENODEV; } + + /* + * If this blob appears to be a CPIO archive, try interpreting it as + * one. Otherwise treat it as a raw vendor blob. + */ + cd = find_cpio_data(ucode_ops.cpio_path, data, size); + if ( cd.data ) + { + data = cd.data; + size = cd.size; + + /* + * (Ab)use opt_scan to inform microcode_init_cache() that + * early_mod_idx refers to a CPIO archive. + */ + opt_scan = true; + } + goto found; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 15:33:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 15:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250210.1547690 (Exim 4.92) (envelope-from ) id 1vzz5H-0006rQ-A0; Tue, 10 Mar 2026 15:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250210.1547690; Tue, 10 Mar 2026 15:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz5H-0006rJ-6z; Tue, 10 Mar 2026 15:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1250210; Tue, 10 Mar 2026 15:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz5F-0006qa-UO for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzz5G-001fyk-0O for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzz5F-001xb5-2q for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cAVuWJFz77VbIpp5cU6A8OlmpDEKjueLkDKqBbnlFB4=; b=6O+kMz5ItiGojhPuKrbC3/GsAJ 3NFlYrX190MAAD4EhvxPH4Gs71lgak72esDUExt/v81cCqQ91cMUiLbxx8hEGS7VJKjFK+DIoIsTh qDfxPhjkoIR7lpGZb0A5HELONpDxklg4ribL75cIS0KcRM/Kytdy860+ZlGghK3HLFjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 10 Mar 2026 15:33:21 +0000 commit 45d18b05c09b412fa53142cadf4ddd2275283564 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:39:14 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:39:14 2026 +0100 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a934a600c45486b7acfe8abc3658e284e64e5dd5 master date: 2026-03-03 15:15:53 +0000 --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 404f5b169c..5892dc9ef8 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -19,6 +19,7 @@ void pv_trap_init(void); int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -37,6 +38,7 @@ static inline void pv_trap_init(void) {} static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index a21d499519..7753e44477 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1381,6 +1382,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9eb7bd2e07..b6d2c5b3ea 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1298,8 +1298,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 15:33:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 15:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250213.1547696 (Exim 4.92) (envelope-from ) id 1vzz5R-0006wa-BZ; Tue, 10 Mar 2026 15:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250213.1547696; Tue, 10 Mar 2026 15:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz5R-0006wP-8X; Tue, 10 Mar 2026 15:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1250213; Tue, 10 Mar 2026 15:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzz5Q-0006vv-12 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzz5Q-001fyp-0g for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzz5P-001xbk-38 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 15:33:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gD1+/QyIEAdoL4JXjJ0VWP8QIyj9NamGhY4z1iXug0M=; b=U5dY1PS7X/WB9ebJGj/nXWBUor s6eWuoqZDjiin3wLFPGxYWItwRqdwmIMs7D0G6/3rA/g6adEctv0XErPro9UmZJrNkRz790YxdlEp DOOAYkBtz2nOO4YeGrElogndjkH+DFeCTq6MEGCmSMB8R9/WKclZBYTB3EWaQvbk+AHA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.20] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 15:33:31 +0000 commit ab68afe62d09df65df7f980fa3ba33770ef3b12b Author: Jan Beulich AuthorDate: Tue Mar 10 14:39:52 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:43:47 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: adfbdaa347d05e53c8c61ad00a6851bd5b82c760 master date: 2026-03-10 09:23:25 +0100 --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 68e8677962..1a5a7d15bf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -316,14 +316,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 16:22:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 16:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250300.1547762 (Exim 4.92) (envelope-from ) id 1vzzqO-0000J2-9t; Tue, 10 Mar 2026 16:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250300.1547762; Tue, 10 Mar 2026 16:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzzqO-0000Iu-7F; Tue, 10 Mar 2026 16:22:04 +0000 Received: by outflank-mailman (input) for mailman id 1250300; Tue, 10 Mar 2026 16:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzzqM-0000Io-6v for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzzqM-001hPd-1F for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzzqM-0020S7-0S for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16: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=vIHBRWvb3f+CVTmO2UdGBbmjRTHEUm8ICTm5mcnT8J4=; b=y9h/s64y1bnBqCEPHB4upPw9y5 WlgdJt1rjhS+jYWrWbcuH1roje7rYlJGt5Khe2H8tBT/DHj3JIBEv0hXHuuBgR8RcJ9FNpY74tmsC EaKg0sWYEKWta8pnedNqGdWEaO2KOfq3vWo92Dvkh8qrhDePl6YG/l9Xo2u4aBL3pVA4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/MCE: restore CPU vendor reporting to the outside world Message-Id: Date: Tue, 10 Mar 2026 16:22:02 +0000 commit b74f88c938f928278575bb674df4daac9d6ff5a8 Author: Jan Beulich AuthorDate: Tue Mar 10 14:45:02 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:45:02 2026 +0100 x86/MCE: restore CPU vendor reporting to the outside world The records reported used to contain Linux enumerators. We first broke that connection when purging unused ones, and then again when switching to the bit mask forms. Fixes: 408413051144 ("x86/cpu: Drop unused X86_VENDOR_* values") Fixes: 0cd074144cbb ("x86/cpu: Renumber X86_VENDOR_* to form a bitmap") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk master commit: a94c5fd8290a55461c599b8baad309df0d929f1f master date: 2026-02-23 08:39:58 +0100 --- xen/arch/x86/cpu/mcheck/mce.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 5a59e79cbc..533425cf51 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -854,6 +854,22 @@ void *x86_mcinfo_reserve(struct mc_info *mi, return mic_index; } +/* Linux values need using when reporting CPU vendors to the outside. */ +static unsigned int xen2linux_vendor(unsigned int vendor) +{ + switch ( vendor ) + { + case X86_VENDOR_INTEL: return 0; + case X86_VENDOR_AMD: return 2; + case X86_VENDOR_CENTAUR: return 5; + case X86_VENDOR_HYGON: return 9; + case X86_VENDOR_SHANGHAI: return 10; /* X86_VENDOR_ZHAOXIN */ + default: break; + } + + return 0xff; /* X86_VENDOR_UNKNOWN */ +} + static void x86_mcinfo_apei_save( struct mcinfo_global *mc_global, struct mcinfo_bank *mc_bank) { @@ -862,7 +878,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); m.cpu = mc_global->mc_coreid; - m.cpuvendor = boot_cpu_data.x86_vendor; + m.cpuvendor = xen2linux_vendor(boot_cpu_data.x86_vendor); m.cpuid = cpuid_eax(1); m.socketid = mc_global->mc_socketid; m.apicid = mc_global->mc_apicid; @@ -964,7 +980,7 @@ static void cf_check do_mc_get_cpu_info(void *v) &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level = c->cpuid_level; xcp->mc_family = c->x86; - xcp->mc_vendor = c->x86_vendor; + xcp->mc_vendor = xen2linux_vendor(c->x86_vendor); xcp->mc_model = c->x86_model; xcp->mc_step = c->x86_mask; xcp->mc_cache_size = c->x86_cache_size; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 16:22:14 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250301.1547766 (Exim 4.92) (envelope-from ) id 1vzzqY-0000Ks-B7; Tue, 10 Mar 2026 16:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250301.1547766; Tue, 10 Mar 2026 16:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzzqY-0000Kk-8Z; Tue, 10 Mar 2026 16:22:14 +0000 Received: by outflank-mailman (input) for mailman id 1250301; Tue, 10 Mar 2026 16:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzzqW-0000KY-9W for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzzqW-001hPi-1X for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzzqW-0020Sv-0k for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16: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=N9R0iZ382S6VpO1i2O/aRXAz3Ifq6lj9JtfcXgLCBOA=; b=viNLd02LeOwU6yUXh51JvzxL+5 cgWd0vCxQeEl2miDemzBaN75EBJSILdEp+L/r0KnUiA+uuVxII/EVvsxzaMOV9rFgCrntGn2+nyrr yoRk6J7EI5zNRXggrxMmnpIRL+Lqvf6ns2j393V8XypE9c8znQ/z8IfeeuAhB/hZlzlU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] x86/pv: Don't assume that INT $imm8 instructions are two bytes long Message-Id: Date: Tue, 10 Mar 2026 16:22:12 +0000 commit 260740e1aa1ff414dab65798e2d2d698c5e78b03 Author: Andrew Cooper AuthorDate: Tue Mar 10 14:45:29 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:45:29 2026 +0100 x86/pv: Don't assume that INT $imm8 instructions are two bytes long For INT $N instructions (besides $0x80 for which there is a dedicated fast path), handling is mostly fault-based because of DPL0 gates in the IDT. This means that when the guest kernel allows the instruction too, Xen must increment %rip to the end of the instruction before passing a trap to the guest kernel. When an INT $N instruction has a prefix, it's longer than two bytes, and Xen will deliver the "trap" with %rip pointing into the middle of the instruction. Introduce a new pv_emulate_sw_interrupt() which uses x86_insn_length() to determine the instruction length, rather than assuming two. This is a change in behaviour for PV guests, but the prior behaviour cannot reasonably be said to be intentional. This change does not affect the INT $0x80 fastpath. Prefixed INT $N instructions occur almost exclusively in test code or exploits, and INT $0x80 appears to be the only user-usable interrupt gate in contemporary PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a934a600c45486b7acfe8abc3658e284e64e5dd5 master date: 2026-03-03 15:15:53 +0000 --- xen/arch/x86/include/asm/pv/traps.h | 2 ++ xen/arch/x86/pv/emul-priv-op.c | 49 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 3 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 404f5b169c..5892dc9ef8 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -19,6 +19,7 @@ void pv_trap_init(void); int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); @@ -37,6 +38,7 @@ static inline void pv_trap_init(void) {} static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } +static inline void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) {} static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index a21d499519..7753e44477 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -1381,6 +1382,54 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs) return 0; } +/* + * Hardware already decoded the INT $N instruction and determined that there + * was a permission issue (i.e. the DPL violation intended to trigger #GP). + * Xen has already determined that the guest kernel has permitted this + * software interrupt. + * + * All that is needed is the instruction length, to turn the fault into a + * trap. All errors are turned back into the original #GP, as that's the + * action that really happened. + */ +void pv_emulate_sw_interrupt(struct cpu_user_regs *regs) +{ + struct vcpu *curr = current; + struct domain *currd = curr->domain; + struct priv_op_ctxt ctxt = { + .ctxt.regs = regs, + .ctxt.lma = !is_pv_32bit_domain(currd), + }; + struct x86_emulate_state *state; + uint8_t vector = regs->error_code >> 3; + unsigned int len, ar; + + if ( !pv_emul_read_descriptor(regs->cs, curr, &ctxt.cs.base, + &ctxt.cs.limit, &ar, 1) || + !(ar & _SEGMENT_S) || + !(ar & _SEGMENT_P) || + !(ar & _SEGMENT_CODE) ) + goto error; + + state = x86_decode_insn(&ctxt.ctxt, insn_fetch); + if ( IS_ERR_OR_NULL(state) ) + goto error; + + len = x86_insn_length(state, &ctxt.ctxt); + x86_emulate_free_state(state); + + /* Note: Checked slightly late to simplify 'state' handling. */ + if ( ctxt.ctxt.opcode != 0xcd /* INT $imm8 */ ) + goto error; + + regs->rip += len; + pv_inject_sw_interrupt(vector); + return; + + error: + pv_inject_hw_exception(X86_EXC_GP, regs->error_code); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index af90d8b27d..0c8c935ee9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1300,8 +1300,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { - regs->rip += 2; - pv_inject_sw_interrupt(vector); + pv_emulate_sw_interrupt(regs); return; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Tue Mar 10 16:22:24 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 10 Mar 2026 16:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250302.1547770 (Exim 4.92) (envelope-from ) id 1vzzqi-0000Nb-CX; Tue, 10 Mar 2026 16:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250302.1547770; Tue, 10 Mar 2026 16:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzzqi-0000NT-9z; Tue, 10 Mar 2026 16:22:24 +0000 Received: by outflank-mailman (input) for mailman id 1250302; Tue, 10 Mar 2026 16:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzzqg-0000NL-CC for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vzzqg-001hPt-1o for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1vzzqg-0020TS-11 for xen-changelog@lists.xenproject.org; Tue, 10 Mar 2026 16: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=mSeNApwCA78KyUBXMTFLRADqeS9Q8mOe694QtEh9DJY=; b=ogQw7jwu3jaD5wQSD7uoH0KTAP N67CbiHMMwyvdKrPM5ISiKlsWICUwg/iBPx0Q48RwIjHfUHxMCZiIufl5Nt77rCTk6YI6a3XUZW23 sR++nuR6xai0Oml6OeCbPX6uHbFN4Qd6H5R9jBWpsdsTmyS6r/SMYN6l3Q8FEBQ/FSaA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] domain: move vmtrace_alloc_buffer() invocation in vcpu_create() Message-Id: Date: Tue, 10 Mar 2026 16:22:22 +0000 commit a38f51516848c86fae75f295af8be1a50f96cabd Author: Jan Beulich AuthorDate: Tue Mar 10 14:45:42 2026 +0100 Commit: Jan Beulich CommitDate: Tue Mar 10 14:45:42 2026 +0100 domain: move vmtrace_alloc_buffer() invocation in vcpu_create() The label used upon the function failing is wrong. Instead of correcting the label, move the invocation up a little, to also avoid it altogether for the idle domain (where ->vmtrace_size would be zero, and hence the function would bail right away anyway). Fixes: 217dd79ee292 ("xen/domain: Add vmtrace_size domain creation parameter") Reported-by: Roger Pau Monné Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: adfbdaa347d05e53c8c61ad00a6851bd5b82c760 master date: 2026-03-10 09:23:25 +0100 --- xen/common/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 168f709423..77dacffd22 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -262,14 +262,14 @@ struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id) set_bit(_VPF_down, &v->pause_flags); vcpu_info_reset(v); init_waitqueue_vcpu(v); + + if ( vmtrace_alloc_buffer(v) != 0 ) + goto fail_wq; } if ( sched_init_vcpu(v) != 0 ) goto fail_wq; - if ( vmtrace_alloc_buffer(v) != 0 ) - goto fail_wq; - if ( arch_vcpu_create(v) != 0 ) goto fail_sched; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 10:33:09 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 10:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250990.1548308 (Exim 4.92) (envelope-from ) id 1w0GsB-0002oT-SQ; Wed, 11 Mar 2026 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250990.1548308; Wed, 11 Mar 2026 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 1w0GsB-0002oL-Pi; Wed, 11 Mar 2026 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1250990; Wed, 11 Mar 2026 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 1w0GsA-0002oF-0W for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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 1w0GsA-003AVd-0X for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0Gs9-003D30-2v for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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=mQ1JjZG7J19SYPvKmP99tVEOMiQ3IUecsPVZYFRi97k=; b=Co1nrPMDR3555ME8f0AKKFSMKu udwmB2Wu2b72qIjZQjU4pmUAL8XGd3zR6vyarLCVxWEtDG6FnsD+kVfGiZVQz6CbxULvIolEUj+N3 SnXBZFlDD5U9FMlP3F66mCnpFqdMiqWXoMomm7HvelsjP2nrFfzIgK7Q7xBxgvyWSX78=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] core-parking: shrink core_parking_cpunum[] Message-Id: Date: Wed, 11 Mar 2026 10:33:01 +0000 commit 5bfd96ddc650513d2ba5b123a3d214e789f96df1 Author: Jan Beulich AuthorDate: Wed Mar 11 10:00:46 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 10:00:46 2026 +0100 core-parking: shrink core_parking_cpunum[] This NR_CPUS-dimensioned array is likely unused on most installations. Therefore it is especially wasteful for it to consume more space than really needed. Allocate it dynamically ahead of registering the hooks. Further the array having all fields set to -1 is actually useless. Nothing relies on it, and core_parking_remove() doesn't restore the sentinel for vacated slots. Drop the initializers altogether, rather than replacing them. Also take the opportunity and update an adjacent variable's type, where a fixed-width type was pretty clearly inappropriate to use. Finally drop the redundant initializer from core_parking_init(). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/common/core_parking.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/common/core_parking.c b/xen/common/core_parking.c index 7d6a18cdcf..08003a536f 100644 --- a/xen/common/core_parking.c +++ b/xen/common/core_parking.c @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -27,8 +28,8 @@ #define CORE_PARKING_DECREMENT 2 static DEFINE_SPINLOCK(accounting_lock); -static uint32_t cur_idle_nums; -static unsigned int core_parking_cpunum[NR_CPUS] = {[0 ... NR_CPUS-1] = -1}; +static unsigned int cur_idle_nums; +static unsigned int *__ro_after_init core_parking_cpunum; struct cp_policy { char name[30]; @@ -188,7 +189,7 @@ long cf_check core_parking_helper(void *data) return ret; spin_lock(&accounting_lock); - BUG_ON(cur_idle_nums >= ARRAY_SIZE(core_parking_cpunum)); + BUG_ON(cur_idle_nums >= nr_cpu_ids); core_parking_cpunum[cur_idle_nums++] = cpu; spin_unlock(&accounting_lock); } @@ -263,9 +264,12 @@ static int __init register_core_parking_policy(const struct cp_policy *policy) static int __init cf_check core_parking_init(void) { - int ret = 0; + int ret; - if ( core_parking_controller == PERFORMANCE_FIRST ) + core_parking_cpunum = xvzalloc_array(unsigned int, nr_cpu_ids); + if ( !core_parking_cpunum ) + ret = -ENOMEM; + else if ( core_parking_controller == PERFORMANCE_FIRST ) ret = register_core_parking_policy(&performance_first); else ret = register_core_parking_policy(&power_first); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 10:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 10:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1250991.1548312 (Exim 4.92) (envelope-from ) id 1w0GsL-0002q0-Tv; Wed, 11 Mar 2026 10:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1250991.1548312; Wed, 11 Mar 2026 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 1w0GsL-0002ps-R4; Wed, 11 Mar 2026 10:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1250991; Wed, 11 Mar 2026 10:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0GsK-0002pc-4I for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 10:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0GsK-003AVx-0x for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 10:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0GsK-003D3z-06 for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 10: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=5jY/SiephDbzxeyq2P5oqmwyEjDdS0gWet9fGIp+AyM=; b=ayYExJqY2/LthRTCqPzRpqI885 eXfLqTPeITg2mWA/cm0E1tk8XABmqWjF8gdgeWu/8NYUfxbn2Wu8RnzlNO1Kd88BU+2cPd5Uw1HxY cbTAfYTV9Em0vI07fXgbM7IzPjJH3QazzJ/xSoH2igzuwUXsw2gMwpZfJoRWUnw9re4I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Remove x86 prefixed names misc Message-Id: Date: Wed, 11 Mar 2026 10:33:12 +0000 commit bfb33fa6d4eb4110cd7dd47ec71d2e550739e126 Author: Kevin Lampis AuthorDate: Wed Mar 11 10:03:37 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 10:03:37 2026 +0100 x86: Remove x86 prefixed names misc struct cpuinfo_x86 .x86 => .family .x86_vendor => .vendor .x86_model => .model .x86_mask => .stepping No functional change. This work is part of making Xen safe for Intel family 18/19. Signed-off-by: Kevin Lampis Acked-by: Jan Beulich --- xen/arch/x86/alternative.c | 8 ++++---- xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpuid.c | 2 +- xen/arch/x86/dom0_build.c | 4 ++-- xen/arch/x86/domain.c | 12 ++++++------ xen/arch/x86/e820.c | 2 +- xen/arch/x86/i8259.c | 2 +- xen/arch/x86/irq.c | 4 ++-- xen/arch/x86/mpparse.c | 6 +++--- xen/arch/x86/msr.c | 4 ++-- xen/arch/x86/nmi.c | 15 +++++++++------ xen/arch/x86/platform_hypercall.c | 8 ++++---- xen/arch/x86/pv/domain.c | 2 +- xen/arch/x86/setup.c | 6 +++--- xen/arch/x86/traps-setup.c | 4 ++-- xen/arch/x86/tsx.c | 4 ++-- xen/drivers/passthrough/amd/iommu_init.c | 6 +++--- 17 files changed, 47 insertions(+), 44 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 9f844241bc..5ed0c26725 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -89,7 +89,7 @@ static bool init_or_livepatch_read_mostly toolchain_nops_are_ideal; static void __init arch_init_ideal_nops(void) { - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: /* @@ -97,10 +97,10 @@ static void __init arch_init_ideal_nops(void) * actually perform better with the "k8_nops" than with the SDM- * recommended NOPs. */ - if ( boot_cpu_data.x86 != 6 ) + if ( boot_cpu_data.family != 6 ) break; - switch ( boot_cpu_data.x86_model ) + switch ( boot_cpu_data.model ) { case 0x0f ... 0x1b: case 0x1d ... 0x25: @@ -111,7 +111,7 @@ static void __init arch_init_ideal_nops(void) break; case X86_VENDOR_AMD: - if ( boot_cpu_data.x86 <= 0xf ) + if ( boot_cpu_data.family <= 0xf ) ideal_nops = k8_nops; break; } diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index fb38be7ec3..d69ef9e16a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -406,7 +406,7 @@ void __init init_bsp_APIC(void) value |= APIC_SPIV_APIC_ENABLED; /* This bit is reserved on P4/Xeon and should be cleared */ - if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 15)) + if ((boot_cpu_data.vendor == X86_VENDOR_INTEL) && (boot_cpu_data.family == 15)) value &= ~APIC_SPIV_FOCUS_DISABLED; else value |= APIC_SPIV_FOCUS_DISABLED; diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 5decfad8cd..6e9b15c9c3 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -437,7 +437,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case 0xa: /* TODO: Rework vPMU control in terms of toolstack choices. */ - if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + if ( boot_cpu_data.vendor != X86_VENDOR_INTEL || !vpmu_available(v) ) *res = EMPTY_LEAF; else diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 0b467fd4a4..864dd9e53e 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -572,10 +572,10 @@ int __init dom0_setup_permissions(struct domain *d) rc |= iomem_deny_access(d, mfn, mfn); } /* HyperTransport range. */ - if ( boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) + if ( boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) { mfn = paddr_to_pfn(1UL << - (boot_cpu_data.x86 < 0x17 ? 40 : paddr_bits)); + (boot_cpu_data.family < 0x17 ? 40 : paddr_bits)); rc |= iomem_deny_access(d, mfn - paddr_to_pfn(3UL << 32), mfn - 1); } diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 9c1f6ef76d..868c26036d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -319,7 +319,7 @@ void domain_cpu_policy_changed(struct domain *d) if ( cpu_has_htt ) edx |= cpufeat_mask(X86_FEATURE_HTT); - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: /* @@ -372,7 +372,7 @@ void domain_cpu_policy_changed(struct domain *d) { uint64_t mask = cpuidmask_defaults._6c; - if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + if ( boot_cpu_data.vendor == X86_VENDOR_AMD ) mask &= (~0ULL << 32) | p->basic.raw[6].c; d->arch.pv.cpuidmasks->_6c = mask; @@ -387,7 +387,7 @@ void domain_cpu_policy_changed(struct domain *d) * wholesale from the policy, but clamp the features in 7[0].ebx * per usual. */ - if ( boot_cpu_data.x86_vendor & + if ( boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) mask = (((uint64_t)p->feat.max_subleaf << 32) | ((uint32_t)mask & p->feat._7b0)); @@ -400,7 +400,7 @@ void domain_cpu_policy_changed(struct domain *d) uint64_t mask = cpuidmask_defaults.Da1; uint32_t eax = p->xstate.Da1; - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + if ( boot_cpu_data.vendor == X86_VENDOR_INTEL ) mask &= (~0ULL << 32) | eax; d->arch.pv.cpuidmasks->Da1 = mask; @@ -427,7 +427,7 @@ void domain_cpu_policy_changed(struct domain *d) if ( !(p->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) edx &= ~CPUID_COMMON_1D_FEATURES; - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: mask &= ((uint64_t)edx << 32) | ecx; @@ -457,7 +457,7 @@ void domain_cpu_policy_changed(struct domain *d) cpu_policy_updated(v); /* If PMU version is zero then the guest doesn't have VPMU */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + if ( boot_cpu_data.vendor == X86_VENDOR_INTEL && p->basic.pmu_version == 0 ) vpmu_destroy(v); } diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index ca577c0bde..872208ab37 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -426,7 +426,7 @@ static uint64_t __init mtrr_top_of_ram(void) /* By default we check only Intel systems. */ if ( e820_mtrr_clip == -1 ) - e820_mtrr_clip = boot_cpu_data.x86_vendor == X86_VENDOR_INTEL; + e820_mtrr_clip = boot_cpu_data.vendor == X86_VENDOR_INTEL; if ( !e820_mtrr_clip ) return 0; diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index 5c7e21a751..d2a08661f8 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -419,7 +419,7 @@ void __init init_IRQ(void) * the interrupt. */ cpumask_copy(desc->arch.cpu_mask, - (boot_cpu_data.x86_vendor & + (boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ? &cpumask_all : cpumask_of(cpu))); desc->arch.vector = LEGACY_VECTOR(irq); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index cc2934bfca..739fc04bd1 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2011,8 +2011,8 @@ void do_IRQ(struct cpu_user_regs *regs) * interrupts have been delivered to CPUs * different than the BSP. */ - (boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | - X86_VENDOR_HYGON))) && + (boot_cpu_data.vendor & (X86_VENDOR_AMD | + X86_VENDOR_HYGON))) && bogus_8259A_irq(vector - FIRST_LEGACY_VECTOR)) ) { printk("CPU%u: No irq handler for vector %02x (IRQ %d%s)\n", diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index c1171f7a3a..1b41aa573f 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -511,9 +511,9 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) /* Either an integrated APIC or a discrete 82489DX. */ processor.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01; processor.mpc_cpuflag = CPU_ENABLED; - processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) | - (boot_cpu_data.x86_model << 4) | - boot_cpu_data.x86_mask; + processor.mpc_cpufeature = (boot_cpu_data.family << 8) | + (boot_cpu_data.model << 4) | + boot_cpu_data.stepping; processor.mpc_featureflag = boot_cpu_data.x86_capability[FEATURESET_1d]; processor.mpc_reserved[0] = 0; diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index ad75a2e108..6a97be59d5 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -170,7 +170,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_IA32_PLATFORM_ID: if ( !(cp->x86_vendor & X86_VENDOR_INTEL) || - !(boot_cpu_data.x86_vendor & X86_VENDOR_INTEL) ) + !(boot_cpu_data.vendor & X86_VENDOR_INTEL) ) goto gp_fault; rdmsrl(MSR_IA32_PLATFORM_ID, *val); break; @@ -190,7 +190,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) * the guest. */ if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || - !(boot_cpu_data.x86_vendor & + !(boot_cpu_data.vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || rdmsr_safe(MSR_AMD_PATCHLEVEL, val) ) goto gp_fault; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index a0c9194ff0..91f95fe6d0 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -216,12 +216,14 @@ void disable_lapic_nmi_watchdog(void) { if (nmi_active <= 0) return; - switch (boot_cpu_data.x86_vendor) { + switch ( boot_cpu_data.vendor ) + { case X86_VENDOR_AMD: wrmsrns(MSR_K7_EVNTSEL0, 0); break; case X86_VENDOR_INTEL: - switch (boot_cpu_data.x86) { + switch ( boot_cpu_data.family ) + { case 6: wrmsrns(MSR_P6_EVNTSEL(0), 0); break; @@ -362,7 +364,7 @@ static void setup_p4_watchdog(void) clear_msr_range(0x3F1, 2); /* MSR 0x3F0 seems to have a default value of 0xFC00, but current docs doesn't fully define it, so leave it alone for now. */ - if (boot_cpu_data.x86_model >= 0x3) { + if (boot_cpu_data.model >= 0x3) { /* MSR_P4_IQ_ESCR0/1 (0x3ba/0x3bb) removed */ clear_msr_range(0x3A0, 26); clear_msr_range(0x3BC, 3); @@ -387,16 +389,17 @@ void setup_apic_nmi_watchdog(void) if ( nmi_watchdog == NMI_NONE ) return; - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_AMD: setup_k7_watchdog(); break; case X86_VENDOR_INTEL: - switch (boot_cpu_data.x86) { + switch ( boot_cpu_data.family ) + { case 6: - setup_p6_watchdog((boot_cpu_data.x86_model < 14) + setup_p6_watchdog((boot_cpu_data.model < 14) ? P6_EVENT_CPU_CLOCKS_NOT_HALTED : CORE_EVENT_CPU_CLOCKS_NOT_HALTED); break; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index cd4f0ae5e5..0431f875af 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -104,7 +104,7 @@ static bool msr_read_allowed(unsigned int msr) * the platform doesn't actually support this MSR. */ case MSR_TEMPERATURE_TARGET: - return boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + return boot_cpu_data.vendor == X86_VENDOR_INTEL && host_cpu_policy.basic.digital_temp_sensor; case MSR_PACKAGE_THERM_STATUS: @@ -688,9 +688,9 @@ ret_t do_platform_op( const struct cpuinfo_x86 *c = &cpu_data[ver->xen_cpuid]; memcpy(ver->vendor_id, c->x86_vendor_id, sizeof(ver->vendor_id)); - ver->family = c->x86; - ver->model = c->x86_model; - ver->stepping = c->x86_mask; + ver->family = c->family; + ver->model = c->model; + ver->stepping = c->stepping; } ver->max_present = cpumask_last(&cpu_present_map); diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index b85abb5ed9..5027c32e1a 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -175,7 +175,7 @@ static int __init cf_check pge_init(void) { if ( opt_global_pages == -1 ) opt_global_pages = !cpu_has_hypervisor || - !(boot_cpu_data.x86_vendor & + !(boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)); return 0; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8e59c9801a..d041cbd5f6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1409,7 +1409,7 @@ void asmlinkage __init noreturn __start_xen(void) * supervisor shadow stacks are now safe to use. */ bool cpu_has_bug_shstk_fracture = - boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + boot_cpu_data.vendor == X86_VENDOR_INTEL && !boot_cpu_has(X86_FEATURE_CET_SSS); ASSERT(opt_fred >= 0); /* Confirm that FRED-ness has been resolved */ @@ -2044,10 +2044,10 @@ void asmlinkage __init noreturn __start_xen(void) /* Do not enable SMEP/SMAP in PV shim on AMD and Hygon by default */ if ( opt_smep == -1 ) - opt_smep = !pv_shim || !(boot_cpu_data.x86_vendor & + opt_smep = !pv_shim || !(boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)); if ( opt_smap == -1 ) - opt_smap = !pv_shim || !(boot_cpu_data.x86_vendor & + opt_smap = !pv_shim || !(boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)); if ( !opt_smep ) diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 9b8301c23e..ccbd53fd9d 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -247,10 +247,10 @@ static void __init init_ler(void) * Intel Pentium 4 is the only known CPU to not use the architectural MSR * indicies. */ - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: - if ( boot_cpu_data.x86 == 0xf ) + if ( boot_cpu_data.family == 0xf ) { msr = MSR_P4_LER_FROM_LIP; break; diff --git a/xen/arch/x86/tsx.c b/xen/arch/x86/tsx.c index fe9f0ab4f7..38371487b9 100644 --- a/xen/arch/x86/tsx.c +++ b/xen/arch/x86/tsx.c @@ -148,8 +148,8 @@ void tsx_init(void) { printk(XENLOG_ERR "FIRMWARE BUG: CPU %02x-%02x-%02x, ucode 0x%08x: RTM_ALWAYS_ABORT vs RTM mismatch\n", - boot_cpu_data.x86, boot_cpu_data.x86_model, - boot_cpu_data.x86_mask, this_cpu(cpu_sig).rev); + boot_cpu_data.family, boot_cpu_data.model, + boot_cpu_data.stepping, this_cpu(cpu_sig).rev); setup_clear_cpu_cap(X86_FEATURE_RTM_ALWAYS_ABORT); setup_clear_cpu_cap(X86_FEATURE_TSX_FORCE_ABORT); diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 00d2c46cbc..d77dd85112 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -840,9 +840,9 @@ static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) { u32 value; - if ( (boot_cpu_data.x86 != 0x15) || - (boot_cpu_data.x86_model < 0x10) || - (boot_cpu_data.x86_model > 0x1f) ) + if ( (boot_cpu_data.family != 0x15) || + (boot_cpu_data.model < 0x10) || + (boot_cpu_data.model > 0x1f) ) return; pci_conf_write32(iommu->sbdf, 0xf0, 0x90); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 11:44:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 11:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251057.1548352 (Exim 4.92) (envelope-from ) id 1w0Hyt-0004Yj-N6; Wed, 11 Mar 2026 11:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251057.1548352; Wed, 11 Mar 2026 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 1w0Hyt-0004Ya-KN; Wed, 11 Mar 2026 11:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1251057; Wed, 11 Mar 2026 11:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0Hyr-0004YT-M1 for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 11:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0Hyr-003Bpm-2g for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 11:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0Hyr-003ID1-1q for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 11: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=twv7D/o6lSU/lzDf69GhMIgh9Rumi1uJLRACBYPbKqU=; b=t1DvhK8qkW8aAwXoWDJiewKLjl wZBnjraZLDu/inpZlnXoxshHpXxD/DJadqCR5AFXucF2Z4xpGFeuL19uNvD/Sr8q2+DYVtxNbz4tR A4eB+7lVDlDqp1rEg2BO4sjxicJYGxk+NL9jbY3+T4Afkw7NKB/uuEJZzavciRTGMpoM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] core-parking: shrink core_parking_cpunum[] Message-Id: Date: Wed, 11 Mar 2026 11:44:01 +0000 commit 5bfd96ddc650513d2ba5b123a3d214e789f96df1 Author: Jan Beulich AuthorDate: Wed Mar 11 10:00:46 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 10:00:46 2026 +0100 core-parking: shrink core_parking_cpunum[] This NR_CPUS-dimensioned array is likely unused on most installations. Therefore it is especially wasteful for it to consume more space than really needed. Allocate it dynamically ahead of registering the hooks. Further the array having all fields set to -1 is actually useless. Nothing relies on it, and core_parking_remove() doesn't restore the sentinel for vacated slots. Drop the initializers altogether, rather than replacing them. Also take the opportunity and update an adjacent variable's type, where a fixed-width type was pretty clearly inappropriate to use. Finally drop the redundant initializer from core_parking_init(). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/common/core_parking.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/common/core_parking.c b/xen/common/core_parking.c index 7d6a18cdcf..08003a536f 100644 --- a/xen/common/core_parking.c +++ b/xen/common/core_parking.c @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -27,8 +28,8 @@ #define CORE_PARKING_DECREMENT 2 static DEFINE_SPINLOCK(accounting_lock); -static uint32_t cur_idle_nums; -static unsigned int core_parking_cpunum[NR_CPUS] = {[0 ... NR_CPUS-1] = -1}; +static unsigned int cur_idle_nums; +static unsigned int *__ro_after_init core_parking_cpunum; struct cp_policy { char name[30]; @@ -188,7 +189,7 @@ long cf_check core_parking_helper(void *data) return ret; spin_lock(&accounting_lock); - BUG_ON(cur_idle_nums >= ARRAY_SIZE(core_parking_cpunum)); + BUG_ON(cur_idle_nums >= nr_cpu_ids); core_parking_cpunum[cur_idle_nums++] = cpu; spin_unlock(&accounting_lock); } @@ -263,9 +264,12 @@ static int __init register_core_parking_policy(const struct cp_policy *policy) static int __init cf_check core_parking_init(void) { - int ret = 0; + int ret; - if ( core_parking_controller == PERFORMANCE_FIRST ) + core_parking_cpunum = xvzalloc_array(unsigned int, nr_cpu_ids); + if ( !core_parking_cpunum ) + ret = -ENOMEM; + else if ( core_parking_controller == PERFORMANCE_FIRST ) ret = register_core_parking_policy(&performance_first); else ret = register_core_parking_policy(&power_first); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 11:44:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 11:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251058.1548357 (Exim 4.92) (envelope-from ) id 1w0Hz3-0004ad-Oi; Wed, 11 Mar 2026 11:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251058.1548357; Wed, 11 Mar 2026 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 1w0Hz3-0004aV-Li; Wed, 11 Mar 2026 11:44:13 +0000 Received: by outflank-mailman (input) for mailman id 1251058; Wed, 11 Mar 2026 11:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0Hz1-0004aI-PM for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 11:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0Hz1-003BqB-36 for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 11:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0Hz1-003IF3-2G for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 11: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=xCBybISu4Sx46oSTESja+0UFCRGND8oaBkqxaiHr3es=; b=T/bhHI0fi6TqfgT7+HokEF7c3q rTYBvL4Bz94f18Py20OXNgqvPRROS2nRTfjb1WfwlRLiC8ISzool30Ld94Wzyc/nXz4tw1hvxIxC6 AmQlD2FZW6g+aUZegT/41+5VYL+2ITAEMPQP6oFHIItibbcEqEA4MObHpCGniyorJR2g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Remove x86 prefixed names misc Message-Id: Date: Wed, 11 Mar 2026 11:44:11 +0000 commit bfb33fa6d4eb4110cd7dd47ec71d2e550739e126 Author: Kevin Lampis AuthorDate: Wed Mar 11 10:03:37 2026 +0100 Commit: Jan Beulich CommitDate: Wed Mar 11 10:03:37 2026 +0100 x86: Remove x86 prefixed names misc struct cpuinfo_x86 .x86 => .family .x86_vendor => .vendor .x86_model => .model .x86_mask => .stepping No functional change. This work is part of making Xen safe for Intel family 18/19. Signed-off-by: Kevin Lampis Acked-by: Jan Beulich --- xen/arch/x86/alternative.c | 8 ++++---- xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpuid.c | 2 +- xen/arch/x86/dom0_build.c | 4 ++-- xen/arch/x86/domain.c | 12 ++++++------ xen/arch/x86/e820.c | 2 +- xen/arch/x86/i8259.c | 2 +- xen/arch/x86/irq.c | 4 ++-- xen/arch/x86/mpparse.c | 6 +++--- xen/arch/x86/msr.c | 4 ++-- xen/arch/x86/nmi.c | 15 +++++++++------ xen/arch/x86/platform_hypercall.c | 8 ++++---- xen/arch/x86/pv/domain.c | 2 +- xen/arch/x86/setup.c | 6 +++--- xen/arch/x86/traps-setup.c | 4 ++-- xen/arch/x86/tsx.c | 4 ++-- xen/drivers/passthrough/amd/iommu_init.c | 6 +++--- 17 files changed, 47 insertions(+), 44 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 9f844241bc..5ed0c26725 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -89,7 +89,7 @@ static bool init_or_livepatch_read_mostly toolchain_nops_are_ideal; static void __init arch_init_ideal_nops(void) { - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: /* @@ -97,10 +97,10 @@ static void __init arch_init_ideal_nops(void) * actually perform better with the "k8_nops" than with the SDM- * recommended NOPs. */ - if ( boot_cpu_data.x86 != 6 ) + if ( boot_cpu_data.family != 6 ) break; - switch ( boot_cpu_data.x86_model ) + switch ( boot_cpu_data.model ) { case 0x0f ... 0x1b: case 0x1d ... 0x25: @@ -111,7 +111,7 @@ static void __init arch_init_ideal_nops(void) break; case X86_VENDOR_AMD: - if ( boot_cpu_data.x86 <= 0xf ) + if ( boot_cpu_data.family <= 0xf ) ideal_nops = k8_nops; break; } diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index fb38be7ec3..d69ef9e16a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -406,7 +406,7 @@ void __init init_bsp_APIC(void) value |= APIC_SPIV_APIC_ENABLED; /* This bit is reserved on P4/Xeon and should be cleared */ - if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 15)) + if ((boot_cpu_data.vendor == X86_VENDOR_INTEL) && (boot_cpu_data.family == 15)) value &= ~APIC_SPIV_FOCUS_DISABLED; else value |= APIC_SPIV_FOCUS_DISABLED; diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 5decfad8cd..6e9b15c9c3 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -437,7 +437,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, case 0xa: /* TODO: Rework vPMU control in terms of toolstack choices. */ - if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + if ( boot_cpu_data.vendor != X86_VENDOR_INTEL || !vpmu_available(v) ) *res = EMPTY_LEAF; else diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 0b467fd4a4..864dd9e53e 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -572,10 +572,10 @@ int __init dom0_setup_permissions(struct domain *d) rc |= iomem_deny_access(d, mfn, mfn); } /* HyperTransport range. */ - if ( boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) + if ( boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) { mfn = paddr_to_pfn(1UL << - (boot_cpu_data.x86 < 0x17 ? 40 : paddr_bits)); + (boot_cpu_data.family < 0x17 ? 40 : paddr_bits)); rc |= iomem_deny_access(d, mfn - paddr_to_pfn(3UL << 32), mfn - 1); } diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 9c1f6ef76d..868c26036d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -319,7 +319,7 @@ void domain_cpu_policy_changed(struct domain *d) if ( cpu_has_htt ) edx |= cpufeat_mask(X86_FEATURE_HTT); - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: /* @@ -372,7 +372,7 @@ void domain_cpu_policy_changed(struct domain *d) { uint64_t mask = cpuidmask_defaults._6c; - if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) + if ( boot_cpu_data.vendor == X86_VENDOR_AMD ) mask &= (~0ULL << 32) | p->basic.raw[6].c; d->arch.pv.cpuidmasks->_6c = mask; @@ -387,7 +387,7 @@ void domain_cpu_policy_changed(struct domain *d) * wholesale from the policy, but clamp the features in 7[0].ebx * per usual. */ - if ( boot_cpu_data.x86_vendor & + if ( boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) mask = (((uint64_t)p->feat.max_subleaf << 32) | ((uint32_t)mask & p->feat._7b0)); @@ -400,7 +400,7 @@ void domain_cpu_policy_changed(struct domain *d) uint64_t mask = cpuidmask_defaults.Da1; uint32_t eax = p->xstate.Da1; - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + if ( boot_cpu_data.vendor == X86_VENDOR_INTEL ) mask &= (~0ULL << 32) | eax; d->arch.pv.cpuidmasks->Da1 = mask; @@ -427,7 +427,7 @@ void domain_cpu_policy_changed(struct domain *d) if ( !(p->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) edx &= ~CPUID_COMMON_1D_FEATURES; - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: mask &= ((uint64_t)edx << 32) | ecx; @@ -457,7 +457,7 @@ void domain_cpu_policy_changed(struct domain *d) cpu_policy_updated(v); /* If PMU version is zero then the guest doesn't have VPMU */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + if ( boot_cpu_data.vendor == X86_VENDOR_INTEL && p->basic.pmu_version == 0 ) vpmu_destroy(v); } diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index ca577c0bde..872208ab37 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -426,7 +426,7 @@ static uint64_t __init mtrr_top_of_ram(void) /* By default we check only Intel systems. */ if ( e820_mtrr_clip == -1 ) - e820_mtrr_clip = boot_cpu_data.x86_vendor == X86_VENDOR_INTEL; + e820_mtrr_clip = boot_cpu_data.vendor == X86_VENDOR_INTEL; if ( !e820_mtrr_clip ) return 0; diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index 5c7e21a751..d2a08661f8 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -419,7 +419,7 @@ void __init init_IRQ(void) * the interrupt. */ cpumask_copy(desc->arch.cpu_mask, - (boot_cpu_data.x86_vendor & + (boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ? &cpumask_all : cpumask_of(cpu))); desc->arch.vector = LEGACY_VECTOR(irq); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index cc2934bfca..739fc04bd1 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2011,8 +2011,8 @@ void do_IRQ(struct cpu_user_regs *regs) * interrupts have been delivered to CPUs * different than the BSP. */ - (boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | - X86_VENDOR_HYGON))) && + (boot_cpu_data.vendor & (X86_VENDOR_AMD | + X86_VENDOR_HYGON))) && bogus_8259A_irq(vector - FIRST_LEGACY_VECTOR)) ) { printk("CPU%u: No irq handler for vector %02x (IRQ %d%s)\n", diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index c1171f7a3a..1b41aa573f 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -511,9 +511,9 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) /* Either an integrated APIC or a discrete 82489DX. */ processor.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01; processor.mpc_cpuflag = CPU_ENABLED; - processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) | - (boot_cpu_data.x86_model << 4) | - boot_cpu_data.x86_mask; + processor.mpc_cpufeature = (boot_cpu_data.family << 8) | + (boot_cpu_data.model << 4) | + boot_cpu_data.stepping; processor.mpc_featureflag = boot_cpu_data.x86_capability[FEATURESET_1d]; processor.mpc_reserved[0] = 0; diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index ad75a2e108..6a97be59d5 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -170,7 +170,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) case MSR_IA32_PLATFORM_ID: if ( !(cp->x86_vendor & X86_VENDOR_INTEL) || - !(boot_cpu_data.x86_vendor & X86_VENDOR_INTEL) ) + !(boot_cpu_data.vendor & X86_VENDOR_INTEL) ) goto gp_fault; rdmsrl(MSR_IA32_PLATFORM_ID, *val); break; @@ -190,7 +190,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) * the guest. */ if ( !(cp->x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || - !(boot_cpu_data.x86_vendor & + !(boot_cpu_data.vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD)) || rdmsr_safe(MSR_AMD_PATCHLEVEL, val) ) goto gp_fault; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index a0c9194ff0..91f95fe6d0 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -216,12 +216,14 @@ void disable_lapic_nmi_watchdog(void) { if (nmi_active <= 0) return; - switch (boot_cpu_data.x86_vendor) { + switch ( boot_cpu_data.vendor ) + { case X86_VENDOR_AMD: wrmsrns(MSR_K7_EVNTSEL0, 0); break; case X86_VENDOR_INTEL: - switch (boot_cpu_data.x86) { + switch ( boot_cpu_data.family ) + { case 6: wrmsrns(MSR_P6_EVNTSEL(0), 0); break; @@ -362,7 +364,7 @@ static void setup_p4_watchdog(void) clear_msr_range(0x3F1, 2); /* MSR 0x3F0 seems to have a default value of 0xFC00, but current docs doesn't fully define it, so leave it alone for now. */ - if (boot_cpu_data.x86_model >= 0x3) { + if (boot_cpu_data.model >= 0x3) { /* MSR_P4_IQ_ESCR0/1 (0x3ba/0x3bb) removed */ clear_msr_range(0x3A0, 26); clear_msr_range(0x3BC, 3); @@ -387,16 +389,17 @@ void setup_apic_nmi_watchdog(void) if ( nmi_watchdog == NMI_NONE ) return; - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_AMD: setup_k7_watchdog(); break; case X86_VENDOR_INTEL: - switch (boot_cpu_data.x86) { + switch ( boot_cpu_data.family ) + { case 6: - setup_p6_watchdog((boot_cpu_data.x86_model < 14) + setup_p6_watchdog((boot_cpu_data.model < 14) ? P6_EVENT_CPU_CLOCKS_NOT_HALTED : CORE_EVENT_CPU_CLOCKS_NOT_HALTED); break; diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index cd4f0ae5e5..0431f875af 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -104,7 +104,7 @@ static bool msr_read_allowed(unsigned int msr) * the platform doesn't actually support this MSR. */ case MSR_TEMPERATURE_TARGET: - return boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + return boot_cpu_data.vendor == X86_VENDOR_INTEL && host_cpu_policy.basic.digital_temp_sensor; case MSR_PACKAGE_THERM_STATUS: @@ -688,9 +688,9 @@ ret_t do_platform_op( const struct cpuinfo_x86 *c = &cpu_data[ver->xen_cpuid]; memcpy(ver->vendor_id, c->x86_vendor_id, sizeof(ver->vendor_id)); - ver->family = c->x86; - ver->model = c->x86_model; - ver->stepping = c->x86_mask; + ver->family = c->family; + ver->model = c->model; + ver->stepping = c->stepping; } ver->max_present = cpumask_last(&cpu_present_map); diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index b85abb5ed9..5027c32e1a 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -175,7 +175,7 @@ static int __init cf_check pge_init(void) { if ( opt_global_pages == -1 ) opt_global_pages = !cpu_has_hypervisor || - !(boot_cpu_data.x86_vendor & + !(boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)); return 0; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8e59c9801a..d041cbd5f6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1409,7 +1409,7 @@ void asmlinkage __init noreturn __start_xen(void) * supervisor shadow stacks are now safe to use. */ bool cpu_has_bug_shstk_fracture = - boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && + boot_cpu_data.vendor == X86_VENDOR_INTEL && !boot_cpu_has(X86_FEATURE_CET_SSS); ASSERT(opt_fred >= 0); /* Confirm that FRED-ness has been resolved */ @@ -2044,10 +2044,10 @@ void asmlinkage __init noreturn __start_xen(void) /* Do not enable SMEP/SMAP in PV shim on AMD and Hygon by default */ if ( opt_smep == -1 ) - opt_smep = !pv_shim || !(boot_cpu_data.x86_vendor & + opt_smep = !pv_shim || !(boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)); if ( opt_smap == -1 ) - opt_smap = !pv_shim || !(boot_cpu_data.x86_vendor & + opt_smap = !pv_shim || !(boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)); if ( !opt_smep ) diff --git a/xen/arch/x86/traps-setup.c b/xen/arch/x86/traps-setup.c index 9b8301c23e..ccbd53fd9d 100644 --- a/xen/arch/x86/traps-setup.c +++ b/xen/arch/x86/traps-setup.c @@ -247,10 +247,10 @@ static void __init init_ler(void) * Intel Pentium 4 is the only known CPU to not use the architectural MSR * indicies. */ - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: - if ( boot_cpu_data.x86 == 0xf ) + if ( boot_cpu_data.family == 0xf ) { msr = MSR_P4_LER_FROM_LIP; break; diff --git a/xen/arch/x86/tsx.c b/xen/arch/x86/tsx.c index fe9f0ab4f7..38371487b9 100644 --- a/xen/arch/x86/tsx.c +++ b/xen/arch/x86/tsx.c @@ -148,8 +148,8 @@ void tsx_init(void) { printk(XENLOG_ERR "FIRMWARE BUG: CPU %02x-%02x-%02x, ucode 0x%08x: RTM_ALWAYS_ABORT vs RTM mismatch\n", - boot_cpu_data.x86, boot_cpu_data.x86_model, - boot_cpu_data.x86_mask, this_cpu(cpu_sig).rev); + boot_cpu_data.family, boot_cpu_data.model, + boot_cpu_data.stepping, this_cpu(cpu_sig).rev); setup_clear_cpu_cap(X86_FEATURE_RTM_ALWAYS_ABORT); setup_clear_cpu_cap(X86_FEATURE_TSX_FORCE_ABORT); diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 00d2c46cbc..d77dd85112 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -840,9 +840,9 @@ static void amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) { u32 value; - if ( (boot_cpu_data.x86 != 0x15) || - (boot_cpu_data.x86_model < 0x10) || - (boot_cpu_data.x86_model > 0x1f) ) + if ( (boot_cpu_data.family != 0x15) || + (boot_cpu_data.model < 0x10) || + (boot_cpu_data.model > 0x1f) ) return; pci_conf_write32(iommu->sbdf, 0xf0, 0x90); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 16:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 16:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251335.1548510 (Exim 4.92) (envelope-from ) id 1w0MUj-0004cu-Ib; Wed, 11 Mar 2026 16:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251335.1548510; Wed, 11 Mar 2026 16:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0MUj-0004cn-G1; Wed, 11 Mar 2026 16:33:13 +0000 Received: by outflank-mailman (input) for mailman id 1251335; Wed, 11 Mar 2026 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 1w0MUi-0004cf-6y for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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 1w0MUi-003HvT-1H for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0MUi-003aLt-0T for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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=q0Fr7z8AgRngkJFM4b0dlgZNOE6N6o+EGrTrQ120jQU=; b=v6AaogNk3GtjBZPP2w1r12QGeJ uACe5h06f6qWpwTCY4kxZwKvm2diEO7TQvr0dXWPUlm6+2DujJAo9eQoUIZCi2QhgQsmv0dWZKdn1 zP+x6goER62V1VN8rGmPDcUJTpYBoTMs13uOWO+m1vnuHeo2KAGKkMtoj/ssvGJSgJj0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] libxl: constify some local variables for building with glibc 2.43 Message-Id: Date: Wed, 11 Mar 2026 16:33:12 +0000 commit 8f7158589979041f96da2f73e7a5f69bc06d46b7 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 26 13:31:48 2026 +0100 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 libxl: constify some local variables for building with glibc 2.43 Archlinux just updated glibc to 2.43+r5+g856c426a7534-1 and that causes libxl build failure: libxl_cpuid.c: In function ‘libxl_cpuid_parse_config_xend’: libxl_cpuid.c:447:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 447 | endptr = strchr(str, '='); | ^ libxl_cpuid.c:452:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 452 | endptr = strchr(str, ','); | ^ libxl_cpuid.c:454:20: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 454 | endptr = strchr(str, 0); | ^ cc1: all warnings being treated as errors Add missing consts. Note in libxl_cpuid_parse_config_xend() non-const endptr still is needed, to be compatible with the second argument to strtoul(). Add second variable for this reason. And while at it, move semicolon to its own line Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Anthony PERARD (cherry picked from commit 44da0e3b4ff7fa15ad28b628f57412a05dae653c) --- tools/libs/light/libxl_cpuid.c | 21 ++++++++++++--------- tools/libs/light/libxl_internal.c | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index f738e17b19..ba428e5ebb 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -440,29 +440,32 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, str = endptr + 1; entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { + const char *endptrc; + if (str[0] != 'e' || str[2] != 'x') { return 4; } value = str[1] - 'a'; - endptr = strchr(str, '='); - if (value > 3 || endptr == NULL) { + endptrc = strchr(str, '='); + if (value > 3 || endptrc == NULL) { return 4; } - str = endptr + 1; - endptr = strchr(str, ','); - if (endptr == NULL) { - endptr = strchr(str, 0); + str = endptrc + 1; + endptrc = strchr(str, ','); + if (endptrc == NULL) { + endptrc = strchr(str, 0); } - if (endptr - str != 32) { + if (endptrc - str != 32) { return 5; } entry->policy[value] = calloc(32 + 1, 1); strncpy(entry->policy[value], str, 32); entry->policy[value][32] = 0; - if (*endptr == 0) { + if (*endptrc == 0) { break; } - for (str = endptr + 1; *str == ' ' || *str == '\n'; str++); + for (str = endptrc + 1; *str == ' ' || *str == '\n'; str++) + ; } return 0; } diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index c95624933f..7e3c0eaae5 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -204,7 +204,7 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c = strrchr(s, '/'); + const char *c = strrchr(s, '/'); if (!c) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 16:33:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 16:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251334.1548507 (Exim 4.92) (envelope-from ) id 1w0MUZ-0004bf-HX; Wed, 11 Mar 2026 16:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251334.1548507; Wed, 11 Mar 2026 16:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0MUZ-0004bW-EI; Wed, 11 Mar 2026 16:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1251334; Wed, 11 Mar 2026 16:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0MUY-0004bQ-4V for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0MUY-003Hv7-0y for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0MUY-003aJU-0A for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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=jSfAStewNRyYWnVSVQ5exCw03gp4/iJWuG1uP18ScrU=; b=GnqfJgkHYcucUHWbA0SjVXcOXP VKJ2UMcPHTMh8k66pcY8RUIhTOhaKwjHsw75utWU8xbrVMsqaBZC0egUiM8z38TWqWOVdJPC6gN5H sMUnPZpI08OlpRuVSrLvw/pU+eDn4PGLLQ5ey8Vf/u/DyKw3Wdde1PxYnSRMuJzA3xRc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Message-Id: Date: Wed, 11 Mar 2026 16:33:02 +0000 commit 49068c5f70608f2dedfa60af135a6c4bbc970001 Author: Anthony PERARD AuthorDate: Mon Dec 15 14:51:24 2025 +0100 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 libxl: Fix device_add QMP calls with QEMU 9.2 and newer QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Tested-by: Maximilian Engelhardt Reviewed-by: Juergen Gross (cherry picked from commit 85e12104f47276b588d5efd33599c987c545eeb1) --- tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 16:33:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 16:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251336.1548515 (Exim 4.92) (envelope-from ) id 1w0MUt-0004fU-K9; Wed, 11 Mar 2026 16:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251336.1548515; Wed, 11 Mar 2026 16:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0MUt-0004fM-HV; Wed, 11 Mar 2026 16:33:23 +0000 Received: by outflank-mailman (input) for mailman id 1251336; Wed, 11 Mar 2026 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 1w0MUs-0004f9-9f for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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 1w0MUs-003HvY-1Y for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0MUs-003aMh-0l for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 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=yHpBspwtQ/Qp+4bz8vHgIhbJmh+bsAE9wEQDqEwQAbQ=; b=q1rD2Z7E2tdGtoDD/8wU6uuB+K 7035GODBWw4o6t2kWebpfoBdLTe6r1SR1FXOPVVj/zCG+9brQPVrbYFtDXQATjHTRoA0JUzi+44ui 6hLo5wDGWVoKpSBFVmizQKKpJ+aC+9WE+fdGdR5rU/BhTiwvc87315uOg68Pt4+s6nis=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] tools/sd-notify.h: Include string.h too Message-Id: Date: Wed, 11 Mar 2026 16:33:22 +0000 commit da800c182026642a87f3e6c1c1d0a0f3bc594c44 Author: Andrew Cooper AuthorDate: Fri Dec 5 21:33:25 2025 +0000 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 tools/sd-notify.h: Include string.h too Alpine Linux, when using --enable-systemd to get the init files, fails with: tools/include/xen-sd-notify.h:69:3: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 69 | memcpy(socket_addr.sun.sun_path, socket_path, path_length); | ^ This will be down to using musl rather than glibc. Include the appropriate header. Fixes: 78510f3a1522 ("tools: Import stand-alone sd_notify() implementation from systemd") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD (cherry picked from commit 8efff5a69ab7596f6c63031d0aef292114948cd9) --- tools/include/xen-sd-notify.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h index 28c9b20f15..20441d0ec9 100644 --- a/tools/include/xen-sd-notify.h +++ b/tools/include/xen-sd-notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 16:33:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 16:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251337.1548519 (Exim 4.92) (envelope-from ) id 1w0MV3-0004hg-LY; Wed, 11 Mar 2026 16:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251337.1548519; Wed, 11 Mar 2026 16: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 1w0MV3-0004hY-Ir; Wed, 11 Mar 2026 16:33:33 +0000 Received: by outflank-mailman (input) for mailman id 1251337; Wed, 11 Mar 2026 16:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0MV2-0004hL-Ce for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0MV2-003Hve-1q for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0MV2-003aOO-12 for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 16: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=Veo4u+9Q1ndt0Qjmxu7JjIPQHeI3Rx6CTvw+zeAeRjs=; b=yrWKeNlkok8yAIQKBwqVhamPJr Bf6D1Qqv6xARXdqfVzjqC5xcZc/wc24KA9TLnDpvqTZz5LsFgeV8cU4E/9FtmasBywajz9W4NPaqD 0wkuHsXkRWEU11FXJmxLROcoPVok3KMqS5zMbmMjDjwXQHdqdGZAvmiwxB9aqvyhFxh0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.19] tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Message-Id: Date: Wed, 11 Mar 2026 16:33:32 +0000 commit 638f4f81af102365737c778cf6ce0dc78130e580 Author: Edwin Török AuthorDate: Thu Feb 5 13:56:45 2026 +0000 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Observed when attempting to boot a >4TiB VM: After a call to domain_setmaxmem with 6370254848 (KiB), the domain's maxmem got set to 2075287552, which is exactly 2^32 smaller. xc_domain_setmaxmem takes an uint64_t as a parameter, and the OCaml value is 64-bit already, so fix the C variable to match the type and avoid the truncation. Fixes: f5b43e95facd ("libxl: fix "xl mem-set" regression from 0c029c4da2") Signed-off-by: Edwin Török Acked-by: Christian Lindig Reviewed-by: Andrew Cooper (cherry picked from commit 381b4ff16f7ff83a2dc44f16b8dd0208f3255ec7) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index c6da9bb091..56a14aada2 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -938,7 +938,7 @@ CAMLprim value stub_xc_domain_setmaxmem(value xch_val, value domid, int retval; uint32_t c_domid = Int_val(domid); - unsigned int c_max_memkb = Int64_val(max_memkb); + uint64_t c_max_memkb = Int64_val(max_memkb); caml_enter_blocking_section(); retval = xc_domain_setmaxmem(xch, c_domid, c_max_memkb); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 17:11:05 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 17:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251379.1548540 (Exim 4.92) (envelope-from ) id 1w0N5L-0001w5-Lx; Wed, 11 Mar 2026 17:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251379.1548540; Wed, 11 Mar 2026 17: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 1w0N5L-0001vx-JV; Wed, 11 Mar 2026 17:11:03 +0000 Received: by outflank-mailman (input) for mailman id 1251379; Wed, 11 Mar 2026 17:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0N5K-0001vr-4j for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0N5K-003IdD-0p for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0N5K-003kmW-02 for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17: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=CfdMzkVHxZRnPPWwVdazGGwEqIW8vZco441YEJGZBCs=; b=35iG37g1zqFW/sFJr8hc6mIhUF GV6NV/tcfAA8+jWFbPDTPPpW+VasQ7xVsgWtYnQF1mMtCqSfuYnoWtHAY+qX3H8SMILlRdm5F6oDL WJfHMhiNhfGXKo+MO4G0b8gb9mOOLy4YxKcRYz4TtR7ZOGr012agsRh3DAAw2nWLm7mU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Message-Id: Date: Wed, 11 Mar 2026 17:11:02 +0000 commit 49068c5f70608f2dedfa60af135a6c4bbc970001 Author: Anthony PERARD AuthorDate: Mon Dec 15 14:51:24 2025 +0100 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 libxl: Fix device_add QMP calls with QEMU 9.2 and newer QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Tested-by: Maximilian Engelhardt Reviewed-by: Juergen Gross (cherry picked from commit 85e12104f47276b588d5efd33599c987c545eeb1) --- tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *egc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 17:11:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 17:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251380.1548546 (Exim 4.92) (envelope-from ) id 1w0N5V-0001xp-Nw; Wed, 11 Mar 2026 17:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251380.1548546; Wed, 11 Mar 2026 17: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 1w0N5V-0001xd-Kq; Wed, 11 Mar 2026 17:11:13 +0000 Received: by outflank-mailman (input) for mailman id 1251380; Wed, 11 Mar 2026 17:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0N5U-0001xP-6A for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0N5U-003Ide-1A for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0N5U-003knF-0K for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17: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=Dae9OVhKKA/3e7kWxXmocPczOTEP1Khic3hdEc3BiPg=; b=hK5URfMgXkKCD2R3Xb0lNv0GoQ osth8UFRTp/unxD18qeYSvQA8G1k4qB/cfsD6QGiFocg1bmMDFBczXRFDjEbFD/yJWDJpQaIF//gR 0bzP5fRifWnzpPL+ugQSYrWHpln6Jv0u6U+FmJ5Vt6cI4tc6/aMyNcRd2Dz9qT64LCGw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] libxl: constify some local variables for building with glibc 2.43 Message-Id: Date: Wed, 11 Mar 2026 17:11:12 +0000 commit 8f7158589979041f96da2f73e7a5f69bc06d46b7 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 26 13:31:48 2026 +0100 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 libxl: constify some local variables for building with glibc 2.43 Archlinux just updated glibc to 2.43+r5+g856c426a7534-1 and that causes libxl build failure: libxl_cpuid.c: In function ‘libxl_cpuid_parse_config_xend’: libxl_cpuid.c:447:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 447 | endptr = strchr(str, '='); | ^ libxl_cpuid.c:452:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 452 | endptr = strchr(str, ','); | ^ libxl_cpuid.c:454:20: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 454 | endptr = strchr(str, 0); | ^ cc1: all warnings being treated as errors Add missing consts. Note in libxl_cpuid_parse_config_xend() non-const endptr still is needed, to be compatible with the second argument to strtoul(). Add second variable for this reason. And while at it, move semicolon to its own line Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Anthony PERARD (cherry picked from commit 44da0e3b4ff7fa15ad28b628f57412a05dae653c) --- tools/libs/light/libxl_cpuid.c | 21 ++++++++++++--------- tools/libs/light/libxl_internal.c | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index f738e17b19..ba428e5ebb 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -440,29 +440,32 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, str = endptr + 1; entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { + const char *endptrc; + if (str[0] != 'e' || str[2] != 'x') { return 4; } value = str[1] - 'a'; - endptr = strchr(str, '='); - if (value > 3 || endptr == NULL) { + endptrc = strchr(str, '='); + if (value > 3 || endptrc == NULL) { return 4; } - str = endptr + 1; - endptr = strchr(str, ','); - if (endptr == NULL) { - endptr = strchr(str, 0); + str = endptrc + 1; + endptrc = strchr(str, ','); + if (endptrc == NULL) { + endptrc = strchr(str, 0); } - if (endptr - str != 32) { + if (endptrc - str != 32) { return 5; } entry->policy[value] = calloc(32 + 1, 1); strncpy(entry->policy[value], str, 32); entry->policy[value][32] = 0; - if (*endptr == 0) { + if (*endptrc == 0) { break; } - for (str = endptr + 1; *str == ' ' || *str == '\n'; str++); + for (str = endptrc + 1; *str == ' ' || *str == '\n'; str++) + ; } return 0; } diff --git a/tools/libs/light/libxl_internal.c b/tools/libs/light/libxl_internal.c index c95624933f..7e3c0eaae5 100644 --- a/tools/libs/light/libxl_internal.c +++ b/tools/libs/light/libxl_internal.c @@ -204,7 +204,7 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c = strrchr(s, '/'); + const char *c = strrchr(s, '/'); if (!c) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 17:11:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 17:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251381.1548548 (Exim 4.92) (envelope-from ) id 1w0N5f-000204-PN; Wed, 11 Mar 2026 17:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251381.1548548; Wed, 11 Mar 2026 17: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 1w0N5f-0001zy-MY; Wed, 11 Mar 2026 17:11:23 +0000 Received: by outflank-mailman (input) for mailman id 1251381; Wed, 11 Mar 2026 17:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0N5e-0001zp-8u for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0N5e-003Idj-1U for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0N5e-003koo-0e for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17: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=lz5V8MeLHCc+PfT00WF5PLA9W/C2MPEGZdhZSpm8TFU=; b=Ym38MYwEJuKPj5zXtJviOWAFFc gR8yqsv4nthuB58+JWWc9Mal+i2bGymlpObZA3FWT4NwUaHdYr+4tblq6GkqV0eXQPP7dwLUwAq84 o7V4aT0tWoOU2pDzxHHTnjrlNRfGQMtZy5bk/73huQU7I8f2C5rSd81udgbd6bms9434=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] tools/sd-notify.h: Include string.h too Message-Id: Date: Wed, 11 Mar 2026 17:11:22 +0000 commit da800c182026642a87f3e6c1c1d0a0f3bc594c44 Author: Andrew Cooper AuthorDate: Fri Dec 5 21:33:25 2025 +0000 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 tools/sd-notify.h: Include string.h too Alpine Linux, when using --enable-systemd to get the init files, fails with: tools/include/xen-sd-notify.h:69:3: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 69 | memcpy(socket_addr.sun.sun_path, socket_path, path_length); | ^ This will be down to using musl rather than glibc. Include the appropriate header. Fixes: 78510f3a1522 ("tools: Import stand-alone sd_notify() implementation from systemd") Reported-by: Marek Marczykowski-Górecki Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Acked-by: Anthony PERARD (cherry picked from commit 8efff5a69ab7596f6c63031d0aef292114948cd9) --- tools/include/xen-sd-notify.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h index 28c9b20f15..20441d0ec9 100644 --- a/tools/include/xen-sd-notify.h +++ b/tools/include/xen-sd-notify.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Wed Mar 11 17:11:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 11 Mar 2026 17:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251382.1548552 (Exim 4.92) (envelope-from ) id 1w0N5p-00022b-Rb; Wed, 11 Mar 2026 17:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251382.1548552; Wed, 11 Mar 2026 17:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0N5p-00022V-P8; Wed, 11 Mar 2026 17:11:33 +0000 Received: by outflank-mailman (input) for mailman id 1251382; Wed, 11 Mar 2026 17:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0N5o-00022N-Bz for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0N5o-003Ids-1n for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0N5o-003kpR-0y for xen-changelog@lists.xenproject.org; Wed, 11 Mar 2026 17:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Et8uJRvy7y4+PWImcajBdrVxDf4y95Ji8QZ0Aikrd8Q=; b=ALlsrMdt+h0rx3EW3EEE5qDPSq AWNksm5Og9QLRtJmk8QKaEbWoPpnoGDhmWQgBEbHfizSVFMHn2CHV+XJr0gZEaEaOgvun+560J+PG AkTNgEVvCmZeXU/cAjM3woI21mOW4zFlmNnyiWGoHgDdsbR6VZnkZNSONVAQQ80K5CLk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.19] tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Message-Id: Date: Wed, 11 Mar 2026 17:11:32 +0000 commit 638f4f81af102365737c778cf6ce0dc78130e580 Author: Edwin Török AuthorDate: Thu Feb 5 13:56:45 2026 +0000 Commit: Anthony PERARD CommitDate: Wed Mar 11 16:48:33 2026 +0100 tools/ocaml: fix 32-bit truncation bug in stub_xc_domain_setmaxmem() Observed when attempting to boot a >4TiB VM: After a call to domain_setmaxmem with 6370254848 (KiB), the domain's maxmem got set to 2075287552, which is exactly 2^32 smaller. xc_domain_setmaxmem takes an uint64_t as a parameter, and the OCaml value is 64-bit already, so fix the C variable to match the type and avoid the truncation. Fixes: f5b43e95facd ("libxl: fix "xl mem-set" regression from 0c029c4da2") Signed-off-by: Edwin Török Acked-by: Christian Lindig Reviewed-by: Andrew Cooper (cherry picked from commit 381b4ff16f7ff83a2dc44f16b8dd0208f3255ec7) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index c6da9bb091..56a14aada2 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -938,7 +938,7 @@ CAMLprim value stub_xc_domain_setmaxmem(value xch_val, value domid, int retval; uint32_t c_domid = Int_val(domid); - unsigned int c_max_memkb = Int64_val(max_memkb); + uint64_t c_max_memkb = Int64_val(max_memkb); caml_enter_blocking_section(); retval = xc_domain_setmaxmem(xch, c_domid, c_max_memkb); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.19 From xen-changelog-bounces@lists.xenproject.org Thu Mar 12 08:33:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Mar 2026 08:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251814.1548672 (Exim 4.92) (envelope-from ) id 1w0bTb-0002Fj-7t; Thu, 12 Mar 2026 08:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251814.1548672; Thu, 12 Mar 2026 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 1w0bTb-0002FZ-4E; Thu, 12 Mar 2026 08:33:03 +0000 Received: by outflank-mailman (input) for mailman id 1251814; Thu, 12 Mar 2026 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 1w0bTa-0002FT-E8 for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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 1w0bTa-004iks-1j for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 08:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0bTa-004wBp-0p for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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=6N3YmaDkM1FhLDDC72aRDFLsi6L7zGIyvVKF9x78D8w=; b=GEsW0DHKcxT6uVPmstgtGBXrf3 OGX+82/IYEOwPk/l8D8DBJf6ObFKSGpeYjbIm+/Yp5i+bsVVa6M0cOnzW5F6+eUqDn+UXrjQI8IFe /UM+F2lqBTtWxch1wHOkAVtcg6u6Fjil/6eiVmDDSRMXTt+E5nVfB76ezx5kpx3zEBN0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: fix unmapped access trapping on GICv2 hardware Message-Id: Date: Thu, 12 Mar 2026 08:33:02 +0000 commit 17a9070d22d21b2faa68231e7fd835748b36fc73 Author: Stewart Hildebrand AuthorDate: Thu Feb 5 20:01:27 2026 +0100 Commit: Michal Orzel CommitDate: Thu Mar 12 09:09:16 2026 +0100 xen/arm: fix unmapped access trapping on GICv2 hardware Since 4dbcb0653621, the vGICv2 CPU interface is mapped in a deferred manner. On domains with XEN_DOMCTL_CDF_trap_unmapped_accesses unset on GICv2 hardware, the vGICv2 CPU interface fails to be mapped. A visible symptom is that a domU gets stuck at: [ 0.177983] smp: Bringing up secondary CPUs ... Move the 2nd check_p2m earlier so it's prioritized over try_handle_mmio. Fixes: 980aff4e8fcd ("xen/arm: Add way to disable traps on accesses to unmapped addresses") Signed-off-by: Stewart Hildebrand Reviewed-by: Michal Orzel --- xen/arch/arm/traps.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 040c0f2e0d..0c01f37ad6 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1915,6 +1915,14 @@ static void do_trap_stage2_abort_guest(struct cpu_user_regs *regs, if ( info.dabt_instr.state == INSTR_ERROR ) goto inject_abt; + /* + * If the instruction syndrome was invalid, then we already checked if + * this was due to a P2M fault. So no point to check again as the result + * will be the same. + */ + if ( (info.dabt_instr.state == INSTR_VALID) && check_p2m(is_data, gpa) ) + return; + state = try_handle_mmio(regs, &info); switch ( state ) @@ -1939,14 +1947,6 @@ static void do_trap_stage2_abort_guest(struct cpu_user_regs *regs, break; } - /* - * If the instruction syndrome was invalid, then we already checked if - * this was due to a P2M fault. So no point to check again as the result - * will be the same. - */ - if ( (info.dabt_instr.state == INSTR_VALID) && check_p2m(is_data, gpa) ) - return; - break; } default: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Mar 12 10:22:11 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Mar 2026 10:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251955.1548756 (Exim 4.92) (envelope-from ) id 1w0dB4-0003KS-UK; Thu, 12 Mar 2026 10:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251955.1548756; Thu, 12 Mar 2026 10: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 1w0dB4-0003KK-Rc; Thu, 12 Mar 2026 10:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1251955; Thu, 12 Mar 2026 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 1w0dB3-0003KE-GL for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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 1w0dB3-004kvu-24 for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 10:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0dB3-0053pR-1E for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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=S6cjn3aaYLxsuLT4c/b/WNYeWQQLAi/yPh5A06EE1Fg=; b=aexl1n94pbeUq79JVcMANzkS3B tMfT2a5+bvPxY6QcFvxDGllLW+hKK7Yvw59DuX6gt6m9ijQst+i2gbIcIvVW7zUeeUCTRqKPiQkjO GAPCN9hPaeXUMXNhKrsqdg3FgnTLEwYMsFoC90mNoZkhGWifsaGqSPKK6gJ4961GUooI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: fix unmapped access trapping on GICv2 hardware Message-Id: Date: Thu, 12 Mar 2026 10:22:01 +0000 commit 17a9070d22d21b2faa68231e7fd835748b36fc73 Author: Stewart Hildebrand AuthorDate: Thu Feb 5 20:01:27 2026 +0100 Commit: Michal Orzel CommitDate: Thu Mar 12 09:09:16 2026 +0100 xen/arm: fix unmapped access trapping on GICv2 hardware Since 4dbcb0653621, the vGICv2 CPU interface is mapped in a deferred manner. On domains with XEN_DOMCTL_CDF_trap_unmapped_accesses unset on GICv2 hardware, the vGICv2 CPU interface fails to be mapped. A visible symptom is that a domU gets stuck at: [ 0.177983] smp: Bringing up secondary CPUs ... Move the 2nd check_p2m earlier so it's prioritized over try_handle_mmio. Fixes: 980aff4e8fcd ("xen/arm: Add way to disable traps on accesses to unmapped addresses") Signed-off-by: Stewart Hildebrand Reviewed-by: Michal Orzel --- xen/arch/arm/traps.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 040c0f2e0d..0c01f37ad6 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1915,6 +1915,14 @@ static void do_trap_stage2_abort_guest(struct cpu_user_regs *regs, if ( info.dabt_instr.state == INSTR_ERROR ) goto inject_abt; + /* + * If the instruction syndrome was invalid, then we already checked if + * this was due to a P2M fault. So no point to check again as the result + * will be the same. + */ + if ( (info.dabt_instr.state == INSTR_VALID) && check_p2m(is_data, gpa) ) + return; + state = try_handle_mmio(regs, &info); switch ( state ) @@ -1939,14 +1947,6 @@ static void do_trap_stage2_abort_guest(struct cpu_user_regs *regs, break; } - /* - * If the instruction syndrome was invalid, then we already checked if - * this was due to a P2M fault. So no point to check again as the result - * will be the same. - */ - if ( (info.dabt_instr.state == INSTR_VALID) && check_p2m(is_data, gpa) ) - return; - break; } default: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Mar 12 10:22:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Mar 2026 10:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251956.1548760 (Exim 4.92) (envelope-from ) id 1w0dBE-0003Lu-Vl; Thu, 12 Mar 2026 10:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251956.1548760; Thu, 12 Mar 2026 10: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 1w0dBE-0003Lm-T5; Thu, 12 Mar 2026 10:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1251956; Thu, 12 Mar 2026 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 1w0dBD-0003La-Uy for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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 1w0dBE-004kwF-0R for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 10:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0dBD-0053rt-2s for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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=TkUlh2WLc1jTjFcs81XIav967YqJ2ZaYtJ1j+e0zC8U=; b=dseaoUoPPah8BLIXXKgt7ffPhf nwRpzaSsso2xMvz40cifGG9hpQxwgdtDGhe2CHGWfkhW0HYaePpn7dqb2aJiFXQC/Mu9O7xENM9cd GFgkJlyl+Vde/wmig+UU7FgtlXdL8rdTHRhpSlk30sDw2+RRp2Y5s8hD5j9ENd9vwBsc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tests/pdx: fix overflow from conversion from page index to address on 32bit Message-Id: Date: Thu, 12 Mar 2026 10:22:11 +0000 commit 87774bbc3982a637081187583f1512c31e7e62d6 Author: Roger Pau Monne AuthorDate: Thu Mar 12 08:45:41 2026 +0100 Commit: Roger Pau Monne CommitDate: Thu Mar 12 11:16:11 2026 +0100 tests/pdx: fix overflow from conversion from page index to address on 32bit When building the PDX test harness as a 32bit executable the page shifts done on unsigned long types can overflow. Instead use pfn_to_paddr(), which casts the values to paddr_t previous to doing the shift. Fixes: cb50e4033717 ("test/pdx: add PDX compression unit tests") Reported-by: Edwin Török Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- tools/tests/pdx/test-pdx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c index eefd54c768..066bd3e7e5 100644 --- a/tools/tests/pdx/test-pdx.c +++ b/tools/tests/pdx/test-pdx.c @@ -208,8 +208,8 @@ int main(int argc, char **argv) if ( !tests[i].ranges[j].start && !tests[i].ranges[j].end ) break; - pfn_pdx_add_region(tests[i].ranges[j].start << PAGE_SHIFT, - size << PAGE_SHIFT); + pfn_pdx_add_region(pfn_to_paddr(tests[i].ranges[j].start), + pfn_to_paddr(size)); } if ( pfn_pdx_compression_setup(0) != tests[i].compress ) @@ -233,8 +233,8 @@ int main(int argc, char **argv) if ( !start && !end ) break; - if ( !pdx_is_region_compressible(start << PAGE_SHIFT, 1) || - !pdx_is_region_compressible((end - 1) << PAGE_SHIFT, 1) ) + if ( !pdx_is_region_compressible(pfn_to_paddr(start), 1) || + !pdx_is_region_compressible(pfn_to_paddr(end - 1), 1) ) { printf( "PFN compression invalid, pages %#lx and %#lx should be compressible\n", -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Mar 12 10:22:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Mar 2026 10:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1251957.1548763 (Exim 4.92) (envelope-from ) id 1w0dBP-0003ON-0h; Thu, 12 Mar 2026 10:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1251957.1548763; Thu, 12 Mar 2026 10: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 1w0dBO-0003OF-US; Thu, 12 Mar 2026 10:22:22 +0000 Received: by outflank-mailman (input) for mailman id 1251957; Thu, 12 Mar 2026 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 1w0dBO-0003O7-1S for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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 1w0dBO-004kwR-0i for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 10:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0dBN-0053sr-39 for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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=KXKAScJdybeY+M9SZJnz5R5FGWGk6HOLtDpyTQd/hDY=; b=nUf690r3OSQKTE/+G/eV7jtCe2 VXwwTZPqmb3YlcWJe7A4uaFXT/3vIBNkBbEEzUyOqfb11cAxQmphWcpz4KQH0rCfW63csl7CWqu/K lfGzJNz8XrxQkWVARsXLGscPLwgITA4A+GVl5CAo3rJxtYvo61NUJu4sjXSWpk8NX1/c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tests/pdx: allow more tests on 32bit build Message-Id: Date: Thu, 12 Mar 2026 10:22:21 +0000 commit a3a1e61ce9a00c5a0c8003bad8f1285360399cf4 Author: Roger Pau Monne AuthorDate: Thu Mar 12 09:42:40 2026 +0100 Commit: Roger Pau Monne CommitDate: Thu Mar 12 11:16:31 2026 +0100 tests/pdx: allow more tests on 32bit build The limitation of which tests can be build on 32bit is too strict. Move some tests out of the 64bit explicit region, as they can also be built on 32bits. Fixes: cb50e4033717 ("test/pdx: add PDX compression unit tests") Reported-by: Jan Beulich Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- tools/tests/pdx/test-pdx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c index 066bd3e7e5..d783186577 100644 --- a/tools/tests/pdx/test-pdx.c +++ b/tools/tests/pdx/test-pdx.c @@ -77,6 +77,17 @@ int main(int argc, char **argv) }, .compress = true, }, + /* Two ranges with the same high bit set. */ + { + .ranges = { + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 0, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 1 }, + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 4 }, + }, + .compress = true, + }, +#endif /* PDX compression, 2 ranges covered by the lower mask. */ { .ranges = { @@ -132,17 +143,6 @@ int main(int argc, char **argv) }, .compress = true, }, - /* Two ranges with the same high bit set. */ - { - .ranges = { - { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 0, - .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 1 }, - { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3, - .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 4 }, - }, - .compress = true, - }, -#endif /* AMD Naples Epyc 7281 2 sockets, 8 NUMA nodes. */ { .ranges = { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Mar 12 11:55:06 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Mar 2026 11:55:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1252232.1548984 (Exim 4.92) (envelope-from ) id 1w0ed4-0001qM-9e; Thu, 12 Mar 2026 11:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1252232.1548984; Thu, 12 Mar 2026 11:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0ed4-0001qE-6s; Thu, 12 Mar 2026 11:55:02 +0000 Received: by outflank-mailman (input) for mailman id 1252232; Thu, 12 Mar 2026 11:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0ed3-0001q6-Gy for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 11:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0ed3-004mjk-29 for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 11:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0ed3-005ADw-1H for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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=w9TxcPajUi36dj2hQvvVifBxEIezTRWtOaUQU/VVk9s=; b=ZIZ+zEdGVU/30UcO4x4qJRZ2+o d6m3alJ0M86ypxjFwLyD1qYlDpmxFejs5+GbO1pr2zsIySmtpJFlqqEiIuECDU2DfdLnfTS4kPuuK ikG5YtqwJZpSHUqgTYkZ74EQ4O1ViCwt7cO72s7yARhoIRhdg9iTX189RZCGFEx7/U34=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tests/pdx: fix overflow from conversion from page index to address on 32bit Message-Id: Date: Thu, 12 Mar 2026 11:55:01 +0000 commit 87774bbc3982a637081187583f1512c31e7e62d6 Author: Roger Pau Monne AuthorDate: Thu Mar 12 08:45:41 2026 +0100 Commit: Roger Pau Monne CommitDate: Thu Mar 12 11:16:11 2026 +0100 tests/pdx: fix overflow from conversion from page index to address on 32bit When building the PDX test harness as a 32bit executable the page shifts done on unsigned long types can overflow. Instead use pfn_to_paddr(), which casts the values to paddr_t previous to doing the shift. Fixes: cb50e4033717 ("test/pdx: add PDX compression unit tests") Reported-by: Edwin Török Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- tools/tests/pdx/test-pdx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c index eefd54c768..066bd3e7e5 100644 --- a/tools/tests/pdx/test-pdx.c +++ b/tools/tests/pdx/test-pdx.c @@ -208,8 +208,8 @@ int main(int argc, char **argv) if ( !tests[i].ranges[j].start && !tests[i].ranges[j].end ) break; - pfn_pdx_add_region(tests[i].ranges[j].start << PAGE_SHIFT, - size << PAGE_SHIFT); + pfn_pdx_add_region(pfn_to_paddr(tests[i].ranges[j].start), + pfn_to_paddr(size)); } if ( pfn_pdx_compression_setup(0) != tests[i].compress ) @@ -233,8 +233,8 @@ int main(int argc, char **argv) if ( !start && !end ) break; - if ( !pdx_is_region_compressible(start << PAGE_SHIFT, 1) || - !pdx_is_region_compressible((end - 1) << PAGE_SHIFT, 1) ) + if ( !pdx_is_region_compressible(pfn_to_paddr(start), 1) || + !pdx_is_region_compressible(pfn_to_paddr(end - 1), 1) ) { printf( "PFN compression invalid, pages %#lx and %#lx should be compressible\n", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Mar 12 11:55:13 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 12 Mar 2026 11:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1252233.1548988 (Exim 4.92) (envelope-from ) id 1w0edF-0001sW-BI; Thu, 12 Mar 2026 11:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1252233.1548988; Thu, 12 Mar 2026 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 1w0edF-0001sO-8K; Thu, 12 Mar 2026 11:55:13 +0000 Received: by outflank-mailman (input) for mailman id 1252233; Thu, 12 Mar 2026 11:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0edD-0001sB-IQ for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 11:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w0edD-004mjo-2Q for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 11:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w0edD-005AEP-1e for xen-changelog@lists.xenproject.org; Thu, 12 Mar 2026 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=tkbXqb65rW2fzwk6Qe9ZH6ZDk8AYassFbVtbz55RJ50=; b=lnTFuKzrbHoDPgm5s2Ry5Mphjk iIibneZ8tC0UKZ2vTDpa5hGDlWm784A1DUmt+b7jnxkjN8wv5FB2lN1fQdP7DKQMxOkWttgSvSJr8 xENGyRnq/0Sk+B3uEeZlx1qL99IBlOGqurXjcjWdtVlGP51Ba/7JiK8Ly8RFmL0Tf3YE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tests/pdx: allow more tests on 32bit build Message-Id: Date: Thu, 12 Mar 2026 11:55:11 +0000 commit a3a1e61ce9a00c5a0c8003bad8f1285360399cf4 Author: Roger Pau Monne AuthorDate: Thu Mar 12 09:42:40 2026 +0100 Commit: Roger Pau Monne CommitDate: Thu Mar 12 11:16:31 2026 +0100 tests/pdx: allow more tests on 32bit build The limitation of which tests can be build on 32bit is too strict. Move some tests out of the 64bit explicit region, as they can also be built on 32bits. Fixes: cb50e4033717 ("test/pdx: add PDX compression unit tests") Reported-by: Jan Beulich Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- tools/tests/pdx/test-pdx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/tests/pdx/test-pdx.c b/tools/tests/pdx/test-pdx.c index 066bd3e7e5..d783186577 100644 --- a/tools/tests/pdx/test-pdx.c +++ b/tools/tests/pdx/test-pdx.c @@ -77,6 +77,17 @@ int main(int argc, char **argv) }, .compress = true, }, + /* Two ranges with the same high bit set. */ + { + .ranges = { + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 0, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 1 }, + { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3, + .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 4 }, + }, + .compress = true, + }, +#endif /* PDX compression, 2 ranges covered by the lower mask. */ { .ranges = { @@ -132,17 +143,6 @@ int main(int argc, char **argv) }, .compress = true, }, - /* Two ranges with the same high bit set. */ - { - .ranges = { - { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 0, - .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 1 }, - { .start = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 3, - .end = (1UL << (51 - PAGE_SHIFT)) + (1 << MAX_ORDER) * 4 }, - }, - .compress = true, - }, -#endif /* AMD Naples Epyc 7281 2 sockets, 8 NUMA nodes. */ { .ranges = { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:22:07 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254275.1550198 (Exim 4.92) (envelope-from ) id 1w16D4-0001LC-OS; Fri, 13 Mar 2026 17:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254275.1550198; Fri, 13 Mar 2026 17:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w16D4-0001L4-Lp; Fri, 13 Mar 2026 17:22:02 +0000 Received: by outflank-mailman (input) for mailman id 1254275; Fri, 13 Mar 2026 17:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w16D3-0001Ky-Tn for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w16D4-006ZF8-0C for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16D3-007k5w-2P for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JRMVWfm4LdLT3V0EfVLNYyjuk4HgXMhetCLevmzn3OA=; b=ROLRDD2PNaaYYwUKidBH035+ig 26y5X37u62BcOfR9OuJORxZdqFBUD8L5BReq7+4nNnbCHps+K6y0iCqUQuy2+oqtfadR8WVsbBggM DD3eEiRQaJDfmiCUlxhe+9RvA9Fqhp1VarOWZi9BiRg7XGFVM9uPE8fMtUEGUGEx0NeY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: Clamp bits in eflags more aggressively Message-Id: Date: Fri, 13 Mar 2026 17:22:01 +0000 commit dbd936248f3846449c0d0e192d544b592c1c44d5 Author: Andrew Cooper AuthorDate: Tue May 27 15:58:46 2025 +0100 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 x86: Clamp bits in eflags more aggressively In FRED mode, ERET is stricter than IRET about flags. Notably this means: * The vm86 bit (bit 17) and IOPL (bits 12,13) must be clear. * The sticky-1 reserved bit (bit 2) must be set, so dom0_construct() needs to set X86_EFLAGS_MBS in order for a PV dom0 to start. * All other reserved bits must be clear. Xen has been overly lax with reserved bit handling. Adjust arch_set_info_guest*() and hypercall_iret() which consume flags to clamp the reserved bits for all guest types. This is a minor ABI change, but by the same argument as commit 9f892f84c279 ("x86/domctl: Stop using XLAT_cpu_user_regs()"); the reserved bits would get clamped like this naturally by hardware when the vCPU is run. The handling of vm86 is also different. Guests under 32bit Xen really could use vm86 mode, but Long Mode disallows vm86 mode and IRET simply ignores the bit. Xen's behaviour for a PV32 guest trying to use vm86 mode under a 64bit Xen is to arrange to deliver #GP at the target of the IRET, rather than to fail the IRET itself. However there's no filtering in arch_set_info_guest() itself, and it can't arrange to queue a #GP at the target, so do the next best thing and fail the hypercall. This is not expected to create an issue for PV guests, as the result of such an arch_set_info_guest() previously would be to run supposedly Real Mode code as Protected Mode code. This allows PV guests to start when Xen is using FRED mode. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 24 ++++++++++++++++++++++-- xen/arch/x86/hvm/domain.c | 4 ++-- xen/arch/x86/include/asm/x86-defns.h | 7 +++++++ xen/arch/x86/pv/dom0_build.c | 2 +- xen/arch/x86/pv/iret.c | 8 +++++--- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 868c26036d..4664264b2f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1193,6 +1193,14 @@ int arch_set_info_guest( if ( !__addr_ok(c.nat->ldt_base) ) return -EINVAL; + + /* + * IRET in Long Mode discards EFLAGS.VM, but in FRED mode ERET + * cares that it is zero. + * + * Guests can't see FRED, so emulate IRET behaviour. + */ + c.nat->user_regs.rflags &= ~X86_EFLAGS_VM; } #ifdef CONFIG_COMPAT else @@ -1205,6 +1213,18 @@ int arch_set_info_guest( for ( i = 0; i < ARRAY_SIZE(c.cmp->trap_ctxt); i++ ) fixup_guest_code_selector(d, c.cmp->trap_ctxt[i].cs); + + /* + * Under 32bit Xen, PV guests could really use vm86 mode. Under + * 64bit Xen, vm86 mode can't be entered even by PV32 guests. + * + * For backwards compatibility, compat HYPERCALL_iret will arrange + * to deliver #GP at the target of the IRET rather than to fail + * the IRET itself, but we can't arrange for the same behaviour + * here. Reject the hypercall as the next best option. + */ + if ( c.cmp->user_regs.eflags & X86_EFLAGS_VM ) + return -EINVAL; } #endif @@ -1244,7 +1264,7 @@ int arch_set_info_guest( v->arch.user_regs.rax = c.nat->user_regs.rax; v->arch.user_regs.rip = c.nat->user_regs.rip; v->arch.user_regs.cs = c.nat->user_regs.cs; - v->arch.user_regs.rflags = c.nat->user_regs.rflags; + v->arch.user_regs.rflags = (c.nat->user_regs.rflags & X86_EFLAGS_ALL) | X86_EFLAGS_MBS; v->arch.user_regs.rsp = c.nat->user_regs.rsp; v->arch.user_regs.ss = c.nat->user_regs.ss; v->arch.pv.es = c.nat->user_regs.es; @@ -1268,7 +1288,7 @@ int arch_set_info_guest( v->arch.user_regs.eax = c.cmp->user_regs.eax; v->arch.user_regs.eip = c.cmp->user_regs.eip; v->arch.user_regs.cs = c.cmp->user_regs.cs; - v->arch.user_regs.eflags = c.cmp->user_regs.eflags; + v->arch.user_regs.eflags = (c.cmp->user_regs.eflags & X86_EFLAGS_ALL) | X86_EFLAGS_MBS; v->arch.user_regs.esp = c.cmp->user_regs.esp; v->arch.user_regs.ss = c.cmp->user_regs.ss; v->arch.pv.es = c.cmp->user_regs.es; diff --git a/xen/arch/x86/hvm/domain.c b/xen/arch/x86/hvm/domain.c index 155d61db13..a0e811ea47 100644 --- a/xen/arch/x86/hvm/domain.c +++ b/xen/arch/x86/hvm/domain.c @@ -194,7 +194,7 @@ int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx) uregs->rsi = regs->esi; uregs->rdi = regs->edi; uregs->rip = regs->eip; - uregs->rflags = regs->eflags; + uregs->rflags = (regs->eflags & X86_EFLAGS_ALL) | X86_EFLAGS_MBS; v->arch.hvm.guest_cr[0] = regs->cr0; v->arch.hvm.guest_cr[3] = regs->cr3; @@ -245,7 +245,7 @@ int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx) uregs->rsi = regs->rsi; uregs->rdi = regs->rdi; uregs->rip = regs->rip; - uregs->rflags = regs->rflags; + uregs->rflags = (regs->rflags & X86_EFLAGS_ALL) | X86_EFLAGS_MBS; v->arch.hvm.guest_cr[0] = regs->cr0; v->arch.hvm.guest_cr[3] = regs->cr3; diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index 0a0ba83de7..edeb0b4ff9 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -27,6 +27,13 @@ (X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF | \ X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF) +#define X86_EFLAGS_ALL \ + (X86_EFLAGS_ARITH_MASK | X86_EFLAGS_TF | X86_EFLAGS_IF | \ + X86_EFLAGS_DF | X86_EFLAGS_OF | X86_EFLAGS_IOPL | \ + X86_EFLAGS_NT | X86_EFLAGS_RF | X86_EFLAGS_VM | \ + X86_EFLAGS_AC | X86_EFLAGS_VIF | X86_EFLAGS_VIP | \ + X86_EFLAGS_ID) + /* * Intel CPU flags in CR0 */ diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 9a11a0a16b..075a3646c2 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -1024,7 +1024,7 @@ static int __init dom0_construct(const struct boot_domain *bd) regs->rip = parms.virt_entry; regs->rsp = vstack_end; regs->rsi = vstartinfo_start; - regs->eflags = X86_EFLAGS_IF; + regs->eflags = X86_EFLAGS_IF | X86_EFLAGS_MBS; /* * We don't call arch_set_info_guest(), so some initialisation needs doing diff --git a/xen/arch/x86/pv/iret.c b/xen/arch/x86/pv/iret.c index d3a1fb2c68..39ce316b8d 100644 --- a/xen/arch/x86/pv/iret.c +++ b/xen/arch/x86/pv/iret.c @@ -80,8 +80,9 @@ long do_iret(void) regs->rip = iret_saved.rip; regs->cs = iret_saved.cs | 3; /* force guest privilege */ - regs->rflags = ((iret_saved.rflags & ~(X86_EFLAGS_IOPL|X86_EFLAGS_VM)) - | X86_EFLAGS_IF); + regs->rflags = ((iret_saved.rflags & X86_EFLAGS_ALL & + ~(X86_EFLAGS_IOPL | X86_EFLAGS_VM)) | + X86_EFLAGS_IF | X86_EFLAGS_MBS); regs->rsp = iret_saved.rsp; regs->ss = iret_saved.ss | 3; /* force guest privilege */ @@ -143,7 +144,8 @@ int compat_iret(void) if ( VM_ASSIST(v->domain, architectural_iopl) ) v->arch.pv.iopl = eflags & X86_EFLAGS_IOPL; - regs->eflags = (eflags & ~X86_EFLAGS_IOPL) | X86_EFLAGS_IF; + regs->eflags = ((eflags & X86_EFLAGS_ALL & ~X86_EFLAGS_IOPL) | + X86_EFLAGS_IF | X86_EFLAGS_MBS); if ( unlikely(eflags & X86_EFLAGS_VM) ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:22:12 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254276.1550202 (Exim 4.92) (envelope-from ) id 1w16DE-0001N8-Q2; Fri, 13 Mar 2026 17:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254276.1550202; Fri, 13 Mar 2026 17: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 1w16DE-0001N0-NF; Fri, 13 Mar 2026 17:22:12 +0000 Received: by outflank-mailman (input) for mailman id 1254276; Fri, 13 Mar 2026 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 1w16DD-0001Ms-Vq for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w16DE-006ZFD-0U for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16DD-007k76-2v for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17: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=w9BprKxHAFqxx6LqTgFWRvurtibSnaPqMVHHfYZXN5M=; b=H+nQiekgFHcdrzyRGK9YZ8s2N5 jBwHSZPOw3xDe7+WWjueVdpVk1KdX6EcbjHFnskw8ZYlHaatbuRX5U3pJb4fqEpau9XY/sMSu+yVN 8gwDwk1w9ZP1oBIay0myhMhd9wfLgUCzzY0tGTfOVdAFcZKf7axT77NKTCw0ouHXdsvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/argo: Fix MISRA violations around function parameters Message-Id: Date: Fri, 13 Mar 2026 17:22:11 +0000 commit f03a9e3bd94f50724655ae892816410688340837 Author: Andrew Cooper AuthorDate: Sat Jan 3 19:52:11 2026 +0000 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 xen/argo: Fix MISRA violations around function parameters For the ARM build only, Eclair reports a R8.4 violation because do_argo_op() cannot see its declaration. This means that x86 is picking hypercall-defs.h up transitively while ARM is not. Include xen/hypercall.h explicitly. Eclair also reports a R8.3 violation because of arg3 and arg4 differing in name with a raw_ prefix. Because hypercall-defs.h generates both do_argo_op() and compat_argo_op() from a single description, it's not possible to simply rename to raw_ in the declaration, as that would force doing the same rename in compat_argo_op(). In do_argo_op(), drop the split parameter handling, and perform the 32bit range check via an explicit cast. While adjusting the surrounding logic, drop unnecessary casts to void * for already pointer arguments in argo_printk(). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Daniel P. Smith --- xen/common/argo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/common/argo.c b/xen/common/argo.c index 029a82825b..28626e00a8 100644 --- a/xen/common/argo.c +++ b/xen/common/argo.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -2084,18 +2085,17 @@ sendv(struct domain *src_d, xen_argo_addr_t *src_addr, long do_argo_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg1, - XEN_GUEST_HANDLE_PARAM(void) arg2, unsigned long raw_arg3, - unsigned long raw_arg4) + XEN_GUEST_HANDLE_PARAM(void) arg2, unsigned long arg3, + unsigned long arg4) { struct domain *currd = current->domain; long rc; - unsigned int arg3 = raw_arg3, arg4 = raw_arg4; argo_dprintk("->do_argo_op(%u,%p,%p,%lu,0x%lx)\n", cmd, - (void *)arg1.p, (void *)arg2.p, raw_arg3, raw_arg4); + arg1.p, arg2.p, arg3, arg4); /* Reject numeric hypercall args outside 32-bit range */ - if ( (arg3 != raw_arg3) || (arg4 != raw_arg4) ) + if ( (arg3 != (uint32_t)arg3) || (arg4 != (uint32_t)arg4) ) return -EINVAL; if ( unlikely(!opt_argo) ) @@ -2248,7 +2248,7 @@ compat_argo_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg1, return rc; argo_dprintk("->compat_argo_op(%u,%p,%p,%lu,0x%lx)\n", cmd, - (void *)arg1.p, (void *)arg2.p, arg3, arg4); + arg1.p, arg2.p, arg3, arg4); send_addr_hnd = guest_handle_cast(arg1, xen_argo_send_addr_t); /* arg2: iovs, arg3: niov, arg4: message_type */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:22:23 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254277.1550206 (Exim 4.92) (envelope-from ) id 1w16DP-0001PV-RE; Fri, 13 Mar 2026 17:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254277.1550206; Fri, 13 Mar 2026 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 1w16DP-0001PN-Of; Fri, 13 Mar 2026 17:22:23 +0000 Received: by outflank-mailman (input) for mailman id 1254277; Fri, 13 Mar 2026 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 1w16DO-0001PG-2T for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 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 1w16DO-006ZFN-0p for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16DO-007k8J-01 for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 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=jnokj8gw+yQee8Vb7mq17Bp7tWmFPxBcyamHn/hWu7s=; b=H/7y/z8kUBkZzHAgElzVK1mM8P QvwTA7/BgICaMsBAm9gl/2hq4/cy+EHl/mztt9BpkdzDXSOt6vh81jKZKYMqI7XgHCrF8/WIved/4 3oPojcliagljb7Gfx6z4CONluN62cHh/GANKlEYIMLmwUWf4JcAh3jv3fxbW1GjLTar0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Bracket uses of macro parameters Message-Id: Date: Fri, 13 Mar 2026 17:22:22 +0000 commit 2429e82c718e00b646166e9dd13f6130fc02bf8d Author: Andrew Cooper AuthorDate: Fri Feb 20 11:52:21 2026 +0000 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 xen: Bracket uses of macro parameters Fixing Rule 20.7 violations. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Nicola Vetrini Reviewed-by: Michal Orzel --- xen/arch/arm/pci/pci-access.c | 6 +++--- xen/arch/x86/include/asm/bootinfo.h | 2 +- xen/arch/x86/mm/shadow/multi.c | 2 +- xen/common/kimage.c | 11 ++++++----- xen/common/livepatch.c | 7 ++++--- xen/crypto/vmac.c | 8 ++++---- xen/include/xen/libfdt/libfdt.h | 6 +++--- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c index 2b23d552bb..7bd6877596 100644 --- a/xen/arch/arm/pci/pci-access.c +++ b/xen/arch/arm/pci/pci-access.c @@ -16,7 +16,7 @@ #include #define INVALID_VALUE (~0U) -#define PCI_ERR_VALUE(len) GENMASK(0, len * 8) +#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) @@ -139,14 +139,14 @@ static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, void pci_conf_write##size(pci_sbdf_t sbdf, \ unsigned int reg, type data) \ { \ - pci_config_write(sbdf, reg, size / 8, data); \ + pci_config_write(sbdf, reg, (size) / 8, data); \ } #define PCI_OP_READ(size, type) \ type pci_conf_read##size(pci_sbdf_t sbdf, \ unsigned int reg) \ { \ - return pci_config_read(sbdf, reg, size / 8); \ + return pci_config_read(sbdf, reg, (size) / 8); \ } PCI_OP_READ(8, uint8_t) diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h index 4f2cc5906e..b3a6b2acf3 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -75,7 +75,7 @@ static inline unsigned int __init next_boot_module_index( #define for_each_boot_module_by_type(i, b, t) \ for ( (i) = first_boot_module_index(b, t); \ (i) <= (b)->nr_modules; \ - (i) = next_boot_module_index(b, t, i + 1) ) + (i) = next_boot_module_index(b, t, (i) + 1) ) #endif /* X86_BOOTINFO_H */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index f95da9ffd2..80cd3299fa 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -796,7 +796,7 @@ do { \ do { \ int __done = 0; \ _FOREACH_PRESENT_L1E(_sl1mfn, _sl1e, _gl1p, \ - ({ (__done = _done); }), _code); \ + ({ __done = (_done); }), _code); \ _sl1mfn = sh_next_page(_sl1mfn); \ if ( !__done ) \ _FOREACH_PRESENT_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code); \ diff --git a/xen/common/kimage.c b/xen/common/kimage.c index e1aec5a18a..6202491f7e 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -491,11 +491,12 @@ static void kimage_terminate(struct kexec_image *image) * Call unmap_domain_page(ptr) after the loop exits. */ #define for_each_kimage_entry(image, ptr, entry) \ - for ( ptr = map_domain_page(_mfn(paddr_to_pfn(image->head))); \ - (entry = *ptr) && !(entry & IND_DONE); \ - ptr = (entry & IND_INDIRECTION) ? \ - (unmap_domain_page(ptr), map_domain_page(_mfn(paddr_to_pfn(entry)))) \ - : ptr + 1 ) + for ( (ptr) = map_domain_page(_mfn(paddr_to_pfn((image)->head))); \ + (entry = *(ptr)) && !((entry) & IND_DONE); \ + (ptr) = (((entry) & IND_INDIRECTION) \ + ? (unmap_domain_page(ptr), \ + map_domain_page(_mfn(paddr_to_pfn(entry)))) \ + : (ptr) + 1) ) static void kimage_free_entry(kimage_entry_t entry) { diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c index 7446533c8c..7515a040ad 100644 --- a/xen/common/livepatch.c +++ b/xen/common/livepatch.c @@ -664,7 +664,8 @@ static inline int livepatch_check_expectations(const struct payload *payload) const struct livepatch_elf_sec *__sec = livepatch_elf_sec_by_name(elf, section_name); \ if ( !__sec ) \ break; \ - if ( !section_ok(elf, __sec, sizeof(*hook)) || __sec->sec->sh_size != sizeof(*hook) ) \ + if ( !section_ok(elf, __sec, sizeof(*(hook))) || \ + __sec->sec->sh_size != sizeof(*(hook)) ) \ return -EINVAL; \ hook = __sec->addr; \ } while (0) @@ -678,10 +679,10 @@ static inline int livepatch_check_expectations(const struct payload *payload) const struct livepatch_elf_sec *__sec = livepatch_elf_sec_by_name(elf, section_name); \ if ( !__sec ) \ break; \ - if ( !section_ok(elf, __sec, sizeof(*hook)) ) \ + if ( !section_ok(elf, __sec, sizeof(*(hook))) ) \ return -EINVAL; \ hook = __sec->addr; \ - nhooks = __sec->sec->sh_size / sizeof(*hook); \ + nhooks = __sec->sec->sh_size / sizeof(*(hook)); \ } while (0) static int prepare_payload(struct payload *payload, diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c index c9914d2c7c..c7aa1e9be3 100644 --- a/xen/crypto/vmac.c +++ b/xen/crypto/vmac.c @@ -203,7 +203,7 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ #define nh_16(mp, kp, nw, rh, rl) \ { int i; uint64_t th, tl; \ rh = rl = 0; \ - for (i = 0; i < nw; i+= 2) { \ + for (i = 0; i < (nw); i+= 2) { \ MUL64(th,tl,get64PE((mp)+i )+(kp)[i ],get64PE((mp)+i+1)+(kp)[i+1]);\ ADD128(rh,rl,th,tl); \ } \ @@ -211,7 +211,7 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ #define nh_16_2(mp, kp, nw, rh, rl, rh1, rl1) \ { int i; uint64_t th, tl; \ rh1 = rl1 = rh = rl = 0; \ - for (i = 0; i < nw; i+= 2) { \ + for (i = 0; i < (nw); i+= 2) { \ MUL64(th,tl,get64PE((mp)+i )+(kp)[i ],get64PE((mp)+i+1)+(kp)[i+1]);\ ADD128(rh,rl,th,tl); \ MUL64(th,tl,get64PE((mp)+i )+(kp)[i+2],get64PE((mp)+i+1)+(kp)[i+3]);\ @@ -223,7 +223,7 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ #define nh_vmac_nhbytes(mp, kp, nw, rh, rl) \ { int i; uint64_t th, tl; \ rh = rl = 0; \ - for (i = 0; i < nw; i+= 8) { \ + for (i = 0; i < (nw); i+= 8) { \ MUL64(th,tl,get64PE((mp)+i )+(kp)[i ],get64PE((mp)+i+1)+(kp)[i+1]);\ ADD128(rh,rl,th,tl); \ MUL64(th,tl,get64PE((mp)+i+2)+(kp)[i+2],get64PE((mp)+i+3)+(kp)[i+3]);\ @@ -237,7 +237,7 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ #define nh_vmac_nhbytes_2(mp, kp, nw, rh, rl, rh1, rl1) \ { int i; uint64_t th, tl; \ rh1 = rl1 = rh = rl = 0; \ - for (i = 0; i < nw; i+= 8) { \ + for (i = 0; i < (nw); i+= 8) { \ MUL64(th,tl,get64PE((mp)+i )+(kp)[i ],get64PE((mp)+i+1)+(kp)[i+1]);\ ADD128(rh,rl,th,tl); \ MUL64(th,tl,get64PE((mp)+i )+(kp)[i+2],get64PE((mp)+i+1)+(kp)[i+3]);\ diff --git a/xen/include/xen/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h index fabddbee8c..1b09bba28e 100644 --- a/xen/include/xen/libfdt/libfdt.h +++ b/xen/include/xen/libfdt/libfdt.h @@ -230,9 +230,9 @@ int fdt_next_subnode(const void *fdt, int offset); * literal. */ #define fdt_for_each_subnode(node, fdt, parent) \ - for (node = fdt_first_subnode(fdt, parent); \ - node >= 0; \ - node = fdt_next_subnode(fdt, node)) + for ((node) = fdt_first_subnode(fdt, parent); \ + (node) >= 0; \ + (node) = fdt_next_subnode(fdt, node)) /**********************************************************************/ /* General functions */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:22:33 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254278.1550209 (Exim 4.92) (envelope-from ) id 1w16DZ-0001RU-Sm; Fri, 13 Mar 2026 17:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254278.1550209; Fri, 13 Mar 2026 17: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 1w16DZ-0001RM-Q2; Fri, 13 Mar 2026 17:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1254278; Fri, 13 Mar 2026 17:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w16DY-0001R7-5g for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w16DY-006ZFT-18 for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16DY-007k9B-0J for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17: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=4zqQYOCwTBBvgWuQNNNKaJoE6siW+iaVPddBDi91B0M=; b=tYP49EnlBzK5ZxxANkw/xROopy SbJCsevhFu7JQyifkNU3pEsfXa/V3mU4zy8PWwRU5ajt9ZesGXgob9DKstglhacb3hogWCejmLwfK HTRAImTb+aQ84LGGjDW6QMmPUthrHVlNRwd0b78FEdumKB2Y5IxUzU3JUWSw92z82lAw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/ffa: deviate violation of MISRA C Rule 20.12 Message-Id: Date: Fri, 13 Mar 2026 17:22:32 +0000 commit 195d7541708918cf0b77ef2afc3d065b16f061a1 Author: Dmytro Prokopchuk1 AuthorDate: Fri Mar 13 09:47:38 2026 +0000 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 arm/ffa: deviate violation of MISRA C Rule 20.12 MISRA C Rule 20.12 states: "A macro parameter used as an operand to the # or ## operators, which is itself subject to further macro replacement, shall only be used as an operand to these operators". In this case the 'FFA_*' macros are used both as a regular macro argument and as an operand for '#' stringification in the expansion of 'FW_ABI()'. This is deviated using a SAF-x-safe comment. No functional changes. Signed-off-by: Dmytro Prokopchuk Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index aa43ae2595..d4a77206c6 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -80,6 +80,7 @@ struct ffa_fw_abi { const char *name; }; +/* SAF-6-safe Rule 20.12 expansion of macro FFA_* with FW_ABI */ #define FW_ABI(abi) {abi,#abi} /* List of ABI we use from the firmware */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:22:44 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254279.1550214 (Exim 4.92) (envelope-from ) id 1w16Dj-0001UA-Ve; Fri, 13 Mar 2026 17:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254279.1550214; Fri, 13 Mar 2026 17: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 1w16Dj-0001U2-Sl; Fri, 13 Mar 2026 17:22:43 +0000 Received: by outflank-mailman (input) for mailman id 1254279; Fri, 13 Mar 2026 17:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w16Di-0001To-8n for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w16Di-006ZFa-1S for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16Di-007kAl-0d for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17: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=brsqjYrRko3eP2fYKgZqYrAgikQxqWmtYFOIAc9H+2Y=; b=mlGe4QRW5fnZqBqcF6qjqhmLjL ujXctp74QHwfTTSpWUezh5DBc9ipv/vR6kl+EbcVL5gvgsMK2U2P0yoiCBUm8VNiG8hrXOE8XNZFB FBrhhZlhYKkc7Oje4LkCvXDI96A4zjF4JKs7WnggMXzh8pM4pdWutQefRPxr00tGFMwU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: add -h parameter description to xenstore-* man pages Message-Id: Date: Fri, 13 Mar 2026 17:22:42 +0000 commit 48899ad6966c6dfdf4291d48b8be004fd96d2cb4 Author: Juergen Gross AuthorDate: Thu Mar 12 16:50:55 2026 +0100 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 docs: add -h parameter description to xenstore-* man pages The "-h" parameter is missing in the man pages of the xenstore-* programs. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- docs/man/xenstore-chmod.1.pod | 4 ++++ docs/man/xenstore-ls.1.pod | 4 ++++ docs/man/xenstore-read.1.pod | 4 ++++ docs/man/xenstore-write.1.pod | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/docs/man/xenstore-chmod.1.pod b/docs/man/xenstore-chmod.1.pod index d221f5dffc..ca1a2172f9 100644 --- a/docs/man/xenstore-chmod.1.pod +++ b/docs/man/xenstore-chmod.1.pod @@ -42,6 +42,10 @@ write, and set permissions). =over +=item B<-h> + +Show the usage information for xenstore-chmod and exit the program. + =item B<-r> Apply the permissions to the key and all its I. diff --git a/docs/man/xenstore-ls.1.pod b/docs/man/xenstore-ls.1.pod index a9f8b32653..b070e8368c 100644 --- a/docs/man/xenstore-ls.1.pod +++ b/docs/man/xenstore-ls.1.pod @@ -13,6 +13,10 @@ using a nested, tree-like view. =over +=item B<-h> + +Show the usage information for xenstore-ls and exit the program. + =item B<-f> Show the full path for all keys. diff --git a/docs/man/xenstore-read.1.pod b/docs/man/xenstore-read.1.pod index c7768cbbe5..7fe63268bd 100644 --- a/docs/man/xenstore-read.1.pod +++ b/docs/man/xenstore-read.1.pod @@ -12,6 +12,10 @@ Read values of one or more Xenstore Is. =over +=item B<-h> + +Show the usage information for xenstore-read and exit the program. + =item B<-p> Prefix value with key name. diff --git a/docs/man/xenstore-write.1.pod b/docs/man/xenstore-write.1.pod index 74f80f7b1b..33a8af2db4 100644 --- a/docs/man/xenstore-write.1.pod +++ b/docs/man/xenstore-write.1.pod @@ -13,6 +13,10 @@ provided to write them at once - in one Xenstore transaction. =over +=item B<-h> + +Show the usage information for xenstore-write and exit the program. + =item B<-R> Write raw value, skip parsing escaped characters (\x..). -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:22:54 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254280.1550217 (Exim 4.92) (envelope-from ) id 1w16Du-0001WC-0m; Fri, 13 Mar 2026 17:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254280.1550217; Fri, 13 Mar 2026 17: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 1w16Dt-0001W4-UC; Fri, 13 Mar 2026 17:22:53 +0000 Received: by outflank-mailman (input) for mailman id 1254280; Fri, 13 Mar 2026 17:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w16Ds-0001Vq-Bc for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w16Ds-006ZFx-1j for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16Ds-007kBd-0x for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17: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=KwVzpbm0RWx8lr315LDNbi2+hJRB3wTbsM4h26qjHFM=; b=pmQ3emvB2Q6DiIIzPSL1wT1HPw 7Y/+fc5TxLck+y4YSQz+TTqaiSg0tztBaxJNrAqaczMaGO3W7aBJ41lEWK2qp5hk4OFo3f+VEfSny 1ru+C11ci2rHRMklcIaWNiZEGuF2ZhgQTLnA/LkKQpSVhiCyMwr8PH4OqEdB8HmE35Ow=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: add man page for xenstore-exists Message-Id: Date: Fri, 13 Mar 2026 17:22:52 +0000 commit 94b31456bf278c9a59152f36cafef368855251f2 Author: Juergen Gross AuthorDate: Thu Mar 12 16:50:56 2026 +0100 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 docs: add man page for xenstore-exists There is no man page for xenstore-exists, add it. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- docs/man/xenstore-exists.1.pod | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/man/xenstore-exists.1.pod b/docs/man/xenstore-exists.1.pod new file mode 100644 index 0000000000..a6eeb7ff96 --- /dev/null +++ b/docs/man/xenstore-exists.1.pod @@ -0,0 +1,25 @@ +=head1 NAME + +xenstore-exists - test whether Xenstore key exists + +=head1 SYNOPSIS + +B I + +=head1 DESCRIPTION + +Tests whether the specified Xenstore I is readable and sets +the exit value accordingly (B<0> if I is readable, B<1> if not). + +=over + +=item B<-h> + +Show the usage information for xenstore-exists and exit the program. + +=back + +=head1 BUGS + +Send bugs to xen-devel@lists.xenproject.org, see +https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Mar 13 17:23:04 2026 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 13 Mar 2026 17:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.1254282.1550221 (Exim 4.92) (envelope-from ) id 1w16E4-0001YL-1v; Fri, 13 Mar 2026 17:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1254282.1550221; Fri, 13 Mar 2026 17:23: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 1w16E3-0001YD-Vc; Fri, 13 Mar 2026 17:23:03 +0000 Received: by outflank-mailman (input) for mailman id 1254282; Fri, 13 Mar 2026 17:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w16E2-0001Y5-E3 for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1w16E2-006ZGK-20 for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.96) (envelope-from ) id 1w16E2-007kCs-1E for xen-changelog@lists.xenproject.org; Fri, 13 Mar 2026 17: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=kpXg5MTbrrmAwhIv3AGENBkOrR1iwnCH/a+EBbhZnZY=; b=BdpGMOwNzO1DMaypqwuefBRNHJ TJDCzB1IspszudFsayQgiUdWZ01FMHU26Immi6ifOCBQSZwCA7yieTqmWI/HfWqnLMOiOXwWWE8Zn L8DPC0fA8GqBm/nWOViwZaY4R9S7PTmr9zFqTOJCS64OeGgLmLZ+NanqkIxgNfji1eho=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: add man page for xenstore-list Message-Id: Date: Fri, 13 Mar 2026 17:23:02 +0000 commit 6d8731c3842a1a534be87bbb4b28131076c502a9 Author: Juergen Gross AuthorDate: Thu Mar 12 16:50:57 2026 +0100 Commit: Andrew Cooper CommitDate: Fri Mar 13 17:18:04 2026 +0000 docs: add man page for xenstore-list There is no man page for xenstore-list, add it. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- docs/man/xenstore-list.1.pod | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docs/man/xenstore-list.1.pod b/docs/man/xenstore-list.1.pod new file mode 100644 index 0000000000..ea2853a1fc --- /dev/null +++ b/docs/man/xenstore-list.1.pod @@ -0,0 +1,28 @@ +=head1 NAME + +xenstore-list - list Xenstore key children + +=head1 SYNOPSIS + +B [I