| Message ID | 20230206135442.15671-3-ozsh@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | add support for per action hw stats | expand |
On Mon, Feb 06, 2023 at 03:54:35PM +0200, Oz Shlomo wrote: > A single tc pedit action may be translated to multiple flow_offload > actions. > Offload only actions that translate to a single pedit command value. > > Signed-off-by: Oz Shlomo <ozsh@nvidia.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> > --- > Change log: > > V1 -> V2: > - Add extack message on error > - Assign the flow action id outside the for loop. > Ensure the rest of the pedit actions follow the assigned id. > > V2 -> V3: > - Fix last_cmd initialization > --- > net/sched/act_pedit.c | 27 ++++++++++++++++++++++++++- > 1 file changed, 26 insertions(+), 1 deletion(-) > > diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c > index c42fcc47dd6d..924beb76f5b7 100644 > --- a/net/sched/act_pedit.c > +++ b/net/sched/act_pedit.c > @@ -545,7 +545,32 @@ static int tcf_pedit_offload_act_setup(struct tc_action *act, void *entry_data, > } > *index_inc = k; > } else { > - return -EOPNOTSUPP; > + struct flow_offload_action *fl_action = entry_data; > + u32 cmd = tcf_pedit_cmd(act, 0); > + u32 last_cmd; > + int k; > + > + switch (cmd) { > + case TCA_PEDIT_KEY_EX_CMD_SET: > + fl_action->id = FLOW_ACTION_MANGLE; > + break; > + case TCA_PEDIT_KEY_EX_CMD_ADD: > + fl_action->id = FLOW_ACTION_ADD; > + break; > + default: > + NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload"); > + return -EOPNOTSUPP; > + } > + > + for (k = 1; k < tcf_pedit_nkeys(act); k++) { > + last_cmd = cmd; nit: The declaration of last_cmd could now be in this scope. No need to respin for this, IMHO. > + cmd = tcf_pedit_cmd(act, k); > + > + if (cmd != last_cmd) { > + NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload"); > + return -EOPNOTSUPP; > + } > + } > } > > return 0; > -- > 1.8.3.1 >
On Mon, Feb 06, 2023 at 03:54:35PM +0200, Oz Shlomo wrote: > A single tc pedit action may be translated to multiple flow_offload > actions. > Offload only actions that translate to a single pedit command value. > > Signed-off-by: Oz Shlomo <ozsh@nvidia.com> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
On Mon, 6 Feb 2023 15:54:35 +0200 Oz Shlomo wrote: > + for (k = 1; k < tcf_pedit_nkeys(act); k++) { > + last_cmd = cmd; > + cmd = tcf_pedit_cmd(act, k); > + > + if (cmd != last_cmd) { > + NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload"); > + return -EOPNOTSUPP; > + } Is there a reason you're comparing to previous and not just always to the first one - since they all must be the same?
On 10/02/2023 8:19, Jakub Kicinski wrote: > On Mon, 6 Feb 2023 15:54:35 +0200 Oz Shlomo wrote: >> + for (k = 1; k < tcf_pedit_nkeys(act); k++) { >> + last_cmd = cmd; >> + cmd = tcf_pedit_cmd(act, k); >> + >> + if (cmd != last_cmd) { >> + NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload"); >> + return -EOPNOTSUPP; >> + } > Is there a reason you're comparing to previous and not just always > to the first one - since they all must be the same? That can be done. I will send a new version.
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index c42fcc47dd6d..924beb76f5b7 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -545,7 +545,32 @@ static int tcf_pedit_offload_act_setup(struct tc_action *act, void *entry_data, } *index_inc = k; } else { - return -EOPNOTSUPP; + struct flow_offload_action *fl_action = entry_data; + u32 cmd = tcf_pedit_cmd(act, 0); + u32 last_cmd; + int k; + + switch (cmd) { + case TCA_PEDIT_KEY_EX_CMD_SET: + fl_action->id = FLOW_ACTION_MANGLE; + break; + case TCA_PEDIT_KEY_EX_CMD_ADD: + fl_action->id = FLOW_ACTION_ADD; + break; + default: + NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload"); + return -EOPNOTSUPP; + } + + for (k = 1; k < tcf_pedit_nkeys(act); k++) { + last_cmd = cmd; + cmd = tcf_pedit_cmd(act, k); + + if (cmd != last_cmd) { + NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload"); + return -EOPNOTSUPP; + } + } } return 0;
A single tc pedit action may be translated to multiple flow_offload actions. Offload only actions that translate to a single pedit command value. Signed-off-by: Oz Shlomo <ozsh@nvidia.com> --- Change log: V1 -> V2: - Add extack message on error - Assign the flow action id outside the for loop. Ensure the rest of the pedit actions follow the assigned id. V2 -> V3: - Fix last_cmd initialization --- net/sched/act_pedit.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)