Merge remote-tracking branch 'origin/6.0/stage' into 6.0/release

Author: rasantel

sdb/commands/linux/internal/slub_helpers.py

@@ -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)
@@ -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)
@@ -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)
@@ -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):

sdb/commands/spl/internal/kmem_helpers.py

@@ -20,6 +20,7 @@
 
 import drgn
 import drgn.helpers.linux.list as drgn_list
+import drgn.helpers.linux.percpu as drgn_percpu
 
 import sdb
 from sdb.commands.internal import p2
@@ -91,12 +92,25 @@ def object_size(cache: drgn.Object) -> int:
 def nr_objects(cache: drgn.Object) -> int:
     assert sdb.type_canonical_name(cache.type_) == 'struct spl_kmem_cache *'
     if backed_by_linux_cache(cache):
-        return int(cache.skc_obj_alloc.value_())
+        return obj_alloc(cache)
     return int(cache.skc_obj_total.value_())
 
 
 def obj_alloc(cache: drgn.Object) -> int:
     assert sdb.type_canonical_name(cache.type_) == 'struct spl_kmem_cache *'
+    if backed_by_linux_cache(cache):
+        try:
+            return int(drgn_percpu.percpu_counter_sum(cache.skc_linux_alloc))
+        except AttributeError:
+            #
+            # The percpu_counter referenced above wasn't in ZoL until the
+            # following commit: ec1fea4516ac2f0c08d31d6308929298d1b281d0
+            #
+            # Fall back to the old-mechanism of using skc_obj_alloc if that
+            # percpu_counter member doesn't exist (an AttributeError will
+            # be thrown).
+            #
+            pass
     return int(cache.skc_obj_alloc.value_())
 
 

tests/integration/test_core_generic.py

@@ -16,6 +16,7 @@
 
 # pylint: disable=missing-module-docstring
 # pylint: disable=missing-function-docstring
+# pylint: disable=not-callable
 
 from typing import Any
 

tests/integration/test_linux_generic.py

@@ -17,6 +17,7 @@
 # pylint: disable=missing-module-docstring
 # pylint: disable=missing-function-docstring
 # pylint: disable=line-too-long
+# pylint: disable=not-callable
 
 from typing import Any
 

tests/integration/test_spl_generic.py

@@ -17,6 +17,7 @@
 # pylint: disable=missing-module-docstring
 # pylint: disable=missing-function-docstring
 # pylint: disable=line-too-long
+# pylint: disable=not-callable
 
 from typing import Any
 

tests/integration/test_zfs_generic.py

@@ -17,6 +17,7 @@
 # pylint: disable=missing-module-docstring
 # pylint: disable=missing-function-docstring
 # pylint: disable=line-too-long
+# pylint: disable=not-callable
 
 from typing import Any
 

tests/unit/test_parser.py

@@ -15,6 +15,7 @@
 #
 
 # pylint: disable=missing-docstring
+# pylint: disable=not-callable
 
 from typing import List, Tuple