Re: [PATCH 5.4.y 4/8] net: sched: don't expose action qstats to skb_tc_reinsert()

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: ef816f3c49c1c404ababc50e10d4cbe5109da678

WARNING: Author mismatch between patch and upstream commit:
Backport author: <skulkarni@mvista.com>
Commit author: Vlad Buslov <vladbu@mellanox.com>

Status in newer kernel trees:
6.15.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (exact SHA1)
6.1.y | Present (exact SHA1)
5.15.y | Present (exact SHA1)
5.10.y | Present (exact SHA1)

Note: The patch differs from the upstream commit:
---
1:  ef816f3c49c1 ! 1:  6b25ed64fd0d net: sched: don't expose action qstats to skb_tc_reinsert()
    @@ Metadata
      ## Commit message ##
         net: sched: don't expose action qstats to skb_tc_reinsert()
     
    +    [ Upstream commit ef816f3c49c1c404ababc50e10d4cbe5109da678 ]
    +
         Previous commit introduced helper function for updating qstats and
         refactored set of actions to use the helpers, instead of modifying qstats
         directly. However, one of the affected action exposes its qstats to
    @@ Commit message
         Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
         Acked-by: Jiri Pirko <jiri@mellanox.com>
         Signed-off-by: David S. Miller <davem@davemloft.net>
    +    [ skulkarni: Adjusted patch for file 'sch_generic.h' wrt the mainline commit ]
    +    Stable-dep-of: ca22da2fbd69 ("act_mirred: use the backlog for nested calls to mirred ingress")
    +    Signed-off-by: Shubham Kulkarni <skulkarni@mvista.com>
     
      ## include/net/sch_generic.h ##
     @@ include/net/sch_generic.h: void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
    @@ include/net/sch_generic.h: void mini_qdisc_pair_swap(struct mini_Qdisc_pair *min
     +	return res->ingress ? netif_receive_skb(skb) : dev_queue_xmit(skb);
      }
      
    - #endif
    + /* Make sure qdisc is no longer in SCHED state. */
     
      ## net/sched/act_mirred.c ##
     @@ net/sched/act_mirred.c: static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,

---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| 5.4                       | Success     | Success    |