From patchwork Thu Jun 22 08:53:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288650 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 6C858EB64D8 for ; Thu, 22 Jun 2023 08:56:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 105DF8D000C; Thu, 22 Jun 2023 04:56:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B6F78D0001; Thu, 22 Jun 2023 04:56:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC0508D000C; Thu, 22 Jun 2023 04:56:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DE5898D0001 for ; Thu, 22 Jun 2023 04:56:30 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B24F51A0B25 for ; Thu, 22 Jun 2023 08:56:30 +0000 (UTC) X-FDA: 80929777740.02.6E4D2D6 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf02.hostedemail.com (Postfix) with ESMTP id E64A48000E for ; Thu, 22 Jun 2023 08:56:28 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RR2ZBd6H; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf02.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.175 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=1687424189; 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=tTZEGaIAEFBjvotA1NXyBA/23sGgDmW1pgUANJLmL6g=; b=Z2aIDzF5CxmdRuNrdQzqtFdRa3JREhb1cvE8kDQXf6ZGoj/hFxlWteSruQJ8OhgB0W4HZ/ SMHmdd6iy3SgivQekMMpJR+QkcRJKAMwyTuaX+6Vb/IuZSlPM26CfSL3BnBy1jj1Dqagk6 83AZkBdfHMH+RelzmBGSskbFv9sMQ6M= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RR2ZBd6H; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf02.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687424189; a=rsa-sha256; cv=none; b=zrwAH1tVXu1inBRDAC0m4jZ9Swsu9kFycl9nF0wdkNH7dWwbetYpgsnTUmUwoeRqlV2Awu LzLrozqI8bJem+Vhqr+Vq95/7QfXXBRsSOM2xBtn0ZdUE9PyL5hwQtaTw2rAy2bINGiNMz YIcFo9CKKs8XM1H1ImmTUNTd8DIzBdk= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b515ec39feso12621895ad.0 for ; Thu, 22 Jun 2023 01:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1687424188; x=1690016188; 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=tTZEGaIAEFBjvotA1NXyBA/23sGgDmW1pgUANJLmL6g=; b=RR2ZBd6H05awxDqDqVthUnK8c2aiJ3/40MwwmbAPlBGQiSswQkBwcxNT/M8cNWLnOA 82Up+za+KnH3T12j6kLa8MWMs1OLNz27XFTdAlPbZ38sAlCSEZeBeei4jIEF3DOGcfFf sqLx7qpbJbMhGZOLWmDQDC3qBDYjKQCUQ+pHZmp4+zwVYsBG9SEPO8LfQRHMRrJmIPZH mEo73QmcjA4JR+vhCDbl2LS55wzlx82Sg5Hmni0lGgyYmJGvSzc9k9c1k7gD3cDGUkxo aNJG0MDIsuR+BfQGSCBSsk1/g4GTm7BXhgoQS8izvkkK6lhK2DzzoNDI+34/82OB/BW3 znuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687424188; x=1690016188; 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=tTZEGaIAEFBjvotA1NXyBA/23sGgDmW1pgUANJLmL6g=; b=avPqUzpFt3TQR5Wk9yoIxGw/zFehIgkfLr1e96+Kclp7qusME8okWqpLZOTGiPF1BT Wd7t1cLa37jeT8pVOPtgBnBzTq+F8tLcPx5M13wd4r7VsUUW7KBEIA4Z+uQ7dv8CTeei 2r13p0DFN5Yccv380xbzqBlCAG8oK0DpjYOLCX2NtsdnDb3PR/6AwrOs9dlFpzQbZky8 SZ0yUuBYzBVxa37Oj7K9n/uECErqHrPf0b9fE4Oqhg6vJ5XzcGZ9hSFL8BNsY518TPkH tumxIA8DSxiEG3jkqEnOiPuMKCJwTnXJxWa8RBiYkUiaELe6otnAoW3Y4efX5aL7ZlaM YzSg== X-Gm-Message-State: AC+VfDyeoad5ROseMMshlyucsAfejOJwz5BXmkn7AJxpB2YaWA9N7xKQ tsZ3daziO1domXRAmwtrNFw+nw== X-Google-Smtp-Source: ACHHUZ6OWalxJOPaEyVlek6DUPm2brDmU3Y4XuKo9voozhXt0KV98CJSzaGxqKjpiLWREy1Rn2GjcA== X-Received: by 2002:a17:902:dac6:b0:1ac:656f:a68d with SMTP id q6-20020a170902dac600b001ac656fa68dmr21469547plx.4.1687424187780; Thu, 22 Jun 2023 01:56:27 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id h2-20020a170902f7c200b001b549fce345sm4806971plw.230.2023.06.22.01.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 01:56:27 -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 Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, intel-gfx@lists.freedesktop.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-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH 18/29] xfs: dynamically allocate the xfs-inodegc shrinker Date: Thu, 22 Jun 2023 16:53:24 +0800 Message-Id: <20230622085335.77010-19-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230622085335.77010-1-zhengqi.arch@bytedance.com> References: <20230622085335.77010-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: E64A48000E X-Stat-Signature: rsn934zn8ze4tfs5wo4poogiwnozfkf6 X-Rspam-User: X-HE-Tag: 1687424188-705860 X-HE-Meta: U2FsdGVkX19knil8zyjxcQEekH0LVR9n6X8G618xtOfBBD8SMe/i4weDIEDiS8+KwdBe/0Wi0GVrRG4yG/LHYne5K+4ayI4A385n8r2FtViepJWY65n/XPYU2rwwCqDOUVmdz02WcTzqyV3JF80g/TDzK1S6Xyd3dbAQm8DNsRgd8SeSIRegS9TKkcTiWIRdRUv38MinDqR5hKeG8NtuxRobzwDD/wYEam7vxd6EyGO21Q7l8H1VOOZ/QbrDyHNQL1lFDPUs9Idr6v9LQdDLZEKFdxWEHumjvNCRJ1/kCN5T8soGAgNBEYeXVBBGvMcw77oI2KmtqJ4HtXuunJ33/UpFUr9Q1B28pKBiQ4DdFNG/O4NT2rIGcQ8uYw8lW3Nyr1cyHsPmbM02XK3EZLnjuUdIySozLdsGguUoMDgJGY1jPcet3xjcTW1Y956OM244l0eiQcui4Pq34FRA9RCTZfdd3Zkh2OuYO1NYcgduPAzAaVc5se6pCxiB9IOGz8tnON8+9x5Dj1IQDjBkhcTeJH7WLKUgujYpeCVf5Mbji4mAn172MkUPDxsAspZtiLz5HadvJSIJN/MsZMRr02lGWRiM2I124Y/OCsoNXQvHaiREncAI/4/bcgMnugSQqdIxXZ+mzMqafuW8mBM9FOhJqjYxNRjeUIg8A/AnH6RjT1490DG08ZyMQiA+0E2UFO257KI+iyv7mC/KN8KjUMCH6eeeRbXUVem3aJDHBTIOfEfiI7ZTRHqsDeIO66cJXFL1Sdko7daezfzoCQSjHiijD7hrpMFpj4A7OUjrErQmGhZN6EafggpwhlhJCQLfrSkoyhA/H2jJ0jSbNec/c/JWkcandYVFUQ8pzg6tM/MJvg6UzASxpJ4aajk+ukrNDb/RGo1cq7NpIqkyqiklIQjuDFViiKCftWBPLxgzyiAKEHKuhoePxPr87ATMRbHXNuO5THrPUHTo+gtug4DgQoa x1DKflTO tsZx+92MPTxM4bQdlsjauczGZqZu3oTijVB9omnSRVBYZxhhel8uOISErYuKzc02kL9G5ud6BGbMPpMx+nzXTwBR2CFieUSGpuRmWTJalfKLYRn7ZLrEZpnuut8qJUqlfyaWH6ygzFWvbUN6QAIMLWHG8SFIqpjcgCnOdEQGMfPS+77PIWa4JWMxZjKmoGnxcKP4PFeaNUCCP1oLLCrRYQNwP4MyU9ipa6zv8RozXEcqwV0cBcyvzHlwPbyqNYeji25f9ssvAC3YaK+arxT28TEb9lUeny5FYDG06atJyJY6UBn02wGwqa6zM7zxdzeOvJashQuXP70RvtvZOyK2jlKXyEabACinpJCpopsFm9twQu3Jqc+K8ZZDNG6DOq6IR6RpD/9dztxWFN6TAwxSGVyrDs+T0HMq/0vud 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, we need to dynamically allocate the xfs-inodegc 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 xfs_mount. Signed-off-by: Qi Zheng --- fs/xfs/xfs_icache.c | 27 ++++++++++++++++----------- fs/xfs/xfs_mount.c | 4 ++-- fs/xfs/xfs_mount.h | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index 453890942d9f..1ef0c9fa57de 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -2225,8 +2225,7 @@ xfs_inodegc_shrinker_count( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_mount *mp = container_of(shrink, struct xfs_mount, - m_inodegc_shrinker); + struct xfs_mount *mp = shrink->private_data; struct xfs_inodegc *gc; int cpu; @@ -2247,8 +2246,7 @@ xfs_inodegc_shrinker_scan( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_mount *mp = container_of(shrink, struct xfs_mount, - m_inodegc_shrinker); + struct xfs_mount *mp = shrink->private_data; struct xfs_inodegc *gc; int cpu; bool no_items = true; @@ -2284,13 +2282,20 @@ int xfs_inodegc_register_shrinker( struct xfs_mount *mp) { - struct shrinker *shrink = &mp->m_inodegc_shrinker; + int ret; - shrink->count_objects = xfs_inodegc_shrinker_count; - shrink->scan_objects = xfs_inodegc_shrinker_scan; - shrink->seeks = 0; - shrink->flags = SHRINKER_NONSLAB; - shrink->batch = XFS_INODEGC_SHRINKER_BATCH; + mp->m_inodegc_shrinker = + shrinker_alloc_and_init(xfs_inodegc_shrinker_count, + xfs_inodegc_shrinker_scan, + XFS_INODEGC_SHRINKER_BATCH, + 0, SHRINKER_NONSLAB, mp); + if (!mp->m_inodegc_shrinker) + return -ENOMEM; + + ret = register_shrinker(mp->m_inodegc_shrinker, "xfs-inodegc:%s", + mp->m_super->s_id); + if (ret) + shrinker_free(mp->m_inodegc_shrinker); - return register_shrinker(shrink, "xfs-inodegc:%s", mp->m_super->s_id); + return ret; } diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index fb87ffb48f7f..67286859ad34 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -1018,7 +1018,7 @@ xfs_mountfs( out_log_dealloc: xfs_log_mount_cancel(mp); out_inodegc_shrinker: - unregister_shrinker(&mp->m_inodegc_shrinker); + unregister_and_free_shrinker(mp->m_inodegc_shrinker); out_fail_wait: if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) xfs_buftarg_drain(mp->m_logdev_targp); @@ -1100,7 +1100,7 @@ xfs_unmountfs( #if defined(DEBUG) xfs_errortag_clearall(mp); #endif - unregister_shrinker(&mp->m_inodegc_shrinker); + unregister_and_free_shrinker(mp->m_inodegc_shrinker); xfs_free_perag(mp); xfs_errortag_del(mp); diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e2866e7fa60c..562c294ca08e 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -217,7 +217,7 @@ typedef struct xfs_mount { atomic_t m_agirotor; /* last ag dir inode alloced */ /* Memory shrinker to throttle and reprioritize inodegc */ - struct shrinker m_inodegc_shrinker; + struct shrinker *m_inodegc_shrinker; /* * Workqueue item so that we can coalesce multiple inode flush attempts * into a single flush.