From patchwork Thu Aug 24 03:42:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13363494 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 228EEC71145 for ; Thu, 24 Aug 2023 03:48:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B54792800A5; Wed, 23 Aug 2023 23:48:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADD128E0011; Wed, 23 Aug 2023 23:48:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 957182800A5; Wed, 23 Aug 2023 23:48:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 823658E0011 for ; Wed, 23 Aug 2023 23:48:27 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5B5111201A1 for ; Thu, 24 Aug 2023 03:48:27 +0000 (UTC) X-FDA: 81157615854.29.E7D11BF Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf16.hostedemail.com (Postfix) with ESMTP id 857DD180005 for ; Thu, 24 Aug 2023 03:48:24 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YIHIoc1R; spf=pass (imf16.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.179 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=1692848904; 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=pYOB+hnIO83YvzUHSYTSuFO2utsF72W4sdU/yBHPL1U=; b=0GR90XH5JBl6bV+KDz9JJMA6/rTOHC5sLx3q5yAK8oxXO50G+H5zJaLc2f789LR1luA2HT Pb1QTdESF3np7iqgJ5sMQzhNuSrgp+cReuQ6enIqEcFvFy9ZG6m7DXNPN90xJR/DJCke8W YftnplQEJK3o1w2DgeF/jgDxJywrCZI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YIHIoc1R; spf=pass (imf16.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.179 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=1692848904; a=rsa-sha256; cv=none; b=Ilm1yLzhVo8o/GhA9L1y13afcn1Q7DxwmfbuwkB3biL1Bv/JwO8PPUpUDPXfnJoJ/lmyoy VtzMfapZmzeVGyxJxvNGBBKdGMa4ngrCuXhOIRw6UEffSZH/n4dTGSaGA9HapJR3/CQ9Xx pFSFu5JSEM8SfT3S4YUojPOhYEGBQ2c= Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-56f8334f15eso164516a12.1 for ; Wed, 23 Aug 2023 20:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692848903; x=1693453703; 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=pYOB+hnIO83YvzUHSYTSuFO2utsF72W4sdU/yBHPL1U=; b=YIHIoc1RJYxmkhYVOcGBRkBxvRhCV1vgbhLHLMHVKdroyXNJiDuJUutMmWOFcPBpBW s/5YL1T7lyc2hav1PtBIIN2Dt6hyxpkwLoN2k+dutrk6yEzT3g/nPXTNMM1CpwIdn7cK vKpo4xp6upXNV6Rk6KduOhBhcTSJ7rKvPI0CWETY6P1zhV3T+cGTYcHPpNts1uIFt7Xa slnyTJaIC+EL0nEINpq6Gumx8Im0B6M3kdYzAJy8prFgOUb8N2+zr2h9bofMyVLTfYMe wH5VoCpJVdhicwlvFPsZC33a5pDKbpFkIRl8d9BjaJjZ66w/ZuYhKjXRayn/0wC3WvtB B4WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692848903; x=1693453703; 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=pYOB+hnIO83YvzUHSYTSuFO2utsF72W4sdU/yBHPL1U=; b=gluNa+g3gGARCiNe7kqc6gzc1rqKMbobprXXoVbtsWf59FTs4CNwVddDVOPkjVapaF Fc9nPclexvtD3dOgneamGZv3NLAtf7aOtD1lyZgyk4MVUO7w9Zw2/737FomwU1xI+YOD QVXund+IAAd6WBX46XELUiWc0Q+0pspAyyJYK0/Vp5QymJLefni4HfFohvOsgIAcWV64 bFEcL/RS9ihrNlUPE3y/TSkb5IWOB4io0bBqU27jMGmvMZfnqVorYv0tLh/OwiOc04pv B1Teoj3Wmv3aRLadHs2ZOTcaZPJ+7jWDjgGx4PbmPE9GA3kIDNPpq7K5RWxxfPOYjb0z W2pw== X-Gm-Message-State: AOJu0YzNWJXtMganhl6/6mmFtabU8rrOZn9YYEBir6j3g21SSkM5OrNs 7gUaih3W7Qdd6ke6MQ6Gk7UumA== X-Google-Smtp-Source: AGHT+IG6N8tn7T7dg336qdyH1rso/0WPaO046+rzbqZhcbNGv58+8uAGt72gzl/ZUc8tgddqdUvO3Q== X-Received: by 2002:a05:6a21:7890:b0:112:cf5:d5cc with SMTP id bf16-20020a056a21789000b001120cf5d5ccmr18056004pzc.1.1692848903439; Wed, 23 Aug 2023 20:48:23 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id t6-20020a63b246000000b005579f12a238sm10533157pgo.86.2023.08.23.20.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 20:48:23 -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, linux-fsdevel@vger.kernel.org, Qi Zheng , Muchun Song , Jan Kara , linux-ext4@vger.kernel.org Subject: [PATCH v5 31/45] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Date: Thu, 24 Aug 2023 11:42:50 +0800 Message-Id: <20230824034304.37411-32-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com> References: <20230824034304.37411-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 857DD180005 X-Rspam-User: X-Stat-Signature: 8z8obsitbmxmptdp6gkj6p1sxu5egcrk X-Rspamd-Server: rspam01 X-HE-Tag: 1692848904-140287 X-HE-Meta: U2FsdGVkX1/mGmZzmhBlQfqrZM7LCZIowoHmWzsXKPe62pW8q9ax13tMCsnY2c2L7XfD9to6HTX1cxSW5V2SdLipGojZGQ8BaYETVBBztqzirMGC78RA/4Vh/wPsKj8dfXEKnE0ueQV7t31qQBlSW8yeKkvuk8RithSyWDyQBX3/RXby6OekFYJd3B916dgMe7bV4U807Aq3SnPZRDeM3zj56nwu6IgskSspywtwYpat/4gqfUkguLB9cHSAXZAEdVjFyXL9ADzqBgBAFj+h8RoLMGjazQdTVyBCTGfaMMyj1hcFYImgKMoxR2hRqVltbZumXG+WJf9K5z/H0UsFzCL4Sv8JbCh6qVbGOu/ZSNN7GtVJwflKyVWRhpEwT12o23Qg/ioFBSd/qCLYK4CwsGhWEdyFsKSBzOsnmHj8lEVhcpybZhZWIiQZOuhlVRdhpf1tYkDwRGZ9Qm1FUQRC0miNQgQiypKRcIAObuljPCjr0Dq1l2b1vZzvAPBgHDKZU/gvhi3jCUC0K4PVgrRQijSXgVmNzlxiq5i8C6RoViHxpbhWs8H8j4jCEajDlbUGttcqwnYoM6Y7C1sDb0fHcASBZwGTIS0zNvqRUcrhAHii21mZkYNKPoqCyD57FevY0TaVtdZsIykOA/6hjTgfRNcoPCvQsf6OT/om0p36DfHq1JbiSYdk3W5g6L7DQMAYaJFmT1uxOWXnaigCdHe9m6MGx78f6rzDYDzPWXXB9PFpojkyUnlLVPKoMlOVDs2tbsZYKyi/VG6D9p3d/0U/pETvHCM0gxygSi5tnG5Qqb817/EKTT4iL43/LAR2DMxz9pQBDs97Dj7kULaXmPHNL+NtO3RaexvTcL/abFU+0GDB6brkcjvSaJjtJ75fHF2b7DbnqR6Gfsk0O+oUABw6KvDwLLNp81M4aaIV2qkMzQ7NFW2bBu4Rvsq8ba769Nbj6XRWIX4toRrmYTsB2vM fmlYvcFw GZTRaRRM51pJqiuc/d8HF2yKG7+BZuLNhacXzM/4WXEOQkDQ3nwtGq6F3bOiMjZb1UE4rep+VhOVgoNG3Gw6euh+mEg2ugAdKPc6+hLQ2IozTdnmHd29QgXcbE5XshrUn/EM6wFTJr8MJ3EXCTGCHpgB6IfAGXI6Qd46BfI5pstu9h7H/m/Cy6mefU0eY00uC09LFR+v05G+6lR4tSvjRj+fPjYOZKHCZndA7MjlD99aBLHqET43yNdaoztRVcYoV+umyVlua07X4PIyWcHvFa1jwgcrS+VnbOjiLur8Giazgsy20YCOgGCKS1L69WHpvDcjoq/bVN9UZBIG/mQCfxyli+EFj/viwq8geZ1x695eT9A1UX9uONDV/7c38byOjscu7fMQmsV6KLF4Zwmypv5CDqoai0JJLbPPGWugREYtOKJN4Jb7OVpt3ScfdR7hnVLpJvA8ZnpZ5cyVbMD9bBbQ4jFafIyWiTxWVa4pBJej6SCnhNCu/EUJKXQ8LbwumHK88b2IZgfFRHDeyUUw393ZnCe6Zuq52qsw8 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 via 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 CC: "Theodore Ts'o" CC: Jan Kara CC: linux-ext4@vger.kernel.org Acked-by: Jan Kara --- fs/jbd2/journal.c | 30 +++++++++++++++++++----------- include/linux/jbd2.h | 2 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 768fa05bcbed..75692baa76e8 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1290,7 +1290,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; @@ -1316,7 +1316,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); @@ -1588,14 +1588,22 @@ static journal_t *journal_init_common(struct block_device *bdev, goto err_cleanup; 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; - err = register_shrinker(&journal->j_shrinker, "jbd2-journal:(%u:%u)", - MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev)); - if (err) + + journal->j_shrinker = shrinker_alloc(0, "jbd2-journal:(%u:%u)", + MAJOR(bdev->bd_dev), + MINOR(bdev->bd_dev)); + if (!journal->j_shrinker) { + err = -ENOMEM; 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; @@ -2170,9 +2178,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 52772c826c86..6dcbb4eb80fb 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -886,7 +886,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: