From patchwork Thu Jun 22 08:39:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288480 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 4BFB6EB64D8 for ; Thu, 22 Jun 2023 08:41:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E51CF8D0007; Thu, 22 Jun 2023 04:41:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DDA348D0001; Thu, 22 Jun 2023 04:41:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7B708D0007; Thu, 22 Jun 2023 04:41:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B5EFE8D0001 for ; Thu, 22 Jun 2023 04:41:00 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8C51CB0473 for ; Thu, 22 Jun 2023 08:41:00 +0000 (UTC) X-FDA: 80929738680.08.8C00B29 Received: from out-48.mta1.migadu.com (out-48.mta1.migadu.com [95.215.58.48]) by imf26.hostedemail.com (Postfix) with ESMTP id 641D214000B for ; Thu, 22 Jun 2023 08:40:58 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=pIkop2eQ; spf=pass (imf26.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.48 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687423258; 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=UVc05N8TOGwuUUKoNz87gDn866CFxAmc8E1rcih1bqo=; b=1Y0DhxiuMN3TJ+RamBliy7A/NU4kREVWsmEm0AY3pRE5RC+JW2c/FXWu35pslZItOtyzR/ zUSDz4bAxxLOtoHRN8XA9R1nrTNWDrsn6DXyd8M5/BJLl7okd9DEXWeYIQ/uIpSH1uTbM9 Ht5T/qwo/JtgyNVDkS7AQnNfPDaCd94= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423258; a=rsa-sha256; cv=none; b=Nlom5Oux05VtbZgDzU8sx2ERUiWAEJtINMhcYs9QojgiOutEAC2ws53EEUfc44SPVWKeGW GP77/8yNQUDRCulOowto/ow+3OsKxgKLgJcnjg+GmP7NnKcLSBQFF9p30O79JrRBhKUPGh ZMxbTSp1wp9IoELNLwT8MtjXiiBvZto= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=pIkop2eQ; spf=pass (imf26.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.48 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1687423256; 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=UVc05N8TOGwuUUKoNz87gDn866CFxAmc8E1rcih1bqo=; b=pIkop2eQR4AzcvFtx0fKC5u74SQHEPst+ye/aRaIN/XLkXx9ENeAfcG9GarTuIM0jnpWjY wc1vZF+DfrPQmzmeUXoRrgWlfs5txUtNbBR8RjUQS7TF9I112ROw+Fu0aprW/Xjax/gTyt /OzCXh22MrqgNQholBQLGjBVav3coLY= 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 08/29] md/raid5: dynamically allocate the md-raid5 shrinker Date: Thu, 22 Jun 2023 08:39:11 +0000 Message-Id: <20230622083932.4090339-9-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 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 641D214000B X-Rspam-User: X-Stat-Signature: dryct683wmsbj33jm7kccd1sujppieae X-Rspamd-Server: rspam03 X-HE-Tag: 1687423258-415998 X-HE-Meta: U2FsdGVkX1+zzf8tgQ8AZ+ZWhkEmmYGAcpcJBDKO8kVzBQu6mPaT8wu4e/7h/TSMPl6BfT7SptlQyNE1Oe61pqenSXi7KVvR2oRc2QuwTSmBaDJA4j9VYPk8HwkVfZIrizetSUKZ90ryr7UYw5It7FHZxA/1HNLgPezSxVTtLO+gKhq51uFxJPf5ry22QpPfZi+yVyI1vrwaHQI80yeVG67jAfxoYjtO8XAirpt6SY6HBrIp+VPwTOiTcnXSQ2Rppn7Fs2C63m2UFCjUGhQLbvfuuD1oE2J88wOWNMbMvg1ijw4fJKHx9k6mo77ulQkDEWvnrkpUMFQmmtMcV1AeyxLzodZ6g5D7g17pm9ker1n5dXzdK9AH9zjI8WswRqauZexGRqGlYwfRGwVlrw4fMUqKjiYQ9e/Zqfb8LWfq8xqaY+d5LqFA1uTS1VmyxqiD5BB7e11q6EKZZOPzOPZRdCGBzoGp9WaQmHyyyqR/fwGnEDzmZVDKUWgBWKeol3bcyWoBrr4JwU3DIJLPX7P7RQXbmR9jCJCYjR8NO3AvYcA/Fxld0hoCr9tGVU/QZ45nwawjG5Kz34xQdDyIPOtLaw7sKmc8w0OoynDtQhtBgFGkGyL8c05/STYJWanZ6n4v8c7iZ2Czlg0sLrMdZDYNCc8a73ikN7q4jGFAGFXQFsKXBKOZZsDjiOjmT182N5jv7A84xilShSZGIAMs3xb3EKRWL5WhPvJPK6azpp2MGI4bckGMTm6HC+jaCUCbzMOi6/DQFLYycJFUXFxXuFr4y7sdIAWr7+hOcw9v1vuWCK/W8xyyYb3tbP9Kv0PrFgGAwOHz3vFBi4TKdFSd28lgXxQbYp7hRUdepbMvMfsc7JbzVLmjsBn9jje1FzfK+rXAVuja8XjgFn19G/zNvzZgYD6NJsiBNt9+WjLQ/m1WhMnjbJjeRxPr2dz/Dyw2Ay/9WU4T+GIspAKaxiE8N/t ocsmX5jV yYjtDClwfgZiw08QPFn/SCDntT5xTL4mnaqcW/N/Dy2MPZ+tcplnBAcQXJUfpFAtRoa6myBWWIL146SLs6SFNgW9Q+R4Pi4YUtw9/0vtsFYeLhOljf/jyysR+YdUQIsdIHVwkcJgcs8QJzgc= 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 md-raid5 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 r5conf. Signed-off-by: Qi Zheng --- drivers/md/raid5.c | 28 +++++++++++++++++----------- drivers/md/raid5.h | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index f4eea1bbbeaf..4866cad1ad62 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7391,7 +7391,7 @@ static void free_conf(struct r5conf *conf) log_exit(conf); - unregister_shrinker(&conf->shrinker); + unregister_and_free_shrinker(conf->shrinker); free_thread_groups(conf); shrink_stripes(conf); raid5_free_percpu(conf); @@ -7439,7 +7439,7 @@ static int raid5_alloc_percpu(struct r5conf *conf) static unsigned long raid5_cache_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct r5conf *conf = container_of(shrink, struct r5conf, shrinker); + struct r5conf *conf = shrink->private_data; unsigned long ret = SHRINK_STOP; if (mutex_trylock(&conf->cache_size_mutex)) { @@ -7460,7 +7460,7 @@ static unsigned long raid5_cache_scan(struct shrinker *shrink, static unsigned long raid5_cache_count(struct shrinker *shrink, struct shrink_control *sc) { - struct r5conf *conf = container_of(shrink, struct r5conf, shrinker); + struct r5conf *conf = shrink->private_data; if (conf->max_nr_stripes < conf->min_nr_stripes) /* unlikely, but not impossible */ @@ -7695,16 +7695,21 @@ static struct r5conf *setup_conf(struct mddev *mddev) * it reduces the queue depth and so can hurt throughput. * So set it rather large, scaled by number of devices. */ - conf->shrinker.seeks = DEFAULT_SEEKS * conf->raid_disks * 4; - conf->shrinker.scan_objects = raid5_cache_scan; - conf->shrinker.count_objects = raid5_cache_count; - conf->shrinker.batch = 128; - conf->shrinker.flags = 0; - ret = register_shrinker(&conf->shrinker, "md-raid5:%s", mdname(mddev)); + conf->shrinker = shrinker_alloc_and_init(raid5_cache_count, + raid5_cache_scan, 128, + DEFAULT_SEEKS * conf->raid_disks * 4, + 0, conf); + if (!conf->shrinker) { + pr_warn("md/raid:%s: couldn't allocate shrinker.\n", + mdname(mddev)); + goto abort; + } + + ret = register_shrinker(conf->shrinker, "md-raid5:%s", mdname(mddev)); if (ret) { pr_warn("md/raid:%s: couldn't register shrinker.\n", mdname(mddev)); - goto abort; + goto abort_shrinker; } sprintf(pers_name, "raid%d", mddev->new_level); @@ -7717,7 +7722,8 @@ static struct r5conf *setup_conf(struct mddev *mddev) } return conf; - +abort_shrinker: + shrinker_free(conf->shrinker); abort: if (conf) free_conf(conf); diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 6a92fafb0748..806f84681599 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -670,7 +670,7 @@ struct r5conf { wait_queue_head_t wait_for_stripe; wait_queue_head_t wait_for_overlap; unsigned long cache_state; - struct shrinker shrinker; + struct shrinker *shrinker; int pool_size; /* number of disks in stripeheads in pool */ spinlock_t device_lock; struct disk_info *disks;