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.

slub: Fix calculation of cpu slabs

/sys/kernel/slab/:t-0000048 # cat cpu_slabs
231 N0=16 N1=215
/sys/kernel/slab/:t-0000048 # cat slabs
145 N0=36 N1=109

See, the number of slabs is smaller than that of cpu slabs.

The bug was introduced by commit 49e2258586b423684f03c278149ab46d8f8b6700
("slub: per cpu cache for partial pages").

We should use page->pages instead of page->pobjects when calculating
the number of cpu partial slabs. This also fixes the mapping of slabs
and nodes.

As there's no variable storing the number of total/active objects in
cpu partial slabs, and we don't have user interfaces requiring those
statistics, I just add WARN_ON for those cases.

Cc: <stable@vger.kernel.org> # 3.2+
Acked-by: Christoph Lameter <cl@linux.com>
Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

authored by

Li Zefan and committed by
Pekka Enberg
8afb1474 e1168c2c

+7 -1
+7 -1
mm/slub.c
··· 4299 4299 4300 4300 page = ACCESS_ONCE(c->partial); 4301 4301 if (page) { 4302 - x = page->pobjects; 4302 + node = page_to_nid(page); 4303 + if (flags & SO_TOTAL) 4304 + WARN_ON_ONCE(1); 4305 + else if (flags & SO_OBJECTS) 4306 + WARN_ON_ONCE(1); 4307 + else 4308 + x = page->pages; 4303 4309 total += x; 4304 4310 nodes[node] += x; 4305 4311 }