netdev - RE: [PATCH] s2io: don't run MSI handlers if device is offline.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <78C9135A3D2ECE4B8162EBDCE82CAD77019D4ED3@nekter>
Date:	Wed, 23 May 2007 01:03:57 -0400
From:	"Sivakumar Subramani" <Sivakumar.Subramani@...erion.com>
To:	"Linas Vepstas" <linas@...tin.ibm.com>,
	"Jeff Garzik" <jgarzik@...ox.com>, "Andrew Morton" <akpm@...l.org>
Cc:	<linux-pci@...ey.karlin.mff.cuni.cz>, <netdev@...r.kernel.org>,
	"Ramkrishna Vepa" <Ramkrishna.Vepa@...erion.com>,
	"Sreenivasa Honnur" <Sreenivasa.Honnur@...erion.com>,
	"Rastapur Santosh" <santosh.rastapur@...erion.com>,
	"Wen Xiong" <wenxiong@...ibm.com>,
	"Leonid Grossman" <Leonid.Grossman@...erion.com>,
	"Sriram Rapuru" <Sriram.Rapuru@...erion.com>
Subject: RE: [PATCH] s2io: don't run MSI handlers if device is offline.

Fix looks good. No comments.
~Siva 

-----Original Message-----
From: Linas Vepstas [mailto:linas@...tin.ibm.com] 
Sent: Wednesday, May 23, 2007 4:20 AM
To: Jeff Garzik; Andrew Morton
Cc: linux-pci@...ey.karlin.mff.cuni.cz; netdev@...r.kernel.org;
Ramkrishna Vepa; Sivakumar Subramani; Sreenivasa Honnur; Rastapur
Santosh; Wen Xiong
Subject: [PATCH] s2io: don't run MSI handlers if device is offline.


Don't run any of the MSI handlers if the channel is off; also don't
gather device statatistics. Also, netif_wake not needed, per suggestions
from Sivakumar Subramani <sivakumar.subramani@...erion.com>.

Signed-off-by: Linas Vepstas <linas@...tin.ibm.com>
Cc: Ramkrishna Vepa <Ramkrishna.Vepa@...erion.com>
Cc: Sivakumar Subramani <sivakumar.subramani@...erion.com>
Cc: Sreenivasa Honnur <sreenivasa.honnur@...erion.com>
Cc: Rastapur Santosh <santosh.rastapur@...erion.com>
Cc: Wen Xiong <wenxiong@...ibm.com>

----
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index
e46e164..871c37c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4202,6 +4202,9 @@ static irqreturn_t s2io_msi_handle(int i
 	struct mac_info *mac_control;
 	struct config_param *config;
 
+	if (pci_channel_offline(sp->pdev))
+		return IRQ_NONE;
+
 	atomic_inc(&sp->isr_cnt);
 	mac_control = &sp->mac_control;
 	config = &sp->config;
@@ -4232,6 +4235,9 @@ static irqreturn_t s2io_msix_ring_handle
 	struct ring_info *ring = (struct ring_info *)dev_id;
 	struct s2io_nic *sp = ring->nic;
 
+	if (pci_channel_offline(sp->pdev))
+		return IRQ_NONE;
+
 	atomic_inc(&sp->isr_cnt);
 
 	rx_intr_handler(ring);
@@ -4246,6 +4252,9 @@ static irqreturn_t s2io_msix_fifo_handle
 	struct fifo_info *fifo = (struct fifo_info *)dev_id;
 	struct s2io_nic *sp = fifo->nic;
 
+	if (pci_channel_offline(sp->pdev))
+		return IRQ_NONE;
+
 	atomic_inc(&sp->isr_cnt);
 	tx_intr_handler(fifo);
 	atomic_dec(&sp->isr_cnt);
@@ -4428,6 +4437,9 @@ static void s2io_updt_stats(struct s2io_
 	u64 val64;
 	int cnt = 0;
 
+	if (pci_channel_offline(sp->pdev))
+		return;
+
 	if (atomic_read(&sp->card_state) == CARD_UP) {
 		/* Apprx 30us on a 133 MHz bus */
 		val64 = SET_UPDT_CLICKS(10) |
@@ -8122,5 +8134,4 @@ static void s2io_io_resume(struct pci_de
 	}
 
 	netif_device_attach(netdev);
-	netif_wake_queue(netdev);
 }
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html