Skip to contentSkip to conversation

mm/kfence: Use str_write_read() helper in get_access_type()

PATCH Applied Thorsten Blum 2 participants 2 messages Jan 15, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mm/kfence: Use str_write_read() helper in get_access_type()

Remove hard-coded strings by using the str_write_read() helper function.

---
Changes in v2:
- Use str_write_read() in report.c as suggested by Marco Elver (thanks!)
- Link to v1: https://lore.kernel.org/r/[email protected]/

---
 mm/kfence/kfence_test.c | 3 ++-
 mm/kfence/report.c      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
mm/kfence/kfence_test.c +2 -1
index f65fb182466d..00034e37bc9f 100644
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/tracepoint.h>
 #include <trace/events/printk.h>
 
@@ -88,7 +89,7 @@ struct expect_report {
 
 static const char *get_access_type(const struct expect_report *r)
 {
-	return r->is_write ? "write" : "read";
+	return str_write_read(r->is_write);
 }
 
 /* Check observed report matches information in @r. */
mm/kfence/report.c +2 -1
index 6370c5207d1a..10e6802a2edf 100644
@@ -16,6 +16,7 @@
 #include <linux/sprintf.h>
 #include <linux/stacktrace.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/sched/clock.h>
 #include <trace/events/error_report.h>
 
@@ -184,7 +185,7 @@ static void print_diff_canary(unsigned long address, size_t bytes_to_show,
 
 static const char *get_access_type(bool is_write)
 {
-	return is_write ? "write" : "read";
+	return str_write_read(is_write);
 }
 
 void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *regs,
Signature · 1 line
2.47.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Thorsten Blum

Remove hard-coded strings by using the str_write_read() helper function.

---
Changes in v2:
- Use str_write_read() in report.c as suggested by Marco Elver (thanks!)
- Link to v1: https://lore.kernel.org/r/[email protected]/

Quoted 50 lines
---
 mm/kfence/kfence_test.c | 3 ++-
 mm/kfence/report.c      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
mm/kfence/kfence_test.c +2 -1
index f65fb182466d..00034e37bc9f 100644
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/tracepoint.h>
 #include <trace/events/printk.h>
 
@@ -88,7 +89,7 @@ struct expect_report {
 
 static const char *get_access_type(const struct expect_report *r)
 {
-       return r->is_write ? "write" : "read";
+       return str_write_read(r->is_write);
 }
 
 /* Check observed report matches information in @r. */
mm/kfence/report.c +2 -2
index 6370c5207d1a..10e6802a2edf 100644
@@ -16,6 +16,7 @@
 #include <linux/sprintf.h>
 #include <linux/stacktrace.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/sched/clock.h>
 #include <trace/events/error_report.h>
 
@@ -184,7 +185,7 @@ static void print_diff_canary(unsigned long address, size_t bytes_to_show,
 
 static const char *get_access_type(bool is_write)
 {
-       return is_write ? "write" : "read";
+       return str_write_read(is_write);
 }
 
 void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *regs,
--

2.47.1