[PATCH 21.11] net/sfc: fix resetting mark in tunnel offload switch rules

[Kevin Traynor]

On 15/03/2023 16:44, Ivan Malov wrote:
> [ upstream commit dfa00c456adb6f4214b581a5e82e601e963248d2 ]
> 
> The currently used API is unfit for the purpose as it
> checks the order in which the action is being added.
> Use a dedicated API to request the reset.
> 
> Fixes: 012bf708c20f ("net/sfc: support group flows in tunnel offload")
> 
> Signed-off-by: Ivan Malov <ivan.malov at arknetworks.am>
> Reviewed-by: Andy Moreton <amoreton at xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
> ---
>   drivers/net/sfc/sfc_mae.c | 8 +++-----
>   1 file changed, 3 insertions(+), 5 deletions(-)
> 

Thanks Ivan, pushed to 21.11 branch.
Kevin.

> diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
> index ca08bd466a..733105bc6e 100644
> --- a/drivers/net/sfc/sfc_mae.c
> +++ b/drivers/net/sfc/sfc_mae.c
> @@ -4131,12 +4131,10 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
>   		break;
>   	case SFC_FT_RULE_GROUP:
>   		/*
> -		 * Packets that go to the rule's AR have FT mark set (from the
> -		 * JUMP rule OR's RECIRC_ID). Remove this mark in matching
> -		 * packets. The user may have provided their own action
> -		 * MARK above, so don't check the return value here.
> +		 * Packets that go to the rule's AR have FT mark set (from
> +		 * the JUMP rule OR's RECIRC_ID). Reset the mark to zero.
>   		 */
> -		(void)efx_mae_action_set_populate_mark(ctx.spec, 0);
> +		efx_mae_action_set_populate_mark_reset(ctx.spec);
>   
>   		ctx.ft_group_hit_counter = &spec_mae->ft->group_hit_counter;
>   		break;