From patchwork Thu Jul 27 08:04:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13329217 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 0A218C04FE0 for ; Thu, 27 Jul 2023 08:11:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0A028D0003; Thu, 27 Jul 2023 04:11:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B9A08D0001; Thu, 27 Jul 2023 04:11:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 881938D0003; Thu, 27 Jul 2023 04:11:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 790428D0001 for ; Thu, 27 Jul 2023 04:11:45 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5179DB2A37 for ; Thu, 27 Jul 2023 08:11:45 +0000 (UTC) X-FDA: 81056672970.21.0A5AE18 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf15.hostedemail.com (Postfix) with ESMTP id 60F15A0010 for ; Thu, 27 Jul 2023 08:11:43 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=SGV84iDT; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf15.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690445503; 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=LaFX3BwmrpvhCQ7689MuoFj6fWFWMuerWJZNZNxWVVc=; b=YJuBeNeSUZZtOf/OTZ4qb1pU8+Q/4a/86wGUoWIDE6rs37tSeo9DjaVYiu1obwrJ8t0UUV 6PYMPT0ZkYjXZ/zVFbqyEqZTUOouX8O52UDgK1b4AWtEEck4vkRgowk1lIBNNPOFH31pfu orQBZrs5mc8zRxcMQC2j2hvKXA0RvWY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=SGV84iDT; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf15.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445503; a=rsa-sha256; cv=none; b=ebzUGyeXSn0aFFikPFjeEs7skt5ECYuwpJDZzNJ9RJ08ah7Ze5C7fOZF4Lsva5nOFOjxN1 nDhJiGeXT/3+4o1hpZJ68sXdq/u9hOh27xt3OCbsbAphqkho6pr6TCdbtWZNNTxxF0WIFH aTAx/F368KgeoAH8ISIFdt6XJwidV/A= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-682eef7d752so204501b3a.0 for ; Thu, 27 Jul 2023 01:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445502; x=1691050302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LaFX3BwmrpvhCQ7689MuoFj6fWFWMuerWJZNZNxWVVc=; b=SGV84iDT12fuj4KQ/vgxpHx68bD/8JsYSa9nhb7ntFAq0TKpEUCTaHREzmRsJ3Oz9G gFKmoptXd+Bze48vx/wk2NbZ7T10E7S2MEqYjOuFeG7krpKwSKpfVHBIQRglXfDWTvzO H6VjPKPaTyQraf7CXaxRYntDfW/rFmDGA8pIc8wp3mkyDCZKtDmTVn+WhnbJ9UTHRuGw cfWrmdeiaPvvoPdILYK4+expmzf+8d5vjjDAS5qG8jY/gHHW1jvZoSyULsapwlJ7yOSa R+fxk2s2E87YRuuXF3DsPLATcyScHTHvPiXBlY0TGTmF0pFa842v0dWDdf9orTc8Pn3s TgHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445502; x=1691050302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LaFX3BwmrpvhCQ7689MuoFj6fWFWMuerWJZNZNxWVVc=; b=ChE8JVc0N0aBs9w9838lhwPgDnm/eMYnLYBcHhe+J09p2ZyK4XQdXJRsvCJMEWcZfg 08oYqtDsWUdaw/uzzz4zD4wMgYysZmmpaMOwse3Q0VxdCYOhKdkyGWimmIy9BbnWEaU+ tNKLVXl1Bp1SvyP8fN0rXaS9XAeMPNQDEk8mkWieyXigXOTe1RBczFkpecp/FJQtAfXe jZKpLMlp73GuqkzHdObKcPnWZw5AFtBVvEU+KMUGNWhJ1HjCDzlBND/aLGzfGBoupARO uXNWfApqiXoSUq+IMKHAmj4bBdcAptTJZi3UPk5HR8/W8cOWH7utKc36f21VK6DlzlEh ywTA== X-Gm-Message-State: ABy/qLaCJBrmigmA/IGISmn09SyREDnY/QPoSpveB51ON3Tnpg43BrTA BZVTeodXomi+r9mrde0r4PL9oQ== X-Google-Smtp-Source: APBJJlE5krPFtX55mdmbm5NUPWWjP9qjtSRaT4qUAQtTa6jtnXVyWfbzlnq9LXdP1SlmgTnMsVycpA== X-Received: by 2002:a05:6a21:78a8:b0:137:3eba:b81f with SMTP id bf40-20020a056a2178a800b001373ebab81fmr6016028pzc.3.1690445502183; Thu, 27 Jul 2023 01:11:42 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:11:41 -0700 (PDT) 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, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@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-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v3 29/49] md/raid5: dynamically allocate the md-raid5 shrinker Date: Thu, 27 Jul 2023 16:04:42 +0800 Message-Id: <20230727080502.77895-30-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: zw5i44hr8pw61wqs5fynahfr9ripj8z3 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 60F15A0010 X-HE-Tag: 1690445503-400997 X-HE-Meta: U2FsdGVkX18gakWlX86/vQ017vf0Hafom+gxJOQu4MhqqAMVOQGX9q+xXa2k1isJERiyPyXlyYA3CNeHaXNNS6r42y1mdbOGOgs1xrj2rgKxy1se0BsyspaPsLmFxEPrUHzaJAFNQxmFAi3HIlq7RpZS8OiZKbHLZW6fWpsrzt6uGDezobTq+KlgPQAUKae/55jIiTd/6HhD/ksLn067bFm10M7Lef/TcRHvKy1F4z61bmBUw6efudkHQrOFz5vSYg0PYjMYviyoD4wXNmCqTPGjIHtB3hi05NrUe95eWpoaZjwlTS6PQFpc1duuUWPQB0qaoGIncoe3To5CB6yYExfErPSnsJnn2H10VS+LvwhUjOF8zYN9Owt0lr6ZPX3ijsJlici43QidbHmmJd+B83MHPHIzQCJ4jm17h/EGSGLGzgjX0BkjQ2mvzAiIM0V6irfx5aM/Py9dxAqPYGQF8O0YyHl08Js95U3vQwH0Zlhg5PSnuTXqDXfv/pgJp7fCyg171RVWP02y//c7ilXJEvrwCB4+qu8xHeFGmtNQ2pSjwtjCpZ9Up2qLMG16t+3Jec8L0IhJ8jKbBZBF2lXRFNnSzEWEUYXXSKfcVpQopqoFX0TzFDPYcX9N6NCB6wHhbpd+uswW99DENZtwtg5DlAkX6x1yBpNxknhrtTXoDO1rVeAfKlz+SzxqrGT2Hi57cEM0jnVVKO+y9f9kYEkKLn9yjFxu5StUZQLFO/7ZJfboSc4mjtxkmY+lBZp7ffoZ914AmuwflMXkWRdK0hNxQpmQcpDGzPKWq7KeecRQPGqGO8T7dHANokjzfjjth1sL4uOFXs1PtxrAzOxlgYDWXbFLZJ1pLk2eSun8iKhE4wpuP0MWj7oXJZJjTIKY1bAWgNlsrU71MnSikqsrMqz3RVPoHlf6lXZI49lBtqJ19kVscYAQMdbyG30LezD4JZVggbGMj58k++1uCLKntXr bJnPKRXO JO2eXjyyZ2AecXI7SF/M4zcoG33f4fgf3cpIElYkA4OTQZVzrXheIjUryKgjAohd6DjI5TR/t5gnfJD7DFMQh6Tzjuw1A4o8PAtbVMZ7LY4S9amvkYPovVDVCouVAT0rnCGpePKKggn12lKL8jm/9dmzmB0sk+5y6VqderkXe9ISUgyIiZTHI9G3Lp6MpnGtQzLZ6PCIczPcLXprfvUAVpimQlvvr9N18n1uydYMlij9CKZVfB4MGH6qVsdMwwS5hpjuFEZCVegw4ElVWAUMut/fevw/+/9l14u7UVstInUg5T60mgPPMS17H2uYgngPGPiuTycK5wOPvPwq5e/SSms2WEepmF4V3i0IHYPJMvzIrfdfzLZeqPEHRGrrF8yQRHqUKGXaTN7kPNO5wp+ErZfAUmuy6UqKPPsq+ 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: In preparation for implementing lockless slab shrink, use new APIs 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 Reviewed-by: Muchun Song --- drivers/md/raid5.c | 25 ++++++++++++++----------- drivers/md/raid5.h | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 85b3004594e0..fbb4e6f5ff43 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7414,7 +7414,7 @@ static void free_conf(struct r5conf *conf) log_exit(conf); - unregister_shrinker(&conf->shrinker); + shrinker_free(conf->shrinker); free_thread_groups(conf); shrink_stripes(conf); raid5_free_percpu(conf); @@ -7462,7 +7462,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)) { @@ -7483,7 +7483,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 */ @@ -7718,18 +7718,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)); - if (ret) { - pr_warn("md/raid:%s: couldn't register shrinker.\n", + conf->shrinker = shrinker_alloc(0, "md-raid5:%s", mdname(mddev)); + if (!conf->shrinker) { + pr_warn("md/raid:%s: couldn't allocate shrinker.\n", mdname(mddev)); goto abort; } + 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->private_data = conf; + + shrinker_register(conf->shrinker); + sprintf(pers_name, "raid%d", mddev->new_level); rcu_assign_pointer(conf->thread, md_register_thread(raid5d, mddev, pers_name)); diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 97a795979a35..22bea20eccbd 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;