From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C9497A0093 for ; Tue, 19 May 2020 15:11:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C10251D702; Tue, 19 May 2020 15:11:54 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 8B3BD1D724 for ; Tue, 19 May 2020 15:11:53 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id n18so3492294wmj.5 for ; Tue, 19 May 2020 06:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fcmYwoGsVvEcuVOQg/i6kO6MPHSolyhmvyz1c3r17Rw=; b=KKsKj9dxa42rRlHCLEJ9sc56PW+8T8VY/nQu3KGOJHYa0MMsu61tO+l8fmaNBT11d3 gfQt1l6niWzB/lcG8ms9X/FvYPuqTq9z5LfMX5Vvro+OU2Si4yAF3o3K8t/S+0RByhDR ngKsbG4DR/F9N5y/aZSfAeJh+RAnsbQhhYPfTaa5klGR73OscQ9yQWFHdZ7Ua+tLKJkS hvmEoin4u2uC9aaG1Y8OeY0BYeaXkZmgQbg/gOXJILzlojjecrJosdGzE/nCw9YjR59q TDALxFH8aXQpSXrnxr2yJD535Q6apByFC+5rKYn/PbvwSYlTxqiONi3FDT37+gxgdbpy YFzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fcmYwoGsVvEcuVOQg/i6kO6MPHSolyhmvyz1c3r17Rw=; b=ImXySXG55yQSIstvixytnOhdTypzAGAw0xLPtC6CAMeIjiLLUejNUa/nQohLqkyxf7 NmLlEUxxfNM8yzrk71aQPbyLTKy4ja2G/Mo3e7hIv0BOMqQXY3TfnhrKZD9WVknUoT/p vH6e1IYS1zZWow5ggFSBRwPcQquLv82zsL7Z0KZLIJeRW+n+WGecD3xoffRgq44KUXeo mXZzYrVafEBe80S/OcwMxqK95I4WRwNPbVh0YfFrllsf3dkD8HIBw/N1ju3Dkt2ICN7Y 9jRqR2YRvzPgg5SHvSPClIkGdi/gZwxEVd/m3wH9/Begcv8vTkeoSh86sDl8FFqXQV3g +spA== X-Gm-Message-State: AOAM530jzmTxQE1KksBohV46BKgq67RxT0uVZhSrrBdrcl10k9qgZAXT Hn1M8fxjhho+eeYfWDpSIYc= X-Google-Smtp-Source: ABdhPJwhJPiGaLUPnAEo5LXxixZgpOd1v2Tp/rYfw1hW4yHjDg/dBSjTGSKquhSFuM2sdTDC7nAh4g== X-Received: by 2002:a1c:96c3:: with SMTP id y186mr5362865wmd.60.1589893912354; Tue, 19 May 2020 06:11:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a12sm20677820wro.68.2020.05.19.06.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Venkat Duvvuru , Ajit Khaparde , dpdk stable Date: Tue, 19 May 2020 14:04:10 +0100 Message-Id: <20200519130549.112823-115-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix VLAN add when port is stopped' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 0407d17daef926a5909d9a8ebc70faa1477c4ede Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 21 Apr 2020 14:33:49 -0700 Subject: [PATCH] net/bnxt: fix VLAN add when port is stopped [ upstream commit 8b60154d4b8a413eec43aafce1b4341dd575d4c3 ] Driver destroys the vnic when the port is brought down. When user tries to add a vlan when port is stopped, driver issues HWRM command to FW with invalid vnic_id and it fails. Fixed to return an error while setting vlan when port is not started. Fixes: b4e190d55c25 ("net/bnxt: fix MAC/VLAN filter allocation") Signed-off-by: Kalesh AP Reviewed-by: Venkat Duvvuru Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index cddcd427df..a4cd6cc672 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1849,6 +1849,11 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev, if (rc) return rc; + if (!eth_dev->data->dev_started) { + PMD_DRV_LOG(ERR, "port must be started before setting vlan\n"); + return -EINVAL; + } + /* These operations apply to ALL existing MAC/VLAN filters */ if (on) return bnxt_add_vlan_filter(bp, vlan_id); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:49.173896464 +0100 +++ 0115-net-bnxt-fix-VLAN-add-when-port-is-stopped.patch 2020-05-19 14:04:44.384651418 +0100 @@ -1,8 +1,10 @@ -From 8b60154d4b8a413eec43aafce1b4341dd575d4c3 Mon Sep 17 00:00:00 2001 +From 0407d17daef926a5909d9a8ebc70faa1477c4ede Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 21 Apr 2020 14:33:49 -0700 Subject: [PATCH] net/bnxt: fix VLAN add when port is stopped +[ upstream commit 8b60154d4b8a413eec43aafce1b4341dd575d4c3 ] + Driver destroys the vnic when the port is brought down. When user tries to add a vlan when port is stopped, driver issues HWRM command to FW with invalid vnic_id and it fails. @@ -11,7 +13,6 @@ not started. Fixes: b4e190d55c25 ("net/bnxt: fix MAC/VLAN filter allocation") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Venkat Duvvuru @@ -21,10 +22,10 @@ 1 file changed, 5 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 206111db5b..589190b372 100644 +index cddcd427df..a4cd6cc672 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -2082,6 +2082,11 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev, +@@ -1849,6 +1849,11 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev, if (rc) return rc;