diff mbox series

[net-next] net/sched: act_api: use the correct TCA_ACT attributes in dump

Message ID 20230314193321.554475-1-pctammela@mojatatu.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net/sched: act_api: use the correct TCA_ACT attributes in dump | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 20 this patch: 20
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 18 this patch: 18
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
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: 20 this patch: 20
netdev/checkpatch warning WARNING: 'functionaly' may be misspelled - perhaps 'functionally'?
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Pedro Tammela March 14, 2023, 7:33 p.m. UTC 
3 places in the act api code are using 'TCA_' definitions where they should be using
'TCA_ACT_', which is confusing for the reader, although functionaly wise they are equivalent.

Cc: Hangbin Liu <haliu@redhat.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
 net/sched/act_api.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Michal Swiatkowski March 15, 2023, 10:21 a.m. UTC | #1 
On Tue, Mar 14, 2023 at 04:33:21PM -0300, Pedro Tammela wrote:
> 3 places in the act api code are using 'TCA_' definitions where they should be using
> 'TCA_ACT_', which is confusing for the reader, although functionaly wise they are equivalent.
> 
> Cc: Hangbin Liu <haliu@redhat.com>
> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
> ---
>  net/sched/act_api.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sched/act_api.c b/net/sched/act_api.c
> index 34c508675041..612b40bf6b0f 100644
> --- a/net/sched/act_api.c
> +++ b/net/sched/act_api.c
> @@ -453,7 +453,7 @@ static size_t tcf_action_shared_attrs_size(const struct tc_action *act)
>  		+ nla_total_size_64bit(sizeof(u64))
>  		/* TCA_STATS_QUEUE */
>  		+ nla_total_size_64bit(sizeof(struct gnet_stats_queue))
> -		+ nla_total_size(0) /* TCA_OPTIONS nested */
> +		+ nla_total_size(0) /* TCA_ACT_OPTIONS nested */
>  		+ nla_total_size(sizeof(struct tcf_t)); /* TCA_GACT_TM */
>  }
>  
> @@ -480,7 +480,7 @@ tcf_action_dump_terse(struct sk_buff *skb, struct tc_action *a, bool from_act)
>  	unsigned char *b = skb_tail_pointer(skb);
>  	struct tc_cookie *cookie;
>  
> -	if (nla_put_string(skb, TCA_KIND, a->ops->kind))
> +	if (nla_put_string(skb, TCA_ACT_KIND, a->ops->kind))
>  		goto nla_put_failure;
>  	if (tcf_action_copy_stats(skb, a, 0))
>  		goto nla_put_failure;
> @@ -1189,7 +1189,7 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
>  	if (nla_put_u32(skb, TCA_ACT_IN_HW_COUNT, a->in_hw_count))
>  		goto nla_put_failure;
>  
> -	nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
> +	nest = nla_nest_start_noflag(skb, TCA_ACT_OPTIONS);
>  	if (nest == NULL)
>  		goto nla_put_failure;
>  	err = tcf_action_dump_old(skb, a, bind, ref);

Right, looks fine for me.
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>

> -- 
> 2.34.1
>
Simon Horman March 15, 2023, 10:49 a.m. UTC | #2 
On Tue, Mar 14, 2023 at 04:33:21PM -0300, Pedro Tammela wrote:
> 3 places in the act api code are using 'TCA_' definitions where they should be using
> 'TCA_ACT_', which is confusing for the reader, although functionaly wise they are equivalent.
> 
> Cc: Hangbin Liu <haliu@redhat.com>
> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>

Hi Pedro,

this looks good, but should the instance of TCA_KIND in tcf_del_walker()
also be updated?
Pedro Tammela March 16, 2023, 1:29 a.m. UTC | #3 
On 15/03/2023 07:49, Simon Horman wrote:
> On Tue, Mar 14, 2023 at 04:33:21PM -0300, Pedro Tammela wrote:
>> 3 places in the act api code are using 'TCA_' definitions where they should be using
>> 'TCA_ACT_', which is confusing for the reader, although functionaly wise they are equivalent.
>>
>> Cc: Hangbin Liu <haliu@redhat.com>
>> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
>> Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
> 
> Hi Pedro,
> 
> this looks good, but should the instance of TCA_KIND in tcf_del_walker()
> also be updated?

Correct, I will add it in v2.
diff mbox series

Patch

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 34c508675041..612b40bf6b0f 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -453,7 +453,7 @@  static size_t tcf_action_shared_attrs_size(const struct tc_action *act)
 		+ nla_total_size_64bit(sizeof(u64))
 		/* TCA_STATS_QUEUE */
 		+ nla_total_size_64bit(sizeof(struct gnet_stats_queue))
-		+ nla_total_size(0) /* TCA_OPTIONS nested */
+		+ nla_total_size(0) /* TCA_ACT_OPTIONS nested */
 		+ nla_total_size(sizeof(struct tcf_t)); /* TCA_GACT_TM */
 }
 
@@ -480,7 +480,7 @@  tcf_action_dump_terse(struct sk_buff *skb, struct tc_action *a, bool from_act)
 	unsigned char *b = skb_tail_pointer(skb);
 	struct tc_cookie *cookie;
 
-	if (nla_put_string(skb, TCA_KIND, a->ops->kind))
+	if (nla_put_string(skb, TCA_ACT_KIND, a->ops->kind))
 		goto nla_put_failure;
 	if (tcf_action_copy_stats(skb, a, 0))
 		goto nla_put_failure;
@@ -1189,7 +1189,7 @@  tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
 	if (nla_put_u32(skb, TCA_ACT_IN_HW_COUNT, a->in_hw_count))
 		goto nla_put_failure;
 
-	nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
+	nest = nla_nest_start_noflag(skb, TCA_ACT_OPTIONS);
 	if (nest == NULL)
 		goto nla_put_failure;
 	err = tcf_action_dump_old(skb, a, bind, ref);