[5.5,14/44] cxgb4: free MQPRIO resources in shutdown path

Message ID	20200411115458.100740804@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=d7Ir=53=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.5 14/44] cxgb4: free MQPRIO resources in shutdown path Date: Sat, 11 Apr 2020 14:09:34 +0200 Message-Id: <20200411115458.100740804@linuxfoundation.org> In-Reply-To: <20200411115456.934174282@linuxfoundation.org> References: <20200411115456.934174282@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,04/44] net: dsa: bcm_sf2: Ensure correct sub-node is parsed [5.5,05/44] net: dsa: mt7530: fix null pointer dereferencing in port5 setup [5.5,06/44] net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing P... [5.5,08/44] net_sched: fix a missing refcnt in tcindex_init() [5.5,09/44] net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting [5.5,12/44] mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE [5.5,14/44] cxgb4: free MQPRIO resources in shutdown path [5.5,16/44] s390: prevent leaking kernel address in BEAR [5.5,18/44] usb: dwc3: gadget: Wrap around when skip TRBs [5.5,20/44] slub: improve bit diffusion for freelist ptr obfuscation [5.5,23/44] RDMA/ucma: Put a lock around every call to the rdma_cm layer [5.5,25/44] RDMA/siw: Fix passive connection establishment [5.5,26/44] Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl [5.5,29/44] fbcon: fix null-ptr-deref in fbcon_switch [5.5,31/44] iommu/vt-d: Allow devices with RMRRs to use identity domain [5.5,34/44] ACPI: PM: Add acpi_[un]register_wakeup_handler() [5.5,36/44] ASoC: tas2562: Fixed incorrect amp_level setting. [5.5,38/44] IB/hfi1: Call kobject_put() when kobject_init_and_add() fails [5.5,41/44] ARM: imx: Enable ARM_ERRATA_814220 for i.MX6UL and i.MX7D [5.5,42/44] ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A [5.5,44/44] ceph: canonicalize server path in place

Message ID

20200411115458.100740804@linuxfoundation.org

State

Superseded

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org,
	Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 5.5 14/44] cxgb4: free MQPRIO resources in shutdown path
Date: Sat, 11 Apr 2020 14:09:34 +0200
Message-Id: <20200411115458.100740804@linuxfoundation.org>
In-Reply-To: <20200411115456.934174282@linuxfoundation.org>
References: <20200411115456.934174282@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg KH April 11, 2020, 12:09 p.m. UTC

From: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>

[ Upstream commit cef8dac96bc108633f5090bb3a9988d734dc1ee0 ]

Perform missing MQPRIO resource cleanup in PCI shutdown path. Also,
fix MQPRIO MSIX bitmap leak in resource cleanup.

Fixes: b1396c2bd675 ("cxgb4: parse and configure TC-MQPRIO offload")
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c      |    4 +++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c |   23 +++++++++++++++++++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h |    1 
 3 files changed, 28 insertions(+)

--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -6651,6 +6651,10 @@  static void shutdown_one(struct pci_dev
 			if (adapter->port[i]->reg_state == NETREG_REGISTERED)
 				cxgb_close(adapter->port[i]);
 
+		rtnl_lock();
+		cxgb4_mqprio_stop_offload(adapter);
+		rtnl_unlock();
+
 		if (is_uld(adapter)) {
 			detach_ulds(adapter);
 			t4_uld_clean_up(adapter);
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
@@ -301,6 +301,7 @@  static void cxgb4_mqprio_free_hw_resourc
 			cxgb4_clear_msix_aff(eorxq->msix->vec,
 					     eorxq->msix->aff_mask);
 			free_irq(eorxq->msix->vec, &eorxq->rspq);
+			cxgb4_free_msix_idx_in_bmap(adap, eorxq->msix->idx);
 		}
 
 		free_rspq_fl(adap, &eorxq->rspq, &eorxq->fl);
@@ -611,6 +612,28 @@  out:
 	return ret;
 }
 
+void cxgb4_mqprio_stop_offload(struct adapter *adap)
+{
+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;
+	struct net_device *dev;
+	u8 i;
+
+	if (!adap->tc_mqprio || !adap->tc_mqprio->port_mqprio)
+		return;
+
+	for_each_port(adap, i) {
+		dev = adap->port[i];
+		if (!dev)
+			continue;
+
+		tc_port_mqprio = &adap->tc_mqprio->port_mqprio[i];
+		if (!tc_port_mqprio->mqprio.qopt.num_tc)
+			continue;
+
+		cxgb4_mqprio_disable_offload(dev);
+	}
+}
+
 int cxgb4_init_tc_mqprio(struct adapter *adap)
 {
 	struct cxgb4_tc_port_mqprio *tc_port_mqprio, *port_mqprio;
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h
@@ -38,6 +38,7 @@  struct cxgb4_tc_mqprio {
 
 int cxgb4_setup_tc_mqprio(struct net_device *dev,
 			  struct tc_mqprio_qopt_offload *mqprio);
+void cxgb4_mqprio_stop_offload(struct adapter *adap);
 int cxgb4_init_tc_mqprio(struct adapter *adap);
 void cxgb4_cleanup_tc_mqprio(struct adapter *adap);
 #endif /* __CXGB4_TC_MQPRIO_H__ */

[5.5,14/44] cxgb4: free MQPRIO resources in shutdown path

Commit Message

Patch