From mboxrd@z Thu Jan 1 00:00:00 1970 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 69180C001E0 for ; Thu, 27 Jul 2023 08:13:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BBCF8D0006; Thu, 27 Jul 2023 04:13:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 046AF8D0001; Thu, 27 Jul 2023 04:13:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E01218D0006; Thu, 27 Jul 2023 04:13:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C9A778D0001 for ; Thu, 27 Jul 2023 04:13:36 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A0A0A1204EC for ; Thu, 27 Jul 2023 08:13:36 +0000 (UTC) X-FDA: 81056677632.20.E3DB87A Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf02.hostedemail.com (Postfix) with ESMTP id 82C3A80020 for ; Thu, 27 Jul 2023 08:13:34 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=AiXoaCJQ; spf=pass (imf02.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.172 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=1690445614; a=rsa-sha256; cv=none; b=2hGL/kU8OIslPUiYBime0SXRbD0OikvEfnIADBYLQN/wA0xHXpiS6IdqbhlE5rMBQEH9cB YByisAaE5Q8brr0qYccq1bIKEoGweWKwB6lVBccqt14ujywdHPQj8/IeHVhMSrBgSwZy2s UXleCwyMKGz92Cs5xbltz5AU1MNbKMo= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=AiXoaCJQ; spf=pass (imf02.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.172 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=1690445614; 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=jaqVlo27zysQOw4inLaa7RWYi61naAqQm5GJ5upJpN4=; b=uvEeF1x7Pv6l3bo6Bv0RNIFmmwyH6kYWb71iK/nhr5asiLK4RJn5RqHLBeRJ0o0S6IuZS4 Y1Xgt9IqViB7MoiIynU4pDbxk806jHJ52Y43XdZx8EN+ww/msgGoCkibRxhl1wBRgOx0rW lP5UWFqVZCdBv0SAe9tMGO2X8ZwbnrY= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-686f74a8992so78388b3a.1 for ; Thu, 27 Jul 2023 01:13:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445613; x=1691050413; 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=jaqVlo27zysQOw4inLaa7RWYi61naAqQm5GJ5upJpN4=; b=AiXoaCJQdjYD9eYmeEdrfJ7ezATe9Yx6/bwBgW+5G+EPOMCuXYwEAcwi/JFENHTjN3 RLofwFvJd4EkqfH7Ye6KmIjKXgnfjEMN6IQZZPzERz8d2kaa1LDxbOfy1pXfbOXi//fW yPmgpOzP5ISM/DRd0jetvScx//7ssTCBUe2enciakCKenXGhXZrdb9q6vjgbH3ZMQFpH R1cJwZwEOETjjGMipjwgI0l9uWlKWu8vb1MB9swWpnARqP7hyemEh7msGfN9mYd5xYpI D03dkm0FvaoEJlj9bRrg4eXRdtCSaQUY5I5xaJER5wRv+adUsRWUp3ZNy7xFaIahEhPe Q+Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445613; x=1691050413; 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=jaqVlo27zysQOw4inLaa7RWYi61naAqQm5GJ5upJpN4=; b=Ni73ZTA2jDpqK1k1gKhPnSgUvHHL/fTBVeUlx5rzIDZO0p+MVqwQDZ9GAZEYXllM0A W4IrDWbr1ZIZ5r9874KP1zU0MCX1M2/dnRsNZ1EwS/Ve8EEh9ri/BpdMX83VJThhCZdN Ree/1sjG98HXYSUdRk/2yXIU4Fau+YYWRLw9f+wOUVI1YI+7EJGwho2yxUCQK63PcU10 OIq4YOr8jWySdPlFEdoHz3jLyQxs+r7eoMzgKf6t2KJG8yG1k01wD1UMh8rsBuXUKkIb vYYAJ12OIEgypE0NFS6v7bo5jE2RvG4cAiUiymZVYe40EYTRHJAx/Y32P8obGQJluHtk pd3Q== X-Gm-Message-State: ABy/qLbTlfK6S7L9VvQVlR4GIKNgyc/XLNOgXPv97zIdVftttKnZgwFX e8JX1Dgk2RgMl2XNHiueQKutVg== X-Google-Smtp-Source: APBJJlG+tRTw+eNG8sDYXmQBYWrWDa50m7E6kRjtDYwVrWUQOS5ovTAWRl9t0zD5rxSD0dIJ86GpuQ== X-Received: by 2002:a05:6a00:2d82:b0:675:8627:a291 with SMTP id fb2-20020a056a002d8200b006758627a291mr4587660pfb.3.1690445613284; Thu, 27 Jul 2023 01:13:33 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:13:32 -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 , Muchun Song Subject: [PATCH v3 38/49] xfs: dynamically allocate the xfs-buf shrinker Date: Thu, 27 Jul 2023 16:04:51 +0800 Message-Id: <20230727080502.77895-39-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 82C3A80020 X-Stat-Signature: dyojoaez1osucai6gecydoagkw5xu61f X-Rspam-User: X-HE-Tag: 1690445614-681758 X-HE-Meta: U2FsdGVkX194IB1hIZ7uup36zEtXe7bPAsRNc/JZV2AOHfS3YPx3gqn2f2igpeKKRZVLXnPbD3fNIeeRvyOZ+cT2zosadYqNom6y6gFZA1kkSfJL+uQQqrU5AB675UStKGADjzGZMLPrGBU/51Ch+1ENzsp+CvJP2b0X+FpU2+3q9veqf3m7/kQb5p0qEpm/6EQgsp3weyoYulc2tTcZO6fE5tU0EBziTp9AlPGBM0NtnfXb+n/q7UXmFz8wEtaNsR3J9PrbnhqEQz4pSCYstVvy9kkHYt/G8HDCFU4yDbwiqAFIuDTaYwnkcp+X6UBuaA5rn1KIiWQkyjIYOXvzQwqafVyUbl2C9fV6VJb+LsWR+W1FAZ8gqEWigo/VAmbgM84IDSXTJftXJOUfjPIDUYZWTzexbnDzYXEOF4BIP22bekZ5uZv2ae+F4vHt0SgGgJVvoAaDqGwIcqNZnYrCMnI9eHFmt+48f+gchFkLMkO+hhz+0hZvZ4E8uOn6nruk0QVRClERm7vEQs7//dtqPdm3pEQ3R7VrsTHfOslybXAGpm2/bMhd1assp8DaK60imgZUMisWiKAszSkqZAq3ou/LLfcPpXUWbK1Vo9l3RXPt5qa5yMXZHiXAJpiM2DLevPBHSVzK0SVqjQtNIcBBkc6ZsORPRbz/6KZntBtmFzmIxIHcIZddCSFuJbsgYGhrNXLj2F9WMqox+H5pNGGjyhIIArrffLwIYtgxK3DqoBUPkq5XEK+dDOxzxW+QAAL1qRW2jNs0DgBK131SJ9cXlEaVx8YhjYb1F2NziBgswmaEsJLrAyg7JaLF0c7l60VEaJpN/zE0wnK3XSf+Uy5oV+SPvqPuDyArtteN0Wku5640f9VeJTkB+lJa9sVJycpZUSc+ORKbimdw4RFOzBL1oWhYlfgk+PWXOjFHO9aM4wv+2QcD1wyAUTAVSKc3OUaRDGnw/aaTkj6u+vqpFDY fiqNKWLj 4Ndjjxo4pC3RFEHIEwkXFywPNsdllh9gMopYmNL07B9dV+MLqo5JyN47kXpAWEVKupC3Ty82+5R/EWTE/l4G7tHNcF0FPRCiC48daryHQhoqMj+rXLOms5KFtq0mlOb4nAWYqhysr9EfbXO8NF1OhA9twhDsC8P4b1xYYnQjzQewyHgbkKnnf0J/2l6gCh6hXc6s0E3AJeboZB6VH6lvoo0O1ant8d+udSON0+Cr0mLTUhtysdZEaYbDvJ0fQ1QFaZRoof1Ggc2T6l7rLqCYHEsMI3/t7Pg0A0POSh5ilvAnXGRJXwInb2zEE2SzwOx63b8Viw4gx795l0Jakppaex3Ly+Vshm77pwCw0AlJpeWNrNbDodNOYgmwChkODXwZa7tW7wLXM7gtzCsV4y0OXZTl2acWfNeROLrTT 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-buf 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_buftarg. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/xfs/xfs_buf.c | 25 ++++++++++++++----------- fs/xfs/xfs_buf.h | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 15d1e5a7c2d3..715730fc91cb 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -1906,8 +1906,7 @@ xfs_buftarg_shrink_scan( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_buftarg *btp = container_of(shrink, - struct xfs_buftarg, bt_shrinker); + struct xfs_buftarg *btp = shrink->private_data; LIST_HEAD(dispose); unsigned long freed; @@ -1929,8 +1928,7 @@ xfs_buftarg_shrink_count( struct shrinker *shrink, struct shrink_control *sc) { - struct xfs_buftarg *btp = container_of(shrink, - struct xfs_buftarg, bt_shrinker); + struct xfs_buftarg *btp = shrink->private_data; return list_lru_shrink_count(&btp->bt_lru, sc); } @@ -1938,7 +1936,7 @@ void xfs_free_buftarg( struct xfs_buftarg *btp) { - unregister_shrinker(&btp->bt_shrinker); + shrinker_free(btp->bt_shrinker); ASSERT(percpu_counter_sum(&btp->bt_io_count) == 0); percpu_counter_destroy(&btp->bt_io_count); list_lru_destroy(&btp->bt_lru); @@ -2021,13 +2019,18 @@ xfs_alloc_buftarg( if (percpu_counter_init(&btp->bt_io_count, 0, GFP_KERNEL)) goto error_lru; - btp->bt_shrinker.count_objects = xfs_buftarg_shrink_count; - btp->bt_shrinker.scan_objects = xfs_buftarg_shrink_scan; - btp->bt_shrinker.seeks = DEFAULT_SEEKS; - btp->bt_shrinker.flags = SHRINKER_NUMA_AWARE; - if (register_shrinker(&btp->bt_shrinker, "xfs-buf:%s", - mp->m_super->s_id)) + btp->bt_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "xfs-buf:%s", + mp->m_super->s_id); + if (!btp->bt_shrinker) goto error_pcpu; + + btp->bt_shrinker->count_objects = xfs_buftarg_shrink_count; + btp->bt_shrinker->scan_objects = xfs_buftarg_shrink_scan; + btp->bt_shrinker->seeks = DEFAULT_SEEKS; + btp->bt_shrinker->private_data = btp; + + shrinker_register(btp->bt_shrinker); + return btp; error_pcpu: diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index 549c60942208..4e6969a675f7 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h @@ -102,7 +102,7 @@ typedef struct xfs_buftarg { size_t bt_logical_sectormask; /* LRU control structures */ - struct shrinker bt_shrinker; + struct shrinker *bt_shrinker; struct list_lru bt_lru; struct percpu_counter bt_io_count; -- 2.30.2