From patchwork Thu Jul 27 08:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13329371 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 CD01EC0015E for ; Thu, 27 Jul 2023 08:12:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6AE608D0008; Thu, 27 Jul 2023 04:12:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 65EF08D0001; Thu, 27 Jul 2023 04:12:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5270A8D0008; Thu, 27 Jul 2023 04:12:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4721E8D0001 for ; Thu, 27 Jul 2023 04:12:59 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 151591A1069 for ; Thu, 27 Jul 2023 08:12:59 +0000 (UTC) X-FDA: 81056676078.28.9F6E789 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf13.hostedemail.com (Postfix) with ESMTP id 287C720023 for ; Thu, 27 Jul 2023 08:12:56 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=h7BzAXWM; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.173 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=1690445577; 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=48waxWZGd1WUnLYaDrTSxvJywKXLcopaiUkWgt7j5Rg=; b=YbV1LZrcWf12cQfLTPBha13CGg3tpd1JV/d+QmbYJH1Sx2Xca6AJnQ42dedoXroUOG3esN M+Am34Uw4ZSHTmgNulieAQ4kTHX4dnRO5MgFxSQJojvqRzMS2K3+DXSABhHpfA3eJnwucq ffO8JxUkO54ZI7xEjH0BmqiqHWyYBV0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=h7BzAXWM; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445577; a=rsa-sha256; cv=none; b=iqSW5hZydUAYXMZ8D29SCMzAXwhzanypGthiYVhQJcuy2khXIQS1ql3f7jQ+gujUf/k+o/ /Pdji0YGzi39TfvJLFCi0MO2qr0OyNqsYzclu56D+p64ofK6SJ30P0L4hx47nrVnWuRa/E jZn83J5IOC9Gw0+2vV6L0mAZ8bpTunw= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-682b1768a0bso175654b3a.0 for ; Thu, 27 Jul 2023 01:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445576; x=1691050376; 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=48waxWZGd1WUnLYaDrTSxvJywKXLcopaiUkWgt7j5Rg=; b=h7BzAXWMeO6q413o2q8QBGFyYtSJJQDVtscFkPudih7uYq32KqAohX6ko7JdrT58zZ jQesZevPWI16RJ584HoFfkctqZliFhC+Sy5DmGf4/p07EAXTPpKceV5c/mFhCQtFe2kc GT00j/8cVqT7gjAO9UrE6yMmEVq+vAOowivD6U/C54ThBKsCCzPpN8b7GVd2fZWCigOk vXp6v9qkHcNnCSidh0rHnK6MCacYxO0sYof9O+5/aUkm0GolyNtTHq/urdLytozqbZlU y5SGivZA8rDsT4B1CBykaduW0zvqtcacoHqzhUYbcvZiZaKGJdqILCFM7NZx5HG0wVY2 fpkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445576; x=1691050376; 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=48waxWZGd1WUnLYaDrTSxvJywKXLcopaiUkWgt7j5Rg=; b=YJa3hXBNofwjGEQA9s1alSaaSXLRzsDIci+OBJ0gHrVlM7XqnH24oylWM980iG+Yjt XMJclnYWIEJolGtBNNpMbm1n47Ir63/DbM7+ndy/GZRC0AK5Img6LTMwcAr8kddNl5xi z3u0Eu7LpqjC3Y2wpkPwtHPJ7VIpnUk93qVC7w94nQ1lInlDsjrV7V1QCfU2lSiQweCM YzvGBI/qiCDadpmG6i8Bn7WQCgqxu/7cafp9a4hurCqFQ8PU84HUDSsvv180NqtO/iME IuDXXaXOIMTgDyKXZyr16Tk90PJ0rp4DFvyLByUort+mbxq2lfLxHE4AX2Hvzsona805 XqCA== X-Gm-Message-State: ABy/qLa+YTuxdjnbUMt48t9Fr9u0lb2juQJysQNfdcY//1kqWUoI6k72 kBv4XRsgam5cT/jdhLTFzeeLxQ== X-Google-Smtp-Source: APBJJlGlNC1VbP/jxEyWXSRyFxMRuhVQW95Y9Ngz7T3+dCe8qyleorovPEoXgtcixk5kZ4l7rZv1Dg== X-Received: by 2002:a05:6a00:4a10:b0:686:b990:560f with SMTP id do16-20020a056a004a1000b00686b990560fmr4386534pfb.2.1690445576006; Thu, 27 Jul 2023 01:12:56 -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.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:12:55 -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 35/49] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Date: Thu, 27 Jul 2023 16:04:48 +0800 Message-Id: <20230727080502.77895-36-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 X-Rspamd-Queue-Id: 287C720023 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: sy6rogthxshzisdzmtsesuikhojsbzm9 X-HE-Tag: 1690445576-483863 X-HE-Meta: U2FsdGVkX19b82uowLsilOTTSElGg5pAlzTgjVsHCGa8BQGQM6EK0rm/KLYHJWJXvyPi9hcjGRabkLnEZ43CVY7rYVC0OnsB55cGPYWNOKBup3lbycSFrtkug2ursBR/YV3BNqTzgQZTtsVtA7RYUFoMZwFTvGpVuGim7L5ACryXuSif4F6CSB8vo2gnWo1wLTud9nHTSxATY6FrcyEk6lUEOQo/y/UizTieh1p/1NDpFI1mlzGBBnLbAAfcEVqx5qWWdVPTwz7tV654OdMlQ4tWFUpz/nFdI3cd6HHSwRu6TtxMfIFJyKQ2UDfRgNoxzAdLT9U+hdBB7zXzXW6IgCKrLg6G5Y3c4ccaSU7zQHi1jxua7lue+k+HU/zngoXRQrbAXMEyFoW2pMmmuFoYNZt6bVKQUHHWXqU0RFLQOYce4dPStiS6+62b9ma53w3zDmusb1F2E3rVZVJQxX6+3QjNWmpvLaL4ltGRwhVOnqsd8NO6lyXb1Gc9yR1a1cHQqFQ0h2eA76r6moqRV1f0J5ulkLyK+NSc8pjmAWrOGFOOqzpjc6R1IGYT3VbfejCFMbhp/LjdRYqqGCpE4oWOWGlnXPYmI60ZrqzKR8ndYyFeWq85QEATYqzFxxbgOl7aV1QLl211VkiwiSEUbsNURD+IEOFU7CW40C0WLpN28N+Mn8aGylavy0pWdHuk5+lGRIRJYZ1H3T1LMJOJWxChjC0t2CKB48WsmPbX4xogczoPtOW3nPzzFv0LiVfOAcIN/UiUSecdzQj/Lr/lgcgSo4tHVU5OBYHwhh2WW5JFOxqr8hOy4fARmuBNasMe4jgbT2KstfqBNLFYcx1wKNCraKurCINtOykkacC8iiR3BcTcPFsiBGxfGaw/HlZcgvupd4yxkEt4NAOeQfFeRyWFi2LhISLXE5wfUlQbjPSUFqSMCbTPQHYj9PF3pppZYf3SKjQ8bw3gBtA09+ufTQw tijIm8sU Hcqj1/K98gauO3n5vnzShWuu0gI7EA7bqef+l8KoxJmOpRrNw7u4VkskfjhRZaj1Dz+kNdrSozlWhiGxy3AgggujOYRRKYCHiETs0/PH6ij4yrM+FahaWB7D9QndHQdvGQJE/2Cmf2nHyfA5y1od9qsOfJtvIe5ipp+e5mc1IGfh1aMf8se5ff1fppMz8oMuYkFDPMZkMtNSXGE0jj+uhfvHsNJ/KghRLnvD4+p9gmPV/D7gkMoeJ/ZMo3016cBpI03t/KFL5TngmocCcbaDVbWEfZkeppeQn+1K6KiC7sIU5SyITkevFVsAWcdIUviMJF+OQnVGl8tvZQFji83Am3L+Rw6yhQu1KlWMuu8KSTzJhhz3pYY5xRcL/y/zRAk8HTi2+qaqMZAYcciOiM0EH+SutfoUcpzy0LY4W 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 jbd2-journal 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 journal_s. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/jbd2/journal.c | 27 +++++++++++++++++---------- include/linux/jbd2.h | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 1b5a45ab62b0..4c421da03fee 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1298,7 +1298,7 @@ static int jbd2_min_tag_size(void) static unsigned long jbd2_journal_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { - journal_t *journal = container_of(shrink, journal_t, j_shrinker); + journal_t *journal = shrink->private_data; unsigned long nr_to_scan = sc->nr_to_scan; unsigned long nr_shrunk; unsigned long count; @@ -1324,7 +1324,7 @@ static unsigned long jbd2_journal_shrink_scan(struct shrinker *shrink, static unsigned long jbd2_journal_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { - journal_t *journal = container_of(shrink, journal_t, j_shrinker); + journal_t *journal = shrink->private_data; unsigned long count; count = percpu_counter_read_positive(&journal->j_checkpoint_jh_count); @@ -1412,19 +1412,26 @@ static journal_t *journal_init_common(struct block_device *bdev, journal->j_superblock = (journal_superblock_t *)bh->b_data; journal->j_shrink_transaction = NULL; - journal->j_shrinker.scan_objects = jbd2_journal_shrink_scan; - journal->j_shrinker.count_objects = jbd2_journal_shrink_count; - journal->j_shrinker.seeks = DEFAULT_SEEKS; - journal->j_shrinker.batch = journal->j_max_transaction_buffers; if (percpu_counter_init(&journal->j_checkpoint_jh_count, 0, GFP_KERNEL)) goto err_cleanup; - if (register_shrinker(&journal->j_shrinker, "jbd2-journal:(%u:%u)", - MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev))) { + journal->j_shrinker = shrinker_alloc(0, "jbd2-journal:(%u:%u)", + MAJOR(bdev->bd_dev), + MINOR(bdev->bd_dev)); + if (!journal->j_shrinker) { percpu_counter_destroy(&journal->j_checkpoint_jh_count); goto err_cleanup; } + + journal->j_shrinker->scan_objects = jbd2_journal_shrink_scan; + journal->j_shrinker->count_objects = jbd2_journal_shrink_count; + journal->j_shrinker->seeks = DEFAULT_SEEKS; + journal->j_shrinker->batch = journal->j_max_transaction_buffers; + journal->j_shrinker->private_data = journal; + + shrinker_register(journal->j_shrinker); + return journal; err_cleanup: @@ -2187,9 +2194,9 @@ int jbd2_journal_destroy(journal_t *journal) brelse(journal->j_sb_buffer); } - if (journal->j_shrinker.flags & SHRINKER_REGISTERED) { + if (journal->j_shrinker) { percpu_counter_destroy(&journal->j_checkpoint_jh_count); - unregister_shrinker(&journal->j_shrinker); + shrinker_free(journal->j_shrinker); } if (journal->j_proc_entry) jbd2_stats_proc_exit(journal); diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 44c298aa58d4..beb4c4586320 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -891,7 +891,7 @@ struct journal_s * Journal head shrinker, reclaim buffer's journal head which * has been written back. */ - struct shrinker j_shrinker; + struct shrinker *j_shrinker; /** * @j_checkpoint_jh_count: