Skip to contentSkip to conversation

pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion

PATCH Applied John Stultz 2 participants 2 messages Dec 14, 2022 – Dec 15, 2022 Pstore filesystem

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion

Wei Wang reported seeing priority inversion caused latencies caused by contention on pmsg_lock, and suggested it be switched to a rt_mutex.

I was initially hesitant this would help, as the tasks in that trace all seemed to be SCHED_NORMAL, so the benefit would be limited to only nice boosting.

However, another similar issue was raised where the priority inversion was seen did involve a blocked RT task so it is clear this would be helpful in that case.

Cc Wei Wang <[email protected]>
Cc Midas Chien<[email protected]>
Cc Connor O'Brien <[email protected]>
Cc Kees Cook <[email protected]>
Cc Anton Vorontsov <[email protected]>
Cc Colin Cross <[email protected]>
Cc Tony Luck <[email protected]>
Fixes 9d5438f462ab ("pstore: Add pmsg - user-space accessible pstore object")

---
v2: Added Fixes tag

---
 fs/pstore/pmsg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
fs/pstore/pmsg.c +4 -3
index d8542ec2f38c..18cf94b597e0 100644
@@ -7,9 +7,10 @@
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
+#include <linux/rtmutex.h>
 #include "internal.h"
 
-static DEFINE_MUTEX(pmsg_lock);
+static DEFINE_RT_MUTEX(pmsg_lock);
 
 static ssize_t write_pmsg(struct file *file, const char __user *buf,
 			  size_t count, loff_t *ppos)
@@ -28,9 +29,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,
 	if (!access_ok(buf, count))
 		return -EFAULT;
 
-	mutex_lock(&pmsg_lock);
+	rt_mutex_lock(&pmsg_lock);
 	ret = psinfo->write_user(&record, buf);
-	mutex_unlock(&pmsg_lock);
+	rt_mutex_unlock(&pmsg_lock);
 	return ret ? ret : count;
 }
 
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
Applied
#1 lore raw
Quoted 9 lines · John Stultz

Wei Wang reported seeing priority inversion caused latencies caused by contention on pmsg_lock, and suggested it be switched to a rt_mutex.

I was initially hesitant this would help, as the tasks in that trace all seemed to be SCHED_NORMAL, so the benefit would be limited to only nice boosting.

[...]

Applied to for-next/pstore, thanks!

[1/1] pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion

      https://git.kernel.org/kees/c/76d62f24db07
Signature · 1 line
Kees Cook