bpf: offload: keep the offload state per-ASIC
Create a higher-level entity to represent a device/ASIC to allow programs and maps to be shared between device ports. The extra work is required to make sure we don't destroy BPF objects as soon as the netdev for which they were loaded gets destroyed, as other ports may still be using them. When netdev goes away all of its BPF objects will be moved to other netdevs of the device, and only destroyed when last netdev is unregistered. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
parent
9fd7c55591
commit
602144c224
6 changed files with 103 additions and 23 deletions
|
|
@ -592,11 +592,16 @@ int nsim_bpf_init(struct netdevsim *ns)
|
|||
debugfs_create_dir("bpf_bound_progs", ns->sdev->ddir);
|
||||
if (IS_ERR_OR_NULL(ns->sdev->ddir_bpf_bound_progs))
|
||||
return -ENOMEM;
|
||||
|
||||
ns->sdev->bpf_dev = bpf_offload_dev_create();
|
||||
err = PTR_ERR_OR_ZERO(ns->sdev->bpf_dev);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
err = bpf_offload_dev_netdev_register(ns->netdev);
|
||||
err = bpf_offload_dev_netdev_register(ns->sdev->bpf_dev, ns->netdev);
|
||||
if (err)
|
||||
return err;
|
||||
goto err_destroy_bdev;
|
||||
|
||||
debugfs_create_u32("bpf_offloaded_id", 0400, ns->ddir,
|
||||
&ns->bpf_offloaded_id);
|
||||
|
|
@ -624,6 +629,11 @@ int nsim_bpf_init(struct netdevsim *ns)
|
|||
&ns->bpf_map_accept);
|
||||
|
||||
return 0;
|
||||
|
||||
err_destroy_bdev:
|
||||
if (ns->sdev->refcnt == 1)
|
||||
bpf_offload_dev_destroy(ns->sdev->bpf_dev);
|
||||
return err;
|
||||
}
|
||||
|
||||
void nsim_bpf_uninit(struct netdevsim *ns)
|
||||
|
|
@ -631,10 +641,11 @@ void nsim_bpf_uninit(struct netdevsim *ns)
|
|||
WARN_ON(ns->xdp.prog);
|
||||
WARN_ON(ns->xdp_hw.prog);
|
||||
WARN_ON(ns->bpf_offloaded);
|
||||
bpf_offload_dev_netdev_unregister(ns->netdev);
|
||||
bpf_offload_dev_netdev_unregister(ns->sdev->bpf_dev, ns->netdev);
|
||||
|
||||
if (ns->sdev->refcnt == 1) {
|
||||
WARN_ON(!list_empty(&ns->sdev->bpf_bound_progs));
|
||||
WARN_ON(!list_empty(&ns->sdev->bpf_bound_maps));
|
||||
bpf_offload_dev_destroy(ns->sdev->bpf_dev);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#define NSIM_EA(extack, msg) NL_SET_ERR_MSG_MOD((extack), msg)
|
||||
|
||||
struct bpf_prog;
|
||||
struct bpf_offload_dev;
|
||||
struct dentry;
|
||||
struct nsim_vf_config;
|
||||
|
||||
|
|
@ -36,6 +37,8 @@ struct netdevsim_shared_dev {
|
|||
|
||||
struct dentry *ddir;
|
||||
|
||||
struct bpf_offload_dev *bpf_dev;
|
||||
|
||||
struct dentry *ddir_bpf_bound_progs;
|
||||
u32 prog_id_gen;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue