UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

slub: Don't read nr_slabs and total_objects directly 

We have node_nr_slabs() to read nr_slabs, node_nr_objs() to read
total_objects in a kmem_cache_node, so no need to access the two
members directly.

Signed-off-by: Xiongwei Song <xiongwei.song@windriver.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
This commit is contained in:
Xiongwei Song 2023-04-13 22:34:52 +08:00 committed by Vlastimil Babka
parent 4f174a8bac
commit 8040cbf5e1
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mm/slub.c
View File

@ -5156,9 +5156,9 @@ static int validate_slab_node(struct kmem_cache *s,
validate_slab(s, slab, obj_map); validate_slab(s, slab, obj_map);
count++; count++;
} }
if (count != atomic_long_read(&n->nr_slabs)) { if (count != node_nr_slabs(n)) {
pr_err("SLUB: %s %ld slabs counted but counter=%ld\n", pr_err("SLUB: %s %ld slabs counted but counter=%ld\n",
s->name, count, atomic_long_read(&n->nr_slabs)); s->name, count, node_nr_slabs(n));
slab_add_kunit_errors(); slab_add_kunit_errors();
} }
@ -5442,12 +5442,11 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
for_each_kmem_cache_node(s, node, n) { for_each_kmem_cache_node(s, node, n) {
if (flags & SO_TOTAL) if (flags & SO_TOTAL)
x = atomic_long_read(&n->total_objects); x = node_nr_objs(n);
else if (flags & SO_OBJECTS) else if (flags & SO_OBJECTS)
x = atomic_long_read(&n->total_objects) - x = node_nr_objs(n) - count_partial(n, count_free);
count_partial(n, count_free);
else else
x = atomic_long_read(&n->nr_slabs); x = node_nr_slabs(n);
total += x; total += x;
nodes[node] += x; nodes[node] += x;
} }
@ -6386,7 +6385,7 @@ static int slab_debug_trace_open(struct inode *inode, struct file *filep)
unsigned long flags; unsigned long flags;
struct slab *slab; struct slab *slab;
if (!atomic_long_read(&n->nr_slabs)) if (!node_nr_slabs(n))
continue; continue;
spin_lock_irqsave(&n->list_lock, flags); spin_lock_irqsave(&n->list_lock, flags);