tests/python: fix blk request probes tests

Linux kernel commit f3fa33acca9f ("block: remove the ->rq_disk field in
struct request") dropped rq_disk in favor of rq->q->disk. The clang
tests still include <linux/blkdev.h> and read rq->rq_disk, which fails
on recent kernels.

    16: include/linux/blkdev.h:34:8: note: forward declaration of 'struct request'
    16: struct request;
    16:        ^
    16: /virtual/main.c:15:12: error: incomplete definition of type 'struct request'
    16:     if (!rq->rq_disk || rq->rq_disk->major != 5 ||
    16:          ~~^

Since blk-mq became default in linux 5.x, this commit includes
<linux/blk-mq.h> and fetch the disk via rq->q->disk so the tests stay
valid on current kernels.

Signed-off-by: Hoyeon Lee <hoyeon.lee@suse.com>

Author: HoyeonRhee

tests/python/test_clang.py

@@ -132,10 +132,11 @@ def test_probe_read_whitelist2(self):
         b = BPF(text=text)
         fn = b.load_func(b"count_tcp", BPF.KPROBE)
 
+    @skipUnless(kernel_version_ge(5,16), "requires kernel >= 5.16")
     def test_probe_read_keys(self):
         text = b"""
 #include <uapi/linux/ptrace.h>
-#include <linux/blkdev.h>
+#include <linux/blk-mq.h>
 BPF_HASH(start, struct request *);
 int do_request(struct pt_regs *ctx, struct request *req) {
     u64 ts = bpf_ktime_get_ns();
@@ -226,9 +227,10 @@ def test_sscanf_string(self):
         self.assertEqual(l.stack[0].name, name)
         self.assertEqual(l.stack[0].path, path)
 
+    @skipUnless(kernel_version_ge(5,16), "requires kernel >= 5.16")
     def test_iosnoop(self):
         text = b"""
-#include <linux/blkdev.h>
+#include <linux/blk-mq.h>
 #include <uapi/linux/ptrace.h>
 
 struct key_t {
@@ -315,10 +317,11 @@ def test_nested_probe_read_deref(self):
         b = BPF(text=text)
         fn = b.load_func(b"test", BPF.KPROBE)
 
+    @skipUnless(kernel_version_ge(5,16), "requires kernel >= 5.16")
     def test_char_array_probe(self):
-        BPF(text=b"""#include <linux/blkdev.h>
+        BPF(text=b"""#include <linux/blk-mq.h>
 int kprobe__blk_update_request(struct pt_regs *ctx, struct request *req) {
-    bpf_trace_printk("%s\\n", req->rq_disk->disk_name);
+    bpf_trace_printk("%s\\n", req->q->disk->disk_name);
     return 0;
 }""")
 
@@ -470,9 +473,10 @@ def test_probe_member_expr(self):
 }""")
         b.load_func(b"test", BPF.KPROBE)
 
+    @skipUnless(kernel_version_ge(5,16), "requires kernel >= 5.16")
     def test_unop_probe_read(self):
         text = b"""
-#include <linux/blkdev.h>
+#include <linux/blk-mq.h>
 int trace_entry(struct pt_regs *ctx, struct request *req) {
     if (!(req->bio->bi_flags & 1))
         return 1;
@@ -1294,24 +1298,24 @@ def test_packed_structure(self):
             self.assertEqual(st.a, 10)
             self.assertEqual(st.b, 20)
 
-    @skipUnless(kernel_version_ge(4,14), "requires kernel >= 4.14")
+    @skipUnless(kernel_version_ge(5,17), "requires kernel >= 5.17")
     def test_jump_table(self):
         text = b"""
 #include <linux/blk_types.h>
-#include <linux/blkdev.h>
+#include <linux/blk-mq.h>
 #include <linux/time64.h>
 
 BPF_PERCPU_ARRAY(rwdf_100ms, u64, 400);
 
 int do_request(struct pt_regs *ctx, struct request *rq) {
     u32 cmd_flags;
     u64 base, dur, slot, now = 100000;
+    struct gendisk *disk = rq->q->disk;
 
     if (!rq->start_time_ns)
       return 0;
 
-    if (!rq->rq_disk || rq->rq_disk->major != 5 ||
-        rq->rq_disk->first_minor != 6)
+    if (!disk || disk->major != 5 || disk->first_minor != 6)
       return 0;
 
     cmd_flags = rq->cmd_flags;