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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 991FCEB64D8 for ; Thu, 22 Jun 2023 08:40:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A3728D0007; Thu, 22 Jun 2023 04:40:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32CC38D0001; Thu, 22 Jun 2023 04:40:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F3C58D0007; Thu, 22 Jun 2023 04:40:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0C2668D0001 for ; Thu, 22 Jun 2023 04:40:47 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DBBEBC014A for ; Thu, 22 Jun 2023 08:40:46 +0000 (UTC) X-FDA: 80929738092.30.8DBA6DB Received: from out-45.mta1.migadu.com (out-45.mta1.migadu.com [95.215.58.45]) by imf27.hostedemail.com (Postfix) with ESMTP id 324E240009 for ; Thu, 22 Jun 2023 08:40:44 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=SZzQmrgV; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.45 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687423245; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=y3F0rUfKL2Xn8vIcW/xqhQA76/McTb+Ba5wKVW4y6Eg=; b=ZvsMyr7Znzb9YclaS1ud5znQKerk/+MXdExQnZ51TGW4m1re8d/8MampOpgoZIkcHKJNhk rg1QW4wRpjnhQWbWuFgvpz/1gTBJr6MWYWCjY0tjJ+CDU5jULXfPswX2YzSpZIx+zEkwhO OeHvFYt9ElmCK4Izuka3+l+cEuOjgkc= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=SZzQmrgV; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.45 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423245; a=rsa-sha256; cv=none; b=N8vFfetcpxi3Q2Z2ej/VwckQPTCYTzcrmQycO/ZnWweAAAeLdCVYMshDJPobYUvSBYF/PA XntfNMTxWiF9ZBgVNxwf/WHC+aAU1ySfhQ1ENS7X45sSkv4QXZ+9ys3hgYYHRLlUMgfaZw +ZKffvaPDwSdzf5r5wHrkn+1uTseq2M= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687423243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y3F0rUfKL2Xn8vIcW/xqhQA76/McTb+Ba5wKVW4y6Eg=; b=SZzQmrgVrr0a7kU9rsMmAszGVDK8bckX7bBVvxfPSHWQYejPEvXLZ2HPRkk+tKQrS23erf SuGqFnRsYjeusCXlNlT1ZT5Owe6S80DA/2VI0ueZ+krAGTceisdq13YNha7j9xlWXYO5kC 5nufnpLwSbmgxVLa1H9hFaeIYeAfjGs= From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH 06/29] dm: dynamically allocate the dm-bufio shrinker Date: Thu, 22 Jun 2023 08:39:09 +0000 Message-Id: <20230622083932.4090339-7-qi.zheng@linux.dev> In-Reply-To: <20230622083932.4090339-1-qi.zheng@linux.dev> References: <20230622083932.4090339-1-qi.zheng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 324E240009 X-Stat-Signature: ax9jid6ztzwbargymf76jd919ufwep49 X-Rspam-User: X-HE-Tag: 1687423244-839069 X-HE-Meta: U2FsdGVkX18Jywi73tJqaIWaY7Kzv9ZQHyw82V2obBE1lFpKEsitEsq354uNld6keAJ4UGsCA2zbqmYsshuUuQaSWDZ+OMyQe079KYw2PslWy99S/TB8onIA225/681weZie62m6wFX5aQj3wqqrlTbEzq2KshD2/oFu/uAM0zvYbsGF0qXtc/FFH3o9ovu8Oj+pZPD5+vlagEp0s0KYTCt5+fCHVYOKh6Jc7Fuupq8vcBSxZR1Ui81kflPizmMFsM8Ji/CUx2/PwjX1ZRbKA2sKgiCiSqS3IxixO/kRz22wAGSJP3C/cZurwr3e2L1kD1eGHQeV1AOd9s+ubZ//4ZCK7KeqjloGefQhvNs5OZWZblPN8fPOq8AlzFIveCZShgeT3dZKoS7dHNknoDTWS6ag1ybFG81shGELVz9ow/Qn4ko3MXhkIV6+sTEuE439rbRBdRMJjQwGffw972IcJloO5KOB4jIJ95G+zV60HGGB1huO2kkPoKPgPQneIBaBSxASwwkkVa595PgrFQLHWjSHSMYfjQ9f3Q3H37gm0Zz8JpEdFJAIV/dCxzE+SXsxRyhP68t5Numukr0wjhTmhOwuj+2H2zhKRnjAEKHuaPgXUafrhFkHp8BKRXW1NIEsb/t9AMIr/bvsKottpZfO7Larh2J7TPH+OQW/AnMNqo92S+bnSbf2FbTKfwWH1kpVvCv/w1UZIBmLQetg3Ip6kOQ3VVLzhmMGML9DF6UKPM0jPMjxS2+Cuoc5s4FqKcuEki/qhcSR+lqmmNfqT47VbdM88D1ZQ30hA0YkHvtFTi11j/OqYoya1ghTi5J5cJjFaK1ekcFziGexYcQvRqv66fnydzRgIUHRBB+Oc+hRHVsIvnq3Pz+tD/6bDx/HLV+w6fG7kkj/B5t2fi8+nWsRK03Tdr9DeQ8SmKGHcigv+QdRlE09gSMi9qtPgpuAQmlOeUNEPSjTIB0xjByrVbn x+FE/OyF ubf44kAX098ANNA/oME1rdMD+c29yy4Mw91oKcA4StRjiEDaFElybpouH1r0RJGSN7iKmqjZKDpOPtNrOaaquF3uX11q/YuKiaxOSSM8gg1fG4spJ8A7CnyZREl5Z7z66D51BamqXsJ28QA4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Qi Zheng In preparation for implementing lockless slab shrink, we need to dynamically allocate the dm-bufio shrinker, so that it can be freed asynchronously using kfree_rcu(). Then it doesn't need to wait for RCU read-side critical section when releasing the struct dm_bufio_client. Signed-off-by: Qi Zheng --- drivers/md/dm-bufio.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index eea977662e81..9472470d456d 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -963,7 +963,7 @@ struct dm_bufio_client { sector_t start; - struct shrinker shrinker; + struct shrinker *shrinker; struct work_struct shrink_work; atomic_long_t need_shrink; @@ -2385,7 +2385,7 @@ static unsigned long dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink { struct dm_bufio_client *c; - c = container_of(shrink, struct dm_bufio_client, shrinker); + c = shrink->private_data; atomic_long_add(sc->nr_to_scan, &c->need_shrink); queue_work(dm_bufio_wq, &c->shrink_work); @@ -2394,7 +2394,7 @@ static unsigned long dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink static unsigned long dm_bufio_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { - struct dm_bufio_client *c = container_of(shrink, struct dm_bufio_client, shrinker); + struct dm_bufio_client *c = shrink->private_data; unsigned long count = cache_total(&c->cache); unsigned long retain_target = get_retain_buffers(c); unsigned long queued_for_cleanup = atomic_long_read(&c->need_shrink); @@ -2507,14 +2507,15 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign INIT_WORK(&c->shrink_work, shrink_work); atomic_long_set(&c->need_shrink, 0); - c->shrinker.count_objects = dm_bufio_shrink_count; - c->shrinker.scan_objects = dm_bufio_shrink_scan; - c->shrinker.seeks = 1; - c->shrinker.batch = 0; - r = register_shrinker(&c->shrinker, "dm-bufio:(%u:%u)", + c->shrinker = shrinker_alloc_and_init(dm_bufio_shrink_count, + dm_bufio_shrink_scan, 0, 1, 0, c); + if (!c->shrinker) + goto bad; + + r = register_shrinker(c->shrinker, "dm-bufio:(%u:%u)", MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev)); if (r) - goto bad; + goto bad_shrinker; mutex_lock(&dm_bufio_clients_lock); dm_bufio_client_count++; @@ -2524,6 +2525,8 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign return c; +bad_shrinker: + shrinker_free(c->shrinker); bad: while (!list_empty(&c->reserved_buffers)) { struct dm_buffer *b = list_to_buffer(c->reserved_buffers.next); @@ -2554,7 +2557,7 @@ void dm_bufio_client_destroy(struct dm_bufio_client *c) drop_buffers(c); - unregister_shrinker(&c->shrinker); + unregister_and_free_shrinker(c->shrinker); flush_work(&c->shrink_work); mutex_lock(&dm_bufio_clients_lock); -- 2.30.2