The patch titled
Subject: procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2
has been added to the -mm tree. Its filename is
procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrei Vagin <avagin@xxxxxxxxxx>
Subject: procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2
v2: don't create a separate function to print delimiter and a few fixes
to make code more readable.
Link: http://lkml.kernel.org/r/20180117082050.25406-1-avagin@xxxxxxxxxx
Signed-off-by: Andrei Vagin <avagin@xxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/seq_file.c | 57 +++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 31 deletions(-)
diff -puN fs/seq_file.c~procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2 fs/seq_file.c
--- a/fs/seq_file.c~procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2
+++ a/fs/seq_file.c
@@ -670,26 +670,6 @@ void seq_puts(struct seq_file *m, const
}
EXPORT_SYMBOL(seq_puts);
-static inline void seq_put_delimeter(struct seq_file *m, const char *delimiter)
-{
- int len;
-
- if (!delimiter || !delimiter[0])
- return;
-
- if (delimiter[1] == 0)
- return seq_putc(m, delimiter[0]);
-
- len = strlen(delimiter);
- if (m->count + len >= m->size) {
- seq_set_overflow(m);
- return;
- }
-
- memcpy(m->buf + m->count, delimiter, len);
- m->count += len;
-}
-
/*
* A helper routine for putting decimal numbers without rich format of printf().
* only 'unsigned long long' is supported.
@@ -705,7 +685,12 @@ void seq_put_decimal_ull(struct seq_file
if (m->count + 2 >= m->size) /* we'll write 2 bytes at least */
goto overflow;
- seq_put_delimeter(m, delimiter);
+ len = strlen(delimiter);
+ if (m->count + len >= m->size)
+ goto overflow;
+
+ memcpy(m->buf + m->count, delimiter, len);
+ m->count += len;
if (m->count + 1 >= m->size)
goto overflow;
@@ -744,27 +729,32 @@ void seq_put_hex_ll(struct seq_file *m,
{
int i, len;
- seq_put_delimeter(m, delimiter);
-
- len = (sizeof(v) * 8 - __builtin_clzll(v) + 3) / 4;
+ if (delimiter && delimiter[0]) {
+ if (delimiter[1] == 0)
+ seq_putc(m, delimiter[0]);
+ else
+ seq_puts(m, delimiter);
+ }
- if (unlikely(len == 0))
+ /* If x is 0, the result of __builtin_clzll is undefined */
+ if (v == 0)
len = 1;
+ else
+ len = (sizeof(v) * 8 - __builtin_clzll(v) + 3) / 4;
if (len < width)
len = width;
- if (m->count + len > m->size)
- goto overflow;
+ if (m->count + len > m->size) {
+ seq_set_overflow(m);
+ return;
+ }
for (i = len - 1; i >= 0; i--) {
m->buf[m->count + i] = hex_asc[0xf & v];
v = v >> 4;
}
m->count += len;
- return;
-overflow:
- seq_set_overflow(m);
}
void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long num)
@@ -774,7 +764,12 @@ void seq_put_decimal_ll(struct seq_file
if (m->count + 3 >= m->size) /* we'll write 2 bytes at least */
goto overflow;
- seq_put_delimeter(m, delimiter);
+ len = strlen(delimiter);
+ if (m->count + len >= m->size)
+ goto overflow;
+
+ memcpy(m->buf + m->count, delimiter, len);
+ m->count += len;
if (m->count + 2 >= m->size)
goto overflow;
_
Patches currently in -mm which might be from avagin@xxxxxxxxxx are
fs-elf-drop-map_fixed-usage-from-elf_map-fix.patch
procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps.patch
procfs-add-seq_put_hex_ll-to-speed-up-proc-pid-maps-v2.patch
procfs-optimize-seq_pad-to-speed-up-proc-pid-maps.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
