From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9558BC00454 for ; Wed, 11 Dec 2019 15:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 600DF21556 for ; Wed, 11 Dec 2019 15:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576078796; bh=AcpzLlGokLpEaRzUG2e4aacaJnmRSsq00Qq5CiJLUCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=p1uYCn7WWR5CbMnhFaHv9yQ9aKsPCaX9DOw8B6//ALoVHbeRjmwLhMOO4rnACJ67M /5A3bLjUn/CRDUfetkmspMSZL0OeaxmSfUkhM456xxfRzIrp57NOsfRG3vm0/FuR8v Sk6qqycVPePcRWv8LQTyHoLC4DaGCszKoH/VjNe0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733090AbfLKPjq (ORCPT ); Wed, 11 Dec 2019 10:39:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:49264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388309AbfLKPil (ORCPT ); Wed, 11 Dec 2019 10:38:41 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 99D2C24656; Wed, 11 Dec 2019 15:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576078720; bh=AcpzLlGokLpEaRzUG2e4aacaJnmRSsq00Qq5CiJLUCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nd3NDPFzyAJ/PtRP+myxeM2Qbiud8FZAC2tuMKtwhNH3v1UDqZAJW5hWAzG4bklyA WgmY7vYyUIEhd+4dBOROVvkmyobr3el3QZi+D9LL6mQHinfiR0bRp7gKUmVZ9SVKZ5 LQvoysBfLDyh2I3QHzwsBJEp4Ax87Il2vyzoLQIU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Coly Li , Jens Axboe , Sasha Levin , linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 25/37] bcache: at least try to shrink 1 node in bch_mca_scan() Date: Wed, 11 Dec 2019 10:38:01 -0500 Message-Id: <20191211153813.24126-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211153813.24126-1-sashal@kernel.org> References: <20191211153813.24126-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Coly Li [ Upstream commit 9fcc34b1a6dd4b8e5337e2b6ef45e428897eca6b ] In bch_mca_scan(), the number of shrinking btree node is calculated by code like this, unsigned long nr = sc->nr_to_scan; nr /= c->btree_pages; nr = min_t(unsigned long, nr, mca_can_free(c)); variable sc->nr_to_scan is number of objects (here is bcache B+tree nodes' number) to shrink, and pointer variable sc is sent from memory management code as parametr of a callback. If sc->nr_to_scan is smaller than c->btree_pages, after the above calculation, variable 'nr' will be 0 and nothing will be shrunk. It is frequeently observed that only 1 or 2 is set to sc->nr_to_scan and make nr to be zero. Then bch_mca_scan() will do nothing more then acquiring and releasing mutex c->bucket_lock. This patch checkes whether nr is 0 after the above calculation, if 0 is the result then set 1 to variable 'n'. Then at least bch_mca_scan() will try to shrink a single B+tree node. Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/btree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 05aa3ac1381ba..5c93582c71cc6 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -686,6 +686,8 @@ static unsigned long bch_mca_scan(struct shrinker *shrink, * IO can always make forward progress: */ nr /= c->btree_pages; + if (nr == 0) + nr = 1; nr = min_t(unsigned long, nr, mca_can_free(c)); i = 0; -- 2.20.1