summaryrefslogtreecommitdiff
path: root/patches/fscache-Use-only-one-fscache_object_cong_wait.patch
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2021-11-02 11:49:06 +0100
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2021-11-02 11:49:06 +0100
commit5487e2783b8a1f0b1e8db435e74c5c694215f0da (patch)
treed71537c4cc7a15ad3c1f07f8cb055cdf87e46e2e /patches/fscache-Use-only-one-fscache_object_cong_wait.patch
parent42ef83f2d169a9f90bca5d2d37aae1208a0392da (diff)
downloadlinux-rt-5487e2783b8a1f0b1e8db435e74c5c694215f0da.tar.gz
[ANNOUNCE] v5.15-rt17v5.15-rt17-patches
Dear RT folks! I'm pleased to announce the v5.15-rt17 patch set. Changes since v5.15-rt16: - Remove put_cpu_var() in fscache which removal was overseen in the last release. - Redo the fs/dcache/start_dir_add() related patch and its description. - Drop preempt_disable_rt(), no more users. Known issues - netconsole triggers WARN. - The "Memory controller" (CONFIG_MEMCG) has been disabled. - Valentin Schneider reported a few splats on ARM64, see https://lkml.kernel.org/r/20210810134127.1394269-1-valentin.schneider@arm.com The delta patch against v5.15-rt16 is appended below and can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.15/incr/patch-5.15-rt16-rt17.patch.xz You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git v5.15-rt17 The RT patch against v5.15 can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15-rt17.patch.xz The split quilt queue is available at: https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patches-5.15-rt17.tar.xz Sebastian Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'patches/fscache-Use-only-one-fscache_object_cong_wait.patch')
-rw-r--r--patches/fscache-Use-only-one-fscache_object_cong_wait.patch13
1 files changed, 9 insertions, 4 deletions
diff --git a/patches/fscache-Use-only-one-fscache_object_cong_wait.patch b/patches/fscache-Use-only-one-fscache_object_cong_wait.patch
index 6a8f1b05a566..7ed718fb88fe 100644
--- a/patches/fscache-Use-only-one-fscache_object_cong_wait.patch
+++ b/patches/fscache-Use-only-one-fscache_object_cong_wait.patch
@@ -26,11 +26,12 @@ Fixes: 8b8edefa2fffb ("fscache: convert object to use workqueue instead of slow-
Reported-by: Gregor Beck <gregor.beck@gmail.com>
Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Link: https://lkml.kernel.org/r/20211029083839.xwwt7jgzru3kcpii@linutronix.de
---
fs/fscache/internal.h | 1 -
fs/fscache/main.c | 6 ------
- fs/fscache/object.c | 11 +++++------
- 3 files changed, 5 insertions(+), 13 deletions(-)
+ fs/fscache/object.c | 13 +++++--------
+ 3 files changed, 5 insertions(+), 15 deletions(-)
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
@@ -82,7 +83,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* enqueue an object for metadata-type processing
*/
-@@ -806,12 +808,10 @@ void fscache_enqueue_object(struct fscac
+@@ -806,16 +808,12 @@ void fscache_enqueue_object(struct fscac
_enter("{OBJ%x}", object->debug_id);
if (fscache_get_object(object, fscache_obj_get_queue) >= 0) {
@@ -95,8 +96,12 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ wake_up(&fscache_object_cong_wait);
} else
fscache_put_object(object, fscache_obj_put_queue);
+-
+- put_cpu_var(fscache_object_cong_wait);
+ }
+ }
-@@ -833,16 +833,15 @@ void fscache_enqueue_object(struct fscac
+@@ -833,16 +831,15 @@ void fscache_enqueue_object(struct fscac
*/
bool fscache_object_sleep_till_congested(signed long *timeoutp)
{