JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-24 10:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

drgn.helpers.linux.block: update for_each_{disk,partition} for Linux 6.4

Browse Source 
Linux kernel commits 884f8ce42cce ("driver core: class: implement
class_get/put without the private pointer.") and 2df418cf4b72 ("driver
core: class: remove subsystem private pointer from struct class") (in
v6.4) changed the way to go from struct class to struct subsys_private.
_for_each_block_device(), used by for_each_disk() and
for_each_partition(), needs struct subsys_private. The "new" way also
works on old kernels, so add _class_to_subsys() mirroring
class_to_subsys() in Linux 6.4 and make _for_each_block_device() use it.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
This commit is contained in:
Omar Sandoval 2023-06-01 11:35:17 -07:00
parent ce8b2938e6
commit da7a11f83e
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drgn/helpers/linux/block.py
View File

@ -50,17 +50,39 @@ def disk_name(disk: Object) -> bytes:
return disk.disk_name.string_() return disk.disk_name.string_()
def _class_to_subsys(class_: Object) -> Object:
# Walk the list of registered classes to find the struct subsys_private
# matching the given class. Note that before Linux kernel commit
# 2df418cf4b72 ("driver core: class: remove subsystem private pointer from
# struct class") (in v6.4), struct subsys_private could also be found in
# struct class::p, but it's easier to only maintain the newer code path.
for sp in list_for_each_entry(
"struct subsys_private",
class_.prog_["class_kset"].list.address_of_(),
"subsys.kobj.entry",
):
if sp.member_("class") == class_:
return sp
else:
raise LookupError("block_class subsys_private not found")
def _for_each_block_device(prog: Program) -> Iterator[Object]: def _for_each_block_device(prog: Program) -> Iterator[Object]:
try: try:
class_in_private = prog.cache["knode_class_in_device_private"] devices, class_in_device_private = prog.cache["_for_each_block_device"]
except KeyError: except KeyError:
devices = _class_to_subsys(
prog["block_class"].address_of_()
).klist_devices.k_list.address_of_()
# Linux kernel commit 570d0200123f ("driver core: move # Linux kernel commit 570d0200123f ("driver core: move
# device->knode_class to device_private") (in v5.1) moved the list # device->knode_class to device_private") (in v5.1) moved the list
# node. # node.
class_in_private = prog.type("struct device_private").has_member("knode_class") class_in_device_private = prog.type("struct device_private").has_member(
prog.cache["knode_class_in_device_private"] = class_in_private "knode_class"
devices = prog["block_class"].p.klist_devices.k_list.address_of_() )
if class_in_private: prog.cache["_for_each_block_device"] = devices, class_in_device_private
if class_in_device_private:
for device_private in list_for_each_entry( for device_private in list_for_each_entry(
"struct device_private", devices, "knode_class.n_node" "struct device_private", devices, "knode_class.n_node"
): ):