From patchwork Thu Apr 6 21:02:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 9668421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52C9B60364 for ; Thu, 6 Apr 2017 21:02:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B3F7285DC for ; Thu, 6 Apr 2017 21:02:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50275285DE; Thu, 6 Apr 2017 21:02:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBD37285DC for ; Thu, 6 Apr 2017 21:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932227AbdDFVCZ (ORCPT ); Thu, 6 Apr 2017 17:02:25 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:33860 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752974AbdDFVCV (ORCPT ); Thu, 6 Apr 2017 17:02:21 -0400 Received: by mail-qk0-f196.google.com with SMTP id p68so7627055qke.1 for ; Thu, 06 Apr 2017 14:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=qt++D8VNg6smR7JmLtPExoFSESi5PQ2Z537qRrAk+3o=; b=fPmB3pAey0yQOEvgHsCwGsAff4Hh5U2ia6DOJ9bIhnWjyJ8J4IxMd78hzz/vAHQAh2 TlF9u/XhHsfdZEbADRDmrSa+uWzprf4WIaz+2eBsFZga87OflvLmoUTIQST4kkCF+mtu nHjlfHf6E/hAwh4FJJb3w/b64PQHfeOdU4SRNdjpmAInrCkfedPmMCVDqFbJCoe7JJq3 Y7uxS79vFebURMlOA4wQas1KVlgnrKYwdyD+mWn54BI7Zzf7wdd9NjwEpoIucE+QkF+V g0G92pZg+/MdTdZWaY9XKPHpsqqFIyqLXolpYlBeSWDJp8T/+VKwI2yRTZ7zTHn8gvpY NyOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=qt++D8VNg6smR7JmLtPExoFSESi5PQ2Z537qRrAk+3o=; b=Ap3bEUhmX6XpkFPuxB1TUCx0DWRGw/dWXduUmlLVAdzyaXpeSCaz1VNyUsGdQ9rmLy U+hVmSbAKHT2bSuSLBSM+sUTIg81wXAPOEhOFkcD5pqLx4YkqEQsmyEvJ9hwoBx5/L1N lJNuLYTXVUoZ3qwARCYF5ezeDYGQKrX4v+whM13/gt9yMrUbPIpLlEOFxPnHasHPZmtX QkE1gbzuXSsSm3KzGGGrHyJXLoIJfbJ6QQBM8lBspO2oZxFnY6rKsrAGU3iXbs7X4ZCr BC7NH3hXOeS3b0+P2uiWZ6jRIhbhHqVE4fOaBBOJoOxZ85aQ3H2CRGVOWcjwFdK6vrNA lpbA== X-Gm-Message-State: AN3rC/7FB7HV3CCg0g0lgAbhkintMMbpGrbSNl50a08gLW+f6X5mfV+lx9YvekIcWHqcIQ== X-Received: by 10.55.212.79 with SMTP id l76mr12396596qki.203.1491512540428; Thu, 06 Apr 2017 14:02:20 -0700 (PDT) Received: from localhost (cpe-2606-A000-4381-1201-225-22FF-FEB3-E51A.dyn6.twc.com. [2606:a000:4381:1201:225:22ff:feb3:e51a]) by smtp.gmail.com with ESMTPSA id q40sm1728949qtq.21.2017.04.06.14.02.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Apr 2017 14:02:19 -0700 (PDT) From: Josef Bacik X-Google-Original-From: Josef Bacik To: axboe@kernel.dk, nbd-general@lists.sourceforge.net, linux-block@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 08/12] nbd: only clear the queue on device teardown Date: Thu, 6 Apr 2017 17:02:03 -0400 Message-Id: <1491512527-4286-9-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491512527-4286-1-git-send-email-jbacik@fb.com> References: <1491512527-4286-1-git-send-email-jbacik@fb.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When running a disconnect torture test I noticed that sometimes we would crash with a negative ref count on our queue. This was because we were ending the same request twice. Turns out we were racing with NBD_CLEAR_SOCK clearing the requests as well as the teardown of the device clearing the requests. So instead make the ioctl only shutdown the sockets and make it so that we only ever run nbd_clear_que from the device teardown. Signed-off-by: Josef Bacik --- drivers/block/nbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 911e36c..70c5e75 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -616,7 +616,9 @@ static void nbd_clear_req(struct request *req, void *data, bool reserved) static void nbd_clear_que(struct nbd_device *nbd) { + blk_mq_stop_hw_queues(nbd->disk->queue); blk_mq_tagset_busy_iter(&nbd->tag_set, nbd_clear_req, NULL); + blk_mq_start_hw_queues(nbd->disk->queue); dev_dbg(disk_to_dev(nbd->disk), "queue cleared\n"); } @@ -1041,7 +1043,7 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b static void nbd_clear_sock_ioctl(struct nbd_device *nbd, struct block_device *bdev) { - nbd_clear_sock(nbd); + sock_shutdown(nbd); kill_bdev(bdev); nbd_bdev_reset(bdev); if (test_and_clear_bit(NBD_HAS_CONFIG_REF,