From patchwork Thu Aug 24 03:42:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13363488 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 647FBC3DA6F for ; Thu, 24 Aug 2023 03:47:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0563528009E; Wed, 23 Aug 2023 23:47:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F21F78E0011; Wed, 23 Aug 2023 23:47:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC30E28009E; Wed, 23 Aug 2023 23:47:32 -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 C81558E0011 for ; Wed, 23 Aug 2023 23:47:32 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A0152B1A31 for ; Thu, 24 Aug 2023 03:47:32 +0000 (UTC) X-FDA: 81157613544.04.D0F6339 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf30.hostedemail.com (Postfix) with ESMTP id DFC2E8000C for ; Thu, 24 Aug 2023 03:47:30 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=DVQw6x+w; spf=pass (imf30.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692848850; 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=rDzcwqaIquIVzn8OsvZGliHXRbA8ENN1qRnYnmk/Xe8=; b=AabZHGcFpw2tWr9fBSsYQ+6A4od3Moa9mb9U0xv9bGiS7/y11qgmDgx790BI/s/68ooMXp OC5suucPxaA4uV1xg2UmOcADnY2y9VAw5OY+MDhshXvYLLvm3nV4kQT6OsBpnx4Z/EH9da N/TSazHiq5pQzKiA4p1aP4EwRkWrsBk= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=DVQw6x+w; spf=pass (imf30.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692848850; a=rsa-sha256; cv=none; b=sNgE3ZxzmOl9orocGHq1JGplJ+ECTl5OHh950H17RT2a8tRW3D7El+6JW/QFDJ4rE4/VXn 9S82Fj1EnS860eKWP1sQrmmxCkXLLDYyp9WP7/MytoDPv5xjJvS93qJ8Kf05UeH31UJnh3 oTaVKuJaKOocqcZTG6vwfpLe0a/Rli4= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-68a32506e90so1062653b3a.1 for ; Wed, 23 Aug 2023 20:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692848850; x=1693453650; 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=rDzcwqaIquIVzn8OsvZGliHXRbA8ENN1qRnYnmk/Xe8=; b=DVQw6x+wRokChvzx3mB2d4JjmEZ8a52hJE0l07W8P8nNrlDhrotmyt3pUv3GQHPCXs 1BrfBypCNsEERgBF0IuI0x1Xr96Fhh2+gAJZZ0EK/1xIsaeYYxT6/EN1k9efrylQkcM1 zJ6XM0kKzaSamlFOt/zlkCHRnLHEfp7PkHOGXd5kLYVg7nejR+dkAMm4O/6awNT3a3Qc xgwMhP+Jmrs8A3VyzQgEal/ZVI5LfCXDTSkiUmeyykfwpxK0jmaWMGlHcl5rKNUdpgen WbYpfAOHKT2MQ9cGHKqu8Hq5a4pOBrfkWUy88QExaDxN1iywSQ8vpGlmHWNB0IOXICaV VZBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692848850; x=1693453650; 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=rDzcwqaIquIVzn8OsvZGliHXRbA8ENN1qRnYnmk/Xe8=; b=dtYBnq++bylsCfubDVVXFAFl80aI6QBSjdWYNdnLEqzsjmjAPZ9PXXgQ6Za5CuTXja y2Dm3jq4ykeaoLzrUO/U16KaRozA0lCNr2fZNx/E3KRU2Cfx+VDCFWEk0Vp/NXt2PgP2 piYSb6ks+wKX+A6gAs3vXdz9jKJ7z7tnXDtbyq+xad448elX3SVfrxzrLgk8Frg0Rk0a uMP27lJR63fLJji4rvB+zZsBDGHekTXs2QAU7cmHGgr6Cmh+dn76YLcBUknxrX7cq/1F PP1lFsCQbeN4f3jfZq3e+J6ynuvCTGmgFcsGfq/F98iXXbpiWWxRSTSCKg57XgVpr3Fe IFZA== X-Gm-Message-State: AOJu0YxnJtl0LsUmccFuma0ZZJq8JpUoEas3qVrPR7EIt325ZvvjHS9Y LYFqM96eByd0ZqGotESfCNHJww== X-Google-Smtp-Source: AGHT+IHnOiXJrClBMOyGTENJi9JIt4dG4SRfFKrPyHzsQUg0+5rqtXlfzEqyCDyUa5PDhlr05atJeA== X-Received: by 2002:a05:6a00:1791:b0:68a:42d0:6b9b with SMTP id s17-20020a056a00179100b0068a42d06b9bmr11893102pfg.3.1692848849886; Wed, 23 Aug 2023 20:47:29 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id t6-20020a63b246000000b005579f12a238sm10533157pgo.86.2023.08.23.20.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 20:47:29 -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, linux-fsdevel@vger.kernel.org, Qi Zheng , Muchun Song , Song Liu , linux-raid@vger.kernel.org Subject: [PATCH v5 25/45] md/raid5: dynamically allocate the md-raid5 shrinker Date: Thu, 24 Aug 2023 11:42:44 +0800 Message-Id: <20230824034304.37411-26-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com> References: <20230824034304.37411-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DFC2E8000C X-Rspam-User: X-Stat-Signature: ccj36d8sa6subfg5ho4uzx1a5jj6xqn5 X-Rspamd-Server: rspam01 X-HE-Tag: 1692848850-716992 X-HE-Meta: U2FsdGVkX1+OGJT2tDhsBeFNDbE6uZz1dmBoFShERF/coDfkna/DpG+yes1SbF8yxAB0hN6406nclTkmUIkmUBFdZH2FAk4D8SFZutmM9aG27G4I84ShR3AdYajNSYvVvxW72VjvUP3C/LYxrAJSHlii5mTy3RQzG1mfofoVvA0WbM1uLhk5dXi+D88h47d8XINqx/8e3DEzE8j3jpQaHfumsYJe/Tly3rC87G+cE5CvREy0wSplFiuYrWrQohAaiMjJlf64HxF+SrCecZiHxf7qtIAqn2YJa3GcZ1TllMqg4F2mHtrcXsin7vS744A4rB+PjVqiRewtNrVTpY+nsGZEzP+lPoamxdbnuJFG0aj7Xpu0Q+9voYpVBknDBs7fB8BkD/vHnNPyHHNZ9Y7bDIrhAAqBcBBc1xe/aWg5Ha0wMUpZ4zrPrff8qat7Qi6V+Hz130knrPmrSrNmQMpu/+MAg/FYANcWxFnkYdPl1LuXaN6DFI/6xUCywTTeVJg3armxoMLMCxnz5BYHH9fuMYbS/PLQBn70N7sAU9gglDgAS/H7pYZ2OdlNtsEYlh7ySbnQMoDZsGfBumcGiN6iW+7MY3EiBR/mok7/4fOTcssWp1JLmb5/7zWcoebr23kmMCZ1TcCFEyChrlrY5hs69GkAHHJIaOFfD6wGrVaawQZKHPZMPTyD7MYaNseR5yWs/+VmXpiMkoD3AhDO3cBu1P3RgfCsEzxv8i7lb+ee15WKwMU7Y0AIfvawBUesYLPk5r62AEN9Qml6gR0dCVZP8x3MIhfy/APucsIoWFxREZg/NCjgjO4vHRhbZK+TfkWaDpEAIJl1POeNpB4ZLANAbneHwurTbsC/tOpGFM3IkgThy7X1wTUcX6V1CnajQgQkuPxtwcm0afIcQeG0zitXxAz9Ik81K3RO7CKqpG4c4WtPsQusd16KXlgD3mNyMh51o+qytmUhylivKkWfuoR 8ge9e7gq 8kzrFqMwcNiGKtbzUIY6SSMfy88f6cHmRTf2wHVBmiU5nFk0YhvxFDJMeKcIBLuClFSSyIBGOo0nCR49ygKlIUt/4wyF9+dEghQsI9dDBCYpV4oo431UeS3/7pV3n5A6esACJqW5K+4tlOeBEsTbdbdIIKUTlmX2ZPTuGUj4iqbsQeOqydmPldoqwjJBlq+5lbve6Ivjbu+pCdc8ZPAM2RluM84Q4vuGmv1JdPkQLGjWR1tRkbqv5m7GtdFGZhK4vqwHi7nMw+h+EHiyaovPqBrfrHBnwfQUiiVLVQp/hvZ/N2I65hGF8UwfNJpFzA33l1ZkXYizmWWgoIN3mtrhm+vYrgvbe/pnD0YMn+CuYF+LeGtDWwZ6q4+94TpVUwQmM+5HvJZEE/ghfpEc3IWEb1pBQ3OI+tjrBazaGplgG/X9BOodvgCPvPUcTA9pshfEGQkWiJwhn8dKze36a5K2wypywi5U9q/4Ya/VP 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 via 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 CC: Song Liu CC: linux-raid@vger.kernel.org Reviewed-by: Song Liu --- drivers/md/raid5.c | 26 +++++++++++++++----------- drivers/md/raid5.h | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 4cb9c608ee19..c8d2c6e50aa1 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7401,7 +7401,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); @@ -7449,7 +7449,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)) { @@ -7470,7 +7470,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 */ @@ -7705,18 +7705,22 @@ 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) { + ret = -ENOMEM; + 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;