Merge branch 'netdevsim-implement-devlink-dev_info-op' (db7fe42d) · Commits · 戴 / test

drivers/net/netdevsim/dev.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -510,6 +510,13 @@ static int nsim_dev_reload_up(struct devlink *devlink,
		return nsim_dev_reload_create(nsim_dev, extack);
		}

		static int nsim_dev_info_get(struct devlink *devlink,
		struct devlink_info_req *req,
		struct netlink_ext_ack *extack)
		{
		return devlink_info_driver_name_put(req, DRV_NAME);
		}

		#define NSIM_DEV_FLASH_SIZE 500000
		#define NSIM_DEV_FLASH_CHUNK_SIZE 1000
		#define NSIM_DEV_FLASH_CHUNK_TIME_MS 10
		@@ -603,6 +610,7 @@ nsim_dev_devlink_trap_action_set(struct devlink *devlink,
		static const struct devlink_ops nsim_dev_devlink_ops = {
		.reload_down = nsim_dev_reload_down,
		.reload_up = nsim_dev_reload_up,
		.info_get = nsim_dev_info_get,
		.flash_update = nsim_dev_flash_update,
		.trap_init = nsim_dev_devlink_trap_init,
		.trap_action_set = nsim_dev_devlink_trap_action_set,

+20 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		lib_dir=$(dirname $0)/../../../net/forwarding

		ALL_TESTS="fw_flash_test params_test regions_test reload_test \
		netns_reload_test resource_test"
		netns_reload_test resource_test dev_info_test"
		NUM_NETIFS=0
		source $lib_dir/lib.sh

		@@ -284,6 +284,25 @@ resource_test()
		log_test "resource test"
		}

		info_get()
		{
		local name=$1

		cmd_jq "devlink dev info $DL_HANDLE -j" ".[][][\"$name\"]" "-e"
		}

		dev_info_test()
		{
		RET=0

		driver=$(info_get "driver")
		check_err $? "Failed to get driver name"
		[ "$driver" == "netdevsim" ]
		check_err $? "Unexpected driver name $driver"

		log_test "dev_info test"
		}

		setup_prepare()
		{
		modprobe netdevsim