Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <axboe@kernel.dk>
Acked-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Roman Gushchin <guro@fb.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

+2 -4
+2 -4
fs/locks.c
··· 2941 2941 int i; 2942 2942 2943 2943 flctx_cache = kmem_cache_create("file_lock_ctx", 2944 - sizeof(struct file_lock_context), 0, 2945 - SLAB_PANIC | SLAB_ACCOUNT, NULL); 2944 + sizeof(struct file_lock_context), 0, SLAB_PANIC, NULL); 2946 2945 2947 2946 filelock_cache = kmem_cache_create("file_lock_cache", 2948 - sizeof(struct file_lock), 0, 2949 - SLAB_PANIC | SLAB_ACCOUNT, NULL); 2947 + sizeof(struct file_lock), 0, SLAB_PANIC, NULL); 2950 2948 2951 2949 for_each_possible_cpu(i) { 2952 2950 struct file_lock_list_struct *fll = per_cpu_ptr(&file_lock_list, i);