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

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

devlink: Move dpipe entry clear function into devlink 



The entry clear routine can be shared between the drivers, thus it is
moved inside devlink.

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 ffd3cdcc

drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c

+2 −22
Original line number Diff line number Diff line
@@ -114,26 +114,6 @@ static int mlxsw_sp_dpipe_table_erif_matches_dump(void *priv, 
	return devlink_dpipe_match_put(skb, &match);

}



static void mlxsw_sp_erif_entry_clear(struct devlink_dpipe_entry *entry)

{

	unsigned int value_count, value_index;

	struct devlink_dpipe_value *value;



	value = entry->action_values;

	value_count = entry->action_values_count;

	for (value_index = 0; value_index < value_count; value_index++) {

		kfree(value[value_index].value);

		kfree(value[value_index].mask);

	}



	value = entry->match_values;

	value_count = entry->match_values_count;

	for (value_index = 0; value_index < value_count; value_index++) {

		kfree(value[value_index].value);

		kfree(value[value_index].mask);

	}

}



static void

mlxsw_sp_erif_match_action_prepare(struct devlink_dpipe_match *match,

				   struct devlink_dpipe_action *action)
@@ -270,12 +250,12 @@ mlxsw_sp_dpipe_table_erif_entries_dump(void *priv, bool counters_enabled, 
		goto start_again;

	rtnl_unlock();



	mlxsw_sp_erif_entry_clear(&entry);

	devlink_dpipe_entry_clear(&entry);

	return 0;

err_entry_append:

err_entry_get:

	rtnl_unlock();

	mlxsw_sp_erif_entry_clear(&entry);

	devlink_dpipe_entry_clear(&entry);

	return err;

}

include/net/devlink.h

+6 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ int devlink_dpipe_entry_ctx_prepare(struct devlink_dpipe_dump_ctx *dump_ctx); 
int devlink_dpipe_entry_ctx_append(struct devlink_dpipe_dump_ctx *dump_ctx,

				   struct devlink_dpipe_entry *entry);

int devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx);

void devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry);

int devlink_dpipe_action_put(struct sk_buff *skb,

			     struct devlink_dpipe_action *action);

int devlink_dpipe_match_put(struct sk_buff *skb,
@@ -448,6 +449,11 @@ devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx) 
	return 0;

}



static inline void

devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry)

{

}



static inline int

devlink_dpipe_action_put(struct sk_buff *skb,

			 struct devlink_dpipe_action *action)

net/core/devlink.c

+22 −0
Original line number Diff line number Diff line
@@ -1996,6 +1996,28 @@ int devlink_dpipe_entry_ctx_close(struct devlink_dpipe_dump_ctx *dump_ctx) 
}

EXPORT_SYMBOL_GPL(devlink_dpipe_entry_ctx_close);



void devlink_dpipe_entry_clear(struct devlink_dpipe_entry *entry)



{

	unsigned int value_count, value_index;

	struct devlink_dpipe_value *value;



	value = entry->action_values;

	value_count = entry->action_values_count;

	for (value_index = 0; value_index < value_count; value_index++) {

		kfree(value[value_index].value);

		kfree(value[value_index].mask);

	}



	value = entry->match_values;

	value_count = entry->match_values_count;

	for (value_index = 0; value_index < value_count; value_index++) {

		kfree(value[value_index].value);

		kfree(value[value_index].mask);

	}

}

EXPORT_SYMBOL(devlink_dpipe_entry_clear);



static int devlink_dpipe_entries_fill(struct genl_info *info,

				      enum devlink_command cmd, int flags,

				      struct devlink_dpipe_table *table)