From patchwork Mon Jul 24 09:43:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13323982 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 D01F0C001DF for ; Mon, 24 Jul 2023 09:52:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7004E280002; Mon, 24 Jul 2023 05:52:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B0BA6B0083; Mon, 24 Jul 2023 05:52:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 578C0280002; Mon, 24 Jul 2023 05:52:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 48D256B0082 for ; Mon, 24 Jul 2023 05:52:45 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1A5DC1C98C8 for ; Mon, 24 Jul 2023 09:52:45 +0000 (UTC) X-FDA: 81046041090.06.D60492A Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf23.hostedemail.com (Postfix) with ESMTP id 1A45F140025 for ; Mon, 24 Jul 2023 09:52:42 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=h3gsG4QX; spf=pass (imf23.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.181 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=1690192363; 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=+msSROnlHTbkN8WdS5VhxMSS48DaBcuNUu675bILAm8=; b=DUW+LCdLHaMJvCwJ4cTfkmTDwpGxlQ85EIL3A+em66ReKwTOl1LblgEOgVVyqCGZRM3B1x QiIy7HdqOC6eRAgmOljEp+AHqxA3eO4+VDQAJl9Lj7ULd/MvhS3G1GdDFxBZw2eJhOCcOv BORK9cg94JbaUXhuZ0G5sVcJ5lFlyXc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=h3gsG4QX; spf=pass (imf23.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.181 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=1690192363; a=rsa-sha256; cv=none; b=18oYPQp9AyPSwuHLxZyb5VUgOShawrssLErVnBsrs4Df+L3DXRe5PcuhqW1+AKsW9rlmcz kKNB8nWMGSl0igReD3LARsBd/wwJoTT4j6NW28IbIlRvTCP5/xTMFBAsKtWnuAyUp1/wry Gi5PLEgn01W/77MJFLQhC6sO0gqsQnY= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1bb91c20602so2234745ad.0 for ; Mon, 24 Jul 2023 02:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690192362; x=1690797162; 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=+msSROnlHTbkN8WdS5VhxMSS48DaBcuNUu675bILAm8=; b=h3gsG4QXWw/nahqBxLdBCvqi4m8rD0FXz9A20d9YDr1GVweA7QI5gIYRXxeR03F7VF avO+YUz8f1IL6J1uYX1/b0NEPW6FiLuYcPPgWc9sNeFYAy1/jQVonTK3Har+aojJwTqi hQZEwnSV3LL7ecl9UfamsDpZO40zuTjDqPfF5eu13La0YtcWt3KQO54XvrgMZueVi5PZ X9MwcigdTTnwiJ3xQrZgNRbLcfkBdWK7eRH096K0D7h66kc666JHvNvIGlIc1vw99tH0 GAm/hWRvtDUBnuyuOUfh8qzrbwzBKl3sPPd+rGOKnxJaCrXEUUZmWLLd6RNa7iYZg14F z6LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690192362; x=1690797162; 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=+msSROnlHTbkN8WdS5VhxMSS48DaBcuNUu675bILAm8=; b=RCLjLp4i9UXsZpUDwhSvGAKt21iVK+Zt1xCccLSEkNqFQJFRwlQj/cyEYs9TgTafsE Cgdry+mBhW076ImCdrgu/S0KBIaQ+1DFo+3QI0q5DJKfZiDyEuIccO0mjwvjECpP4aJH uRTwfrHhm2heyFQbu79vUjZPraVUxY3Fvh7fLTwTbQy4nhJVfo8+zq4y+dO9vG6o3N7T QGG0DJdQDHBev7wJcegTtEYJ3LqBSszSDdZSyykRW/yl1gQRy+HTzbbw/naOSBsEF+6p NIyDosYDzE/8f3L6Ut4i7WsZ/MLLoI7OL4iMh7OmGAiE4ETP2uAY5u1J6huSpVGAAv/p 1tlg== X-Gm-Message-State: ABy/qLabMkVX6eoOxkAVJ+O5UIOXLIN94/MNpIql4vkyR3CymkxOYGgG Z0t5QwWMlbZdDS1WYtqhGc7uhg== X-Google-Smtp-Source: APBJJlFjFnMUMe3SYJatR/saB9KY/jkISOdIPz1PLzDLS3adgTzHCnV8/bXf0D4q3OfiSxgFenVrMg== X-Received: by 2002:a17:903:41c9:b0:1b8:17e8:547e with SMTP id u9-20020a17090341c900b001b817e8547emr12208099ple.1.1690192361964; Mon, 24 Jul 2023 02:52:41 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id d5-20020a170902c18500b001bb20380bf2sm8467233pld.13.2023.07.24.02.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 02:52: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 Subject: [PATCH v2 38/47] xfs: dynamically allocate the xfs-qm shrinker Date: Mon, 24 Jul 2023 17:43:45 +0800 Message-Id: <20230724094354.90817-39-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230724094354.90817-1-zhengqi.arch@bytedance.com> References: <20230724094354.90817-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1A45F140025 X-Rspam-User: X-Stat-Signature: h6g8mo9ho7b6r1abar8oezwjst54r6ai X-Rspamd-Server: rspam01 X-HE-Tag: 1690192362-13017 X-HE-Meta: U2FsdGVkX1+wRSyKPjl86Mhkeb8TPN5867486v0NB013bp4ENHA7c46SYNXlD9vH8l7sF0e8U46V4XwErOGFkhi4hkjLl55qvOZHDtvEpkMjoBBJC6+l1J+ZU4D8dZ+8b2KVOH9Q4lFWRL5923zTnnV9kf1i112vD1Lesz82OPD/pTMJxa35fszsV2gwgh/4Y4aHQycpAzCCmyTC3WxHGR+I1FWaKtWOI3FqzWUU+XJt+pwzIMTXondW8Wp72kr4QopYPIFZ5S7gi6unUyrglD++//92S5W41wyScSJmxkP9GR7bfGgBUDdodtCU3Uh1QNctJFFT88PA5crHrKPT2E6Run9kdOxwbHuK+uXzBw5bFcl6HuudhQfTebURAPxDdYtS+xholMoz62vBbFOtjDhNGSYaGHyhSzINsZd+PIwSMhJqBi9NKQd7nIU9x3PDgem42ThoMuRJTiC2vojFt6oWxTO0I0GMlT/kjwSlSaH4H32f2Ix5or3QCUazi3WNTOmT7mfXpNRYw0dofTs8DvEdhv0sBiXrfEsXsxhW8SwqM0+84e/in8JFWkY367TctU4qxB8H0e4TRFA27PN7b5Z0PJIZwzM2Gl2Z/u/VfbDnNZ3/QbMcLmW+ViUSRn2+yLLsAyaGBC8wHyTslMxyXpktGDtQFHLuDlKVDHtXbBqi0J+gC5+NwqhQ/aZtYbvk4lfzDtOU87+YTFNxh0tDTvml4lMxteyaMQg6avQMWu7oZc41JhBMAJw9RINiXZ/89TBhlCTmnjO6bannDbJ5Qar3/0P5lu8BIkkSibeCp5Db3A7UV/z8sEDc/o91m1D2WFJwQRrtupMtnaysb0yv0oW/rVkHymRVlL/aMm1yFaYB5IqkiQhSUFDOvPFtyex78zVJDNqiG2DjGa0yPRF+dE65CFd3cnANCOVVnVjqUxvZJRbwsZpGv+qquL3DiPDQ9J3pUpBqVfWN2haUb/5 8fRNb6cW y9vULPzDjFjLqYKhvMKtyDgmDowXZbn9vk9MMpzkMR0y4bZnLM/aewAFQubeJUKRKFxez/s56C9aWSIv2b9NmdyXW0c3G8SUcbdNW0qC4pHWw4FqBNlhoZFVN3QVa2BxukfMJyHlSVOt0k55xnf1u6sAI5x9YQUSHPHjbBfYhO7UDBkOmQ7YSUDJJ3hyUcpmo6AB2v0TZW/QOENgJN7cDHePduhU+i5TlTABzJOhmiahBD1PE+BLja1MFdqhBqKnOsQtH1RFDdPuj64ACZ7lNC77RLmyM/LYtdUQ8VwuKYN46FdqQhJy7f3UEc8mR5h+HVFvrHjftzXOFwd3fwIfqY6kTgK/HMQd0nHXOgdiyIzHpmjEE9Q4wg+XYzlIeM+QlwJPVPZAeowV3cnC2TM5RLsahbzRkcTVVGExl 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 xfs-qm 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_quotainfo. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/xfs/xfs_qm.c | 26 +++++++++++++------------- fs/xfs/xfs_qm.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 6abcc34fafd8..8f1216e1efc1 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -504,8 +504,7 @@ xfs_qm_shrink_scan( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_quotainfo *qi = container_of(shrink, - struct xfs_quotainfo, qi_shrinker); + struct xfs_quotainfo *qi = shrink->private_data; struct xfs_qm_isolate isol; unsigned long freed; int error; @@ -539,8 +538,7 @@ xfs_qm_shrink_count( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_quotainfo *qi = container_of(shrink, - struct xfs_quotainfo, qi_shrinker); + struct xfs_quotainfo *qi = shrink->private_data; return list_lru_shrink_count(&qi->qi_lru, sc); } @@ -680,16 +678,18 @@ xfs_qm_init_quotainfo( if (XFS_IS_PQUOTA_ON(mp)) xfs_qm_set_defquota(mp, XFS_DQTYPE_PROJ, qinf); - qinf->qi_shrinker.count_objects = xfs_qm_shrink_count; - qinf->qi_shrinker.scan_objects = xfs_qm_shrink_scan; - qinf->qi_shrinker.seeks = DEFAULT_SEEKS; - qinf->qi_shrinker.flags = SHRINKER_NUMA_AWARE; - - error = register_shrinker(&qinf->qi_shrinker, "xfs-qm:%s", - mp->m_super->s_id); - if (error) + qinf->qi_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "xfs-qm:%s", + mp->m_super->s_id); + if (!qinf->qi_shrinker) goto out_free_inos; + qinf->qi_shrinker->count_objects = xfs_qm_shrink_count; + qinf->qi_shrinker->scan_objects = xfs_qm_shrink_scan; + qinf->qi_shrinker->seeks = DEFAULT_SEEKS; + qinf->qi_shrinker->private_data = qinf; + + shrinker_register(qinf->qi_shrinker); + return 0; out_free_inos: @@ -718,7 +718,7 @@ xfs_qm_destroy_quotainfo( qi = mp->m_quotainfo; ASSERT(qi != NULL); - unregister_shrinker(&qi->qi_shrinker); + shrinker_unregister(qi->qi_shrinker); list_lru_destroy(&qi->qi_lru); xfs_qm_destroy_quotainos(qi); mutex_destroy(&qi->qi_tree_lock); diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h index 9683f0457d19..d5c9fc4ba591 100644 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@ -63,7 +63,7 @@ struct xfs_quotainfo { struct xfs_def_quota qi_usr_default; struct xfs_def_quota qi_grp_default; struct xfs_def_quota qi_prj_default; - struct shrinker qi_shrinker; + struct shrinker *qi_shrinker; /* Minimum and maximum quota expiration timestamp values. */ time64_t qi_expiry_min;