bpf, xdp: Remove XDP_QUERY_PROG and XDP_QUERY_PROG_HW XDP commands
Now that BPF program/link management is centralized in generic net_device code, kernel code never queries program id from drivers, so XDP_QUERY_PROG/XDP_QUERY_PROG_HW commands are unnecessary. This patch removes all the implementations of those commands in kernel, along the xdp_attachment_query(). This patch was compile-tested on allyesconfig. Signed-off-by: Andrii Nakryiko <andriin@fb.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Link: https://lore.kernel.org/bpf/20200722064603.3350758-10-andriin@fb.com
This commit is contained in:

committed by
Alexei Starovoitov

parent
fe48230cf2
commit
e8407fdeb9
@@ -163,16 +163,6 @@ int netvsc_vf_setxdp(struct net_device *vf_netdev, struct bpf_prog *prog)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static u32 netvsc_xdp_query(struct netvsc_device *nvdev)
|
||||
{
|
||||
struct bpf_prog *prog = netvsc_xdp_get(nvdev);
|
||||
|
||||
if (prog)
|
||||
return prog->aux->id;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int netvsc_bpf(struct net_device *dev, struct netdev_bpf *bpf)
|
||||
{
|
||||
struct net_device_context *ndevctx = netdev_priv(dev);
|
||||
@@ -182,12 +172,7 @@ int netvsc_bpf(struct net_device *dev, struct netdev_bpf *bpf)
|
||||
int ret;
|
||||
|
||||
if (!nvdev || nvdev->destroy) {
|
||||
if (bpf->command == XDP_QUERY_PROG) {
|
||||
bpf->prog_id = 0;
|
||||
return 0; /* Query must always succeed */
|
||||
} else {
|
||||
return -ENODEV;
|
||||
}
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
switch (bpf->command) {
|
||||
@@ -208,10 +193,6 @@ int netvsc_bpf(struct net_device *dev, struct netdev_bpf *bpf)
|
||||
|
||||
return ret;
|
||||
|
||||
case XDP_QUERY_PROG:
|
||||
bpf->prog_id = netvsc_xdp_query(nvdev);
|
||||
return 0;
|
||||
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user