[PATCHv2 iproute2 0/2] tc: fix parsing of TCA_EXT_WARN_MSG

[PATCHv2 iproute2 0/2] tc: fix parsing of TCA_EXT_WARN_MSG

[Hangbin Liu]

The TCA_EXT_WARN_MSG enum belongs to __TCA_MAX namespace. We can't use it
in tc action as it use TCA_ROOT_MAX enum. Fix it by adding a new
TCA_ROOT_EXT_WARN_MSG enum.

Hangbin Liu (2):
  Revert "tc: m_action: fix parsing of TCA_EXT_WARN_MSG"
  tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum

 include/uapi/linux/rtnetlink.h | 1 +
 tc/m_action.c                  | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

-- 
2.38.1

[PATCHv2 iproute2 1/2] Revert "tc: m_action: fix parsing of TCA_EXT_WARN_MSG"

[Hangbin Liu]

This reverts commit 70b9ebae63ce7e6f9911bdfbcf47a6d18f24159a.

The TCA_EXT_WARN_MSG is not sit within the TCA_ACT_TAB hierarchy. It's
belong to the TCA_MAX namespace. I will fix the issue in another patch.

Reviewed-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
 tc/m_action.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tc/m_action.c b/tc/m_action.c
index 6c91af2c..0400132c 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -586,7 +586,7 @@ int print_action(struct nlmsghdr *n, void *arg)
 
 	open_json_object(NULL);
 	tc_dump_action(fp, tb[TCA_ACT_TAB], tot_acts ? *tot_acts:0, false);
-	print_ext_msg(&tb[TCA_ACT_TAB]);
+	print_ext_msg(tb);
 	close_json_object();
 
 	return 0;
-- 
2.38.1

[PATCHv2 iproute2 2/2] tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum

[Hangbin Liu]

We can't use TCA_EXT_WARN_MSG directly in tc action as it's using different
enum with filter. Let's use a new TCA_ROOT_EXT_WARN_MSG for tc action
specifically.

Fixes: 6035995665b7 ("tc: add new attr TCA_EXT_WARN_MSG")
Reviewed-by: Andrea Claudi <aclaudi@redhat.com>
Reported-and-tested-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
v2: rename TCA_ACT_EXT_ to TCA_ROOT_EXT_
---
 include/uapi/linux/rtnetlink.h | 1 +
 tc/m_action.c                  | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 217b25b9..2132e941 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -787,6 +787,7 @@ enum {
 	TCA_ROOT_FLAGS,
 	TCA_ROOT_COUNT,
 	TCA_ROOT_TIME_DELTA, /* in msecs */
+	TCA_ROOT_EXT_WARN_MSG,
 	__TCA_ROOT_MAX,
 #define	TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)
 };
diff --git a/tc/m_action.c b/tc/m_action.c
index 0400132c..a446cabd 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -586,7 +586,13 @@ int print_action(struct nlmsghdr *n, void *arg)
 
 	open_json_object(NULL);
 	tc_dump_action(fp, tb[TCA_ACT_TAB], tot_acts ? *tot_acts:0, false);
-	print_ext_msg(tb);
+
+	if (tb[TCA_ROOT_EXT_WARN_MSG]) {
+		print_string(PRINT_ANY, "warn", "%s",
+			     rta_getattr_str(tb[TCA_ROOT_EXT_WARN_MSG]));
+		print_nl();
+	}
+
 	close_json_object();
 
 	return 0;
-- 
2.38.1

Re: [PATCHv2 iproute2 2/2] tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum

[Stephen Hemminger]

On Thu, 16 Mar 2023 11:52:42 +0800
Hangbin Liu <liuhangbin@gmail.com> wrote:

> We can't use TCA_EXT_WARN_MSG directly in tc action as it's using different
> enum with filter. Let's use a new TCA_ROOT_EXT_WARN_MSG for tc action
> specifically.
> 
> Fixes: 6035995665b7 ("tc: add new attr TCA_EXT_WARN_MSG")
> Reviewed-by: Andrea Claudi <aclaudi@redhat.com>
> Reported-and-tested-by: Davide Caratti <dcaratti@redhat.com>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> ---

Applied but all headers files get done separately by a script
that uses sanitized kernel headers.

Re: [PATCHv2 iproute2 2/2] tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum

[Hangbin Liu]

On Sat, Mar 18, 2023 at 07:26:51PM -0700, Stephen Hemminger wrote:
> Applied but all headers files get done separately by a script
> that uses sanitized kernel headers.

Got it, I will drop the header file changes in future.

Thanks
Hangbin

Re: [PATCHv2 iproute2 0/2] tc: fix parsing of TCA_EXT_WARN_MSG

[Andrea Claudi]

On Thu, Mar 16, 2023 at 11:52:40AM +0800, Hangbin Liu wrote:
> The TCA_EXT_WARN_MSG enum belongs to __TCA_MAX namespace. We can't use it
> in tc action as it use TCA_ROOT_MAX enum. Fix it by adding a new
> TCA_ROOT_EXT_WARN_MSG enum.
> 
> Hangbin Liu (2):
>   Revert "tc: m_action: fix parsing of TCA_EXT_WARN_MSG"
>   tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum
> 
>  include/uapi/linux/rtnetlink.h | 1 +
>  tc/m_action.c                  | 8 +++++++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> -- 
> 2.38.1
> 

Reviewed-by: Andrea Claudi <aclaudi@redhat.com>

Re: [PATCHv2 iproute2 0/2] tc: fix parsing of TCA_EXT_WARN_MSG

[patchwork-bot+netdevbpf]

Hello:

This series was applied to iproute2/iproute2.git (main)
by Stephen Hemminger <stephen@networkplumber.org>:

On Thu, 16 Mar 2023 11:52:40 +0800 you wrote:
> The TCA_EXT_WARN_MSG enum belongs to __TCA_MAX namespace. We can't use it
> in tc action as it use TCA_ROOT_MAX enum. Fix it by adding a new
> TCA_ROOT_EXT_WARN_MSG enum.
> 
> Hangbin Liu (2):
>   Revert "tc: m_action: fix parsing of TCA_EXT_WARN_MSG"
>   tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum
> 
> [...]

Here is the summary with links:
  - [PATCHv2,iproute2,1/2] Revert "tc: m_action: fix parsing of TCA_EXT_WARN_MSG"
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=0012881f3499
  - [PATCHv2,iproute2,2/2] tc: m_action: fix parsing of TCA_EXT_WARN_MSG by using different enum
    (no matching commit)

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html