History

flow_dissector: Move out netns_bpf prog callbacks

Move functions to manage BPF programs attached to netns that are not specific to flow dissector to a dedicated module named bpf/net_namespace.c. The set of functions will grow with the addition of bpf_link support for netns attached programs. This patch prepares ground by creating a place for it. This is a code move with no functional changes intended.

Jakub Sitnicki committed 6 years ago

Commit b27f7bb1 parent a3fd7ce4 files · +144 −121Browse files

Showing the changes to kernel (2 of 4 files). Show all

Unified · Split

2 files
  1. kernel/bpf/Makefile +1 −0
  2. kernel/bpf/net_namespace.c +133 −0
kernel/bpf/Makefile+1−0
@@ -13,6 +13,7 @@ ifeq ($(CONFIG_NET),y) · 12 unmodified lines
13obj-$(CONFIG_BPF_SYSCALL) += devmap.o13obj-$(CONFIG_BPF_SYSCALL) += devmap.o
14obj-$(CONFIG_BPF_SYSCALL) += cpumap.o14obj-$(CONFIG_BPF_SYSCALL) += cpumap.o
15obj-$(CONFIG_BPF_SYSCALL) += offload.o15obj-$(CONFIG_BPF_SYSCALL) += offload.o
16obj-$(CONFIG_BPF_SYSCALL) += net_namespace.o
16endif17endif
17ifeq ($(CONFIG_PERF_EVENTS),y)18ifeq ($(CONFIG_PERF_EVENTS),y)
18obj-$(CONFIG_BPF_SYSCALL) += stackmap.o19obj-$(CONFIG_BPF_SYSCALL) += stackmap.o
kernel/bpf/net_namespace.c+133−0
@@ -0,0 +1,133 @@
1// SPDX-License-Identifier: GPL-2.0
2
3#include <linux/bpf.h>
4#include <linux/filter.h>
5#include <net/net_namespace.h>
6
7/*
8 * Functions to manage BPF programs attached to netns
9 */
10
11/* Protects updates to netns_bpf */
12DEFINE_MUTEX(netns_bpf_mutex);
13
14int netns_bpf_prog_query(const union bpf_attr *attr,
15 union bpf_attr __user *uattr)
16{
17 __u32 __user *prog_ids = u64_to_user_ptr(attr->query.prog_ids);
18 u32 prog_id, prog_cnt = 0, flags = 0;
19 enum netns_bpf_attach_type type;
20 struct bpf_prog *attached;
21 struct net *net;
22
23 if (attr->query.query_flags)
24 return -EINVAL;
25
26 type = to_netns_bpf_attach_type(attr->query.attach_type);
27 if (type < 0)
28 return -EINVAL;
29
30 net = get_net_ns_by_fd(attr->query.target_fd);
31 if (IS_ERR(net))
32 return PTR_ERR(net);
33
34 rcu_read_lock();
35 attached = rcu_dereference(net->bpf.progs[type]);
36 if (attached) {
37 prog_cnt = 1;
38 prog_id = attached->aux->id;
39 }
40 rcu_read_unlock();
41
42 put_net(net);
43
44 if (copy_to_user(&uattr->query.attach_flags, &flags, sizeof(flags)))
45 return -EFAULT;
46 if (copy_to_user(&uattr->query.prog_cnt, &prog_cnt, sizeof(prog_cnt)))
47 return -EFAULT;
48
49 if (!attr->query.prog_cnt || !prog_ids || !prog_cnt)
50 return 0;
51
52 if (copy_to_user(prog_ids, &prog_id, sizeof(u32)))
53 return -EFAULT;
54
55 return 0;
56}
57
58int netns_bpf_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog)
59{
60 enum netns_bpf_attach_type type;
61 struct net *net;
62 int ret;
63
64 type = to_netns_bpf_attach_type(attr->attach_type);
65 if (type < 0)
66 return -EINVAL;
67
68 net = current->nsproxy->net_ns;
69 mutex_lock(&netns_bpf_mutex);
70 switch (type) {
71 case NETNS_BPF_FLOW_DISSECTOR:
72 ret = flow_dissector_bpf_prog_attach(net, prog);
73 break;
74 default:
75 ret = -EINVAL;
76 break;
77 }
78 mutex_unlock(&netns_bpf_mutex);
79
80 return ret;
81}
82
83/* Must be called with netns_bpf_mutex held. */
84static int __netns_bpf_prog_detach(struct net *net,
85 enum netns_bpf_attach_type type)
86{
87 struct bpf_prog *attached;
88
89 attached = rcu_dereference_protected(net->bpf.progs[type],
90 lockdep_is_held(&netns_bpf_mutex));
91 if (!attached)
92 return -ENOENT;
93 RCU_INIT_POINTER(net->bpf.progs[type], NULL);
94 bpf_prog_put(attached);
95 return 0;
96}
97
98int netns_bpf_prog_detach(const union bpf_attr *attr)
99{
100 enum netns_bpf_attach_type type;
101 int ret;
102
103 type = to_netns_bpf_attach_type(attr->attach_type);
104 if (type < 0)
105 return -EINVAL;
106
107 mutex_lock(&netns_bpf_mutex);
108 ret = __netns_bpf_prog_detach(current->nsproxy->net_ns, type);
109 mutex_unlock(&netns_bpf_mutex);
110
111 return ret;
112}
113
114static void __net_exit netns_bpf_pernet_pre_exit(struct net *net)
115{
116 enum netns_bpf_attach_type type;
117
118 mutex_lock(&netns_bpf_mutex);
119 for (type = 0; type < MAX_NETNS_BPF_ATTACH_TYPE; type++)
120 __netns_bpf_prog_detach(net, type);
121 mutex_unlock(&netns_bpf_mutex);
122}
123
124static struct pernet_operations netns_bpf_pernet_ops __net_initdata = {
125 .pre_exit = netns_bpf_pernet_pre_exit,
126};
127
128static int __init netns_bpf_init(void)
129{
130 return register_pernet_subsys(&netns_bpf_pernet_ops);
131}
132
133subsys_initcall(netns_bpf_init);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t