Skip to content

Rebase edera/mainline onto master @ 23c62304dde2 - #112

Closed
edera-rebase-app[bot] wants to merge 10000 commits into
edera/mainlinefrom
rebase/edera-mainline/20261115-7ad1695c933c-23c62304dde2
Closed

edera-rebase-app[bot] wants to merge 10000 commits into
edera/mainlinefrom
rebase/edera-mainline/20261115-7ad1695c933c-23c62304dde2

Conversation

@edera-rebase-app

Copy link
Copy Markdown

Nightly rebase of edera/mainline (7ad1695c933c) onto master (23c62304dde2), driven by Claude. Not pushed automatically because the checker found no result (it did not run) and Claude's report asks for a decision. Run log.

Important

Do not use the merge button: this branch replaces edera/mainline rather than merging into it. Approve the pull request to land it; the land workflow force-pushes edera/mainline to the approved head, pinned to 7ad1695c933c, and keeps a backup.

Independent checks

Builds: success (x86_64 vmlinux on the Edera host config and arm64 vmlinux, both with the Edera features built in; per-build results in the run).

The checker did not run.

Claude's report

Summary

Rebased edera/mainline (old tip 7ad1695c933c) from merge base 864c07de0c7d (v7.2-rc5-26646-g864c07de0c7d) onto upstream 23c62304dde2 (v7.2-rc5-43108-g23c62304dde2), a range of 15515 non-merge upstream commits. All 126 downstream commits were replayed in order onto rebase-result (tip ef69faa75bf0), with no merges, drops, squashes or rewording. Five commits conflicted and were resolved by hand; no commit went empty. Both x86_64 and arm64 build. verify-upstream-rebase.sh reports the branch is on the upstream tip and linear. It flags two commits whose own +/- lines changed and some drift. All of that comes from the conflict resolutions below and is expected, so the checker will not pass clean. Two items need a maintainer decision.

Needs a decision

  • UNSURE: xen/gntdev: don't copy to user space under priv->lock (#79) and upstream 7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap (Cc: stable) fix the same deadlock in gntdev_ioctl_map_grant_ref(). Both carry the same Fixes: 45ca1afe2fd1 tag. Both drop priv->lock before copy_to_user(); they differ only in the -EFAULT path.
    • Upstream: re-takes the lock and looks the map up again with gntdev_find_map_index(index, count).
    • Downstream: takes an extra reference before unlocking and removes the map only if that exact pointer is still on priv->maps.
    • Reading 1 (committed): keep the downstream commit as it was. The final drivers/xen/gntdev.c is byte-identical to the downstream post-image (blob b0ae02e10cd0). Refcounts balance on every path, and matching by pointer avoids a narrow case in upstream's version: if another thread unmaps the map and a new map reuses the same index and count, upstream would remove the wrong map. Upstream's ordering constraint (no copy_to_user() under priv->lock) is kept.
    • Reading 2: take upstream's fix and drop the downstream commit as superseded, so the tree carries no gntdev delta from upstream here.
    • This replaces the error path of an upstream stable fix, which is why it needs your call. It shows up as drift in drivers/xen/gntdev.c.
  • UNSURE: upstream 228e21764b38 Drivers: hv: Run VMBus kexec cleanup from syscore shutdown changes behaviour on the Hyper-V-nested-on-Xen path without touching the same lines. Before, hv_kexec_handler() was reached only through the x86 machine-kexec hook, which is installed only on native Hyper-V, so a Xen PV dom0 nested under Hyper-V never ran it. Now it runs from the VMBus syscore .shutdown callback (drivers/hv/vmbus_drv.c ~2918–2930) whenever kexec_is_in_progress(). On kexec the nested dom0 will therefore call vmbus_initiate_unload(false) and remove the hyperv cpuhp state. It does this without tearing down the downstream Xen VMBus interrupt bridge, because hyperv_remove_xen_vmbus_irq() is only called from vmbus_exit() and the err_connect path.
    • Reading 1: this is desirable. It leaves L0 clean for the next kernel, and the bridge dies with the old kernel anyway.
    • Reading 2: the nested path needs the bridge torn down here too, or the new behaviour should be skipped when hyperv_nested_on_xen.
    • I committed no change: upstream behaviour applies as-is. This is untested on the nested setup.

