From patchwork Mon Jul 24 09:43:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13323746 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 90319C001DE for ; Mon, 24 Jul 2023 09:47:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B85B900004; Mon, 24 Jul 2023 05:47:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2680E900003; Mon, 24 Jul 2023 05:47:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1302E900004; Mon, 24 Jul 2023 05:47:22 -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 07770900003 for ; Mon, 24 Jul 2023 05:47:22 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BFDB5A0A0C for ; Mon, 24 Jul 2023 09:47:21 +0000 (UTC) X-FDA: 81046027482.21.42C8BA2 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf07.hostedemail.com (Postfix) with ESMTP id E671140018 for ; Mon, 24 Jul 2023 09:47:19 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PYcbzrtY; spf=pass (imf07.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.169 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=1690192040; 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=UBNhxmwoWFukUMFCa6L5K1ksS1zA9QvfN1MSwW+LOvg=; b=Ekz1xSlGA9paD2duSQKhoZvvX7eUFmaSzGSzFuMZtr3K+9Hzjulo/CG2R+IjZ3qZrZ6pDL 5VIBeDqGrBte1O1qHdMr8Emk6wVoUU4SDlIvbHgq0Bo2J6Y7KAMroPVmIafrAJpCrBKKpO 8Yup94oWiw9uiD7xYGnlVuYgjCLpwwk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PYcbzrtY; spf=pass (imf07.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.169 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=1690192040; a=rsa-sha256; cv=none; b=59VWADHGmq1TY+ITWMC5VVxsyxyF3uONerpMtU0Vq9gt6z4ixeE5HCAPjtlwaegWWPmGn0 89J1HFNbeyXq3ZzbxmCOvlV3iE8z1S1B4uYIttLM+vV4FfcAD0gdyj6YsoiPyzUcEycVVL yFqK+8EIuJEs6DX0y8Q1h85rKEH47vo= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1bb85ed352bso2233235ad.0 for ; Mon, 24 Jul 2023 02:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690192039; x=1690796839; 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=UBNhxmwoWFukUMFCa6L5K1ksS1zA9QvfN1MSwW+LOvg=; b=PYcbzrtYJQj413Q0/SwymVhgK8hPc8ex6XZDsNX+o4IV2cADzaV/i2ya7gUKq/uTsu wsioX/oC9g6+AR05yLYLolp75BAxO+vtAgmvegSP/6oS7xyFJbaLjDx8bzKHReC/LdPy ZD0p0zqCSm4I20GpIy4a7cDW1rypHC1YzlPKbmR7fKpS+iPZ3nobfzQ/pyKjlQMwP8jK Nmzke41P9dSVS9eDDUNJUwzSb8mk0vo1CuJyAAX+qbcUvC6mBpCbrcmY6qwTVXPENs8X jAMFBNAsAWQ6gQ7fzECuFMhzmmAgzRWBECByoqxf+ey+4diWRhb6HmTmtKgQ50al6pO0 t6+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690192039; x=1690796839; 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=UBNhxmwoWFukUMFCa6L5K1ksS1zA9QvfN1MSwW+LOvg=; b=GHr3BO9WiJp4jl96ifK3iXRoVb8CJwbO2xkW4WUGtouXjLKRuSNyS5cbpO/WNu9zvz lsednonNE428Ml+sjWtKZ+WMjUce9UGA0zD52SlK7VQECg2T8CUJT99KZCGhU6hWcFFO 8Amv8BLZML3+ePXiiGtHLBf29vb5hu/3TJRdNgwlFSlrHB0EGM74J+tA2C380Vveicgo d+QcN8URm7p7UdWxEmYQKWM8Gn2tydvJFoA9Jem0NZnG8Ci9hsiCfuvKly2dc3ngABW7 Y/LK7e6nwzJBmPOyH0+zvERC7LdZxDCmw9YmkgVJ2iaFTdY8grZNS0STZAel23qzln4q 3mbg== X-Gm-Message-State: ABy/qLZf59VB9hmDU8qe4AuEppncEbQ1QvG4jrl58JWT83XH2pcteu1P wGvqiExupIdwzIGW5oYS+UNdJQ== X-Google-Smtp-Source: APBJJlF/3KLtCT6eHhEfIce84TGjlwCK5paHy95Ixo7dnPUARJYmTi5EEMpBHN4EFiKTP+Yjoiy13g== X-Received: by 2002:a17:903:24f:b0:1b8:ac61:ffcd with SMTP id j15-20020a170903024f00b001b8ac61ffcdmr12333562plh.3.1690192038795; Mon, 24 Jul 2023 02:47:18 -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.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 02:47:18 -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 11/47] gfs2: dynamically allocate the gfs2-qd shrinker Date: Mon, 24 Jul 2023 17:43:18 +0800 Message-Id: <20230724094354.90817-12-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: E671140018 X-Rspam-User: X-Stat-Signature: 875ecfdneq3ntg3azso6h9573tr47hxf X-Rspamd-Server: rspam01 X-HE-Tag: 1690192039-834000 X-HE-Meta: U2FsdGVkX18sVEsd1Vk1aLFjjzuw58llFUWqLuiJQJXLvgoxr+yhKS383QMmAqwvMHOdq9/ShvlEJQB1AcLWAVso9z89AzPIce+uLs5o3d2ORTaNCtkHkrtjlwd5Pimd2+KFCrguRdxtzs6ZgEReUa1Gua7QDm0Jo4DtrxCuhcBXTLmMWdUaThLLZC/VYSotREV3jq815vyIBpp8UZy6+b1LuzpMe5qJXgfhDH2epeApnuXoJeuJtS49oWnObh1X61M9mnSkcRQn7HAtRn/sxaJUOyg7Wv+BqBjuxXI79VjpBEGGacBXRsfNhCCi+MkJxPlqNxdydWboeqgkp3Raf/zfEftRILWfSaLQqb4W1jragDxjtvmDlPdmv2AbuOYT8EGLiMHfQ5ndPO0ZQdNRSyxRZ52Zl5NDJCpAyp/zk6k09kRlBAarOvIVjJBxh2iEMYHwKp2y7LXpRiw3lG2KB5QvSU9BAshUuMACtXDXAmuZCulCqr70HuVquiNtQt4i3KG4st/I9SMwPjoqeLcPKxYl3u0ofx2n2KetBvxwon8WYNU4S/EFLX263t3sxE3j7mpKruqcUXlgzCLEFZ1Rh7HaK1KA95bSd4whA48CgB9pTKLyuP4GexPdIlPfB3ws2W5AvN+P9MLyhtffKhXTJ0gbuTjzgVU2PnTYwebdd2NeAmd5XHjA0vntHciGE2UPlee9IaR1DCMD6MxhKoouT7jcs/2IFXCb66qOj95TRD6VK83QcdZ7RaVCAFlkyYzuQ5fjwC+eE/kEF4gTCP4TBtA/DkH8oEn6LqHsDQEdRGddzFum1KbWjbtb6xSN8pNmhKPJ30drar453mu621KYmCg03vQ6NQjojRaGuAUY/fPaPjt9KJ1/UoELfPr2z6BzDedSkKfcaCFphb9FT7+c0v+IOtte7AzErjmqHvQ2qNPWiKnxIw0ChQlX1L/dvG+ORg3+xDS5FhsndeJ0HGx IzLiwLqn sbiCNI+ZjVC/o9HJenzwdGmaoZUboGBtMSf26ZiiBGzsRaC8ngCzPUR5QjD6DMxUhlGif8aPXsifH/HvvRb1pJDft3+razI5EE9NfqegRhJSa4nUT5320Yb23VNSlriwXerzAILiDK+NkOk6Aq+ihHctzg/IX9hushjxTQOFTGeXj81frB2EEttjGQBGzFnAHmPGwXYIbE0eNX/T8IYeqCDBJbeFH1p99I48Fd8kV3qkQ4Xh1bd8zr5jzh68GJi71Hl+gncUK0G9csq0dW1Bum51nYRDZyOcUK0EyAX0t7YtCk4D6Ktac8bgjtRTLCgqejwCvw0KxFx8EjTUGD5h8+nx/yfh9N95KvddJzzOfNpQe4d7D02bBoEejZyKptqZcr04Hp+7ycCTss2Gol2kAOww61t0qvxyCKVScHwC93J+K2qyDEINvBecNN1u2g0NKy6x3flj0C/s81Ok= 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: Use new APIs to dynamically allocate the gfs2-qd shrinker. Signed-off-by: Qi Zheng --- fs/gfs2/main.c | 6 +++--- fs/gfs2/quota.c | 26 ++++++++++++++++++++------ fs/gfs2/quota.h | 3 ++- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index afcb32854f14..e47b1cc79f59 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@ -147,7 +147,7 @@ static int __init init_gfs2_fs(void) if (!gfs2_trans_cachep) goto fail_cachep8; - error = register_shrinker(&gfs2_qd_shrinker, "gfs2-qd"); + error = gfs2_qd_shrinker_init(); if (error) goto fail_shrinker; @@ -196,7 +196,7 @@ static int __init init_gfs2_fs(void) fail_wq2: destroy_workqueue(gfs_recovery_wq); fail_wq1: - unregister_shrinker(&gfs2_qd_shrinker); + gfs2_qd_shrinker_exit(); fail_shrinker: kmem_cache_destroy(gfs2_trans_cachep); fail_cachep8: @@ -229,7 +229,7 @@ static int __init init_gfs2_fs(void) static void __exit exit_gfs2_fs(void) { - unregister_shrinker(&gfs2_qd_shrinker); + gfs2_qd_shrinker_exit(); gfs2_glock_exit(); gfs2_unregister_debugfs(); unregister_filesystem(&gfs2_fs_type); diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 704192b73605..bc9883cea847 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -186,13 +186,27 @@ static unsigned long gfs2_qd_shrink_count(struct shrinker *shrink, return vfs_pressure_ratio(list_lru_shrink_count(&gfs2_qd_lru, sc)); } -struct shrinker gfs2_qd_shrinker = { - .count_objects = gfs2_qd_shrink_count, - .scan_objects = gfs2_qd_shrink_scan, - .seeks = DEFAULT_SEEKS, - .flags = SHRINKER_NUMA_AWARE, -}; +static struct shrinker *gfs2_qd_shrinker; + +int gfs2_qd_shrinker_init(void) +{ + gfs2_qd_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "gfs2-qd"); + if (!gfs2_qd_shrinker) + return -ENOMEM; + + gfs2_qd_shrinker->count_objects = gfs2_qd_shrink_count; + gfs2_qd_shrinker->scan_objects = gfs2_qd_shrink_scan; + gfs2_qd_shrinker->seeks = DEFAULT_SEEKS; + + shrinker_register(gfs2_qd_shrinker); + return 0; +} + +void gfs2_qd_shrinker_exit(void) +{ + shrinker_unregister(gfs2_qd_shrinker); +} static u64 qd2index(struct gfs2_quota_data *qd) { diff --git a/fs/gfs2/quota.h b/fs/gfs2/quota.h index 21ada332d555..f9cb863373f7 100644 --- a/fs/gfs2/quota.h +++ b/fs/gfs2/quota.h @@ -59,7 +59,8 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip, } extern const struct quotactl_ops gfs2_quotactl_ops; -extern struct shrinker gfs2_qd_shrinker; +int gfs2_qd_shrinker_init(void); +void gfs2_qd_shrinker_exit(void); extern struct list_lru gfs2_qd_lru; extern void __init gfs2_quota_hash_init(void);