Merge branch 'refs/heads/upstream-HEAD' into repo-HEAD

drgn/helpers/linux/slab.py

@@ -16,9 +16,20 @@
 """
 
 import operator
-from typing import Iterator, Optional, Set, Union, overload
-
-from drgn import NULL, FaultError, IntegerLike, Object, Program, Type, cast, sizeof
+from os import fsdecode
+from typing import Dict, Iterator, Optional, Set, Union, overload
+
+from drgn import (
+    NULL,
+    FaultError,
+    IntegerLike,
+    Object,
+    Program,
+    Type,
+    cast,
+    container_of,
+    sizeof,
+)
 from drgn.helpers.common.format import escape_ascii_string
 from drgn.helpers.linux.cpumask import for_each_online_cpu
 from drgn.helpers.linux.list import list_for_each_entry
@@ -30,11 +41,13 @@
     virt_to_page,
 )
 from drgn.helpers.linux.percpu import per_cpu_ptr
+from drgn.helpers.linux.rbtree import rbtree_inorder_for_each_entry
 
 __all__ = (
     "find_containing_slab_cache",
     "find_slab_cache",
     "for_each_slab_cache",
+    "get_slab_cache_aliases",
     "print_slab_caches",
     "slab_cache_for_each_allocated_object",
     "slab_cache_is_merged",
@@ -92,6 +105,68 @@ def slab_cache_is_merged(slab_cache: Object) -> bool:
     return slab_cache.refcount > 1
 
 
+def get_slab_cache_aliases(prog: Program) -> Dict[str, str]:
+    """
+    Return a dict mapping slab cache name to the cache it was merged with.
+
+    The SLAB and SLUB subsystems can merge caches with similar settings and
+    object sizes, as described in the documentation of
+    :func:`slab_cache_is_merged()`. In some cases, the information about which
+    caches were merged is lost, but in other cases, we can reconstruct the info.
+    This function reconstructs the mapping, but requires that the kernel is
+    configured with ``CONFIG_SLUB`` and ``CONFIG_SYSFS``.
+
+    The returned dict maps from original cache name, to merged cache name. You
+    can use this mapping to discover the correct cache to lookup via
+    :func:`find_slab_cache()`. The dict contains an entry only for caches which
+    were merged into a cache of a different name.
+
+    >>> cache_to_merged = get_slab_cache_aliases(prog)
+    >>> cache_to_merged["dnotify_struct"]
+    'avc_xperms_data'
+    >>> "avc_xperms_data" in cache_to_merged
+    False
+    >>> find_slab_cache(prog, "dnotify_struct") is None
+    True
+    >>> find_slab_cache(prog, "avc_xperms_data") is None
+    False
+
+    :warning: This function will only work on kernels which are built with
+      ``CONFIG_SLUB`` and ``CONFIG_SYSFS`` enabled.
+
+    :param prog: Program to search
+    :returns: Mapping of slab cache name to final merged name
+    :raises LookupError: If the helper fails because the debugged kernel
+      doesn't have the required configuration
+    """
+    try:
+        slab_kset = prog["slab_kset"]
+    except KeyError:
+        raise LookupError(
+            "Couldn't find SLUB sysfs information: get_slab_cache_aliases() "
+            "requires CONFIG_SLUB and CONFIG_SYSFS enabled in the debugged "
+            "kernel."
+        ) from None
+    link_flag = prog.constant("KERNFS_LINK")
+    name_map = {}
+    for child in rbtree_inorder_for_each_entry(
+        "struct kernfs_node",
+        slab_kset.kobj.sd.dir.children.address_of_(),
+        "rb",
+    ):
+        if child.flags & link_flag:
+            cache = container_of(
+                cast("struct kobject *", child.symlink.target_kn.priv),
+                "struct kmem_cache",
+                "kobj",
+            )
+            original_name = fsdecode(child.name.string_())
+            target_name = fsdecode(cache.name.string_())
+            if original_name != target_name:
+                name_map[original_name] = target_name
+    return name_map
+
+
 def for_each_slab_cache(prog: Program) -> Iterator[Object]:
     """
     Iterate over all slab caches.

tests/linux_kernel/helpers/test_slab.py

@@ -10,6 +10,7 @@
     find_containing_slab_cache,
     find_slab_cache,
     for_each_slab_cache,
+    get_slab_cache_aliases,
     slab_cache_for_each_allocated_object,
     slab_cache_is_merged,
 )
@@ -19,6 +20,8 @@
     skip_unless_have_test_kmod,
 )
 
+SLAB_SYSFS_PATH = Path("/sys/kernel/slab")
+
 
 def get_proc_slabinfo_names():
     with open("/proc/slabinfo", "rb") as f:
@@ -44,11 +47,10 @@ def fallback_slab_cache_names(prog):
 
 class TestSlab(LinuxKernelTestCase):
     def _slab_cache_aliases(self):
-        slab_path = Path("/sys/kernel/slab")
-        if not slab_path.exists():
-            self.skipTest(f"{slab_path} does not exist")
+        if not SLAB_SYSFS_PATH.exists():
+            self.skipTest(f"{str(SLAB_SYSFS_PATH)} does not exist")
         aliases = defaultdict(list)
-        for child in slab_path.iterdir():
+        for child in SLAB_SYSFS_PATH.iterdir():
             if not child.name.startswith(":"):
                 aliases[child.stat().st_ino].append(child.name)
         return aliases
@@ -75,6 +77,39 @@ def test_slab_cache_is_merged_true(self):
             self.fail("couldn't find slab cache")
         self.assertTrue(slab_cache_is_merged(slab_cache))
 
+    def test_get_slab_cache_aliases(self):
+        if not SLAB_SYSFS_PATH.exists():
+            # A SLOB or SLAB kernel, or one without SYSFS. Test that the
+            # helper fails as expected.
+            self.assertRaisesRegex(
+                LookupError, "CONFIG_SYSFS", get_slab_cache_aliases, self.prog
+            )
+            return
+        # Otherwise, the helper should work, test functionality.
+        alias_to_name = get_slab_cache_aliases(self.prog)
+        for aliases in self._slab_cache_aliases().values():
+            # Alias groups of size 1 are either non-mergeable slabs, or
+            # mergeable slabs which haven't actually been merged. Either way,
+            # they should not be present in the dictionary.
+            if len(aliases) == 1:
+                self.assertNotIn(aliases[0], alias_to_name)
+                continue
+
+            # Find out which cache in the group is target -- it won't be
+            # included in the alias dict.
+            for alias in aliases:
+                if alias not in alias_to_name:
+                    target_alias = alias
+                    aliases.remove(alias)
+                    break
+            else:
+                self.fail("could not find target slab cache name")
+
+            # All aliases should map to the same name
+            for alias in aliases:
+                self.assertEqual(alias_to_name[alias], target_alias)
+            self.assertNotIn(target_alias, alias_to_name)
+
     def test_for_each_slab_cache(self):
         try:
             slab_cache_names = get_proc_slabinfo_names()