From: Oz Shlomo <ozsh@nvidia•com>
To: <netdev@vger•kernel.org>
Cc: Saeed Mahameed <saeedm@nvidia•com>, Roi Dayan <roid@nvidia•com>,
"Jiri Pirko" <jiri@nvidia•com>,
Marcelo Ricardo Leitner <mleitner@redhat•com>,
"Simon Horman" <simon.horman@corigine•com>,
Baowen Zheng <baowen.zheng@corigine•com>,
Jamal Hadi Salim <jhs@mojatatu•com>,
Edward Cree <ecree.xilinx@gmail•com>,
"Oz Shlomo" <ozsh@nvidia•com>
Subject: [PATCH net-next v3 3/9] net/sched: pass flow_stats instead of multiple stats args
Date: Mon, 6 Feb 2023 15:54:36 +0200 [thread overview]
Message-ID: <20230206135442.15671-4-ozsh@nvidia.com> (raw)
In-Reply-To: <20230206135442.15671-1-ozsh@nvidia.com>
Instead of passing 6 stats related args, pass the flow_stats.
Signed-off-by: Oz Shlomo <ozsh@nvidia•com>
Reviewed-by: Simon Horman <simon.horman@corigine•com>
---
include/net/pkt_cls.h | 11 +++++------
net/sched/cls_flower.c | 7 +------
net/sched/cls_matchall.c | 6 +-----
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index cd410a87517b..bf50829d9255 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -294,8 +294,7 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
static inline void
tcf_exts_hw_stats_update(const struct tcf_exts *exts,
- u64 bytes, u64 packets, u64 drops, u64 lastuse,
- u8 used_hw_stats, bool used_hw_stats_valid)
+ struct flow_stats *stats)
{
#ifdef CONFIG_NET_CLS_ACT
int i;
@@ -306,12 +305,12 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
/* if stats from hw, just skip */
if (tcf_action_update_hw_stats(a)) {
preempt_disable();
- tcf_action_stats_update(a, bytes, packets, drops,
- lastuse, true);
+ tcf_action_stats_update(a, stats->bytes, stats->pkts, stats->drops,
+ stats->lastused, true);
preempt_enable();
- a->used_hw_stats = used_hw_stats;
- a->used_hw_stats_valid = used_hw_stats_valid;
+ a->used_hw_stats = stats->used_hw_stats;
+ a->used_hw_stats_valid = stats->used_hw_stats_valid;
}
}
#endif
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 0b15698b3531..cb04739a13ce 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -502,12 +502,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f,
tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, false,
rtnl_held);
- tcf_exts_hw_stats_update(&f->exts, cls_flower.stats.bytes,
- cls_flower.stats.pkts,
- cls_flower.stats.drops,
- cls_flower.stats.lastused,
- cls_flower.stats.used_hw_stats,
- cls_flower.stats.used_hw_stats_valid);
+ tcf_exts_hw_stats_update(&f->exts, &cls_flower.stats);
}
static void __fl_put(struct cls_fl_filter *f)
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 705f63da2c21..b3883d3d4dbd 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -331,11 +331,7 @@ static void mall_stats_hw_filter(struct tcf_proto *tp,
tc_setup_cb_call(block, TC_SETUP_CLSMATCHALL, &cls_mall, false, true);
- tcf_exts_hw_stats_update(&head->exts, cls_mall.stats.bytes,
- cls_mall.stats.pkts, cls_mall.stats.drops,
- cls_mall.stats.lastused,
- cls_mall.stats.used_hw_stats,
- cls_mall.stats.used_hw_stats_valid);
+ tcf_exts_hw_stats_update(&head->exts, &cls_mall.stats);
}
static int mall_dump(struct net *net, struct tcf_proto *tp, void *fh,
--
1.8.3.1
next prev parent reply other threads:[~2023-02-06 14:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-06 13:54 [PATCH net-next v3 0/9] add support for per action hw stats Oz Shlomo
2023-02-06 13:54 ` [PATCH net-next v3 1/9] net/sched: optimize action stats api calls Oz Shlomo
2023-02-10 2:31 ` Marcelo Ricardo Leitner
2023-02-06 13:54 ` [PATCH net-next v3 2/9] net/sched: act_pedit, setup offload action for action stats query Oz Shlomo
2023-02-06 14:17 ` Simon Horman
2023-02-10 2:31 ` Marcelo Ricardo Leitner
2023-02-10 6:19 ` Jakub Kicinski
2023-02-12 11:33 ` Oz Shlomo
2023-02-06 13:54 ` Oz Shlomo [this message]
2023-02-10 2:32 ` [PATCH net-next v3 3/9] net/sched: pass flow_stats instead of multiple stats args Marcelo Ricardo Leitner
2023-02-06 13:54 ` [PATCH net-next v3 4/9] net/sched: introduce flow_offload action cookie Oz Shlomo
2023-02-10 2:32 ` Marcelo Ricardo Leitner
2023-02-06 13:54 ` [PATCH net-next v3 5/9] net/sched: support per action hw stats Oz Shlomo
2023-02-10 2:32 ` Marcelo Ricardo Leitner
2023-02-06 13:54 ` [PATCH net-next v3 6/9] net/mlx5e: TC, add hw counter to branching actions Oz Shlomo
2023-02-06 13:54 ` [PATCH net-next v3 7/9] net/mlx5e: TC, store tc action cookies per attr Oz Shlomo
2023-02-06 13:54 ` [PATCH net-next v3 8/9] net/mlx5e: TC, map tc action cookie to a hw counter Oz Shlomo
2023-02-06 13:54 ` [PATCH net-next v3 9/9] net/mlx5e: TC, support per action stats Oz Shlomo
2023-02-08 5:29 ` [PATCH net-next v3 0/9] add support for per action hw stats Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230206135442.15671-4-ozsh@nvidia.com \
--to=ozsh@nvidia$(echo .)com \
--cc=baowen.zheng@corigine$(echo .)com \
--cc=ecree.xilinx@gmail$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=jiri@nvidia$(echo .)com \
--cc=mleitner@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=roid@nvidia$(echo .)com \
--cc=saeedm@nvidia$(echo .)com \
--cc=simon.horman@corigine$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox