The patch titled
Subject: vsprintf: inline call to ptr_to_hashval
has been removed from the -mm tree. Its filename was
rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix-2.patch
This patch was dropped because it was folded into rss_stat-add-support-to-detect-rss-updates-of-external-mm.patch
------------------------------------------------------
From: Joel Fernandes <joelaf@xxxxxxxxxx>
Subject: vsprintf: inline call to ptr_to_hashval
There is concern that ptr_to_hashval not being inlined can cause
performance issues (unlike before where it was a static branch) with
trace_printk being a hot path for it. Just create an inline version
called __ptr_to_hashval(), and have the actual ptr_to_hashval() call it.
Link: http://lore.kernel.org/r/20191113153816.14b95acd@xxxxxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20191114164622.GC233237@xxxxxxxxxx
Signed-off-by: Joel Fernandes <joelaf@xxxxxxxxxx>
Suggested-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Bc: Ioannis Ilkos <ilkos@xxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxxx>
Cc: Tim Murray <timmurray@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Carmen Jackson <carmenjackson@xxxxxxxxxx>
Cc: Mayank Gupta <mayankgupta@xxxxxxxxxx>
Cc: Daniel Colascione <dancol@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Jerome Glisse <jglisse@xxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Ralph Campbell <rcampbell@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/vsprintf.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/lib/vsprintf.c~rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix-2
+++ a/lib/vsprintf.c
@@ -740,7 +740,7 @@ static int __init initialize_ptr_random(
early_initcall(initialize_ptr_random);
/* Maps a pointer to a 32 bit unique identifier. */
-int ptr_to_hashval(const void *ptr, unsigned long *hashval_out)
+static inline int __ptr_to_hashval(const void *ptr, unsigned long *hashval_out)
{
unsigned long hashval;
@@ -761,6 +761,11 @@ int ptr_to_hashval(const void *ptr, unsi
return 0;
}
+int ptr_to_hashval(const void *ptr, unsigned long *hashval_out)
+{
+ return __ptr_to_hashval(ptr, hashval_out);
+}
+
static char *ptr_to_id(char *buf, char *end, const void *ptr,
struct printf_spec spec)
{
@@ -774,7 +779,7 @@ static char *ptr_to_id(char *buf, char *
return pointer_string(buf, end, (const void *)hashval, spec);
}
- ret = ptr_to_hashval(ptr, &hashval);
+ ret = __ptr_to_hashval(ptr, &hashval);
if (ret) {
spec.field_width = 2 * sizeof(ptr);
/* string length must be less than default_width */
_
Patches currently in -mm which might be from joelaf@xxxxxxxxxx are
rss_stat-add-support-to-detect-rss-updates-of-external-mm.patch
