From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sowmini Varadhan Subject: [PATCHv4 3/4] sparc64: Avoid irqsave/restore on vio.lock if in_softirq() Date: Tue, 21 Oct 2014 10:16:47 -0400 Message-ID: <20141021141647.GF15405@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, sparclinux@vger.kernel.org To: davem@davemloft.net, sowmini.varadhan@oracle.com Return-path: Content-Disposition: inline Sender: sparclinux-owner@vger.kernel.org List-Id: netdev.vger.kernel.org For NAPIfied drivers , there is no need to synchronize by doing irqsave/restore on vio.lock in the I/O path. Signed-off-by: Sowmini Varadhan --- arch/sparc/kernel/viohs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c index 7ef081a..d731586 100644 --- a/arch/sparc/kernel/viohs.c +++ b/arch/sparc/kernel/viohs.c @@ -747,10 +747,11 @@ EXPORT_SYMBOL(vio_ldc_free); void vio_port_up(struct vio_driver_state *vio) { - unsigned long flags; + unsigned long flags = 0; int err, state; - spin_lock_irqsave(&vio->lock, flags); + if (!in_softirq()) + spin_lock_irqsave(&vio->lock, flags); state = ldc_state(vio->lp); @@ -777,7 +778,8 @@ void vio_port_up(struct vio_driver_state *vio) mod_timer(&vio->timer, expires); } - spin_unlock_irqrestore(&vio->lock, flags); + if (!in_softirq()) + spin_unlock_irqrestore(&vio->lock, flags); } EXPORT_SYMBOL(vio_port_up); -- 1.8.4.2