diff mbox series

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

Message ID 20230212132520.12571-3-ozsh@nvidia.com (mailing list archive)
State Accepted
Commit 3320f36fd8ad45312c98857d36ecbef90f829497
Delegated to: Netdev Maintainers
Headers show
Series add support for per action hw stats | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 4 maintainers not CCed: pabeni@redhat.com edumazet@google.com xiyou.wangcong@gmail.com davem@davemloft.net
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: line length of 88 exceeds 80 columns WARNING: line length of 96 exceeds 80 columns
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Oz Shlomo Feb. 12, 2023, 1:25 p.m. UTC 
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>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.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

V3 -> V4:
    - Compare all action types to the first action
---
 net/sched/act_pedit.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

Comments

Jamal Hadi Salim Feb. 12, 2023, 2:59 p.m. UTC | #1 
On Sun, Feb 12, 2023 at 8:26 AM Oz Shlomo <ozsh@nvidia.com> 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>
> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>

cheers,
jamal

> ---
> 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
>
> V3 -> V4:
>     - Compare all action types to the first action
> ---
>  net/sched/act_pedit.c | 23 ++++++++++++++++++++++-
>  1 file changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
> index c42fcc47dd6d..35ebe5d5c261 100644
> --- a/net/sched/act_pedit.c
> +++ b/net/sched/act_pedit.c
> @@ -545,7 +545,28 @@ 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);
> +               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++) {
> +                       if (cmd != tcf_pedit_cmd(act, k)) {
> +                               NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload");
> +                               return -EOPNOTSUPP;
> +                       }
> +               }
>         }
>
>         return 0;
> --
> 1.8.3.1
>
diff mbox series

Patch

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index c42fcc47dd6d..35ebe5d5c261 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -545,7 +545,28 @@  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);
+		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++) {
+			if (cmd != tcf_pedit_cmd(act, k)) {
+				NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit command offload");
+				return -EOPNOTSUPP;
+			}
+		}
 	}
 
 	return 0;