devlink: Fix param cmode driverinit for string type (1276534c) · Commits · 戴 / test

Driverinit configuration mode value is held by devlink to enable the driver fetch the value after reload command. In case the param type is string devlink should copy the value from driver string buffer to devlink string buffer on devlink_param_driverinit_value_set() and vice-versa on devlink_param_driverinit_value_get(). Fixes: ("devlink: Add support for get/set driverinit value") Signed-off-by:

Moshe Shemesh <moshe@mellanox.com> Acked-by:

Jiri Pirko <jiri@mellanox.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/devlink.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -3105,6 +3105,9 @@ static int devlink_nl_cmd_param_set_doit(struct sk_buff *skb,
		return -EOPNOTSUPP;

		if (cmode == DEVLINK_PARAM_CMODE_DRIVERINIT) {
		if (param->type == DEVLINK_PARAM_TYPE_STRING)
		strcpy(param_item->driverinit_value.vstr, value.vstr);
		else
		param_item->driverinit_value = value;
		param_item->driverinit_value_valid = true;
		} else {
		@@ -4545,6 +4548,9 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,
		DEVLINK_PARAM_CMODE_DRIVERINIT))
		return -EOPNOTSUPP;

		if (param_item->param->type == DEVLINK_PARAM_TYPE_STRING)
		strcpy(init_val->vstr, param_item->driverinit_value.vstr);
		else
		*init_val = param_item->driverinit_value;

		return 0;
		@@ -4576,6 +4582,9 @@ int devlink_param_driverinit_value_set(struct devlink *devlink, u32 param_id,
		DEVLINK_PARAM_CMODE_DRIVERINIT))
		return -EOPNOTSUPP;

		if (param_item->param->type == DEVLINK_PARAM_TYPE_STRING)
		strcpy(param_item->driverinit_value.vstr, init_val.vstr);
		else
		param_item->driverinit_value = init_val;
		param_item->driverinit_value_valid = true;

Admin message