2023-07-21 08:22:37

by George Guo

Subject: [PATCH] btf: Remove unnecessary header file inclusions

Remove unnecessary header file inclusions in btf.c

Signed-off-by: George Guo <[email protected]>
---
kernel/bpf/btf.c | 16 ----------------
1 file changed, 16 deletions(-)

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 817204d53372..e5ea729ba6b8 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -1,20 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2018 Facebook */

-#include <uapi/linux/btf.h>
-#include <uapi/linux/bpf.h>
-#include <uapi/linux/bpf_perf_event.h>
-#include <uapi/linux/types.h>
-#include <linux/seq_file.h>
-#include <linux/compiler.h>
-#include <linux/ctype.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
#include <linux/anon_inodes.h>
-#include <linux/file.h>
-#include <linux/uaccess.h>
-#include <linux/kernel.h>
-#include <linux/idr.h>
#include <linux/sort.h>
#include <linux/bpf_verifier.h>
#include <linux/btf.h>
@@ -22,9 +9,6 @@
#include <linux/bpf_lsm.h>
#include <linux/skmsg.h>
#include <linux/perf_event.h>
-#include <linux/bsearch.h>
-#include <linux/kobject.h>
-#include <linux/sysfs.h>

#include <net/netfilter/nf_bpf_link.h>

--
2.34.1

2023-07-25 22:04:18

by Martin KaFai Lau

Subject: Re: [PATCH] btf: Remove unnecessary header file inclusions

On 7/21/23 12:50 AM, George Guo wrote:
> Remove unnecessary header file inclusions in btf.c
>
> Signed-off-by: George Guo <[email protected]>
> ---
> kernel/bpf/btf.c | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 817204d53372..e5ea729ba6b8 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -1,20 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> /* Copyright (c) 2018 Facebook */
>
> -#include <uapi/linux/btf.h>
> -#include <uapi/linux/bpf.h>
> -#include <uapi/linux/bpf_perf_event.h>
> -#include <uapi/linux/types.h>
> -#include <linux/seq_file.h>
> -#include <linux/compiler.h>
> -#include <linux/ctype.h>
> -#include <linux/errno.h>
> -#include <linux/slab.h>
> #include <linux/anon_inodes.h>
> -#include <linux/file.h>
> -#include <linux/uaccess.h>
> -#include <linux/kernel.h>
> -#include <linux/idr.h>
> #include <linux/sort.h>
> #include <linux/bpf_verifier.h>
> #include <linux/btf.h>
> @@ -22,9 +9,6 @@
> #include <linux/bpf_lsm.h>
> #include <linux/skmsg.h>
> #include <linux/perf_event.h>
> -#include <linux/bsearch.h>
> -#include <linux/kobject.h>
> -#include <linux/sysfs.h>

What is the reason that needs this change and only to this file? There are other
files that can do this kind of removal. Are you planning to make all the changes
also?

afaict, they are here because this file is using something defined in them. Now
it is depending on other header files implicitly including the removed headers.

>
> #include <net/netfilter/nf_bpf_link.h>
>

2023-07-26 01:11:11

by Martin KaFai Lau

Subject: Re: [PATCH] btf: Remove unnecessary header file inclusions

On 7/21/23 12:50 AM, George Guo wrote:
> Remove unnecessary header file inclusions in btf.c
>
> Signed-off-by: George Guo <[email protected]>
> ---
> kernel/bpf/btf.c | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 817204d53372..e5ea729ba6b8 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -1,20 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0
> /* Copyright (c) 2018 Facebook */
>
> -#include <uapi/linux/btf.h>
> -#include <uapi/linux/bpf.h>
> -#include <uapi/linux/bpf_perf_event.h>
> -#include <uapi/linux/types.h>
> -#include <linux/seq_file.h>
> -#include <linux/compiler.h>
> -#include <linux/ctype.h>
> -#include <linux/errno.h>
> -#include <linux/slab.h>
> #include <linux/anon_inodes.h>
> -#include <linux/file.h>
> -#include <linux/uaccess.h>
> -#include <linux/kernel.h>
> -#include <linux/idr.h>
> #include <linux/sort.h>
> #include <linux/bpf_verifier.h>
> #include <linux/btf.h>
> @@ -22,9 +9,6 @@
> #include <linux/bpf_lsm.h>
> #include <linux/skmsg.h>
> #include <linux/perf_event.h>
> -#include <linux/bsearch.h>
> -#include <linux/kobject.h>
> -#include <linux/sysfs.h>

What is the reason that needs this change and only to this file? There are other
files that can do this kind of removal. Are you planning to make all the changes
also?

afaict, they are here because this file is using something defined in them. Now
it is depending on other header files implicitly including the removed headers.

>
> #include <net/netfilter/nf_bpf_link.h>
>