Skip to content

Merge branch 'master' into '6.0/stage' #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2020
Merged

Merge branch 'master' into '6.0/stage' #234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba00946
Slub helpers should be aware of multi-node kmem caches
sdimitro Jul 22, 2020
e5c1c96
Merge pull request #233 from sdimitro/fix_kmem_nodes
sdimitro Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions sdb/commands/linux/internal/slub_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,18 @@ def for_each_child_cache(root_cache: drgn.Object) -> Iterable[drgn.Object]:
"memcg_params.children_node")


def for_each_node(cache: drgn.Object) -> Iterable[drgn.Object]:
assert sdb.type_canonical_name(cache.type_) == 'struct kmem_cache *'
node_num = sdb.get_object('nr_node_ids')
for i in range(node_num):
yield cache.node[i]


def nr_slabs(cache: drgn.Object) -> int:
assert sdb.type_canonical_name(cache.type_) == 'struct kmem_cache *'
nslabs: int = cache.node[0].nr_slabs.counter.value_()
nslabs = 0
for node in for_each_node(cache):
nslabs += node.nr_slabs.counter.value_()
if is_root_cache(cache):
for child in for_each_child_cache(cache):
nslabs += nr_slabs(child)
Expand Down Expand Up @@ -78,7 +87,9 @@ def total_memory(cache: drgn.Object) -> int:

def objs(cache: drgn.Object) -> int:
assert sdb.type_canonical_name(cache.type_) == 'struct kmem_cache *'
count: int = cache.node[0].total_objects.counter.value_()
count = 0
for node in for_each_node(cache):
count += node.total_objects.counter.value_()
if is_root_cache(cache):
for child in for_each_child_cache(cache):
count += objs(child)
Expand All @@ -87,10 +98,12 @@ def objs(cache: drgn.Object) -> int:

def inactive_objs(cache: drgn.Object) -> int:
assert sdb.type_canonical_name(cache.type_) == 'struct kmem_cache *'
node = cache.node[0].partial # assumption nr_node_ids == 0
free = 0
for page in list_for_each_entry("struct page", node.address_of_(), "lru"):
free += page.objects.value_() - page.inuse.value_()
for node in for_each_node(cache):
node_partial = node.partial
for page in list_for_each_entry("struct page",
node_partial.address_of_(), "lru"):
free += page.objects.value_() - page.inuse.value_()
if is_root_cache(cache):
for child in for_each_child_cache(cache):
free += inactive_objs(child)
Expand Down Expand Up @@ -178,9 +191,10 @@ def for_each_freeobj_in_slab(cache: drgn.Object,

def for_each_partial_slab_in_cache(cache: drgn.Object) -> Iterable[drgn.Object]:
assert sdb.type_canonical_name(cache.type_) == 'struct kmem_cache *'

node = cache.node[0].partial # assumption nr_node_ids == 0
yield from list_for_each_entry("struct page", node.address_of_(), "lru")
for node in for_each_node(cache):
node_partial = node.partial
yield from list_for_each_entry("struct page",
node_partial.address_of_(), "lru")

if is_root_cache(cache):
for child in for_each_child_cache(cache):
Expand Down