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 22624A0093 for ; Thu, 28 May 2020 18:26:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 18B0D1DC13; Thu, 28 May 2020 18:26:22 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id F1BDB1DC18 for ; Thu, 28 May 2020 18:26:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683180; 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=5OXF5GoCgAAVz+uU6hLDLfbETu4XWsII7WR4Dwvrc64=; b=NZG/+sjgoFfwbieyBrwDjwcpaB33X7WcgPyMcM/XCXFsujti9am78Ud0SJQy8hg0tnz1G0 a/nm3lpdE/VJmVULJbyiR7pzKYh3hdRNgE+JzmuPoO3QhUciPsFZ2CfLmm+muCbGeeVySm FTRJtoJMIEIOJAzyEse3VPsk2737Zwc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-tJTNononOH6WjksoG0ydbw-1; Thu, 28 May 2020 12:26:15 -0400 X-MC-Unique: tJTNononOH6WjksoG0ydbw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A579A8735C0; Thu, 28 May 2020 16:26:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97C8160C05; Thu, 28 May 2020 16:26:13 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Venkat Duvvuru , Ajit Khaparde , dpdk stable Date: Thu, 28 May 2020 17:23:14 +0100 Message-Id: <20200528162322.7863-87-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix VLAN add when port is stopped' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/56090ed8eab43f2a4319d098aa89baec60f60817 Thanks. Kevin. --- >From 56090ed8eab43f2a4319d098aa89baec60f60817 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 90139bc837..2dbfd11cd7 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1419,4 +1419,9 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev, struct bnxt *bp = eth_dev->data->dev_private; + 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) -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.615603625 +0100 +++ 0087-net-bnxt-fix-VLAN-add-when-port-is-stopped.patch 2020-05-28 17:12:59.181554590 +0100 @@ -1 +1 @@ -From 8b60154d4b8a413eec43aafce1b4341dd575d4c3 Mon Sep 17 00:00:00 2001 +From 56090ed8eab43f2a4319d098aa89baec60f60817 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8b60154d4b8a413eec43aafce1b4341dd575d4c3 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 206111db5b..589190b372 100644 +index 90139bc837..2dbfd11cd7 100644 @@ -27,2 +28,2 @@ -@@ -2083,4 +2083,9 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev, - return rc; +@@ -1419,4 +1419,9 @@ static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev, + struct bnxt *bp = eth_dev->data->dev_private;