Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d60713 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

netdevsim: associate bound programs with shared dev 



Move bound program information from netdevsim to shared sub-object,
as programs will soon be shared between netdevs of the same ASIC.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent eeeaaf18

drivers/net/netdevsim/bpf.c

+18 −12
Original line number Diff line number Diff line
@@ -238,8 +238,8 @@ static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog) 
	state->state = "verify";



	/* Program id is not populated yet when we create the state. */

	sprintf(name, "%u", ns->prog_id_gen++);

	state->ddir = debugfs_create_dir(name, ns->ddir_bpf_bound_progs);

	sprintf(name, "%u", ns->sdev->prog_id_gen++);

	state->ddir = debugfs_create_dir(name, ns->sdev->ddir_bpf_bound_progs);

	if (IS_ERR_OR_NULL(state->ddir)) {

		kfree(state);

		return -ENOMEM;
@@ -250,7 +250,7 @@ static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog) 
			    &state->state, &nsim_bpf_string_fops);

	debugfs_create_bool("loaded", 0400, state->ddir, &state->is_loaded);



	list_add_tail(&state->l, &ns->bpf_bound_progs);

	list_add_tail(&state->l, &ns->sdev->bpf_bound_progs);



	prog->aux->offload->dev_priv = state;
@@ -497,7 +497,7 @@ nsim_bpf_map_alloc(struct netdevsim *ns, struct bpf_offloaded_map *offmap) 
	}



	offmap->dev_ops = &nsim_bpf_map_ops;

	list_add_tail(&nmap->l, &ns->bpf_bound_maps);

	list_add_tail(&nmap->l, &ns->sdev->bpf_bound_maps);



	return 0;
@@ -582,8 +582,15 @@ int nsim_bpf(struct net_device *dev, struct netdev_bpf *bpf) 


int nsim_bpf_init(struct netdevsim *ns)

{

	INIT_LIST_HEAD(&ns->bpf_bound_progs);

	INIT_LIST_HEAD(&ns->bpf_bound_maps);

	if (ns->sdev->refcnt == 1) {

		INIT_LIST_HEAD(&ns->sdev->bpf_bound_progs);

		INIT_LIST_HEAD(&ns->sdev->bpf_bound_maps);



		ns->sdev->ddir_bpf_bound_progs =

			debugfs_create_dir("bpf_bound_progs", ns->sdev->ddir);

		if (IS_ERR_OR_NULL(ns->sdev->ddir_bpf_bound_progs))

			return -ENOMEM;

	}



	debugfs_create_u32("bpf_offloaded_id", 0400, ns->ddir,

			   &ns->bpf_offloaded_id);
@@ -593,10 +600,6 @@ int nsim_bpf_init(struct netdevsim *ns) 
			    &ns->bpf_bind_accept);

	debugfs_create_u32("bpf_bind_verifier_delay", 0600, ns->ddir,

			   &ns->bpf_bind_verifier_delay);

	ns->ddir_bpf_bound_progs =

		debugfs_create_dir("bpf_bound_progs", ns->ddir);

	if (IS_ERR_OR_NULL(ns->ddir_bpf_bound_progs))

		return -ENOMEM;



	ns->bpf_tc_accept = true;

	debugfs_create_bool("bpf_tc_accept", 0600, ns->ddir,
@@ -619,9 +622,12 @@ int nsim_bpf_init(struct netdevsim *ns) 


void nsim_bpf_uninit(struct netdevsim *ns)

{

	WARN_ON(!list_empty(&ns->bpf_bound_progs));

	WARN_ON(!list_empty(&ns->bpf_bound_maps));

	WARN_ON(ns->xdp.prog);

	WARN_ON(ns->xdp_hw.prog);

	WARN_ON(ns->bpf_offloaded);



	if (ns->sdev->refcnt == 1) {

		WARN_ON(!list_empty(&ns->sdev->bpf_bound_progs));

		WARN_ON(!list_empty(&ns->sdev->bpf_bound_maps));

	}

}

drivers/net/netdevsim/netdevsim.h

+6 −5
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ struct netdevsim_shared_dev { 
	u32 switch_id;



	struct dentry *ddir;



	struct dentry *ddir_bpf_bound_progs;

	u32 prog_id_gen;



	struct list_head bpf_bound_progs;

	struct list_head bpf_bound_maps;

};



#define NSIM_IPSEC_MAX_SA_COUNT		33
@@ -79,12 +85,8 @@ struct netdevsim { 
	struct xdp_attachment_info xdp;

	struct xdp_attachment_info xdp_hw;



	u32 prog_id_gen;



	bool bpf_bind_accept;

	u32 bpf_bind_verifier_delay;

	struct dentry *ddir_bpf_bound_progs;

	struct list_head bpf_bound_progs;



	bool bpf_tc_accept;

	bool bpf_tc_non_bound_accept;
@@ -92,7 +94,6 @@ struct netdevsim { 
	bool bpf_xdpoffload_accept;



	bool bpf_map_accept;

	struct list_head bpf_bound_maps;

#if IS_ENABLED(CONFIG_NET_DEVLINK)

	struct devlink *devlink;

#endif

tools/testing/selftests/bpf/test_offload.py

+3 −2
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ class NetdevSim: 
        self.ns = ""



        self.dfs_dir = '/sys/kernel/debug/netdevsim/%s' % (self.dev['ifname'])

        self.sdev_dir = self.dfs_dir + '/sdev/'

        self.dfs_refresh()



    def __getitem__(self, key):
@@ -345,12 +346,12 @@ class NetdevSim: 
        return data.strip()



    def dfs_num_bound_progs(self):

        path = os.path.join(self.dfs_dir, "bpf_bound_progs")

        path = os.path.join(self.sdev_dir, "bpf_bound_progs")

        _, progs = cmd('ls %s' % (path))

        return len(progs.split())



    def dfs_get_bound_progs(self, expected):

        progs = DebugfsDir(os.path.join(self.dfs_dir, "bpf_bound_progs"))

        progs = DebugfsDir(os.path.join(self.sdev_dir, "bpf_bound_progs"))

        if expected is not None:

            if len(progs) != expected:

                fail(True, "%d BPF programs bound, expected %d" %