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 9152AC4332F for ; Wed, 1 Nov 2023 21:56:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2814D8D0054; Wed, 1 Nov 2023 17:56:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20CAB8D0050; Wed, 1 Nov 2023 17:56:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 085098D0054; Wed, 1 Nov 2023 17:56:57 -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 E8A828D0050 for ; Wed, 1 Nov 2023 17:56:56 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BDBFFA09FF for ; Wed, 1 Nov 2023 21:56:56 +0000 (UTC) X-FDA: 81410746032.30.462F587 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id 0DEA84000D for ; Wed, 1 Nov 2023 21:56:54 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=bnATcLlH; spf=pass (imf17.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698875815; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OXKg7iP77CusroG9lg9fQPh6opCVjYUl9CRe3reT2o4=; b=hhQndYEbTlC3hhr3MJBzO8gKSmUGuo8/+dv4zOyx4ICKuZJFMafmyoz3UP5GQ+ibINEyYr 7X26/fzbR7RuArenCGxduNNDBm2QTE++R6pxog6uBIg/ObFIh6E7z8+tZ5277vLpmCCXB6 42YZdn6biLuKx+iutjtSFWq1GgCwlUc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=bnATcLlH; spf=pass (imf17.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698875815; a=rsa-sha256; cv=none; b=PEw912SbOBtlMGkc2pxBgPhNod5RkQWawkkNErUu0Fepe9TYFiwQcdNN++UmMZAp8E4Xcq P4apuYjRqbpjS968xc1S4tRRsvijKhsnBY5Q7H/lxeHSkXknaeZv5RsqIxmz+Q3hZ9Ajap MnHksrbQ0fbP+1YDm2k962X6rSaJkDE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 073C961267; Wed, 1 Nov 2023 21:56:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88281C433C7; Wed, 1 Nov 2023 21:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1698875813; bh=gno+Qq/S9t9Xx5vxCvbTys4gMgigrQ0DXVdnE3+iPpM=; h=Date:From:To:Subject:In-Reply-To:References:From; b=bnATcLlHnN/ATGsZYeuY1BQo/UULv5rGPJqin6da2KuPN1eZf/fcyMERYs8hh4hNv j09w+KxpI7ufcxWwezOQHRobfvkvcaotLlJuxFgx6neniBvAwKlVD96CGvykoZbP2P gJ3lR+JBYvKB0YmtJz9aLa46axH3ZqmVmwNFVKo8= Date: Wed, 1 Nov 2023 14:56:52 -0700 From: Andrew Morton To: Linus Torvalds , linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] MM updates for 6.7-rc1 Message-Id: <20231101145652.8ff234ca6c327c5e49e2b21f@linux-foundation.org> In-Reply-To: <20231101145447.60320c9044e7db4dba2d93e3@linux-foundation.org> References: <20231101145447.60320c9044e7db4dba2d93e3@linux-foundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 0DEA84000D X-Rspam-User: X-Stat-Signature: bi8ixwpkj9bf449o87nuajss4ux5697y X-Rspamd-Server: rspam01 X-HE-Tag: 1698875814-300887 X-HE-Meta: U2FsdGVkX19fOsS7bzqp3I1KKDwck0ItffJwtrYp8vFHjSXGvuy0WIbwu2r3uylkrBS++J8tXAOKeycbdL4MR8kdgg9Ee8XKFwlVKfrfUJD7Ehoc1Oxied6SYfPT106u4gNC5dPCVAUbQA2jfXFL/pFKjotAO/aynpR2ax4ebRBKkXHaHYMdF6PEpkyrbRmyM2BqG6153ySzRW4cUtMn70XF5wrfDAqYLM9iAnjLVhRhKMczhAt9Xbq+thCZ2e35H41NQ7IwTSfgTYpOhiju8cO1JQHACdroi1uED6esGYuJ8g1cuu6KdudcWcfb+flCAsWC9SAvmQg/IioZ1+FmSJwL63NgsOuoead6nMRfL74GYLWbUbQEEhVBgSpTEKqOlKQ8K2P9uuU3N2yhlkNIzFmtSIk3pDPKcEhdfJvxyQ26TcXkWmWdVpSY+k1ZoycJx8TXXqTPsLiIQRXCURFGjBTYVj9w84Hrqkx/8ozbZSejGoGEIQXNQiGLsD/nhI5nPu7OVQATenIOUcSmUHCoY8bkm+9ApLEOZ12/iRmPND40CR46QbOMQwMZDIW5Wgej6hRwq0+Goi9L14766uo1UCHtIFWwM72xa4STk9F9gjdnQoQ93WalSbX8bEvC8gwUoXpwQYc5Z5E8FUD92Al9I7rywIbNlLyvRsh1otwknaFTQh0DoZJRwCx4vEtii4w0zsi13YunpyI5c9a8UFuVUMLAdT9CYNvaWiXs98ULbZCHXG4Zz+EOtydycWhHKYqx2fDEuZCYYBlaBzIf6Yrc9rvtBnqSXWlz9JVqfFoJdSW37Xi8xbrWUjaoyzYzrWLyRUfXO07jC4FvGSIxsZVROFNxEmlHjc1uR/53SLRaDw7UlKeU6ok4F1RLma8QVE6rzWEu2E/CsudDq2gTvgyR/pt1EFmwcT827/NKcs96Benf8+rwCHQTkYRpRDDroUE4UVlIq/xrkJvz133SeJC MJvYpfwH f7j4rE1LUiBk0pMeRXuIo7tkQif8kw/NyH3s0z2PLQXVUPAkVBqqaDZnRnpOSXS0dJisiJqG3845IPS10u/N5holFCM5GbQqKEi8+tDTUcg9+gR+KCqdgyClqXAHWL1Yga8dEr84i5CN/fF7FMz0c4xBv+AetX0YHfIva2U3DNuT2pFGNb3L/SqgvtF/vE7UXg6ya60WMG0B+0CY4UsdeS5g/uWej5jctUJS1aEPsgFsjmJ2qO3m/n0hFBFNM8L2kaIGFh8knOHmHEfUFCtj3yOeJqO6KscDyXw2GAuCd+So3ocqyESSCHjiY7FhSZctfFLDP2QKxHfmHfQZtVDvAVE3pBaCi4uTZ0kA61eRzDH2CWthH3cEPQ/rjXE53GmttdQhsGSLmJRyENHVprnHZC9wVPcSzm29XfXiIfFldLbN67ro48dEzw8dtEbBqdZ2TPto/fpYh571zTHBETwjKe43fCQ04xT3aH0IrzJmgRU4MmKbKVkG9TrvcaBDFbxvX3Kg99yQUoV529W4= 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: List-Subscribe: List-Unsubscribe: On Wed, 1 Nov 2023 14:54:47 -0700 Andrew Morton wrote: > vs bcachefs tree > https://lkml.kernel.org/r/20230913093553.4290421e@canb.auug.org.au > I shall send Stephen's conversion patch in reply to this email. From: Stephen Rothwell Subject: bcachefs: convert to dynamically allocated shrinkers Date: Tue, 12 Sep 2023 11:27:22 +1000 Link: https://lkml.kernel.org/r/20230913093553.4290421e@canb.auug.org.au Signed-off-by: Stephen Rothwell Reviewed-by: Qi Zheng Cc: Kent Overstreet Signed-off-by: Andrew Morton --- fs/bcachefs/btree_cache.c | 22 ++++++++++++---------- fs/bcachefs/btree_key_cache.c | 21 ++++++++++++--------- fs/bcachefs/btree_types.h | 4 ++-- fs/bcachefs/fs.c | 2 +- fs/bcachefs/sysfs.c | 2 +- 5 files changed, 28 insertions(+), 23 deletions(-) --- a/fs/bcachefs/btree_cache.c~bcachefs-convert-to-dynamically-allocated-shrinkers +++ a/fs/bcachefs/btree_cache.c @@ -285,8 +285,7 @@ static int btree_node_write_and_reclaim( static unsigned long bch2_btree_cache_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct bch_fs *c = container_of(shrink, struct bch_fs, - btree_cache.shrink); + struct bch_fs *c = shrink->private_data; struct btree_cache *bc = &c->btree_cache; struct btree *b, *t; unsigned long nr = sc->nr_to_scan; @@ -384,8 +383,7 @@ out_nounlock: static unsigned long bch2_btree_cache_count(struct shrinker *shrink, struct shrink_control *sc) { - struct bch_fs *c = container_of(shrink, struct bch_fs, - btree_cache.shrink); + struct bch_fs *c = shrink->private_data; struct btree_cache *bc = &c->btree_cache; if (bch2_btree_shrinker_disabled) @@ -400,7 +398,7 @@ void bch2_fs_btree_cache_exit(struct bch struct btree *b; unsigned i, flags; - unregister_shrinker(&bc->shrink); + shrinker_free(bc->shrink); /* vfree() can allocate memory: */ flags = memalloc_nofs_save(); @@ -454,6 +452,7 @@ void bch2_fs_btree_cache_exit(struct bch int bch2_fs_btree_cache_init(struct bch_fs *c) { struct btree_cache *bc = &c->btree_cache; + struct shrinker *shrink; unsigned i; int ret = 0; @@ -473,12 +472,15 @@ int bch2_fs_btree_cache_init(struct bch_ mutex_init(&c->verify_lock); - bc->shrink.count_objects = bch2_btree_cache_count; - bc->shrink.scan_objects = bch2_btree_cache_scan; - bc->shrink.seeks = 4; - ret = register_shrinker(&bc->shrink, "%s/btree_cache", c->name); - if (ret) + shrink = shrinker_alloc(0, "%s/btree_cache", c->name); + if (!shrink) goto err; + bc->shrink = shrink; + shrink->count_objects = bch2_btree_cache_count; + shrink->scan_objects = bch2_btree_cache_scan; + shrink->seeks = 4; + shrink->private_data = c; + shrinker_register(shrink); return 0; err: --- a/fs/bcachefs/btree_key_cache.c~bcachefs-convert-to-dynamically-allocated-shrinkers +++ a/fs/bcachefs/btree_key_cache.c @@ -834,8 +834,7 @@ void bch2_btree_key_cache_drop(struct bt static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, struct shrink_control *sc) { - struct bch_fs *c = container_of(shrink, struct bch_fs, - btree_key_cache.shrink); + struct bch_fs *c = shrink->private_data; struct btree_key_cache *bc = &c->btree_key_cache; struct bucket_table *tbl; struct bkey_cached *ck, *t; @@ -932,8 +931,7 @@ out: static unsigned long bch2_btree_key_cache_count(struct shrinker *shrink, struct shrink_control *sc) { - struct bch_fs *c = container_of(shrink, struct bch_fs, - btree_key_cache.shrink); + struct bch_fs *c = shrink->private_data; struct btree_key_cache *bc = &c->btree_key_cache; long nr = atomic_long_read(&bc->nr_keys) - atomic_long_read(&bc->nr_dirty); @@ -953,7 +951,7 @@ void bch2_fs_btree_key_cache_exit(struct int cpu; #endif - unregister_shrinker(&bc->shrink); + shrinker_free(bc->shrink); mutex_lock(&bc->lock); @@ -1027,6 +1025,7 @@ void bch2_fs_btree_key_cache_init_early( int bch2_fs_btree_key_cache_init(struct btree_key_cache *bc) { struct bch_fs *c = container_of(bc, struct bch_fs, btree_key_cache); + struct shrinker *shrink; #ifdef __KERNEL__ bc->pcpu_freed = alloc_percpu(struct btree_key_cache_freelist); @@ -1039,11 +1038,15 @@ int bch2_fs_btree_key_cache_init(struct bc->table_init_done = true; - bc->shrink.seeks = 0; - bc->shrink.count_objects = bch2_btree_key_cache_count; - bc->shrink.scan_objects = bch2_btree_key_cache_scan; - if (register_shrinker(&bc->shrink, "%s/btree_key_cache", c->name)) + shrink = shrinker_alloc(0, "%s/btree_key_cache", c->name); + if (!shrink) return -BCH_ERR_ENOMEM_fs_btree_cache_init; + bc->shrink = shrink; + shrink->seeks = 0; + shrink->count_objects = bch2_btree_key_cache_count; + shrink->scan_objects = bch2_btree_key_cache_scan; + shrink->private_data = c; + shrinker_register(shrink); return 0; } --- a/fs/bcachefs/btree_types.h~bcachefs-convert-to-dynamically-allocated-shrinkers +++ a/fs/bcachefs/btree_types.h @@ -163,7 +163,7 @@ struct btree_cache { unsigned used; unsigned reserve; atomic_t dirty; - struct shrinker shrink; + struct shrinker *shrink; /* * If we need to allocate memory for a new btree node and that @@ -321,7 +321,7 @@ struct btree_key_cache { bool table_init_done; struct list_head freed_pcpu; struct list_head freed_nonpcpu; - struct shrinker shrink; + struct shrinker *shrink; unsigned shrink_iter; struct btree_key_cache_freelist __percpu *pcpu_freed; --- a/fs/bcachefs/fs.c~bcachefs-convert-to-dynamically-allocated-shrinkers +++ a/fs/bcachefs/fs.c @@ -1904,7 +1904,7 @@ got_sb: sb->s_flags |= SB_POSIXACL; #endif - sb->s_shrink.seeks = 0; + sb->s_shrink->seeks = 0; vinode = bch2_vfs_inode_get(c, BCACHEFS_ROOT_SUBVOL_INUM); ret = PTR_ERR_OR_ZERO(vinode); --- a/fs/bcachefs/sysfs.c~bcachefs-convert-to-dynamically-allocated-shrinkers +++ a/fs/bcachefs/sysfs.c @@ -494,7 +494,7 @@ STORE(bch2_fs) sc.gfp_mask = GFP_KERNEL; sc.nr_to_scan = strtoul_or_return(buf); - c->btree_cache.shrink.scan_objects(&c->btree_cache.shrink, &sc); + c->btree_cache.shrink->scan_objects(c->btree_cache.shrink, &sc); } if (attr == &sysfs_btree_wakeup) _