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 166F7C04E69 for ; Mon, 7 Aug 2023 11:17:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8ED116B0074; Mon, 7 Aug 2023 07:17:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 89CEB6B007B; Mon, 7 Aug 2023 07:17:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 764DD8D0002; Mon, 7 Aug 2023 07:17:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 69B7D6B0074 for ; Mon, 7 Aug 2023 07:17:03 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id F115B40995 for ; Mon, 7 Aug 2023 11:17:02 +0000 (UTC) X-FDA: 81097056684.03.0779248 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf21.hostedemail.com (Postfix) with ESMTP id 19DCD1C000D for ; Mon, 7 Aug 2023 11:17:00 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=l3d3GmRd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf21.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691407021; a=rsa-sha256; cv=none; b=8mOTqESGwny3Mb3BYYkV4FC8FvOH0kPIZoE45+nGDRYxwbYy05xPNeCFDNUo/UtPe+6aRq r0lhsrPkRhvMbNxQnXQImZKDT731iYiClrUSl1er9H+8kfc5/hIfh9DmkLe7ip+vPJw0Rg UUUAFDfprrGVczat35OlTYSzOhROl+g= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=l3d3GmRd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf21.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.48 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=1691407021; 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=EIUP2Z+Njo4a1BEj4icZmHsMWaHOvZz2gypuwwXx0Do=; b=uD12/A8Yjzyf/Yas7KtWyhiY5bUO/p6X6qPtK2wLOz8bgaZ1jIvb11KFTDCRDsolOvhHaz VvcONLJTpmZ4tSxrw+WQbRyzVCckkQXxnrIM7qsRVptswwHZ5sdQF5SstrqJfE+NmZ8pnR CD+FVyKZPhzfsNZTP47lPgPnCERZgFE= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-268f6ba57b5so625237a91.1 for ; Mon, 07 Aug 2023 04:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1691407020; x=1692011820; 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=EIUP2Z+Njo4a1BEj4icZmHsMWaHOvZz2gypuwwXx0Do=; b=l3d3GmRdHVbykswjvj36xLNJU/HkRN0qQPtaCG+8C7U8JyCsrS7Omd1smNfjTVHq8n mmfknLuVWKPue6MQRQdYpG2Cap7GHxCVjCjmXm7SqhyxnTlXTIqiD6Dq4SurElV0d5A7 yjtafWW6aQouIDt5nRUMTSVpj6O1jVRczCF6pjoLUl7iIEpS61wXJNKr8xLD++xEk/hK PFaJuConQXPH9DxAW8LM6Qo0CoTe6tjYe9zN1tPP9wJtycShcCxIvBgENM+8mu3gxPqB pNPWVQXnsLY4dcbOjU72J1n4zmuXrZ5CIb4eDvQ0qGFRUeSI2BGNFxZSx5CdqcSToBir CZSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691407020; x=1692011820; 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=EIUP2Z+Njo4a1BEj4icZmHsMWaHOvZz2gypuwwXx0Do=; b=kNRESQHuSY3Ilkn2L71io5wbruYJ0KIc8Sx1UaksJHLkroPbGmlMypTvaxbwdR+QD6 53+5l1KB7te54PfTnpSTeqfCm9jx0LfiFW+ZuYxRRzMsKM21IvFT3rbqidReXa+s0i7X tToExAAMZUT/Zou9WCzsXPe+rOAHi9b1kezJLb+KSA4HXZWvSi67NRBxAIcIttM4roIw U9s0C2j22NNZLQUAzwS92iNBj3f1fpo4sUWYDnCjOZA46L0NSnPPHG3lmtsPPkRG9Dwv yiKjpK9t/9bJ7Nm6ynKkGJb63vzO6Vz4lXeIWz3G6sBRMZ3TK8E6Wsy90rAPBjX//Mgg I6Ew== X-Gm-Message-State: AOJu0YzYXccAXX+gC5lGr9wCG6MYonPF+zWRDBy2UEsjX1R3iDvmKqcc c8ek7yxSEA6fWE1AFJsf2okYuA== X-Google-Smtp-Source: AGHT+IGL/1gBIk2C+QwkMNr6hEGRZG4q+xpVeUoXNA4D2kibZqrKnrVjY0bqX283iYX9eWQrJAN/xA== X-Received: by 2002:a17:90a:6701:b0:269:32c7:24dc with SMTP id n1-20020a17090a670100b0026932c724dcmr6036278pjj.0.1691407020016; Mon, 07 Aug 2023 04:17:00 -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.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:16:59 -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 33/48] ext4: dynamically allocate the ext4-es shrinker Date: Mon, 7 Aug 2023 19:09:21 +0800 Message-Id: <20230807110936.21819-34-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 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 19DCD1C000D X-Stat-Signature: sof4risjeggasduzjwj843qxtnbouzmx X-HE-Tag: 1691407020-209576 X-HE-Meta: U2FsdGVkX18hYut+WHmZYrx3kBCQPzm9C4C3O4N02LTNxdHTRbnF7eo8G04ujk2BhXt5k1bsW4b8+5Xi2t3RkKc9kIuX3738MR+/DAq8ROTKr6IAvUPTEh87tn6m05L1t+5WJ34foVo495se6TZ+4+2h71i5pggVSjNQt+hFn88JhcPArR4lGvbML09Mm4SWJXEjm3nFP0rZlYBQUAImGGxE9l1uo+ogw38ddJJq/nNdx8R54dkLvRb00m3C5GNdTpTmIjGaHjvgsT+dunQELB+Qok59qpqjxqEJb9u6cY2tr3LbzI7zDWgrC8bEgb2EP0e4Azc8jFSfzzntSPtfQjjJDDSLsHvvf+UH4fDUvHFblvV7ErBYF/UYpWKt1zG8sGvr1EutzbS97783Nf2MgosZFyUpIkQjm3nayZYScERrr65Uw40aeSP7SQ6EEz7vAmKQfst588vOuM4ksFXE7zYZl9vAEcKZqhdmo6uESvcMNA9UFv69raTSH8O3b1MeR91we5mv+s8tPTIkAoB/TW8QO8W9lLBQi8ZIIgoGrzvOiL0SdzRVpwQ2K2p/7gNJ2SWRfH8aL5gr++lky4tJ6wib4S40cVvH7575T53oFvY0PDvK/Lk9XLrS8uzqjLvR7tSaQeWRIrVq+THAEX2NGdfxHWaVdANe2shgZFKbY7zd3nC+3MHSvDWZvS4UPceMHhW2u7c4ja3AUeqM1Q5TjNKKrJ3Liv0SzZxh3/udoSukCkxNog7x1xW4W1XzcCsK01zMq9z4QbfvkyEH3tipHeoFhBqxg1UN2nkbdbBSdamlEr0r5MhZ3jy+rz+PHrj6hrs1yrZ1SHgIO1VywIWpi20FWLrNfQbIKpHGyqDBx0uXEyzv4UQNP7gWsPSeADhWvj8cZuC+mvTW5qEWzEXBqfkT0AvhQWJlWMlbnfxi/XmfkyHVKozv2xpYdFa9vbehKQyI2W37WLHkQF9TESD WfVIeAtt t/KlFqrhzEojpuPli17Wo8G4zQpH37Vwx8wmshum3XSCBHfpkRBVg1/BqCPHESeawWMsz5tAExgQ3rv6aDDXjYldbpWqX64/fomGa2LvuY8+LcK3TP/8RrRg1GKvEV/fbM3E9hVUBChX0Dsu06Z4Id/8F88KU2PnvpRe2YNHvA+WIi2zavCPKinU0WGmwJJZ1YtoiYakSNP2PkSkwWzMW82yBZloxv9x8drEADCxWMJV4a43hnSYrmf6vdhZPKid9sQIXoNOyuJ2nqGSuGzhU7MrTC458m4o1kFCgVSw93tqtb3BRZmthrZ/D7qQ/SbVI23OG1APs7gh18ZMSoEU6h85NIH+ogCzwEd9A+1lxwIO5I1KNi1jQAuE3DTirv5g1dBUMjCdPQWaWOCEE1JCYo+BrXq/wxsiJnYvr 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 ext4-es 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 ext4_sb_info. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/ext4/ext4.h | 2 +- fs/ext4/extents_status.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 481491e892df..48baf03eb1a6 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1657,7 +1657,7 @@ struct ext4_sb_info { __u32 s_csum_seed; /* Reclaim extents from extent status tree */ - struct shrinker s_es_shrinker; + struct shrinker *s_es_shrinker; struct list_head s_es_list; /* List of inodes with reclaimable extents */ long s_es_nr_inode; struct ext4_es_stats s_es_stats; diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 9b5b8951afb4..0532a81a7669 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1596,7 +1596,7 @@ static unsigned long ext4_es_count(struct shrinker *shrink, unsigned long nr; struct ext4_sb_info *sbi; - sbi = container_of(shrink, struct ext4_sb_info, s_es_shrinker); + sbi = shrink->private_data; nr = percpu_counter_read_positive(&sbi->s_es_stats.es_stats_shk_cnt); trace_ext4_es_shrink_count(sbi->s_sb, sc->nr_to_scan, nr); return nr; @@ -1605,8 +1605,7 @@ static unsigned long ext4_es_count(struct shrinker *shrink, static unsigned long ext4_es_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct ext4_sb_info *sbi = container_of(shrink, - struct ext4_sb_info, s_es_shrinker); + struct ext4_sb_info *sbi = shrink->private_data; int nr_to_scan = sc->nr_to_scan; int ret, nr_shrunk; @@ -1690,13 +1689,18 @@ int ext4_es_register_shrinker(struct ext4_sb_info *sbi) if (err) goto err3; - sbi->s_es_shrinker.scan_objects = ext4_es_scan; - sbi->s_es_shrinker.count_objects = ext4_es_count; - sbi->s_es_shrinker.seeks = DEFAULT_SEEKS; - err = register_shrinker(&sbi->s_es_shrinker, "ext4-es:%s", - sbi->s_sb->s_id); - if (err) + sbi->s_es_shrinker = shrinker_alloc(0, "ext4-es:%s", sbi->s_sb->s_id); + if (!sbi->s_es_shrinker) { + err = -ENOMEM; goto err4; + } + + sbi->s_es_shrinker->scan_objects = ext4_es_scan; + sbi->s_es_shrinker->count_objects = ext4_es_count; + sbi->s_es_shrinker->seeks = DEFAULT_SEEKS; + sbi->s_es_shrinker->private_data = sbi; + + shrinker_register(sbi->s_es_shrinker); return 0; err4: @@ -1716,7 +1720,7 @@ void ext4_es_unregister_shrinker(struct ext4_sb_info *sbi) percpu_counter_destroy(&sbi->s_es_stats.es_stats_cache_misses); percpu_counter_destroy(&sbi->s_es_stats.es_stats_all_cnt); percpu_counter_destroy(&sbi->s_es_stats.es_stats_shk_cnt); - unregister_shrinker(&sbi->s_es_shrinker); + shrinker_free(sbi->s_es_shrinker); } /* -- 2.30.2