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

Commit 56dc7cd0 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

devlink: Add relation between dpipe and resource 



The hardware processes which are modeled via dpipe commonly use some
internal hardware resources. Such relation can improve the understanding
of hardware limitations. The number of resource's unit consumed per
table's entry are also provided for each table.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d8dc5bb

include/net/devlink.h

+17 −0
Original line number Original line Diff line number Diff line
@@ -183,6 +183,9 @@ struct devlink_dpipe_table_ops; 
 * @counters_enabled: indicates if counters are active

 * @counters_enabled: indicates if counters are active

 * @counter_control_extern: indicates if counter control is in dpipe or

 * @counter_control_extern: indicates if counter control is in dpipe or

 *			    external tool

 *			    external tool

 * @resource_valid: Indicate that the resource id is valid

 * @resource_id: relative resource this table is related to

 * @resource_units: number of resource's unit consumed per table's entry

 * @table_ops: table operations

 * @table_ops: table operations

 * @rcu: rcu

 * @rcu: rcu

 */

 */
@@ -192,6 +195,9 @@ struct devlink_dpipe_table { 
	const char *name;

	const char *name;

	bool counters_enabled;

	bool counters_enabled;

	bool counter_control_extern;

	bool counter_control_extern;

	bool resource_valid;

	u64 resource_id;

	u64 resource_units;

	struct devlink_dpipe_table_ops *table_ops;

	struct devlink_dpipe_table_ops *table_ops;

	struct rcu_head rcu;

	struct rcu_head rcu;

};

};
@@ -403,6 +409,9 @@ void devlink_resources_unregister(struct devlink *devlink, 
int devlink_resource_size_get(struct devlink *devlink,

int devlink_resource_size_get(struct devlink *devlink,

			      u64 resource_id,

			      u64 resource_id,

			      u64 *p_resource_size);

			      u64 *p_resource_size);

int devlink_dpipe_table_resource_set(struct devlink *devlink,

				     const char *table_name, u64 resource_id,

				     u64 resource_units);





#else

#else
@@ -566,6 +575,14 @@ devlink_resource_size_get(struct devlink *devlink, u64 resource_id, 
	return -EOPNOTSUPP;

	return -EOPNOTSUPP;

}

}





static inline int

devlink_dpipe_table_resource_set(struct devlink *devlink,

				 const char *table_name, u64 resource_id,

				 u64 resource_units)

{

	return -EOPNOTSUPP;

}



#endif

#endif





#endif /* _NET_DEVLINK_H_ */
 
#endif /* _NET_DEVLINK_H_ */

include/uapi/linux/devlink.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,8 @@ enum devlink_attr { 
	DEVLINK_ATTR_RESOURCE_SIZE_GRAN,        /* u64 */

	DEVLINK_ATTR_RESOURCE_SIZE_GRAN,        /* u64 */

	DEVLINK_ATTR_RESOURCE_UNIT,		/* u8 */

	DEVLINK_ATTR_RESOURCE_UNIT,		/* u8 */

	DEVLINK_ATTR_RESOURCE_OCC,		/* u64 */

	DEVLINK_ATTR_RESOURCE_OCC,		/* u64 */

	DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,	/* u64 */

	DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,/* u64 */





	/* add new attributes above here, update the policy in devlink.c */

	/* add new attributes above here, update the policy in devlink.c */

net/core/devlink.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -1694,6 +1694,12 @@ static int devlink_dpipe_table_put(struct sk_buff *skb, 
		       table->counters_enabled))

		       table->counters_enabled))

		goto nla_put_failure;

		goto nla_put_failure;





	if (table->resource_valid) {

		nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,

				  table->resource_id, DEVLINK_ATTR_PAD);

		nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,

				  table->resource_units, DEVLINK_ATTR_PAD);

	}

	if (devlink_dpipe_matches_put(table, skb))

	if (devlink_dpipe_matches_put(table, skb))

		goto nla_put_failure;

		goto nla_put_failure;
@@ -3254,6 +3260,37 @@ int devlink_resource_size_get(struct devlink *devlink, 
}

}

EXPORT_SYMBOL_GPL(devlink_resource_size_get);

EXPORT_SYMBOL_GPL(devlink_resource_size_get);





/**

 *	devlink_dpipe_table_resource_set - set the resource id

 *

 *	@devlink: devlink

 *	@table_name: table name

 *	@resource_id: resource id

 *	@resource_units: number of resource's units consumed per table's entry

 */

int devlink_dpipe_table_resource_set(struct devlink *devlink,

				     const char *table_name, u64 resource_id,

				     u64 resource_units)

{

	struct devlink_dpipe_table *table;

	int err = 0;



	mutex_lock(&devlink->lock);

	table = devlink_dpipe_table_find(&devlink->dpipe_table_list,

					 table_name);

	if (!table) {

		err = -EINVAL;

		goto out;

	}

	table->resource_id = resource_id;

	table->resource_units = resource_units;

	table->resource_valid = true;

out:

	mutex_unlock(&devlink->lock);

	return err;

}

EXPORT_SYMBOL_GPL(devlink_dpipe_table_resource_set);



static int __init devlink_module_init(void)

static int __init devlink_module_init(void)

{

{

	return genl_register_family(&devlink_nl_family);

	return genl_register_family(&devlink_nl_family);