APPLIED: [SRU][F:linux-bluefield][PATCH] UBUNTU: SAUCE: net/sched: act_mirred: Reset ct when reinserting skb back into queue

[Stefan Bader]

On 09.07.21 05:25, Bodong Wang wrote:
> From: Roi Dayan <roid at nvidia.com>
> 
> BugLink: https://launchpad.net/bugs/1935584
> 
> When we reinsert an skb from ingress back into the ingress queue
> for reclassification, we start from chain 0 so reset ct.
> 
> Signed-off-by: Roi Dayan <roid at nvidia.com>
> Signed-off-by: Bodong Wang <bodong at nvidia.com>
> ---

Applied to focal:linux-bluefield/master-next. Thanks.

-Stefan

>   net/sched/act_mirred.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
> index 5ae3e31..6556003 100644
> --- a/net/sched/act_mirred.c
> +++ b/net/sched/act_mirred.c
> @@ -286,6 +286,8 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
>   
>   		/* let's the caller reinsert the packet, if possible */
>   		if (use_reinsert) {
> +			if (want_ingress)
> +				nf_reset_ct(skb);
>   			res->ingress = want_ingress;
>   			if (skb_tc_reinsert(skb, res))
>   				tcf_action_inc_overlimit_qstats(&m->common);
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20210714/00a97759/attachment.sig>