xarray-add-a-bug_on-to-ensure-caller-is-not-sibling.patch removed from -mm tree
The quilt patch titled
Subject: xarray: add a BUG_ON() to ensure caller is not sibling
has been removed from the -mm tree. Its filename was
xarray-add-a-bug_on-to-ensure-caller-is-not-sibling.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Dev Jain <[email protected]>
Subject: xarray: add a BUG_ON() to ensure caller is not sibling
Date: Wed, 4 Jun 2025 09:45:33 +0530
Suppose xas is pointing somewhere near the end of the multi-entry batch. Then it may happen that the computed slot already falls beyond the batch, thus breaking the loop due to !xa_is_sibling(), and computing the wrong order.
For example, suppose we have a shift-6 node having an order-9 entry => 8 - 1 = 7 siblings, so assume the slots are at offset 0 till 7 in this node. If xas->xa_offset is 6, then the code will compute order as 1 + xas->xa_node->shift = 7. Therefore, the order computation must start from the beginning of the multi-slot entries, that is, the non-sibling entry.
Thus ensure that the caller is aware of this by triggering a BUG when the entry is a sibling entry. Note that this BUG_ON() is only active while running selftests, so there is no overhead in a running kernel.
---
lib/xarray.c | 3 +++ 1 file changed, 3 insertions(+)
lib/xarray.c renamed from lib/xarray.c~xarray-add-a-bug_on-to-ensure-caller-is-not-sibling +3 -0
@@ -1910,6 +1910,7 @@ EXPORT_SYMBOL(xa_store_range);* @xas: XArray operation state. * * Called after xas_load, the xas should not be in an error state. +* The xas should not be pointing to a sibling entry. * * Return: A number between 0 and 63 indicating the order of the entry. */
@@ -1920,6 +1921,8 @@ int xas_get_order(struct xa_state *xas)if (!xas->xa_node)return 0 ; +XA_NODE_BUG_ON (xas->xa_node,xa_is_sibling (xa_entry (xas->xa, + xas->xa_node, xas->xa_offset)));for (;;) {unsigned int slot = xas->xa_offset + (1 << order);
_
Patches currently in -mm which might be from [email protected] are
maple-tree-add-some-comments.patch khugepaged-reduce-race-probability-between-migration-and-khugepaged.patch khugepaged-generalize-alloc_charge_folio.patch