From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, saeedm@mellanox.com,
leon@kernel.org, michael.chan@broadcom.com, vishal@chelsio.com,
jeffrey.t.kirsher@intel.com, idosch@mellanox.com,
aelior@marvell.com, peppe.cavallaro@st.com,
alexandre.torgue@st.com, jhs@mojatatu.com,
xiyou.wangcong@gmail.com, pablo@netfilter.org,
ecree@solarflare.com, mlxsw@mellanox.com
Subject: [patch net-next v3 05/10] mlxsw: restrict supported HW stats type to "any"
Date: Fri, 6 Mar 2020 14:28:51 +0100 [thread overview]
Message-ID: <20200306132856.6041-6-jiri@resnulli.us> (raw)
In-Reply-To: <20200306132856.6041-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@mellanox.com>
Currently don't allow actions with any other type to be inserted.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
v2->v3:
- moved to bitfield
v1->v2:
- move the code to the first action processing
---
.../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
index 7435629c9e65..588d374531cc 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
@@ -29,10 +29,16 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,
if (!flow_action_mixed_hw_stats_types_check(flow_action, extack))
return -EOPNOTSUPP;
- /* Count action is inserted first */
- err = mlxsw_sp_acl_rulei_act_count(mlxsw_sp, rulei, extack);
- if (err)
- return err;
+ act = flow_action_first_entry_get(flow_action);
+ if (act->hw_stats_type == FLOW_ACTION_HW_STATS_TYPE_ANY) {
+ /* Count action is inserted first */
+ err = mlxsw_sp_acl_rulei_act_count(mlxsw_sp, rulei, extack);
+ if (err)
+ return err;
+ } else {
+ NL_SET_ERR_MSG_MOD(extack, "Unsupported action HW stats type");
+ return -EOPNOTSUPP;
+ }
flow_action_for_each(i, act, flow_action) {
switch (act->id) {
--
2.21.1
next prev parent reply other threads:[~2020-03-06 13:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 13:28 [patch net-next v3 00/10] net: allow user specify TC action HW stats type Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 01/10] flow_offload: Introduce offload of " Jiri Pirko
2020-03-06 19:23 ` Jakub Kicinski
2020-03-06 13:28 ` [patch net-next v3 02/10] ocelot_flower: use flow_offload_has_one_action() helper Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 03/10] flow_offload: check for basic action hw stats type Jiri Pirko
2020-03-06 19:28 ` Jakub Kicinski
2020-03-07 6:59 ` Jiri Pirko
2020-03-09 19:17 ` Jakub Kicinski
2020-03-10 10:13 ` Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 04/10] mlxsw: spectrum_flower: Do not allow mixing HW stats types for actions Jiri Pirko
2020-03-06 13:28 ` Jiri Pirko [this message]
2020-03-06 13:28 ` [patch net-next v3 06/10] flow_offload: introduce "immediate" HW stats type and allow it in mlxsw Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 07/10] flow_offload: introduce "delayed" HW stats type and allow it in mlx5 Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 08/10] mlxsw: spectrum_acl: Ask device for rule stats only if counter was created Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 09/10] flow_offload: introduce "disabled" HW stats type and allow it in mlxsw Jiri Pirko
2020-03-06 19:31 ` Jakub Kicinski
2020-03-07 6:56 ` Jiri Pirko
2020-03-09 19:20 ` Jakub Kicinski
2020-03-10 10:14 ` Jiri Pirko
2020-03-06 13:28 ` [patch net-next v3 10/10] sched: act: allow user to specify type of HW stats for a filter Jiri Pirko
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=20200306132856.6041-6-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=aelior@marvell.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=ecree@solarflare.com \
--cc=idosch@mellanox.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jhs@mojatatu.com \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=michael.chan@broadcom.com \
--cc=mlxsw@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=peppe.cavallaro@st.com \
--cc=saeedm@mellanox.com \
--cc=vishal@chelsio.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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