Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

xarray: add a BUG_ON() to ensure caller is not sibling

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.

Link: https://lkml.kernel.org/r/20250604041533.91198-1-dev.jain@arm.com
Signed-off-by: Dev Jain <dev.jain@arm.com>
Acked-by: Zi Yan <ziy@nvidia.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Dev Jain and committed by
Andrew Morton
1e6b17b4 ff7ec8dc

+3
+3
lib/xarray.c
··· 1910 1910 * @xas: XArray operation state. 1911 1911 * 1912 1912 * Called after xas_load, the xas should not be in an error state. 1913 + * The xas should not be pointing to a sibling entry. 1913 1914 * 1914 1915 * Return: A number between 0 and 63 indicating the order of the entry. 1915 1916 */ ··· 1921 1920 if (!xas->xa_node) 1922 1921 return 0; 1923 1922 1923 + XA_NODE_BUG_ON(xas->xa_node, xa_is_sibling(xa_entry(xas->xa, 1924 + xas->xa_node, xas->xa_offset))); 1924 1925 for (;;) { 1925 1926 unsigned int slot = xas->xa_offset + (1 << order); 1926 1927