Re: [PATCH 5.10.y] net/sched: flower: Fix chain template offload

[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: 32f2a0afa95fae0d1ceec2ff06e0e816939964b8

WARNING: Author mismatch between patch and upstream commit:
Backport author: <jianqi.ren.cn@windriver.com>
Commit author: Ido Schimmel<idosch@nvidia.com>

Status in newer kernel trees:
6.14.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 9ed46144cff3)
6.1.y | Not found
5.15.y | Not found

Note: The patch differs from the upstream commit:
---
1:  32f2a0afa95fa ! 1:  53af17da4857d net/sched: flower: Fix chain template offload
    @@ Metadata
      ## Commit message ##
         net/sched: flower: Fix chain template offload
     
    +    [ Upstream commit 32f2a0afa95fae0d1ceec2ff06e0e816939964b8 ]
    +
         When a qdisc is deleted from a net device the stack instructs the
         underlying driver to remove its flow offload callback from the
         associated filter block using the 'FLOW_BLOCK_UNBIND' command. The stack
    @@ Commit message
         Fixes: bbf73830cd48 ("net: sched: traverse chains in block with tcf_get_next_chain()")
         Signed-off-by: Ido Schimmel <idosch@nvidia.com>
         Signed-off-by: David S. Miller <davem@davemloft.net>
    +    [Minor conflict resolved due to code context change.]
    +    Signed-off-by: Jianqi Ren <jianqi.ren.cn@windriver.com>
    +    Signed-off-by: He Zhe <zhe.he@windriver.com>
     
      ## include/net/sch_generic.h ##
     @@ include/net/sch_generic.h: struct tcf_proto_ops {
    @@ include/net/sch_generic.h: struct tcf_proto_ops {
     +						   bool add,
     +						   flow_setup_cb_t *cb,
     +						   void *cb_priv);
    - 	struct tcf_exts *	(*get_exts)(const struct tcf_proto *tp,
    - 					    u32 handle);
      
    + 	/* rtnetlink specific */
    + 	int			(*dump)(struct net*, struct tcf_proto*, void *,
     
      ## net/sched/cls_api.c ##
     @@ net/sched/cls_api.c: tcf_block_playback_offloads(struct tcf_block *block, flow_setup_cb_t *cb,
    @@ net/sched/cls_flower.c: static struct tcf_proto_ops cls_fl_ops __read_mostly = {
      	.tmplt_destroy	= fl_tmplt_destroy,
     +	.tmplt_reoffload = fl_tmplt_reoffload,
      	.tmplt_dump	= fl_tmplt_dump,
    - 	.get_exts	= fl_get_exts,
      	.owner		= THIS_MODULE,
    + 	.flags		= TCF_PROTO_OPS_DOIT_UNLOCKED,
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y       |  Success    |  Success   |