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 66473A0032 for ; Fri, 18 Feb 2022 13:41:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 605F140395; Fri, 18 Feb 2022 13:41:00 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id A47B340E28 for ; Fri, 18 Feb 2022 13:40:59 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id m27so2580107wrb.4 for ; Fri, 18 Feb 2022 04:40:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=msYWmJJq/QdY9LV0IiKCEGYqX+A0dWMRgnSuGKVvaIA=; b=WlZP+RKEmXK+hb6Ev+4Amm8NhDNFhpYt/DAbRit3j/Wbrklb4ZS2JMWJWO7730TEYS 9Oxlqm4ZHQqMerVXT+f4DgtCY7O1V/netXfikk4CwfSmW6MskBnvSjd2sx2jv52Upk84 ekfm4v4DQG+N+u/OOGlAfzLFuT3/UAkCXn9VM36nde0D2vk1g1IQjq+th4f74GUeEv/K zzXjEPAgbp8vftVnrWycKHXvDKhQWGARLWdgv7rx5lbLUAmfIkbfzsolM+olXEd8/Ean rdOdCg9rhzOWsLFZXHlaY/NX/H0o4erp6+8+Ifte2qqKmTcB4Ssck7zaMixiIbnOXplt gHIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=msYWmJJq/QdY9LV0IiKCEGYqX+A0dWMRgnSuGKVvaIA=; b=yqRiDQA4wI8R/iX+VCMWAPgBjXKrH7VQhDC1e+vT7IMTBJoGdjUbgdCdf/KuBzA/8e 6enQZmsl8MjTkGeA9gMNocVP11Hi77hPkUqrNqUxefpYlG+kUwmxjB3HNX9rt8/iEwql 9vr9m0Vrop4wu1gBamrYXqcAcqEs2MdoYCx5RjukywGpPpqeSNdQMEtDX6+NcGQUgNap HCLG5FkObLDeptNJtnZyVHsniF8PaWsCZvihO+Xve/x3mQBXFeW/HxUrk2ml1ctZtaFe AJFv/OJUyAwUZVyEytOSQsZAqMVuaQgRSTYf13kAZusadZMvQnsHMGdPvhmsABmbJ+Dk Y87Q== X-Gm-Message-State: AOAM531IT2RLOmybzdU+nuTBP8zjoqyQGpJyOugIOfsGfvFo/wewTjuB hd+babY4oJ+m6z53G1Wmt9I= X-Google-Smtp-Source: ABdhPJw4EzPBvE8PmUTogTLwryGgYmjtRe/Pk5MUiZ8prEl7RP4E08AIrcNtewC2cQ31DIAg+p+xaA== X-Received: by 2002:adf:806c:0:b0:1e7:5d75:b61a with SMTP id 99-20020adf806c000000b001e75d75b61amr5760203wrk.366.1645188059326; Fri, 18 Feb 2022 04:40:59 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id r2sm6087272wmq.0.2022.02.18.04.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:40:58 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix restoring VLAN filtering after recovery' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:56 +0000 Message-Id: <20220218123931.1749595-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/fa8cc81989ee756f18d9b3f99aa35b9fb930c18d Thanks. Luca Boccassi --- >From fa8cc81989ee756f18d9b3f99aa35b9fb930c18d Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 4 Jan 2022 14:08:11 +0530 Subject: [PATCH] net/bnxt: fix restoring VLAN filtering after recovery [ upstream commit 8717548934d89498b9c679221d9a24996034b128 ] During port start, driver calls bnxt_vlan_offload_set_op() to program VLAN Filter/VLAN Strip setting to the HW. This in turns add the vlan filters. This results in a failure when bnxt_restore_filters() invokes bnxt_restore_vlan_filters() during the recovery as the vlans are already programmed. Fix to ignore the error(-EEXIST). Fixes: 151c8240ac6a ("net/bnxt: restore VLAN filters during reset recovery") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 0c00f25f5b..0168481663 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4113,8 +4113,9 @@ static int bnxt_restore_filters(struct bnxt *bp) if (ret) return ret; + /* if vlans are already programmed, this can fail with -EEXIST */ ret = bnxt_restore_vlan_filters(bp); - if (ret) + if (ret && ret != -EEXIST) return ret; ret = bnxt_restore_mcast_mac_filters(bp); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.193101191 +0000 +++ 0027-net-bnxt-fix-restoring-VLAN-filtering-after-recovery.patch 2022-02-18 12:37:37.594789776 +0000 @@ -1 +1 @@ -From 8717548934d89498b9c679221d9a24996034b128 Mon Sep 17 00:00:00 2001 +From fa8cc81989ee756f18d9b3f99aa35b9fb930c18d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8717548934d89498b9c679221d9a24996034b128 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index dcf2839215..99a7d35470 100644 +index 0c00f25f5b..0168481663 100644 @@ -30 +31 @@ -@@ -4308,8 +4308,9 @@ static int bnxt_restore_filters(struct bnxt *bp) +@@ -4113,8 +4113,9 @@ static int bnxt_restore_filters(struct bnxt *bp)