From patchwork Tue Apr 25 09:33:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 9697769 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 4BF47601D3 for ; Tue, 25 Apr 2017 09:34:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49543283FB for ; Tue, 25 Apr 2017 09:34:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E0FB28452; Tue, 25 Apr 2017 09:34:36 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 E03C3283FB for ; Tue, 25 Apr 2017 09:34:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1428717AbdDYJea (ORCPT ); Tue, 25 Apr 2017 05:34:30 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:36476 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1428697AbdDYJeO (ORCPT ); Tue, 25 Apr 2017 05:34:14 -0400 Received: by mail-qt0-f194.google.com with SMTP id t52so24174166qtb.3 for ; Tue, 25 Apr 2017 02:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=Gjzl9o+gyxTvSOw86mW3MmbNoZTiQ129IxpsZ4o45Z8=; b=RDg5lQPlfhFwTtzf6MKzKw04G2rnKAgjQaX5YVCz6aBM67/oGShErJh4E6aSNHRQCQ b9kCmZGebpYOTpSPflNRvfolgbwX0aGHpqqlA7usxbxvHTgLvREjgklm2/giFeH8gAke 6/G0viiLEwDZZCl++cbpMRYq3WSXgMA1AmaBctYErN1zso4EW8izJrhjs0DFt1w3NWp/ oBmAcexiCar8cDo2D9+OpaGCkw8fhgXxaUSDyxTqdD7b0L2CxZToa4IZM27FsNsYrhyj GffUt8he4MGtXLiIYENyl0LAPOkBrp5r6rzR1roJFu6lFRA02kv2E9bPn6DbeALr5boA omvQ== 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=Gjzl9o+gyxTvSOw86mW3MmbNoZTiQ129IxpsZ4o45Z8=; b=b9Gg5xzQSVPdj5CL3u59O8YQNaDpVwBRWYiTZCQymll7YoRu4Uv8sgNCu6oOjwuzmT jN9/hFlRU5VsOrDI4JqT75iAKEgFgWgKVJ7kLkO3WUZWmrxSTgl7RvrbcVLTQQ1BgIp+ hpRLcFzBG78EImTeAPRYos3VbmGdHMqK1XMwJP9XPYDjjkzAUqJ+W2bdzeX4Pc23dB9+ srXS/zvYHsz7JbytPw16eDicpV13gSfeeIVBfpF6G3m3KEiLRY2wu1Wyl3GM8Smz0mgK Wu/Q5ugBXSUHqrHQxKo55oSg2usXaOWSfP8QnHBUX50u+8pUdgMooAh1Ayd6KeO9T72k 5gfw== X-Gm-Message-State: AN3rC/4KZ0WiXYHQuiCI0pUpVKXbGTpIXY5JmPL7wYFAmusVMOf7EcCJ RZFS00An8K7WydSRnws= X-Received: by 10.237.35.134 with SMTP id j6mr29616803qtc.256.1493112853491; Tue, 25 Apr 2017 02:34:13 -0700 (PDT) Received: from orange.brq.redhat.com. (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id w6sm7461396qta.50.2017.04.25.02.34.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Apr 2017 02:34:13 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 2/9] rbd: move rbd_unregister_watch() call into rbd_dev_image_release() Date: Tue, 25 Apr 2017 11:33:38 +0200 Message-Id: <1493112825-16403-3-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1493112825-16403-1-git-send-email-idryomov@gmail.com> References: <1493112825-16403-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP rbd_dev->disk tear down vs rbd_watch_cb() race shouldn't be a problem anymore thanks to EXISTS and REMOVING checks in rbd_dev_update_size(). A similar race could occur on "rbd map", see commit 811c66887746 ("rbd: fix rbd map vs notify races"). Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2effa3e8f96c..a21587732749 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5964,6 +5964,8 @@ static int rbd_dev_header_name(struct rbd_device *rbd_dev) static void rbd_dev_image_release(struct rbd_device *rbd_dev) { rbd_dev_unprobe(rbd_dev); + if (rbd_dev->opts) + rbd_unregister_watch(rbd_dev); rbd_dev->image_format = 0; kfree(rbd_dev->spec->image_id); rbd_dev->spec->image_id = NULL; @@ -6126,15 +6128,8 @@ static ssize_t do_rbd_add(struct bus_type *bus, rbd_dev->mapping.read_only = read_only; rc = rbd_dev_device_setup(rbd_dev); - if (rc) { - /* - * rbd_unregister_watch() can't be moved into - * rbd_dev_image_release() without refactoring, see - * commit 1f3ef78861ac. - */ - rbd_unregister_watch(rbd_dev); + if (rc) goto err_out_image_probe; - } rc = count; out: @@ -6275,14 +6270,7 @@ static ssize_t do_rbd_remove(struct bus_type *bus, if (__rbd_is_lock_owner(rbd_dev)) rbd_unlock(rbd_dev); up_write(&rbd_dev->lock_rwsem); - rbd_unregister_watch(rbd_dev); - /* - * Don't free anything from rbd_dev->disk until after all - * notifies are completely processed. Otherwise - * rbd_bus_del_dev() will race with rbd_watch_cb(), resulting - * in a potential use after free of rbd_dev->disk or rbd_dev. - */ rbd_dev_device_release(rbd_dev); rbd_dev_image_release(rbd_dev); rbd_dev_destroy(rbd_dev);