Conflicts resolved

  • sysctl: wire up PaX softmode setting, file kernel/sysctl.c. Collided with 443bea2f71c5 sysctl: consolidate CONFIG_SYSCTL into a single block in kernel/sysctl.c (plus acd19f2c56f2), which moved sysctl_subsys_table and sysctl_init_bases() into the first CONFIG_SYSCTL block and dropped the inner #ifdef CONFIG_SYSCTL. I kept upstream's layout and put the same pax_table and register_sysctl_init("kernel/pax", pax_table) lines at the new location. The commit's own +/- lines are unchanged; it shows as drift only because the code moved.
  • use maximum supported mmap rnd entropy by default, file arch/Kconfig. Collided with 8cdae75cebe0 arch/Kconfig: fix dead conditions by removing dead options, which removed ARCH_MMAP_RND_{,COMPAT_}BITS_DEFAULT and their default ... if ... lines. I kept the removal and applied the downstream change (default ..._MIN → default ..._MAX for both symbols). The removed conditional defaults always evaluated false, so behaviour is unchanged, and nothing in the tree references the removed symbols.
  • 9p/xen: reconnect to the backend on resume, file net/9p/trans_xen.c. Collided with b3d07d64832c 9p/xen: Use array for data rings and 7b6f2e3c29fb 9p/xen: drain response work after unbinding IRQ (Cc: stable).
    • Kept upstream's fixed rings[XEN_9PFS_NUM_RINGS] array, adding the downstream ring_order, rings_sem and connected fields.
    • In the downstream xen_9pfs_front_free_rings() split, kept upstream's order: unbind the IRQ, then cancel_work_sync().
    • xen_9pfs_front_free() now calls xen_9pfs_front_free_rings() unconditionally, with no if (priv->rings) and no kfree(priv->rings).
    • xen_9pfs_front_init() keeps the downstream ring_order and init_rwsem() setup but loses the kzalloc of the rings, which upstream removed.
    • The checker lists this commit as changed and shows drift in the free path.
  • 9p/xen: carry the 9P session across a restore, file net/9p/trans_xen.c. Collided with 9b4cf60c6b73 9p/xen: validate the response size from the backend (Cc: stable) and b3d07d64832c.
    • The downstream control-reply branch in p9_xen_response() sits where upstream added the h.size check. I put upstream's check first, then the control branch, which also advances cons by h.size. A malformed control reply therefore stops the loop as upstream intends, and the control waiter times out (wait_for_completion_timeout) instead of the ring spinning.
    • Same array adaptation as above in xen_9pfs_front_free() (adds xen_9pfs_front_session_free()) and xen_9pfs_front_init() (adds INIT_LIST_HEAD and init_completion, no kzalloc).
    • The commit's own +/- lines are unchanged.
  • xen/gntdev: don't copy to user space under priv->lock (#79), file drivers/xen/gntdev.c. Collided with 7620a997e485. Kept the downstream version; see the first item under Needs a decision.

The run hit two transient errors fetching blobs from the promisor remote (upload-pack: not our ref). They interrupted the picks of 63d25eed3b79 xen: add xen_mfn_to_node... and 85e1da02b838 9p/xen: end foreign access on the grant refs we granted.... Both times the commit had been marked done but not applied. I re-applied each with git cherry-pick of the same commit, which applied cleanly, and continued the rebase. The checker shows neither commit as changed.

Dropped downstream commits

None.

Build fixes

None.

Upstream commits that meet the series

Fixes. For each, I read the final tree:

  • 9b4cf60c6b73 9p/xen: validate the response size from the backend: intact. The size check (net/9p/trans_xen.c ~295–301) runs before the downstream control branch. That branch copies only when h.size <= ctl_reply_cap, and h.size is already bounded by the queued bytes.
  • 7b6f2e3c29fb 9p/xen: drain response work after unbinding IRQ: intact in xen_9pfs_front_free_rings(), which runs unbind → cancel_work_sync() → free. The downstream xen_9pfs_front_disconnect() first does schedule_work+flush_work with the IRQ still bound, then calls free_rings, which does unbind-then-cancel under rings_sem held for write. The worker does not take rings_sem. The race is not reintroduced.
  • 4d183e6f1532 9p/xen: fix refcount leak in p9_xen_response() on wrong tag: intact. The downstream control branch never calls p9_tag_lookup().
  • 241d46901226 9p: reject RERROR/RLERROR with zero errcode: intact in net/9p/client.c. The downstream control-request Rlerror parsing in trans_xen.c also rejects ecode == 0 (and > MAX_ERRNO) with -EPROTO.
  • 7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap: superseded by the downstream variant. See Needs a decision.
  • 2b66f2cc7532 Xen/gnttab: improve error handling in gnttab_dma_{alloc,free}_pages(), 4ebb3b8d129c xen: don't allow gnttab_dma_[alloc|free]_pages() in PV guest, 704f812cdab8 xen/grant-table: annotate on-stack work in gnttab_unmap_refs_sync(), 6eecb67b69af xen/grant-table: stop setting PG_private on pages for grant mapping: intact. The downstream gnttab_alloc_pages_node() uses the same private-data helpers (which no longer set PG_private) and the same free path.
  • a02926f7c89b xen-blkback: Avoid UAF when reading I/O statistics, bfddc420afe8 xen-netback: defer xenvif_mcast_addr_list_free(): intact. The downstream NUMA-placement commits don't touch the code these fixes changed.
  • b1ee87802111, 0193e8336802, 168ed9c5d5ec, 769417e410dd, c386d799f423, aa09311c40f6 (mm/vma fixes), 4c2dec1dce36 mm/ksm: fix use of a freed anon_vma at swap-in, ef694e2d2101 fork: take mmap_lock before copying mm_struct: intact. The OpenPaX hunks in mm/vma.c/mm/mmap.c/mm/util.c don't overlap them. pax_flags is still inherited through dup_mm's copy, now under mmap_lock.
  • cf27412f19c9 x86/bugs: Mitigate TSA on AMD Zen5: intact. It is independent of the downstream Xen domU reset-reason change in amd.c.
  • 0f4a9e682f7f xattr: always invoke cap_convert_nscap() for security.capability writes: intact. The downstream change only adds PaX xattr retrieval.
  • 51e766bcd35e, b82ed0e3a1da (init/main argv/env fixes): intact. pax_softmode= is a plain __setup.

