From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 891B4427E3 for ; Mon, 20 Mar 2023 17:14:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82F73410D0; Mon, 20 Mar 2023 17:14:36 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E3A7D40A80 for ; Mon, 20 Mar 2023 17:14:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679328875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CTx5Wdf1rWlPN6wa0oxrYLuskxFn3qF1mfsckURx1rQ=; b=AvnDEQflU9eFsvqRxer4br09LnY7Y0lPlZBogjdTBkt7xLdEq7nt2FV2H6avTSQ410XWaV 3XP9TpK0QOcAupXYU8nu8gO7yqFnlhU1327Ck6iWo2Gwmhl1Rdx5PgQOc6sXdYA1QNx8Bf UqM2A+IGHnCZnMH/42Q5T/MaHCcLpLM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-546-4wy2y8kYPXSLMbhR8B0yrg-1; Mon, 20 Mar 2023 12:14:34 -0400 X-MC-Unique: 4wy2y8kYPXSLMbhR8B0yrg-1 Received: by mail-wr1-f72.google.com with SMTP id y4-20020adfc7c4000000b002d633dc129aso396241wrg.0 for ; Mon, 20 Mar 2023 09:14:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679328873; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CTx5Wdf1rWlPN6wa0oxrYLuskxFn3qF1mfsckURx1rQ=; b=iXesFltDgg/Vph56/JbzdH3DpMsi3+zhXtTc0Qc7qDiDU8anhRS4yMTSeZTITpSCoO 17mJZYLQN5n+w3uY7mXfsggN/aRuqf0+JyCVKY9+wLLiXhyvohLosRM42WAMFvoShj1w NqFqMAJ2Piby9rh8u0Fds+6LQAAxDRWQo3/M3CFVWsTWJyVOd1+nEItfTJcciP/wgC2a KEg5vhRWNRxpHcJznDhdbD2YtyxooYgfpsq0HioOAqWUmk9jTc4a1wGelAgM3b1lY7ER B6j+c0aR0+7xwyL4fXlH/YG4/f1AniG5Xe750tEmDNQOOUtiE3rqblKgC9iNe89RnjtP bcpQ== X-Gm-Message-State: AO0yUKWSilnI4yYSTC0Y8qlwexMMs9R+khbdhbcS1z4PcWolZEFkE4lG dsUzSXZCwxU6u7hvBLpIPAR5Kb0Dbc3373GBQNegXu74G8Ly5bZJ0BL/n1FSO7KT51/0TDaEA28 7nDy3ZnA= X-Received: by 2002:adf:eb03:0:b0:2ce:9da7:6d42 with SMTP id s3-20020adfeb03000000b002ce9da76d42mr14133855wrn.38.1679328872919; Mon, 20 Mar 2023 09:14:32 -0700 (PDT) X-Google-Smtp-Source: AK7set+L7n4+DsRgIxirdZRl06cZAIX+vw3bEkKujMiXh3zZeKQHAfGVUUbLWrlu7+jkjCfCoxJRVg== X-Received: by 2002:adf:eb03:0:b0:2ce:9da7:6d42 with SMTP id s3-20020adfeb03000000b002ce9da76d42mr14133837wrn.38.1679328872598; Mon, 20 Mar 2023 09:14:32 -0700 (PDT) Received: from [192.168.0.36] ([78.19.103.115]) by smtp.gmail.com with ESMTPSA id l12-20020adfe9cc000000b002cea8e3bd54sm9209383wrn.53.2023.03.20.09.14.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Mar 2023 09:14:32 -0700 (PDT) Message-ID: Date: Mon, 20 Mar 2023 16:14:31 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 To: Ivan Malov , stable@dpdk.org Cc: Andy Moreton , Andrew Rybchenko References: <20230315164453.8016-1-ivan.malov@arknetworks.am> From: Kevin Traynor Subject: Re: [PATCH 21.11] net/sfc: fix resetting mark in tunnel offload switch rules In-Reply-To: <20230315164453.8016-1-ivan.malov@arknetworks.am> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 > Reviewed-by: Andy Moreton > Acked-by: Andrew Rybchenko > --- > 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;