Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp894239ybe; Fri, 13 Sep 2019 07:58:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxLK70wS2TUy9uEeKmqYuzgHmLXpCBxVMG8s0cmxDnxLwJJa3T1lKlu/N3Vw0CrjqXc7UBn X-Received: by 2002:a17:906:4d0f:: with SMTP id r15mr5148212eju.147.1568386738814; Fri, 13 Sep 2019 07:58:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568386738; cv=none; d=google.com; s=arc-20160816; b=eJbDG6T6B9PpCafVf5ZxCLZeLSeFfAPt9krJea1Iyr3GxSZtWjRK9pFgBSZ4qzwdFL q0+ftQdiu9hpvqsuLeS1/45DRHph7dcIsG+hpWH/eM+IUvkn53n9anmrG7hdaTla4R42 8HRciCAhEu7qbRYDLCkJdiH/LrXFwFYgp5xorHlAdCD4sLaZqNI9+P2Kh2clcfndfpIE syIqVUoy6cCynAd87XkkvAEeSU7shiT/vaE14TyTeyRN/sCwRBJqwZFum7DajkL0ycip J0lt7SjUG/xubnoyy4Hfb2zQbhqPQmWLlrL6w28x+sn+l0mFnDxzJy/749xaMEaco+Jb rynA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OrZDnDWxLEQqEzf3LLfGUMn/KUlKSBoG9rGh0WBFtxw=; b=O3ty+vdsrb6VtMVIp8igiETgbbSNVmgSdDNdQurPRTW9lSuY4kkQbO7it5X5sW7gEB kW6kI/f8ogJigvnOsMMcohc2ttYZLqxmRXX4MFo1hbE0EcPHyZ6FtxW6ZMhAhFn4fC2O lVGXkbmUK8U8xtm9Z1U5vWUUKFcJDbp7rMsNL11vrbW0fDKi1mrA9p8k6moS0Tb1RJJr iTvMkYZEGyrGmo7v0eIMiWRmoL+4ldCnj1+MtBxr46Rb6q0lRvJNhdRTAFpGcwP1SHOc wv3hYWexINzHiPpotTNzmM+ek6gsUEjO/pw0NlVrBq7SLGea+lQrfPjQHnHh6C1uYJqn mQIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZwDvPbNv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n19si1442270ejs.159.2019.09.13.07.58.33; Fri, 13 Sep 2019 07:58:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZwDvPbNv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390784AbfIMNVR (ORCPT + 99 others); Fri, 13 Sep 2019 09:21:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:50722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389614AbfIMNVP (ORCPT ); Fri, 13 Sep 2019 09:21:15 -0400 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C7C41206A5; Fri, 13 Sep 2019 13:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380874; bh=a87RG2IfDm8y/jeALS+aChFaTmKn6VxACxCU8UBvCG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZwDvPbNvFCH7jKxgIBGWZ4CHfVv5EVdLphSG2eRzxJBerwFECeBbGqnCEjaYtJHTq k2Z5JVZbfhMbnFmHtPezUqvNIjQ84gBOokIi1ejlyeixb++XP0Daga6ysW3v+3Rry3 YDlHmKKQGcTmfLFWr3Zqu3enhVNZVEv86eHWoHDk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Coly Li , Jens Axboe Subject: [PATCH 5.2 19/37] bcache: add comments for mutex_lock(&b->write_lock) Date: Fri, 13 Sep 2019 14:07:24 +0100 Message-Id: <20190913130518.607029021@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190913130510.727515099@linuxfoundation.org> References: <20190913130510.727515099@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When accessing or modifying BTREE_NODE_dirty bit, it is not always necessary to acquire b->write_lock. In bch_btree_cache_free() and mca_reap() acquiring b->write_lock is necessary, and this patch adds comments to explain why mutex_lock(&b->write_lock) is necessary for checking or clearing BTREE_NODE_dirty bit there. Signed-off-by: Coly Li Signed-off-by: Jens Axboe --- drivers/md/bcache/btree.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 3fbadf2058a65..9788b2ee6638f 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -655,6 +655,11 @@ static int mca_reap(struct btree *b, unsigned int min_order, bool flush) up(&b->io_mutex); } + /* + * BTREE_NODE_dirty might be cleared in btree_flush_btree() by + * __bch_btree_node_write(). To avoid an extra flush, acquire + * b->write_lock before checking BTREE_NODE_dirty bit. + */ mutex_lock(&b->write_lock); if (btree_node_dirty(b)) __bch_btree_node_write(b, &cl); @@ -778,6 +783,11 @@ void bch_btree_cache_free(struct cache_set *c) while (!list_empty(&c->btree_cache)) { b = list_first_entry(&c->btree_cache, struct btree, list); + /* + * This function is called by cache_set_free(), no I/O + * request on cache now, it is unnecessary to acquire + * b->write_lock before clearing BTREE_NODE_dirty anymore. + */ if (btree_node_dirty(b)) { btree_complete_write(b, btree_current_write(b)); clear_bit(BTREE_NODE_dirty, &b->flags); -- 2.20.1