leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bpf: Invert the dependency between bpf-netns.h and netns/bpf.h

Browse Source 
netns/bpf.h gets included by netdevice.h (thru net_namespace.h)
which in turn gets included in a lot of places. We should keep
netns/bpf.h as light-weight as possible.

bpf-netns.h seems to contain more implementation details than
deserves to be included in a netns header. It needs to pull in
uapi/bpf.h to get various enum types.

Move enum netns_bpf_attach_type to netns/bpf.h and invert the
dependency. This makes netns/bpf.h fit the mold of a struct
definition header more clearly, and drops the number of objects
rebuilt when uapi/bpf.h is touched from 7.7k to 1.1k.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211230012742.770642-3-kuba@kernel.org
This commit is contained in:
Jakub Kicinski 2021-12-29 17:27:42 -08:00 committed by Alexei Starovoitov
parent 3b80b73a4b
commit aebb51ec3d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/bpf-netns.h
View File

@ -3,15 +3,9 @@
#define _BPF_NETNS_H #define _BPF_NETNS_H
#include <linux/mutex.h> #include <linux/mutex.h>
#include <net/netns/bpf.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
enum netns_bpf_attach_type {
NETNS_BPF_INVALID = -1,
NETNS_BPF_FLOW_DISSECTOR = 0,
NETNS_BPF_SK_LOOKUP,
MAX_NETNS_BPF_ATTACH_TYPE
};
static inline enum netns_bpf_attach_type static inline enum netns_bpf_attach_type
to_netns_bpf_attach_type(enum bpf_attach_type attach_type) to_netns_bpf_attach_type(enum bpf_attach_type attach_type)
{ {

9
include/net/netns/bpf.h
View File

@ -6,11 +6,18 @@
#ifndef __NETNS_BPF_H__ #ifndef __NETNS_BPF_H__
#define __NETNS_BPF_H__ #define __NETNS_BPF_H__
#include <linux/bpf-netns.h> #include <linux/list.h>
struct bpf_prog; struct bpf_prog;
struct bpf_prog_array; struct bpf_prog_array;
enum netns_bpf_attach_type {
NETNS_BPF_INVALID = -1,
NETNS_BPF_FLOW_DISSECTOR = 0,
NETNS_BPF_SK_LOOKUP,
MAX_NETNS_BPF_ATTACH_TYPE
};
struct netns_bpf { struct netns_bpf {
/* Array of programs to run compiled from progs or links */ /* Array of programs to run compiled from progs or links */
struct bpf_prog_array __rcu *run_array[MAX_NETNS_BPF_ATTACH_TYPE]; struct bpf_prog_array __rcu *run_array[MAX_NETNS_BPF_ATTACH_TYPE];