DLPX-93447 test_estat_subcommands failed to run estat zvol command with compilation error

[palash-gandhi]

Problem

The estat zvol command fails on 24.04 with:

10:54:26  dlpx-os-upgrade-qar-163491-766f97e2.dcol2.delphix.com: Error executing command "sudo -- timeout --preserve-status --signal=SIGINT 30 estat zvol 15". Code: 1. Error: In file included from /virtual/main.c:64:
10:54:26  /usr/src/zfs-6.8.0-47-dx2025012303-436f4ae50-generic/include/sys/zvol_impl.h:91:22: error: unknown type name 'zvol_state_handle_t'; did you mean 'depot_stack_handle_t'?
10:54:26     91 | int zvol_clone_range(zvol_state_handle_t *, uint64_t,
10:54:26        |                      ^~~~~~~~~~~~~~~~~~~
10:54:26        |                      depot_stack_handle_t
10:54:26  include/linux/stackdepot.h:25:13: note: 'depot_stack_handle_t' declared here
10:54:26     25 | typedef u32 depot_stack_handle_t;
10:54:26        |             ^
10:54:26  In file included from /virtual/main.c:64:
10:54:26  /usr/src/zfs-6.8.0-47-dx2025012303-436f4ae50-generic/include/sys/zvol_impl.h:92:5: error: unknown type name 'zvol_state_handle_t'; did you mean 'depot_stack_handle_t'?
10:54:26     92 |     zvol_state_handle_t *, uint64_t, uint64_t);
10:54:26        |     ^~~~~~~~~~~~~~~~~~~
10:54:26        |     depot_stack_handle_t
10:54:26  include/linux/stackdepot.h:25:13: note: 'depot_stack_handle_t' declared here
10:54:26     25 | typedef u32 depot_stack_handle_t;
10:54:26        |             ^
10:54:26  2 errors generated.
10:54:26  Traceback (most recent call last):
10:54:26    File "/usr/bin/estat", line 413, in <module>
10:54:26      b = BPF(text=bpf_text, cflags=cflags, debug=debug_level)
10:54:26          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10:54:26    File "/usr/lib/python3/dist-packages/bcc/__init__.py", line 479, in __init__
10:54:26      raise Exception("Failed to compile BPF module %s" % (src_file or "<text>"))

The problem is a missing include directive in zvol_impl.h. openzfs/zfs@9dd5fe1
caused this.
zvol_state_handle_t is declared in sys/zvol.h which is not included in zvol_impl.h.

Solution

There were 2 fixes: include zvol.h in zvol_impl.h or do what upstream does, include zvol.h whenever including zvol_impl.h. This is likely why upstream doesn't see this issue. As such, I chose the latter here but have tested both fixes.

Testing Done

ab-pre-push: https://selfservice-jenkins.eng-tools-prd.aws.delphixcloud.com/job/appliance-build-orchestrator-pre-push/10452/

delphix@ip-10-110-202-51:~$ sudo estat zvol 15
02/24/25 - 16:33:27 UTC

 Tracing enabled... Hit Ctrl-C to end.