From patchwork Mon Aug 7 11:09:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13343692 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 76D26C001DF for ; Mon, 7 Aug 2023 11:18:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D7BB6B007D; Mon, 7 Aug 2023 07:18:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 060478D0005; Mon, 7 Aug 2023 07:18:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1E128D0003; Mon, 7 Aug 2023 07:18:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CDCEA6B007D for ; Mon, 7 Aug 2023 07:18:19 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A4CA51404FF for ; Mon, 7 Aug 2023 11:18:19 +0000 (UTC) X-FDA: 81097059918.07.DA90D63 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf22.hostedemail.com (Postfix) with ESMTP id D4652C000B for ; Mon, 7 Aug 2023 11:18:17 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=I0fRADtM; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf22.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.177 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=1691407097; 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=NbTnBXz1rftevvtnrJnbyUTbBXZHNhmRyJT9VBuSKEk=; b=fF0t8MFnnQJQvUF4QSMm8XqAuEz1SbfEt5XKAYvHJ5g/JtCUmkbCLNG9zXRq2D33dVCwg0 unxzGiI6xqShQO/i9y7mbCykoYmu1RVhWNGp2aKeDalkNcmbTFufpI941N2GORuViUfd4t DpI4M7n2YY/0kwoXAn3uQ9sosmer5As= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=I0fRADtM; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf22.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691407097; a=rsa-sha256; cv=none; b=NF7d2l9imhp96QsNUvn3sZEoZHkAnXxw3mWIZ6bDB8jC4Le7etzM8ubiH91NEyYLJHdQav lmI/llApv//3MfbNMdlB6FJZFVoZGC0+EbKA6Ur6yJAK5cE5MQRbxjoNZoXhJgv/od0QY6 VQtab0JwYVMtm3sevWnkBIXfkqHIU08= Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-55b78bf0423so392511a12.0 for ; Mon, 07 Aug 2023 04:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1691407097; x=1692011897; 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=NbTnBXz1rftevvtnrJnbyUTbBXZHNhmRyJT9VBuSKEk=; b=I0fRADtMeQ7ZYN4lawqOYqpZyATzMma8+JI7v8Zk4meeIAhlCUAEE4oant9GMpCU9c e1/RDTnNhNkcs7YzYpKhdN1XDfh3C1CzV0J+KZ3/D4mlZFUuIdDCGJV9GUewRdITND6b 4GYUs3S5ZWDZ5Jh0dvaqr1VDHgapHBN1S1ychIZWiQ7oRwFoKrrtIpw0qxts3s8CAjGr ydAlHOG9qMq4ZFwUnfssYxxr3X8fPLTZ5CluqYa54YAa1ITLLjbOydQ2pku3tDphziTJ CgtcI6R1bGyzpwkNzZouq5zSQbcmQPiHyBeMkjagL4bEVNYZ8WMV4Nik0kWzaqHzYD2e Au8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691407097; x=1692011897; 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=NbTnBXz1rftevvtnrJnbyUTbBXZHNhmRyJT9VBuSKEk=; b=HGXgYWQDCN5hQzYSUperZU69QI3zVOCQNk/gktmwQQc5b1ywSCnKlt2e17PQsRzo6o s02wV29QZ0PflcYe38qozhcVB/QgRcKnTqn8rz6i6ryRk7v5Clkf6t6iL/388zy+cfyX uQYWLYfkKsQnjCB/Of1aG3+Kl2r0KOUJYfgt8NHc0W4fG/yCjUbwQhkTnwhLHgjtb1cK SqE5d6SQyp8JjuAHLsnKAiZJG+y9KTDAuIj3m7sJAQ7vI0I22WzFgDPrzigbZphXwaH2 IRT9gWZXdpXHc9+13Z9QPUU6WwUBNHA1ytb6svlhiPEOPVCFsv6gH7J+A9Kj5FTG1BS+ n2nQ== X-Gm-Message-State: ABy/qLZGmKJFPrvBT1RbHBbBa/LkGe1G3B6sKyysWOPTYO7XrdFdt6Hr OliMd+8o0VURDtZGjQxfVmTcLw== X-Google-Smtp-Source: APBJJlHEA3k+axkYWIvy1nHuTMRTEcDAAx3CbSXEmipYg83y/9axHDl54yrvmY4ExsXdwismqiSLfg== X-Received: by 2002:a17:90a:901:b0:268:3a31:3e4d with SMTP id n1-20020a17090a090100b002683a313e4dmr23078546pjn.2.1691407096844; Mon, 07 Aug 2023 04:18:16 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id y13-20020a17090aca8d00b0025be7b69d73sm5861191pjt.12.2023.08.07.04.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:18:16 -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, simon.horman@corigine.com, dlemoal@kernel.org 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 v4 39/48] xfs: dynamically allocate the xfs-qm shrinker Date: Mon, 7 Aug 2023 19:09:27 +0800 Message-Id: <20230807110936.21819-40-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230807110936.21819-1-zhengqi.arch@bytedance.com> References: <20230807110936.21819-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D4652C000B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: wtq8kbjpdob4oer8a3mn56of3tbi76q6 X-HE-Tag: 1691407097-656220 X-HE-Meta: U2FsdGVkX19Jat1CT5qD0nuUP7M1VX41YwXjZwF9GgJUKxqySAjQpzD7njK9MQl/5Lhakeh73yPjCsQbsemK2flS4WCU4PmKehTxhPs2wuWNzKeUZLJlnIe/bkypOjEH6+cV5lGFmDfQKKHw0e0EIgTz7ED9AFxsj/lk5qSSOfH9ZamRItW3FmE1QEupz7G3PrdT/zfG6Ro9mKfqJ8Fgsna/0atuBZydxGjqKtxfPbdb+vXrUhd5M0egRrdQRIiej2Yg9oSUEHkb2saPn9qV6xP8XghOAgyxHqxrPRhL17mMVIPMRZ/h0j0+CLt15oND3qGE0M2p+OIZpAv4pMpUw9D39dD7XptvZtYynn1DJJ/0HqHhRG4NBhs+w/oYgQODE+sVLg4pPStytNeUXRkM7KkGINTlbitHdKBSKNCisQYbDoGXAybfoOr0jClUkaOckZXkUcG1KQ5m26qqyynhJq2gb9euysQXgatQD9MnqG99+pcI+mDRh/XjgJKkvrTQrfInoSCHhSTCew+inJcwHImO5ybOUjJu104AneIY2kky8R3e0PfOjLfZfnmtAQTX3fzYA9GdWAU6Ln4ZvCC5k34FJzl5hmjTywnjMZAvjZloLaFsT5bSL6lzoDc8Q0+GKLqYCZe1iP3DhzB7KHB1xrkyq412g8EYBhjhWbvQBQ62xHOhpCBuYwzEBW8onqmqjlYgvQEyRphgpSIldQOSaPv3tl2d0kasDuPx9/eqYl325KVknZ4Z32v0WfvHiFipcj4sS76hlDtb1et+mGFK/ImVFyTV63BrBsNJuWgWTmy1JUfHafOnctReO3uep1YzuNiTzHJ2g6nHjq7mLFAwaniMUz3Spv/BtQGBQSNa1hme3wLaP1q5+EvBoZtRvJ/5J5e35fW4NPNHfmTn4ncjfhYwMXxUTSYcrlVE+CIY0v/xd8Dj6a4ulYUi/ZNPKFnG+F7IfwA9DXWDCmgsb21 /pXut4L5 14pujnUqYrtW15mJuasqP+mv5dIH5FgxcPeBf2lyj/CQqfWbNaKZHgLHjzmU2QKRUutugvVbIxnMWrNWm6H1XlqpZN1NhK1qZenJ2af7BxiYaC8/mlPzntm0zpX5Wv+/1i5W1ha2Vn0y16ephs76e61c0rO2xvaLvEwLCoE4kKYsI0Jhz6RrUAe8GPvWApSq6GWZN0Fn8F0pB0jvzqH4tPlC9vzPvYw9bP/fi9r3yt2WTrvkvJwWItDf7PXvkmlwi+ivJjYk+PJVdpirehx1EPtXzZrK7yfWTbwGI6ELEARSKq2fUjJHV3GzuCgdHpFwZKrJ4HLZTZxPtPoTCpShBlmKC1UY889RH1DjSGov4AmaBFvqxBO5gWb1ySrF7JKeIMRpk1YBBwd0cYavEaH1nGY2sKcV36MY/GWAb 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 | 28 +++++++++++++++------------- fs/xfs/xfs_qm.h | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 6abcc34fafd8..15ba23f11271 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,15 +678,19 @@ 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) { + error = -ENOMEM; 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; @@ -718,7 +720,7 @@ xfs_qm_destroy_quotainfo( qi = mp->m_quotainfo; ASSERT(qi != NULL); - unregister_shrinker(&qi->qi_shrinker); + shrinker_free(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;