Commit 4b3a84bc authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

netdevsim: move sdev-specific init/uninit code into separate functions 



In order to improve readability and prepare for future code changes,
move sdev specific init/uninit code into separate functions.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b26b6946

drivers/net/netdevsim/bpf.c

+38 −25
Original line number Original line Diff line number Diff line
@@ -578,35 +578,51 @@ int nsim_bpf(struct net_device *dev, struct netdev_bpf *bpf) 
	}

	}

}

}





int nsim_bpf_init(struct netdevsim *ns)

static int nsim_bpf_sdev_init(struct netdevsim_shared_dev *sdev)

{

{

	int err;

	int err;





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

	INIT_LIST_HEAD(&sdev->bpf_bound_progs);

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

	INIT_LIST_HEAD(&sdev->bpf_bound_maps);

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





		ns->sdev->ddir_bpf_bound_progs =

	sdev->ddir_bpf_bound_progs =

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

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

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

	if (IS_ERR_OR_NULL(sdev->ddir_bpf_bound_progs))

		return -ENOMEM;

		return -ENOMEM;





		ns->sdev->bpf_dev = bpf_offload_dev_create(&nsim_bpf_dev_ops,

	sdev->bpf_dev = bpf_offload_dev_create(&nsim_bpf_dev_ops, sdev);

							   ns->sdev);

	err = PTR_ERR_OR_ZERO(sdev->bpf_dev);

		err = PTR_ERR_OR_ZERO(ns->sdev->bpf_dev);

	if (err)

	if (err)

		return err;

		return err;





		ns->sdev->bpf_bind_accept = true;

	sdev->bpf_bind_accept = true;

		debugfs_create_bool("bpf_bind_accept", 0600, ns->sdev->ddir,

	debugfs_create_bool("bpf_bind_accept", 0600, sdev->ddir,

				    &ns->sdev->bpf_bind_accept);

			    &sdev->bpf_bind_accept);

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

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

				   &ns->sdev->bpf_bind_verifier_delay);

			   &sdev->bpf_bind_verifier_delay);

	return 0;

}



static void nsim_bpf_sdev_uninit(struct netdevsim_shared_dev *sdev)

{

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

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

	bpf_offload_dev_destroy(sdev->bpf_dev);

}



int nsim_bpf_init(struct netdevsim *ns)

{

	int err;



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

		err = nsim_bpf_sdev_init(ns->sdev);

		if (err)

			return err;

	}

	}





	err = bpf_offload_dev_netdev_register(ns->sdev->bpf_dev, ns->netdev);

	err = bpf_offload_dev_netdev_register(ns->sdev->bpf_dev, ns->netdev);

	if (err)

	if (err)

		goto err_destroy_bdev;

		goto err_bpf_sdev_uninit;





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

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

			   &ns->bpf_offloaded_id);

			   &ns->bpf_offloaded_id);
@@ -629,9 +645,9 @@ int nsim_bpf_init(struct netdevsim *ns) 




	return 0;

	return 0;





err_destroy_bdev:

err_bpf_sdev_uninit:

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

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

		bpf_offload_dev_destroy(ns->sdev->bpf_dev);

		nsim_bpf_sdev_uninit(ns->sdev);

	return err;

	return err;

}

}
@@ -642,9 +658,6 @@ void nsim_bpf_uninit(struct netdevsim *ns) 
	WARN_ON(ns->bpf_offloaded);

	WARN_ON(ns->bpf_offloaded);

	bpf_offload_dev_netdev_unregister(ns->sdev->bpf_dev, ns->netdev);

	bpf_offload_dev_netdev_unregister(ns->sdev->bpf_dev, ns->netdev);





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

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

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

		nsim_bpf_sdev_uninit(ns->sdev);

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

		bpf_offload_dev_destroy(ns->sdev->bpf_dev);

	}

}
 
}