Commit 637989b5 authored by Parav Pandit's avatar Parav Pandit Committed by David S. Miller
Browse files

devlink: Always use user_ptr[0] for devlink and simplify post_doit 



Currently devlink instance is searched on all doit() operations.
But it is optionally stored into user_ptr[0]. This requires
rediscovering devlink again doing post_doit().

Few devlink commands related to port shared buffers needs 3 pointers
(devlink, devlink_port, and devlink_sb) while executing doit commands.
Though devlink pointer can be derived from the devlink_port during
post_doit() operation when doit() callback has acquired devlink
instance lock, relying on such scheme to access devlik pointer makes
code very fragile.

Hence, to avoid ambiguity in post_doit() and to avoid searching
devlink instance again, simplify code by always storing devlink
instance in user_ptr[0] and derive devlink_sb pointer in their
respective callback routines.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fdd8fac4

net/core/devlink.c

+70 −94
Original line number Diff line number Diff line
@@ -386,16 +386,14 @@ devlink_region_snapshot_get_by_id(struct devlink_region *region, u32 id) 
	return NULL;

}



#define DEVLINK_NL_FLAG_NEED_DEVLINK		BIT(0)

#define DEVLINK_NL_FLAG_NEED_PORT		BIT(1)

#define DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT	BIT(2)

#define DEVLINK_NL_FLAG_NEED_SB			BIT(3)

#define DEVLINK_NL_FLAG_NEED_PORT		BIT(0)

#define DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT	BIT(1)



/* The per devlink instance lock is taken by default in the pre-doit

 * operation, yet several commands do not require this. The global

 * devlink lock is taken and protects from disruption by user-calls.

 */

#define DEVLINK_NL_FLAG_NO_LOCK			BIT(4)

#define DEVLINK_NL_FLAG_NO_LOCK			BIT(2)



static int devlink_nl_pre_doit(const struct genl_ops *ops,

			       struct sk_buff *skb, struct genl_info *info)
@@ -412,31 +410,19 @@ static int devlink_nl_pre_doit(const struct genl_ops *ops, 
	}

	if (~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)

		mutex_lock(&devlink->lock);

	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_DEVLINK) {

	info->user_ptr[0] = devlink;

	} else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_PORT) {

	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_PORT) {

		devlink_port = devlink_port_get_from_info(devlink, info);

		if (IS_ERR(devlink_port)) {

			err = PTR_ERR(devlink_port);

			goto unlock;

		}

		info->user_ptr[0] = devlink_port;

		info->user_ptr[1] = devlink_port;

	} else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT) {

		info->user_ptr[0] = devlink;

		devlink_port = devlink_port_get_from_info(devlink, info);

		if (!IS_ERR(devlink_port))

			info->user_ptr[1] = devlink_port;

	}

	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_SB) {

		struct devlink_sb *devlink_sb;



		devlink_sb = devlink_sb_get_from_info(devlink, info);

		if (IS_ERR(devlink_sb)) {

			err = PTR_ERR(devlink_sb);

			goto unlock;

		}

		info->user_ptr[1] = devlink_sb;

	}

	return 0;



unlock:
@@ -451,16 +437,8 @@ static void devlink_nl_post_doit(const struct genl_ops *ops, 
{

	struct devlink *devlink;



	/* When devlink changes netns, it would not be found

	 * by devlink_get_from_info(). So try if it is stored first.

	 */

	if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_DEVLINK) {

	devlink = info->user_ptr[0];

	} else {

		devlink = devlink_get_from_info(info);

		WARN_ON(IS_ERR(devlink));

	}

	if (!IS_ERR(devlink) && ~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)

	if (~ops->internal_flags & DEVLINK_NL_FLAG_NO_LOCK)

		mutex_unlock(&devlink->lock);

	mutex_unlock(&devlink_mutex);

}
@@ -759,7 +737,7 @@ out: 
static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,

					struct genl_info *info)

{

	struct devlink_port *devlink_port = info->user_ptr[0];

	struct devlink_port *devlink_port = info->user_ptr[1];

	struct devlink *devlink = devlink_port->devlink;

	struct sk_buff *msg;

