Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'slab-for-6.1-rc1-hotfix' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull slab hotfix from Vlastimil Babka:
"A single fix for the common-kmalloc series, for warnings on mips and
sparc64 reported by Guenter Roeck"
* tag 'slab-for-6.1-rc1-hotfix' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
mm/slab: use kmalloc_node() for off slab freelist_idx_t array allocation
+18
-18
-1
include/linux/slab_def.h
-1
include/linux/slab_def.h
+18
-17
mm/slab.c
+18
-17
mm/slab.c
···
1619
1619
* although actual page can be freed in rcu context
1620
1620
*/
1621
1621
if (OFF_SLAB(cachep))
1622
-
kmem_cache_free(cachep->freelist_cache, freelist);
1622
+
kfree(freelist);
1623
1623
}
1624
1624
1625
1625
/*
···
1671
1671
if (flags & CFLGS_OFF_SLAB) {
1672
1672
struct kmem_cache *freelist_cache;
1673
1673
size_t freelist_size;
1674
+
size_t freelist_cache_size;
1674
1675
1675
1676
freelist_size = num * sizeof(freelist_idx_t);
1676
-
freelist_cache = kmalloc_slab(freelist_size, 0u);
1677
-
if (!freelist_cache)
1678
-
continue;
1677
+
if (freelist_size > KMALLOC_MAX_CACHE_SIZE) {
1678
+
freelist_cache_size = PAGE_SIZE << get_order(freelist_size);
1679
+
} else {
1680
+
freelist_cache = kmalloc_slab(freelist_size, 0u);
1681
+
if (!freelist_cache)
1682
+
continue;
1683
+
freelist_cache_size = freelist_cache->size;
1679
1684
1680
-
/*
1681
-
* Needed to avoid possible looping condition
1682
-
* in cache_grow_begin()
1683
-
*/
1684
-
if (OFF_SLAB(freelist_cache))
1685
-
continue;
1685
+
/*
1686
+
* Needed to avoid possible looping condition
1687
+
* in cache_grow_begin()
1688
+
*/
1689
+
if (OFF_SLAB(freelist_cache))
1690
+
continue;
1691
+
}
1686
1692
1687
1693
/* check if off slab has enough benefit */
1688
-
if (freelist_cache->size > cachep->size / 2)
1694
+
if (freelist_cache_size > cachep->size / 2)
1689
1695
continue;
1690
1696
}
1691
1697
···
2067
2061
cachep->flags &= ~(SLAB_RED_ZONE | SLAB_STORE_USER);
2068
2062
#endif
2069
2063
2070
-
if (OFF_SLAB(cachep)) {
2071
-
cachep->freelist_cache =
2072
-
kmalloc_slab(cachep->freelist_size, 0u);
2073
-
}
2074
-
2075
2064
err = setup_cpu_cache(cachep, gfp);
2076
2065
if (err) {
2077
2066
__kmem_cache_release(cachep);
···
2293
2292
freelist = NULL;
2294
2293
else if (OFF_SLAB(cachep)) {
2295
2294
/* Slab management obj is off-slab. */
2296
-
freelist = kmem_cache_alloc_node(cachep->freelist_cache,
2295
+
freelist = kmalloc_node(cachep->freelist_size,
2297
2296
local_flags, nodeid);
2298
2297
} else {
2299
2298
/* We will use last bytes at the slab for freelist */