aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2017-11-20 18:21:59 -0500
committerDaniel Borkmann <daniel@iogearbox.net>2017-11-20 18:37:35 -0500
commit1ee640095f049e7ac4ec36b985abada497b98cc2 (patch)
tree8cc464b6d7f56efb6a355caba80631ebca2c078a /kernel
parent51aa423959b0ab62169c98b90566a0628ba096b8 (diff)
bpf: revert report offload info to user space
This reverts commit bd601b6ada11 ("bpf: report offload info to user space"). The ifindex by itself is not sufficient, we should provide information on which network namespace this ifindex belongs to. After considering some options we concluded that it's best to just remove this API for now, and rework it in -next. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/offload.c12
-rw-r--r--kernel/bpf/syscall.c5
2 files changed, 0 insertions, 17 deletions
diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c
index d4267c674fec..68ec884440b7 100644
--- a/kernel/bpf/offload.c
+++ b/kernel/bpf/offload.c
@@ -149,18 +149,6 @@ int bpf_prog_offload_compile(struct bpf_prog *prog)
149 return bpf_prog_offload_translate(prog); 149 return bpf_prog_offload_translate(prog);
150} 150}
151 151
152u32 bpf_prog_offload_ifindex(struct bpf_prog *prog)
153{
154 struct bpf_dev_offload *offload = prog->aux->offload;
155 u32 ifindex;
156
157 rtnl_lock();
158 ifindex = offload->netdev ? offload->netdev->ifindex : 0;
159 rtnl_unlock();
160
161 return ifindex;
162}
163
164const struct bpf_prog_ops bpf_offload_prog_ops = { 152const struct bpf_prog_ops bpf_offload_prog_ops = {
165}; 153};
166 154
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 41509cf825d8..2c4cfeaa8d5e 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1616,11 +1616,6 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
1616 return -EFAULT; 1616 return -EFAULT;
1617 } 1617 }
1618 1618
1619 if (bpf_prog_is_dev_bound(prog->aux)) {
1620 info.status |= BPF_PROG_STATUS_DEV_BOUND;
1621 info.ifindex = bpf_prog_offload_ifindex(prog);
1622 }
1623
1624done: 1619done:
1625 if (copy_to_user(uinfo, &info, info_len) || 1620 if (copy_to_user(uinfo, &info, info_len) ||
1626 put_user(info_len, &uattr->info.info_len)) 1621 put_user(info_len, &uattr->info.info_len))