	int err;
@@ -906,7 +884,7 @@ devlink_port_function_set(struct devlink *devlink, struct devlink_port *port, 
static int devlink_nl_cmd_port_set_doit(struct sk_buff *skb,

					struct genl_info *info)

{

	struct devlink_port *devlink_port = info->user_ptr[0];

	struct devlink_port *devlink_port = info->user_ptr[1];

	struct devlink *devlink = devlink_port->devlink;

	int err;
@@ -1041,10 +1019,14 @@ static int devlink_nl_cmd_sb_get_doit(struct sk_buff *skb, 
				      struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	struct devlink_sb *devlink_sb;

	struct sk_buff *msg;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)

		return -ENOMEM;
@@ -1146,11 +1128,15 @@ static int devlink_nl_cmd_sb_pool_get_doit(struct sk_buff *skb, 
					   struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	struct devlink_sb *devlink_sb;

	struct sk_buff *msg;

	u16 pool_index;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,

						  &pool_index);

	if (err)
@@ -1255,12 +1241,16 @@ static int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb, 
					   struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	enum devlink_sb_threshold_type threshold_type;

	struct devlink_sb *devlink_sb;

	u16 pool_index;

	u32 size;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,

						  &pool_index);

	if (err)
@@ -1339,13 +1329,17 @@ nla_put_failure: 
static int devlink_nl_cmd_sb_port_pool_get_doit(struct sk_buff *skb,

						struct genl_info *info)

{

	struct devlink_port *devlink_port = info->user_ptr[0];

	struct devlink_port *devlink_port = info->user_ptr[1];

	struct devlink *devlink = devlink_port->devlink;

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	struct devlink_sb *devlink_sb;

	struct sk_buff *msg;

	u16 pool_index;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,

						  &pool_index);

	if (err)
@@ -1455,12 +1449,17 @@ static int devlink_sb_port_pool_set(struct devlink_port *devlink_port, 
static int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb,

						struct genl_info *info)

{

	struct devlink_port *devlink_port = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	struct devlink_port *devlink_port = info->user_ptr[1];

	struct devlink *devlink = info->user_ptr[0];

	struct devlink_sb *devlink_sb;

	u16 pool_index;

	u32 threshold;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	err = devlink_sb_pool_index_get_from_info(devlink_sb, info,

						  &pool_index);

	if (err)
@@ -1542,14 +1541,18 @@ nla_put_failure: 
static int devlink_nl_cmd_sb_tc_pool_bind_get_doit(struct sk_buff *skb,

						   struct genl_info *info)

{

	struct devlink_port *devlink_port = info->user_ptr[0];

	struct devlink_port *devlink_port = info->user_ptr[1];

	struct devlink *devlink = devlink_port->devlink;

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	struct devlink_sb *devlink_sb;

	struct sk_buff *msg;

	enum devlink_sb_pool_type pool_type;

	u16 tc_index;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	err = devlink_sb_pool_type_get_from_info(info, &pool_type);

	if (err)

		return err;
@@ -1689,14 +1692,19 @@ static int devlink_sb_tc_pool_bind_set(struct devlink_port *devlink_port, 
static int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb,

						   struct genl_info *info)

{

	struct devlink_port *devlink_port = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	struct devlink_port *devlink_port = info->user_ptr[1];

	struct devlink *devlink = info->user_ptr[0];

	enum devlink_sb_pool_type pool_type;

	struct devlink_sb *devlink_sb;

	u16 tc_index;

	u16 pool_index;

	u32 threshold;

	int err;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	err = devlink_sb_pool_type_get_from_info(info, &pool_type);

	if (err)

		return err;
@@ -1724,8 +1732,12 @@ static int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb, 
					       struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	const struct devlink_ops *ops = devlink->ops;

	struct devlink_sb *devlink_sb;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	if (ops->sb_occ_snapshot)

		return ops->sb_occ_snapshot(devlink, devlink_sb->index);
@@ -1736,8 +1748,12 @@ static int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb, 
						struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	struct devlink_sb *devlink_sb = info->user_ptr[1];

	const struct devlink_ops *ops = devlink->ops;

	struct devlink_sb *devlink_sb;



	devlink_sb = devlink_sb_get_from_info(devlink, info);

	if (IS_ERR(devlink_sb))

		return PTR_ERR(devlink_sb);



	if (ops->sb_occ_max_clear)

		return ops->sb_occ_max_clear(devlink, devlink_sb->index);
@@ -7018,7 +7034,6 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_get_doit,

		.dumpit = devlink_nl_cmd_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7041,24 +7056,20 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_port_split_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NO_LOCK,

		.internal_flags = DEVLINK_NL_FLAG_NO_LOCK,

	},

	{

		.cmd = DEVLINK_CMD_PORT_UNSPLIT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_port_unsplit_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NO_LOCK,

		.internal_flags = DEVLINK_NL_FLAG_NO_LOCK,

	},

	{

		.cmd = DEVLINK_CMD_SB_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_get_doit,

		.dumpit = devlink_nl_cmd_sb_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NEED_SB,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7066,8 +7077,6 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_pool_get_doit,

		.dumpit = devlink_nl_cmd_sb_pool_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NEED_SB,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7075,16 +7084,13 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_pool_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NEED_SB,

	},

	{

		.cmd = DEVLINK_CMD_SB_PORT_POOL_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_port_pool_get_doit,

		.dumpit = devlink_nl_cmd_sb_port_pool_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |

				  DEVLINK_NL_FLAG_NEED_SB,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7092,16 +7098,14 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_port_pool_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |

				  DEVLINK_NL_FLAG_NEED_SB,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,

	},

	{

		.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,

		.dumpit = devlink_nl_cmd_sb_tc_pool_bind_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |

				  DEVLINK_NL_FLAG_NEED_SB,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7109,60 +7113,50 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT |

				  DEVLINK_NL_FLAG_NEED_SB,

		.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,

	},

	{

		.cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_occ_snapshot_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NEED_SB,

	},

	{

		.cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_sb_occ_max_clear_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NEED_SB,

	},

	{

		.cmd = DEVLINK_CMD_ESWITCH_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_eswitch_get_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NO_LOCK,

		.internal_flags = DEVLINK_NL_FLAG_NO_LOCK,

	},

	{

		.cmd = DEVLINK_CMD_ESWITCH_SET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_eswitch_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NO_LOCK,

		.internal_flags = DEVLINK_NL_FLAG_NO_LOCK,

	},

	{

		.cmd = DEVLINK_CMD_DPIPE_TABLE_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_dpipe_table_get,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{

		.cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_dpipe_entries_get,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{

		.cmd = DEVLINK_CMD_DPIPE_HEADERS_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_dpipe_headers_get,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7170,20 +7164,17 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_dpipe_table_counters_set,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_RESOURCE_SET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_resource_set,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_RESOURCE_DUMP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_resource_dump,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7191,15 +7182,13 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_reload,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |

				  DEVLINK_NL_FLAG_NO_LOCK,

		.internal_flags = DEVLINK_NL_FLAG_NO_LOCK,

	},

	{

		.cmd = DEVLINK_CMD_PARAM_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_param_get_doit,

		.dumpit = devlink_nl_cmd_param_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7207,7 +7196,6 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_param_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_PORT_PARAM_GET,
@@ -7230,21 +7218,18 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.doit = devlink_nl_cmd_region_get_doit,

		.dumpit = devlink_nl_cmd_region_get_dumpit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_REGION_NEW,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_region_new,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_REGION_DEL,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_region_del,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_REGION_READ,
@@ -7252,14 +7237,12 @@ static const struct genl_ops devlink_nl_ops[] = { 
			    GENL_DONT_VALIDATE_DUMP_STRICT,

		.dumpit = devlink_nl_cmd_region_read_dumpit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_INFO_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_info_get_doit,

		.dumpit = devlink_nl_cmd_info_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{
@@ -7317,46 +7300,39 @@ static const struct genl_ops devlink_nl_ops[] = { 
		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = devlink_nl_cmd_flash_update,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_TRAP_GET,

		.doit = devlink_nl_cmd_trap_get_doit,

		.dumpit = devlink_nl_cmd_trap_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{

		.cmd = DEVLINK_CMD_TRAP_SET,

		.doit = devlink_nl_cmd_trap_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_TRAP_GROUP_GET,

		.doit = devlink_nl_cmd_trap_group_get_doit,

		.dumpit = devlink_nl_cmd_trap_group_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{

		.cmd = DEVLINK_CMD_TRAP_GROUP_SET,

		.doit = devlink_nl_cmd_trap_group_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_TRAP_POLICER_GET,

		.doit = devlink_nl_cmd_trap_policer_get_doit,

		.dumpit = devlink_nl_cmd_trap_policer_get_dumpit,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

		/* can be retrieved by unprivileged users */

	},

	{

		.cmd = DEVLINK_CMD_TRAP_POLICER_SET,

		.doit = devlink_nl_cmd_trap_policer_set_doit,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE