Skip to content

Commit 282a364

Browse files
dbshah12claude
andcommitted
Revert __LINUX_SECURITY_H: breaks compilation on kernel 6.17
linux/perf_event.h calls security_perf_event_open() which is declared in linux/security.h. Blocking security.h via __LINUX_SECURITY_H therefore breaks BPF compilation on kernel 6.17 — confirmed on de-dev1.dlpxdc.co (2.4.99-1delphix.2026.03.15, kernel 6.17.0-1007). The kernel 6.14 bpf_wq compile error (DLPX-96701 class) needs a kernel-version-conditional fix in estat.py rather than a blanket header guard in the BPF source. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
1 parent ed3d575 commit 282a364

1 file changed

Lines changed: 0 additions & 9 deletions

File tree

bpf/estat/metaslab-alloc.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
* SPDX-License-Identifier: GPL-2.0-or-later
55
*/
66

7-
/*
8-
* On some kernel versions (e.g. 6.14) linux/bpf.h is pulled in transitively
9-
* via metaslab.h -> spa.h -> zfs_context.h -> vfs.h -> security.h and
10-
* contains sizeof(struct bpf_wq) where bpf_wq is only forward-declared,
11-
* causing a compile error (DLPX-96701). Blocking security.h (which this BPF
12-
* program does not need) stops the chain without touching linux/bpf.h itself.
13-
*/
14-
#define __LINUX_SECURITY_H
15-
167
#include <sys/metaslab.h>
178
#include <sys/metaslab_impl.h>
189
#include <sys/vdev_impl.h>

0 commit comments

Comments
 (0)