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

Commit 907389b7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdevsim-implement-support-for-devlink-region-and-snapshots' 



Jiri Pirko says:

====================
netdevsim: implement support for devlink region and snapshots

Implement devlink region support for netdevsim and test it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd00cc36 5156d7ef

drivers/net/netdevsim/dev.c

+62 −1
Original line number Diff line number Diff line
@@ -27,6 +27,41 @@ 


static struct dentry *nsim_dev_ddir;



#define NSIM_DEV_DUMMY_REGION_SIZE (1024 * 32)



static ssize_t nsim_dev_take_snapshot_write(struct file *file,

					    const char __user *data,

					    size_t count, loff_t *ppos)

{

	struct nsim_dev *nsim_dev = file->private_data;

	void *dummy_data;

	int err;

	u32 id;



	dummy_data = kmalloc(NSIM_DEV_DUMMY_REGION_SIZE, GFP_KERNEL);

	if (!dummy_data)

		return -ENOMEM;



	get_random_bytes(dummy_data, NSIM_DEV_DUMMY_REGION_SIZE);



	id = devlink_region_shapshot_id_get(priv_to_devlink(nsim_dev));

	err = devlink_region_snapshot_create(nsim_dev->dummy_region,

					     dummy_data, id, kfree);

	if (err) {

		pr_err("Failed to create region snapshot\n");

		kfree(dummy_data);

		return err;

	}



	return count;

}



static const struct file_operations nsim_dev_take_snapshot_fops = {

	.open = simple_open,

	.write = nsim_dev_take_snapshot_write,

	.llseek = generic_file_llseek,

};



static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)

{

	char dev_ddir_name[16];
@@ -44,6 +79,8 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev) 
			   &nsim_dev->max_macs);

	debugfs_create_bool("test1", 0600, nsim_dev->ddir,

			    &nsim_dev->test1);

	debugfs_create_file("take_snapshot", 0200, nsim_dev->ddir, nsim_dev,

			    &nsim_dev_take_snapshot_fops);

	return 0;

}
@@ -248,6 +285,23 @@ static void nsim_devlink_param_load_driverinit_values(struct devlink *devlink) 
		nsim_dev->test1 = saved_value.vbool;

}



#define NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX 16



static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev,

				      struct devlink *devlink)

{

	nsim_dev->dummy_region =

		devlink_region_create(devlink, "dummy",

				      NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX,

				      NSIM_DEV_DUMMY_REGION_SIZE);

	return PTR_ERR_OR_ZERO(nsim_dev->dummy_region);

}



static void nsim_dev_dummy_region_exit(struct nsim_dev *nsim_dev)

{

	devlink_region_destroy(nsim_dev->dummy_region);

}



static int nsim_dev_reload(struct devlink *devlink,

			   struct netlink_ext_ack *extack)

{
@@ -363,10 +417,14 @@ nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev, unsigned int port_count) 
		goto err_dl_unregister;

	nsim_devlink_set_params_init_values(nsim_dev, devlink);



	err = nsim_dev_debugfs_init(nsim_dev);

	err = nsim_dev_dummy_region_init(nsim_dev, devlink);

	if (err)

		goto err_params_unregister;



	err = nsim_dev_debugfs_init(nsim_dev);

	if (err)

		goto err_dummy_region_exit;



	err = nsim_bpf_dev_init(nsim_dev);

	if (err)

		goto err_debugfs_exit;
@@ -376,6 +434,8 @@ nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev, unsigned int port_count) 


err_debugfs_exit:

	nsim_dev_debugfs_exit(nsim_dev);

err_dummy_region_exit:

	nsim_dev_dummy_region_exit(nsim_dev);

err_params_unregister:

	devlink_params_unregister(devlink, nsim_devlink_params,

				  ARRAY_SIZE(nsim_devlink_params));
@@ -396,6 +456,7 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev) 


	nsim_bpf_dev_exit(nsim_dev);

	nsim_dev_debugfs_exit(nsim_dev);

	nsim_dev_dummy_region_exit(nsim_dev);

	devlink_params_unregister(devlink, nsim_devlink_params,

				  ARRAY_SIZE(nsim_devlink_params));

	devlink_unregister(devlink);

drivers/net/netdevsim/netdevsim.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ struct nsim_dev { 
	bool fw_update_status;

	u32 max_macs;

	bool test1;

	struct devlink_region *dummy_region;

};



int nsim_dev_init(void);

tools/testing/selftests/drivers/net/netdevsim/devlink.sh

+53 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


lib_dir=$(dirname $0)/../../../net/forwarding



ALL_TESTS="fw_flash_test params_test"

ALL_TESTS="fw_flash_test params_test regions_test"

NUM_NETIFS=0

source $lib_dir/lib.sh
@@ -90,6 +90,58 @@ params_test() 
	log_test "params test"

}



check_region_size()

{

	local name=$1

	local size



	size=$(devlink region show $DL_HANDLE/$name -j | jq -e -r '.[][].size')

	check_err $? "Failed to get $name region size"

	[ $size -eq 32768 ]

	check_err $? "Invalid $name region size"

}



check_region_snapshot_count()

{

	local name=$1

	local phase_name=$2

	local expected_count=$3

	local count



	count=$(devlink region show $DL_HANDLE/$name -j | jq -e -r '.[][].snapshot | length')

	[ $count -eq $expected_count ]

	check_err $? "Unexpected $phase_name snapshot count"

}



regions_test()

{

	RET=0



	local count



	check_region_size dummy

	check_region_snapshot_count dummy initial 0



	echo ""> $DEBUGFS_DIR/take_snapshot

	check_err $? "Failed to take first dummy region snapshot"

	check_region_snapshot_count dummy post-first-snapshot 1



	echo ""> $DEBUGFS_DIR/take_snapshot

	check_err $? "Failed to take second dummy region snapshot"

	check_region_snapshot_count dummy post-second-snapshot 2



	echo ""> $DEBUGFS_DIR/take_snapshot

	check_err $? "Failed to take third dummy region snapshot"

	check_region_snapshot_count dummy post-third-snapshot 3



	devlink region del $DL_HANDLE/dummy snapshot 1

	check_err $? "Failed to delete first dummy region snapshot"



	check_region_snapshot_count dummy post-first-delete 2



	log_test "regions test"

}



setup_prepare()

{

	modprobe netdevsim