From 3754707bcc3e190e5dadc978d172b61e809cb3bd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 7 Sep 2021 11:21:48 -0700 Subject: Revert "memcg: enable accounting for file lock caches" This reverts commit 0f12156dff2862ac54235fc72703f18770769042. The kernel test robot reports a sizeable performance regression for this commit, and while it clearly does the rigth thing in theory, we'll need to look at just how to avoid or minimize the performance overhead of the memcg accounting. People already have suggestions on how to do that, but it's "future work". So revert it for now. Link: https://lore.kernel.org/lkml/20210907150757.GE17617@xsang-OptiPlex-9020/ Acked-by: Jens Axboe Acked-by: Shakeel Butt Acked-by: Roman Gushchin Cc: Tejun Heo Signed-off-by: Linus Torvalds --- fs/locks.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'fs') diff --git a/fs/locks.c b/fs/locks.c index 51a5b72ef302..3d6fb4ae847b 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2941,12 +2941,10 @@ static int __init filelock_init(void) int i; flctx_cache = kmem_cache_create("file_lock_ctx", - sizeof(struct file_lock_context), 0, - SLAB_PANIC | SLAB_ACCOUNT, NULL); + sizeof(struct file_lock_context), 0, SLAB_PANIC, NULL); filelock_cache = kmem_cache_create("file_lock_cache", - sizeof(struct file_lock), 0, - SLAB_PANIC | SLAB_ACCOUNT, NULL); + sizeof(struct file_lock), 0, SLAB_PANIC, NULL); for_each_possible_cpu(i) { struct file_lock_list_struct *fll = per_cpu_ptr(&file_lock_list, i); -- cgit v1.2.3-59-g8ed1b