| Message ID | 20250115155511.954535-2-thorsten.blum@linux.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] mm/kfence: Use str_write_read() helper in get_access_type() | expand |
On Wed, 15 Jan 2025 at 16:56, Thorsten Blum <thorsten.blum@linux.dev> wrote: > > Remove hard-coded strings by using the str_write_read() helper function. > > Suggested-by: Anshuman Khandual <anshuman.khandual@arm.com> > Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> > --- > Changes in v2: > - Use str_write_read() in report.c as suggested by Marco Elver (thanks!) > - Link to v1: https://lore.kernel.org/r/20250115090303.918192-2-thorsten.blum@linux.dev/ Reviewed-by: Marco Elver <elver@google.com> > --- > mm/kfence/kfence_test.c | 3 ++- > mm/kfence/report.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/mm/kfence/kfence_test.c b/mm/kfence/kfence_test.c > index f65fb182466d..00034e37bc9f 100644 > --- a/mm/kfence/kfence_test.c > +++ b/mm/kfence/kfence_test.c > @@ -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. */ > diff --git a/mm/kfence/report.c b/mm/kfence/report.c > index 6370c5207d1a..10e6802a2edf 100644 > --- a/mm/kfence/report.c > +++ b/mm/kfence/report.c > @@ -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 >
diff --git a/mm/kfence/kfence_test.c b/mm/kfence/kfence_test.c index f65fb182466d..00034e37bc9f 100644 --- a/mm/kfence/kfence_test.c +++ b/mm/kfence/kfence_test.c @@ -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. */ diff --git a/mm/kfence/report.c b/mm/kfence/report.c index 6370c5207d1a..10e6802a2edf 100644 --- a/mm/kfence/report.c +++ b/mm/kfence/report.c @@ -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,
Remove hard-coded strings by using the str_write_read() helper function. Suggested-by: Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> --- Changes in v2: - Use str_write_read() in report.c as suggested by Marco Elver (thanks!) - Link to v1: https://lore.kernel.org/r/20250115090303.918192-2-thorsten.blum@linux.dev/ --- mm/kfence/kfence_test.c | 3 ++- mm/kfence/report.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)