From patchwork Thu Jun 22 08:39:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288479 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 297C9EB64D8 for ; Thu, 22 Jun 2023 08:40:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C074E8D0009; Thu, 22 Jun 2023 04:40:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B90748D0001; Thu, 22 Jun 2023 04:40:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A31258D0009; Thu, 22 Jun 2023 04:40:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9469F8D0001 for ; Thu, 22 Jun 2023 04:40:53 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 66E4F80AD4 for ; Thu, 22 Jun 2023 08:40:53 +0000 (UTC) X-FDA: 80929738386.02.8DD6FB2 Received: from out-54.mta1.migadu.com (out-54.mta1.migadu.com [95.215.58.54]) by imf21.hostedemail.com (Postfix) with ESMTP id A9E841C0009 for ; Thu, 22 Jun 2023 08:40:51 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="XJ2b/f93"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf21.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.54 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=1687423251; 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=+vImA33fZeTM1PYF4pdKNYjlIIB9YvJgFHxY2Yd6EgU=; b=xvtXN9okXxdkLXyHnPGRzr9fauXlyGr3zdD91OtQITwFTL99k+JSfSiiGI8AwHvJfGvbgB K034ZM50sE9BKy4jres7HS3K7rVY7VPwy0gSTBrC31M9iH8ysf9S3TTJEkqhvjsx/Jf/vU xj0iSsVmOBczQjm17LivYN74xU276Qs= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="XJ2b/f93"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf21.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.54 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423251; a=rsa-sha256; cv=none; b=A/MfxLiky5IIxbqjuAz7ZJB5EP1/JxobhxVgI7t6cNptSlV9E3WQ/XIZCY9DuymwfXvJFO +wKhQZ+KdeceqXOBJ5bMZxy/l9uWSrwHX8b6loAoABmNJ5CdzC66zghyGps+Rxs+CvaTnR 5OtgvIFxdyd+BR3ehExDubbprwqOzl0= 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=1687423250; 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=+vImA33fZeTM1PYF4pdKNYjlIIB9YvJgFHxY2Yd6EgU=; b=XJ2b/f93BCyHxcWaDsebGy2CDaVAa7CPWBXx4c1QEI5VZTDPyp/zp8+Tr/BVaJTW4wXOtq IIZBnQdZZsns0g8Xv0V8GQsEaQgo1jYe7j36H8wsShDt9m5MKBHRcZes1lLxnY0D/KqSYq hjrF1/l+OEZW9z9MquhsKQ9biy+7Xxo= 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 07/29] dm zoned: dynamically allocate the dm-zoned-meta shrinker Date: Thu, 22 Jun 2023 08:39:10 +0000 Message-Id: <20230622083932.4090339-8-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-Rspam-User: X-Stat-Signature: doosfh4ymta3sfehk8f3iw5zhhechtdw X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A9E841C0009 X-HE-Tag: 1687423251-902999 X-HE-Meta: U2FsdGVkX1/b/lbOqiqUhjumiahqCcbcB9CWNh4JPLpycWExcdlmOYb2QiXD4Dlls+NuJEs8/XoDWkCiNDaZ/gggOrbvTcanP6/J3lDEe60QprzJG+aOFRQ+EsXqMJAM/qxs6BakKhP1FCMMpVTnUblN8//a8HCGQNNpIyI3NC23DTxzyCGN16a7nfvU8xsB0AJ6rKrfImORFsd9x55ADgrwoGNI9L9SL5xa+HJmCBoi/n5VIlRP5MA7Lvbh0t+3YFv4CF0l0Skdg1UX7yLafsFZzqoOmkXhZEoKIHMsQquOzysDWLWkw7GcA0rFcKYGB1y113w4pYeoMHhTZRWS8KdDM5un8mTqxdq5TasqSCQNJtKvJDJSu045thNQaZU14A2MFPnZTW9WPp9MeKnKR5IrYuPEDblAnubJDSTzFQuFAndiWmlEV3894KyQfomoluaMsFYoGy5x4F4Jsom6K1GsthZvjTPI9augqtvJMxHi7qU3eZQ0SFhCg2QPA05RDixJY/8UhUQ869reSUsdLAPGB2o2sHBNqZVVFshFS2hNfQ9WhuBKsfMgfyQQXnHBp4kE6ph/gaOIOYpL1u3d6e0kvPzDJohWSVO5wIziTOqgbQLiReN9LB21bBY8OwINmnHhJ3tQUgougo0LDeHBc/SsEvFlZ1rw053TJgFnjrgBY4a0+cJkZIinfA+/uW1DDCECbaW9wWBPFUnNsAfKcSEmbgtV4+/eybNYaYSKMRX/aoaxIBndL4PIto0mzyY1OsEyDUUmfUoWLu0g3r4GoCWvPVjJ5vIAQdxwlOqqhEl9YeM9zMgXp6MDzqUf+FICxIsToPgd1t1+bgnJZQfBoLi+hFLNRn0P9i/6JJuAh5DLimiZN5xb7YsDA2GGfnl+VvHPieN0Mk/mAcoZsalAsk51LfhNH4mhGhAJ8zcY2M34iVBANokIoUIoIZ2ZI+FepaWAcVGb0aksdObOA3T 4FORG0S1 CRbwk0/oSsP/XLondvLPKNENl9tM894NeYtUxpxRFtWdWAmiK5F8Rx7WsCHRDH995Osq1UsFb7KscuaN+ewMwZd4OsAp5P7HKafCQC6kHmUxB3+CG4vjQ6DfBjYIRN3VFoSXTfK+MSQGJlSA= 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-zoned-meta 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 dmz_metadata. Signed-off-by: Qi Zheng --- drivers/md/dm-zoned-metadata.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c index 9d3cca8e3dc9..41b10ffb968a 100644 --- a/drivers/md/dm-zoned-metadata.c +++ b/drivers/md/dm-zoned-metadata.c @@ -187,7 +187,7 @@ struct dmz_metadata { struct rb_root mblk_rbtree; struct list_head mblk_lru_list; struct list_head mblk_dirty_list; - struct shrinker mblk_shrinker; + struct shrinker *mblk_shrinker; /* Zone allocation management */ struct mutex map_lock; @@ -615,7 +615,7 @@ static unsigned long dmz_shrink_mblock_cache(struct dmz_metadata *zmd, static unsigned long dmz_mblock_shrinker_count(struct shrinker *shrink, struct shrink_control *sc) { - struct dmz_metadata *zmd = container_of(shrink, struct dmz_metadata, mblk_shrinker); + struct dmz_metadata *zmd = shrink->private_data; return atomic_read(&zmd->nr_mblks); } @@ -626,7 +626,7 @@ static unsigned long dmz_mblock_shrinker_count(struct shrinker *shrink, static unsigned long dmz_mblock_shrinker_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct dmz_metadata *zmd = container_of(shrink, struct dmz_metadata, mblk_shrinker); + struct dmz_metadata *zmd = shrink->private_data; unsigned long count; spin_lock(&zmd->mblk_lock); @@ -2936,17 +2936,22 @@ int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev, */ zmd->min_nr_mblks = 2 + zmd->nr_map_blocks + zmd->zone_nr_bitmap_blocks * 16; zmd->max_nr_mblks = zmd->min_nr_mblks + 512; - zmd->mblk_shrinker.count_objects = dmz_mblock_shrinker_count; - zmd->mblk_shrinker.scan_objects = dmz_mblock_shrinker_scan; - zmd->mblk_shrinker.seeks = DEFAULT_SEEKS; + + zmd->mblk_shrinker = shrinker_alloc_and_init(dmz_mblock_shrinker_count, + dmz_mblock_shrinker_scan, + 0, DEFAULT_SEEKS, 0, zmd); + if (!zmd->mblk_shrinker) { + dmz_zmd_err(zmd, "allocate metadata cache shrinker failed"); + goto err; + } /* Metadata cache shrinker */ - ret = register_shrinker(&zmd->mblk_shrinker, "dm-zoned-meta:(%u:%u)", + ret = register_shrinker(zmd->mblk_shrinker, "dm-zoned-meta:(%u:%u)", MAJOR(dev->bdev->bd_dev), MINOR(dev->bdev->bd_dev)); if (ret) { dmz_zmd_err(zmd, "Register metadata cache shrinker failed"); - goto err; + goto err_shrinker; } dmz_zmd_info(zmd, "DM-Zoned metadata version %d", zmd->sb_version); @@ -2982,6 +2987,8 @@ int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev, *metadata = zmd; return 0; +err_shrinker: + shrinker_free(zmd->mblk_shrinker); err: dmz_cleanup_metadata(zmd); kfree(zmd); @@ -2995,7 +3002,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, int num_dev, */ void dmz_dtr_metadata(struct dmz_metadata *zmd) { - unregister_shrinker(&zmd->mblk_shrinker); + unregister_and_free_shrinker(zmd->mblk_shrinker); dmz_cleanup_metadata(zmd); kfree(zmd); }