From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752130AbcELJn1 (ORCPT ); Thu, 12 May 2016 05:43:27 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:36351 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751450AbcELJn0 (ORCPT ); Thu, 12 May 2016 05:43:26 -0400 From: Markus Pargmann To: "Pranay Kr . Srivastava" Cc: nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Markus Pargmann Subject: [PATCH] nbd: Move socket shutdown out of spinlock Date: Thu, 12 May 2016 11:43:15 +0200 Message-Id: <1463046195-30536-1-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <2919757.NIRCIcnYi2@adelgunde> References: <2919757.NIRCIcnYi2@adelgunde> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org spinlocked ranges should be small and not contain calls into huge subfunctions. Fix my mistake and just get the pointer to the socket instead of doing everything with spinlock held. Reported-by: Mikulas Patocka Signed-off-by: Markus Pargmann --- drivers/block/nbd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 0b892eed06a0..157bf3da876e 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -173,20 +173,22 @@ static void nbd_end_request(struct nbd_device *nbd, struct request *req) */ static void sock_shutdown(struct nbd_device *nbd) { + struct socket *sock; + spin_lock_irq(&nbd->sock_lock); + sock = nbd->sock; + nbd->sock = NULL; + spin_unlock_irq(&nbd->sock_lock); - if (!nbd->sock) { - spin_unlock_irq(&nbd->sock_lock); + if (!sock) return; - } + + del_timer(&nbd->timeout_timer); dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n"); - kernel_sock_shutdown(nbd->sock, SHUT_RDWR); - sockfd_put(nbd->sock); - nbd->sock = NULL; - spin_unlock_irq(&nbd->sock_lock); + kernel_sock_shutdown(sock, SHUT_RDWR); + sockfd_put(sock); - del_timer(&nbd->timeout_timer); } static void nbd_xmit_timeout(unsigned long arg) -- 2.8.0.rc3