From: Jakub Kicinski <jakub.kicinski@netronome.com>

Date: Wed, 31 May 2017 08:06:43 -0700

Subject: sched: add helper for updating statistics on all actions

Patch-mainline: v4.13-rc1

Git-commit: d897a638e98c476c56118d0dcc1bc55450504866

References: bsc#1055968

Forgetting to disable preemption around tcf_action_stats_update()

seems to be a common mistake.  Add a helper function for updating

stats on all actions of a filter.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c       |   10 ---------

 drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c |   10 ---------

 drivers/net/ethernet/netronome/nfp/nfp_net_offload.c  |   11 +---------

 include/net/pkt_cls.h                                 |   19 ++++++++++++++++++

 4 files changed, 23 insertions(+), 27 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

@@ -1862,9 +1862,7 @@ int mlx5e_stats_flower(struct mlx5e_priv

 {

 	struct mlx5e_tc_table *tc = &priv->fs.tc;

 	struct mlx5e_tc_flow *flow;

-	struct tc_action *a;

 	struct mlx5_fc *counter;

-	LIST_HEAD(actions);

 	u64 bytes;

 	u64 packets;

 	u64 lastuse;

@@ -1883,13 +1881,7 @@ int mlx5e_stats_flower(struct mlx5e_priv

 	mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);

-	preempt_disable();

-

-	tcf_exts_to_list(f->exts, &actions);

-	list_for_each_entry(a, &actions, list)

-		tcf_action_stats_update(a, bytes, packets, lastuse);

-

-	preempt_enable();

+	tcf_exts_stats_update(f->exts, bytes, packets, lastuse);

 	return 0;

 }

--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

@@ -363,8 +363,6 @@ int mlxsw_sp_flower_stats(struct mlxsw_s

 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

 	struct mlxsw_sp_acl_ruleset *ruleset;

 	struct mlxsw_sp_acl_rule *rule;

-	struct tc_action *a;

-	LIST_HEAD(actions);

 	u64 packets;

 	u64 lastuse;

 	u64 bytes;

@@ -385,13 +383,7 @@ int mlxsw_sp_flower_stats(struct mlxsw_s

 	if (err)

 		goto err_rule_get_stats;

-	preempt_disable();

-

-	tcf_exts_to_list(f->exts, &actions);

-	list_for_each_entry(a, &actions, list)

-		tcf_action_stats_update(a, bytes, packets, lastuse);

-

-	preempt_enable();

+	tcf_exts_stats_update(f->exts, bytes, packets, lastuse);

 	mlxsw_sp_acl_ruleset_put(mlxsw_sp, ruleset);

 	return 0;

--- a/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c

+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c

@@ -84,8 +84,6 @@ static void nfp_net_bpf_stats_reset(stru

 static int

 nfp_net_bpf_stats_update(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf)

 {

-	struct tc_action *a;

-	LIST_HEAD(actions);

 	u64 bytes, pkts;

 	pkts = nn->rx_filter.pkts - nn->rx_filter_prev.pkts;

@@ -94,13 +92,8 @@ nfp_net_bpf_stats_update(struct nfp_net

 	nn->rx_filter_prev = nn->rx_filter;

-	preempt_disable();

-

-	tcf_exts_to_list(cls_bpf->exts, &actions);

-	list_for_each_entry(a, &actions, list)

-		tcf_action_stats_update(a, bytes, pkts, nn->rx_filter_change);

-

-	preempt_enable();

+	tcf_exts_stats_update(cls_bpf->exts,

+			      bytes, pkts, nn->rx_filter_change);

 	return 0;

 }

--- a/include/net/pkt_cls.h

+++ b/include/net/pkt_cls.h

@@ -136,6 +136,25 @@ static inline void tcf_exts_to_list(cons

 #endif

 }

+static inline void

+tcf_exts_stats_update(const struct tcf_exts *exts,

+		      u64 bytes, u64 packets, u64 lastuse)

+{

+#ifdef CONFIG_NET_CLS_ACT

+	int i;

+

+	preempt_disable();

+

+	for (i = 0; i < exts->nr_actions; i++) {

+		struct tc_action *a = exts->actions[i];

+

+		tcf_action_stats_update(a, bytes, packets, lastuse);

+	}

+

+	preempt_enable();

+#endif

+}

+

 /**

  * tcf_exts_exec - execute tc filter extensions

  * @skb: socket buffer