Re: [PATCH net-next v2 2/9] net/sched: act_pedit, setup offload action for action stats query

Yes, I will fix this

On 06/02/2023 13:49, Jamal Hadi Salim wrote:

Never mind - of course it does ;->

cheers,
jamal

On Mon, Feb 6, 2023 at 6:48 AM Jamal Hadi Salim [off-list ref] wrote:

quoted

Does it have to be?

cheers,
jamal

On Mon, Feb 6, 2023 at 5:49 AM Simon Horman [off-list ref] wrote:

quoted

On Sun, Feb 05, 2023 at 03:55:18PM +0200, Oz Shlomo wrote:

quoted

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 <redacted>

---
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.
---
  net/sched/act_pedit.c | 28 +++++++++++++++++++++++++++-
  1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index c42fcc47dd6d..dae88e205cb1 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c

@@ -545,7 +545,33 @@ 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++) {
+                     cmd = tcf_pedit_cmd(act, k);
+
+                     if (cmd != last_cmd) {

Hi Oz,

Is last_cmd initialised for the first iteration of this loop?

quoted

+                             NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload");
+                             return -EOPNOTSUPP;
+                     }
+
+                     last_cmd = cmd;
+             }
       }

       return 0;
--
1.8.3.1