HID: samples: fix the 2 struct_ops definitions

Benjamin Tissoires · Benjamin Tissoires · commit a67a1deb11d9 · 2024-07-05T14:08:31.000+02:00
Turns out that this is not compiling anymore because the hid_bpf_ops struct_ops definition had a change during the revisions. Fixes: e342d6f ("HID: samples: convert the 2 HID-BPF samples into struct_ops") Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
diff --git a/samples/hid/hid_mouse.bpf.c b/samples/hid/hid_mouse.bpf.c
@@ -67,7 +67,7 @@ static int hid_x_event(struct hid_bpf_ctx *hctx)
 	return 0;
 }
 
-SEC("struct_ops/device_event")
+SEC("struct_ops/hid_device_event")
 int BPF_PROG(hid_event, struct hid_bpf_ctx *hctx, enum hid_report_type type)
 {
 	int ret = hid_y_event(hctx);
@@ -79,7 +79,7 @@ int BPF_PROG(hid_event, struct hid_bpf_ctx *hctx, enum hid_report_type type)
 }
 
 
-SEC("struct_ops/rdesc_fixup")
+SEC("struct_ops/hid_rdesc_fixup")
 int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hctx)
 {
 	__u8 *data = hid_bpf_get_data(hctx, 0 /* offset */, 4096 /* size */);
@@ -121,8 +121,8 @@ int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hctx)
 
 SEC(".struct_ops.link")
 struct hid_bpf_ops mouse_invert = {
-	.rdesc_fixup = (void *)hid_rdesc_fixup,
-	.device_event = (void *)hid_event,
+	.hid_rdesc_fixup = (void *)hid_rdesc_fixup,
+	.hid_device_event = (void *)hid_event,
 };
 
 char _license[] SEC("license") = "GPL";
diff --git a/samples/hid/hid_surface_dial.bpf.c b/samples/hid/hid_surface_dial.bpf.c
@@ -10,7 +10,7 @@
 #define HID_UP_BUTTON		0x0009
 #define HID_GD_WHEEL		0x0038
 
-SEC("struct_ops/device_event")
+SEC("struct_ops/hid_device_event")
 int BPF_PROG(hid_event, struct hid_bpf_ctx *hctx)
 {
 	__u8 *data = hid_bpf_get_data(hctx, 0 /* offset */, 9 /* size */);
@@ -101,7 +101,7 @@ int set_haptic(struct haptic_syscall_args *args)
 }
 
 /* Convert REL_DIAL into REL_WHEEL */
-SEC("struct_ops/rdesc_fixup")
+SEC("struct_ops/hid_rdesc_fixup")
 int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hctx)
 {
 	__u8 *data = hid_bpf_get_data(hctx, 0 /* offset */, 4096 /* size */);
@@ -132,8 +132,8 @@ int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hctx)
 
 SEC(".struct_ops.link")
 struct hid_bpf_ops surface_dial = {
-	.rdesc_fixup = (void *)hid_rdesc_fixup,
-	.device_event = (void *)hid_event,
+	.hid_rdesc_fixup = (void *)hid_rdesc_fixup,
+	.hid_device_event = (void *)hid_event,
 };
 
 char _license[] SEC("license") = "GPL";

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ static int hid_x_event(struct hid_bpf_ctx *hctx)`
`67`	`67`	`return 0;`
`68`	`68`	`}`
`69`	`69`
`70`		`-SEC("struct_ops/device_event")`
	`70`	`+SEC("struct_ops/hid_device_event")`
`71`	`71`	`int BPF_PROG(hid_event, struct hid_bpf_ctx *hctx, enum hid_report_type type)`
`72`	`72`	`{`
`73`	`73`	`int ret = hid_y_event(hctx);`
`@@ -79,7 +79,7 @@ int BPF_PROG(hid_event, struct hid_bpf_ctx *hctx, enum hid_report_type type)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`
`82`		`-SEC("struct_ops/rdesc_fixup")`
	`82`	`+SEC("struct_ops/hid_rdesc_fixup")`
`83`	`83`	`int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hctx)`
`84`	`84`	`{`
`85`	`85`	`__u8 data = hid_bpf_get_data(hctx, 0 / offset /, 4096 / size */);`
`@@ -121,8 +121,8 @@ int BPF_PROG(hid_rdesc_fixup, struct hid_bpf_ctx *hctx)`
`121`	`121`
`122`	`122`	`SEC(".struct_ops.link")`
`123`	`123`	`struct hid_bpf_ops mouse_invert = {`
`124`		`- .rdesc_fixup = (void *)hid_rdesc_fixup,`
`125`		`- .device_event = (void *)hid_event,`
	`124`	`+ .hid_rdesc_fixup = (void *)hid_rdesc_fixup,`
	`125`	`+ .hid_device_event = (void *)hid_event,`
`126`	`126`	`};`
`127`	`127`
`128`	`128`	`char _license[] SEC("license") = "GPL";`