* [PATCH] NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation
@ 2022-04-01 2:59 Muchun Song
2022-04-08 15:21 ` Muchun Song
0 siblings, 1 reply; 4+ messages in thread
From: Muchun Song @ 2022-04-01 2:59 UTC (permalink / raw)
To: trond.myklebust, anna, akpm
Cc: linux-nfs, linux-kernel, linux-mm, duanxiongchun, smuchun,
Muchun Song, NeilBrown
The commit 5c60e89e71f8 ("NFSv4.2: Fix up an invalid combination of memory
allocation flags") has stripped GFP_KERNEL_ACCOUNT down to GFP_KERNEL,
however, it forgot to remove SLAB_ACCOUNT from kmem_cache allocation.
It means that memory is still limited by kmemcg. This patch also fix a
NULL pointer reference issue [1] reported by NeilBrown.
Link: https://lore.kernel.org/all/164870069595.25542.17292003658915487357@noble.neil.brown.name/ [1]
Fixes: 5c60e89e71f8 ("NFSv4.2: Fix up an invalid combination of memory allocation flags")
Fixes: 5abc1e37afa0 ("mm: list_lru: allocate list_lru_one only when needed")
Reported-by: NeilBrown <neilb@suse.de>
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
fs/nfs/nfs42xattr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c
index ad3405c64b9e..e7b34f7e0614 100644
--- a/fs/nfs/nfs42xattr.c
+++ b/fs/nfs/nfs42xattr.c
@@ -997,7 +997,7 @@ int __init nfs4_xattr_cache_init(void)
nfs4_xattr_cache_cachep = kmem_cache_create("nfs4_xattr_cache_cache",
sizeof(struct nfs4_xattr_cache), 0,
- (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_ACCOUNT),
+ (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD),
nfs4_xattr_cache_init_once);
if (nfs4_xattr_cache_cachep == NULL)
return -ENOMEM;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation
2022-04-01 2:59 [PATCH] NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation Muchun Song
@ 2022-04-08 15:21 ` Muchun Song
2022-04-08 15:24 ` Trond Myklebust
0 siblings, 1 reply; 4+ messages in thread
From: Muchun Song @ 2022-04-08 15:21 UTC (permalink / raw)
To: trond.myklebust, anna, Andrew Morton
Cc: linux-nfs, LKML, Linux Memory Management List, Xiongchun duan,
Muchun Song, NeilBrown
Ping
Could someone be willing to help merge this?
On Fri, Apr 1, 2022 at 10:59 AM Muchun Song <songmuchun@bytedance.com> wrote:
>
> The commit 5c60e89e71f8 ("NFSv4.2: Fix up an invalid combination of memory
> allocation flags") has stripped GFP_KERNEL_ACCOUNT down to GFP_KERNEL,
> however, it forgot to remove SLAB_ACCOUNT from kmem_cache allocation.
> It means that memory is still limited by kmemcg. This patch also fix a
> NULL pointer reference issue [1] reported by NeilBrown.
>
> Link: https://lore.kernel.org/all/164870069595.25542.17292003658915487357@noble.neil.brown.name/ [1]
> Fixes: 5c60e89e71f8 ("NFSv4.2: Fix up an invalid combination of memory allocation flags")
> Fixes: 5abc1e37afa0 ("mm: list_lru: allocate list_lru_one only when needed")
> Reported-by: NeilBrown <neilb@suse.de>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
> ---
> fs/nfs/nfs42xattr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c
> index ad3405c64b9e..e7b34f7e0614 100644
> --- a/fs/nfs/nfs42xattr.c
> +++ b/fs/nfs/nfs42xattr.c
> @@ -997,7 +997,7 @@ int __init nfs4_xattr_cache_init(void)
>
> nfs4_xattr_cache_cachep = kmem_cache_create("nfs4_xattr_cache_cache",
> sizeof(struct nfs4_xattr_cache), 0,
> - (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_ACCOUNT),
> + (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD),
> nfs4_xattr_cache_init_once);
> if (nfs4_xattr_cache_cachep == NULL)
> return -ENOMEM;
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation
2022-04-08 15:21 ` Muchun Song
@ 2022-04-08 15:24 ` Trond Myklebust
2022-04-09 13:16 ` Muchun Song
0 siblings, 1 reply; 4+ messages in thread
From: Trond Myklebust @ 2022-04-08 15:24 UTC (permalink / raw)
To: anna@kernel.org, songmuchun@bytedance.com,
akpm@linux-foundation.org
Cc: linux-mm@kvack.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com,
neilb@suse.de, smuchun@gmail.com
On Fri, 2022-04-08 at 23:21 +0800, Muchun Song wrote:
> Ping
>
> Could someone be willing to help merge this?
>
It's already in the queue.
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation
2022-04-08 15:24 ` Trond Myklebust
@ 2022-04-09 13:16 ` Muchun Song
0 siblings, 0 replies; 4+ messages in thread
From: Muchun Song @ 2022-04-09 13:16 UTC (permalink / raw)
To: Trond Myklebust
Cc: anna@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
duanxiongchun@bytedance.com, neilb@suse.de, smuchun@gmail.com
On Fri, Apr 8, 2022 at 11:24 PM Trond Myklebust <trondmy@hammerspace.com> wrote:
>
> On Fri, 2022-04-08 at 23:21 +0800, Muchun Song wrote:
> > Ping
> >
> > Could someone be willing to help merge this?
> >
> It's already in the queue.
>
Thanks Trond
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-09 13:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-01 2:59 [PATCH] NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation Muchun Song
2022-04-08 15:21 ` Muchun Song
2022-04-08 15:24 ` Trond Myklebust
2022-04-09 13:16 ` Muchun Song
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).