Other upstream commits touching series files (checked, no action needed):

  • b3d07d64832c 9p/xen: Use array for data rings: absorbed in the resolutions above. No leftover NULL checks or kfree of priv->rings.
  • 443bea2f71c5, acd19f2c56f2, 242bac52294e, d08ab285b096, 2bfbb09b505c (sysctl): proc_dointvec is unchanged for the PaX table.
  • 8cdae75cebe0 arch/Kconfig: fix dead conditions by removing dead options: resolved above.
  • 35e340a47888 mm: userland pgtable freeing is RCU-safe now... (arch/Kconfig): unrelated hunk.
  • 228e21764b38 Drivers: hv: Run VMBus kexec cleanup from syscore shutdown: see Needs a decision.
  • dd57772e36f7 Drivers: hv: vmbus: Check ACPI companion before use: no effect. The nested dom0 still enumerates VMBus through ACPI.
  • 118bdac10546 Drivers: hv: Add logical device ID registry for vPCI devices: works on the nested path, because hyperv_init_nested_on_xen() calls hv_common_init().
  • 56fb075b77f8 mshv: Redesign hypervisor memory deposit logic: the removed helper is not used downstream.
  • 2690d4156b51 iommu/hyperv: Add para-virtualized IOMMU support for Hyper-V guest: its iommu_init hook is set only in hyperv_init(), which does not run on Xen PV, so it does not start in the nested dom0.
  • 1ae140d0f272 iommu: Make iommu-dma helpers private: drivers/iommu/xen-iommu.c uses none of the helpers made private. Upstream now includes "iommu-priv.h" in dma-iommu.c, which the downstream iommu/dma: Don't reserve PCI windows under a paravirtual IOMMU already did, so the file includes it twice. That is harmless because of the include guard; dropping the downstream line is an optional cleanup.
  • 1c8f6308e557, fdd81f15fc43, 641a9b9cc697, 95d2fec40c48 (dma-iommu): don't overlap the downstream hunk.
  • d0ec95a8a4e7 hv_netvsc: Advertise the SR-IOV capability for CoCo VMs: independent of the downstream DMA-map change; the nested dom0 is not isolated.
  • 0af298e62e5c treewide: refresh kmalloc_obj() conversions: mechanical.
  • mm refactors (72a993449cb0 eliminate VM_SPECIAL, c911e7ebebf5 rename is_vm_hugetlb_page(), and the other mm/vma API changes): no downstream code uses a removed or renamed identifier.
  • 9p cleanups (9eb9b583ea35, 2acd800de882, 7fb9bd365905, 8bb0279930cc, 33625427a382, 5852cdf0006f): no interaction.
  • init/main.c bootconfig changes (278b2abf660a, 958c01049e0a, 677f83795fdf, aabe6e1b36ce, 2e83e2ce34ff): no interaction.
  • Documentation-only changes to kernel-parameters.txt: no interaction.

Separately, and not caused by this rebase (the old tip has it too): drivers/hv/vmbus_drv.c calls hyperv_remove_xen_vmbus_irq(), but it is declared only in arch/x86/include/asm/mshyperv.h. A non-x86 build with CONFIG_HYPERV_VMBUS would likely fail with an implicit declaration. arm64 defconfig has CONFIG_HYPERV unset, so the builds below don't exercise it.

Builds

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.