lib/string_helpers: get rid of ugly *_escape_mem_ascii()
Subsystems (6)
v2 cover lib/string_helpers: get rid of ugly *_escape_mem_ascii()
Get rid of ugly *_escape_mem_ascii() API since it's not flexible and has the only single user. Provide better approach based on usage of the string_escape_mem() with appropriate flags.
Test cases has been expanded accordingly to cover new functionality.
This is assumed to go either thru VFS or Andrew's tree. I don't expect too many changes in string_helpers.
Changelog v2:
- introduced seq_escape_mem() instead of poking seq_get_buf() (Al)
- to keep balance of seq_get_buf() usage, convert seq_escape() to use above
- added missed ESCAPE_APPEND flag in NFSv4 patch
- moved indentation patch closer to the beginning of the series
- reshuffled series to be in two groups: generic library extension followed by seq_file updates
Andy Shevchenko (14):
lib/string_helpers: Switch to use BIT() macro lib/string_helpers: Move ESCAPE_NP check inside 'else' branch in a
loop
lib/string_helpers: Drop indentation level in string_escape_mem() lib/string_helpers: Introduce ESCAPE_NA for escaping non-ASCII lib/string_helpers: Introduce ESCAPE_NAP to escape non-ASCII and
non-printable
lib/string_helpers: Allow to append additional characters to be
escaped
lib/test-string_helpers: Print flags in hexadecimal format lib/test-string_helpers: Get rid of trailing comma in terminators lib/test-string_helpers: Add test cases for new features
MAINTAINERS: Add myself as designated reviewer for generic string
library
seq_file: Introduce seq_escape_mem()
seq_file: Replace seq_escape() with inliner
nfsd: Avoid non-flexible API in seq_quote_mem()
seq_file: Drop unused *_escape_mem_ascii()
MAINTAINERS | 8 ++ fs/nfsd/nfs4state.c | 2 +- fs/seq_file.c | 35 +++----- include/linux/seq_file.h | 21 ++++- include/linux/string_helpers.h | 31 ++++--- lib/string_helpers.c | 102 ++++++++++++--------- lib/test-string_helpers.c | 157 +++++++++++++++++++++++++++++---- 7 files changed, 262 insertions(+), 94 deletions(-)
Signature · 1 line
2.30.2
PATCH v2 1/14 lib/string_helpers: Switch to use BIT() macro
Switch to use BIT() macro for flag definitions. No changes implied.
--- include/linux/string_helpers.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
include/linux/string_helpers.h +11 -10
@@ -2,6 +2,7 @@#ifndef _LINUX_STRING_HELPERS_H_#define _LINUX_STRING_HELPERS_H_ +#include <linux/bits.h> #include <linux/ctype.h> #include <linux/types.h>
@@ -18,10 +19,10 @@ enum string_size_units {void string_get_size (u64 size,u64 blk_size,enum string_size_units units,char *buf,int len); -#define UNESCAPE_SPACE 0x01 -#define UNESCAPE_OCTAL 0x02 -#define UNESCAPE_HEX 0x04 -#define UNESCAPE_SPECIAL 0x08 +#define UNESCAPE_SPACE BIT(0) +#define UNESCAPE_OCTAL BIT(1) +#define UNESCAPE_HEX BIT(2) +#define UNESCAPE_SPECIAL BIT(3)#define UNESCAPE_ANY \ (UNESCAPE_SPACE | UNESCAPE_OCTAL | UNESCAPE_HEX | UNESCAPE_SPECIAL)
@@ -42,15 +43,15 @@ static inline int string_unescape_any_inplace(char *buf)return string_unescape_any (buf, buf,0 ); } -#define ESCAPE_SPACE 0x01 -#define ESCAPE_SPECIAL 0x02 -#define ESCAPE_NULL 0x04 -#define ESCAPE_OCTAL 0x08 +#define ESCAPE_SPACE BIT(0) +#define ESCAPE_SPECIAL BIT(1) +#define ESCAPE_NULL BIT(2) +#define ESCAPE_OCTAL BIT(3)#define ESCAPE_ANY \ (ESCAPE_SPACE | ESCAPE_OCTAL | ESCAPE_SPECIAL | ESCAPE_NULL) -#define ESCAPE_NP 0x10 +#define ESCAPE_NP BIT(4)#define ESCAPE_ANY_NP (ESCAPE_ANY | ESCAPE_NP) -#define ESCAPE_HEX 0x20 +#define ESCAPE_HEX BIT(5)int string_escape_mem (const char *src,size_t isz,char *dst,size_t osz,unsigned int flags,const char *only);
Signature · 1 line
2.30.2
PATCH v2 2/14 lib/string_helpers: Move ESCAPE_NP check inside 'else' branch in a loop
In reply to Andy ShevchenkoRefactor code to have better readability by moving ESCAPE_NP handling inside 'else' branch in the loop.
No functional change intended.
--- lib/string_helpers.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
lib/string_helpers.c +10 -7
@@ -452,10 +452,10 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* The process of escaping byte buffer includes several parts. They are applied * in the following sequence. * -* 1. The character is matched to the printable class, if asked, and in -* case of match it passes through to the output. -* 2. The character is not matched to the one from @only string and thus +* 1. The character is not matched to the one from @only string and thus * must go as-is to the output. +* 2. The character is matched to the printable class, if asked, and in +* case of match it passes through to the output. * 3. The character is checked if it falls into the class given by @flags. * %ESCAPE_OCTAL and %ESCAPE_HEX are going last since they cover any * character. Note that they actually can't go together, otherwise
@@ -506,19 +506,22 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,/* * Apply rules in the following sequence: -* - the character is printable, when @flags has -* %ESCAPE_NP bit set * - the @only string is supplied and does not contain a * character under question +* - the character is printable, when @flags has +* %ESCAPE_NP bit set * - the character doesn't fall into a class of symbols * defined by given @flags * In these cases we just pass through a character to the * output buffer. */ -if ((flags &ESCAPE_NP &&isprint (c)) || - (is_dict && !strchr (only, c))) { +if (is_dict && !strchr (only, c)) {/* do nothing */ }else { +if (isprint (c) && + flags &ESCAPE_NP &&escape_passthrough (c, &p, end)) +continue ; +if (flags &ESCAPE_SPACE &&escape_space (c, &p, end))continue ;
Signature · 1 line
2.30.2
PATCH v2 3/14 lib/string_helpers: Drop indentation level in string_escape_mem()
In reply to Andy ShevchenkoThe only one conditional is left on the upper level, move the rest to the same level and drop indentation level. No functional changes.
--- lib/string_helpers.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
lib/string_helpers.c +18 -18
@@ -515,29 +515,29 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,* In these cases we just pass through a character to the * output buffer. */ -if (is_dict && !strchr (only, c)) { -/* do nothing */ - }else { -if (isprint (c) && - flags &ESCAPE_NP &&escape_passthrough (c, &p, end)) -continue ; +if (is_dict && !strchr (only, c) && +escape_passthrough (c, &p, end)) +continue ; -if (flags &ESCAPE_SPACE &&escape_space (c, &p, end)) -continue ; +if (isprint (c) && + flags &ESCAPE_NP &&escape_passthrough (c, &p, end)) +continue ; -if (flags &ESCAPE_SPECIAL &&escape_special (c, &p, end)) -continue ; +if (flags &ESCAPE_SPACE &&escape_space (c, &p, end)) +continue ; -if (flags &ESCAPE_NULL &&escape_null (c, &p, end)) -continue ; +if (flags &ESCAPE_SPECIAL &&escape_special (c, &p, end)) +continue ; -/* ESCAPE_OCTAL and ESCAPE_HEX always go last */ -if (flags &ESCAPE_OCTAL &&escape_octal (c, &p, end)) -continue ; +if (flags &ESCAPE_NULL &&escape_null (c, &p, end)) +continue ; -if (flags &ESCAPE_HEX &&escape_hex (c, &p, end)) -continue ; - } +/* ESCAPE_OCTAL and ESCAPE_HEX always go last */ +if (flags &ESCAPE_OCTAL &&escape_octal (c, &p, end)) +continue ; + +if (flags &ESCAPE_HEX &&escape_hex (c, &p, end)) +continue ;escape_passthrough (c, &p, end); }
Signature · 1 line
2.30.2
PATCH v2 4/14 lib/string_helpers: Introduce ESCAPE_NA for escaping non-ASCII
In reply to Andy ShevchenkoSome users may want to have an ASCII based filter, provided by isascii() function. Here is the addition of a such.
--- include/linux/string_helpers.h | 1 + lib/string_helpers.c | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)
include/linux/string_helpers.h +1 -0
@@ -52,6 +52,7 @@ static inline int string_unescape_any_inplace(char *buf)#define ESCAPE_NP BIT(4)#define ESCAPE_ANY_NP (ESCAPE_ANY | ESCAPE_NP)#define ESCAPE_HEX BIT(5) +#define ESCAPE_NA BIT(6)int string_escape_mem (const char *src,size_t isz,char *dst,size_t osz,unsigned int flags,const char *only);
lib/string_helpers.c +17 -4
@@ -454,8 +454,8 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* * 1. The character is not matched to the one from @only string and thus * must go as-is to the output. -* 2. The character is matched to the printable class, if asked, and in -* case of match it passes through to the output. +* 2. The character is matched to the printable or ASCII class, if asked, +* and in case of match it passes through to the output. * 3. The character is checked if it falls into the class given by @flags. * %ESCAPE_OCTAL and %ESCAPE_HEX are going last since they cover any * character. Note that they actually can't go together, otherwise
@@ -463,7 +463,7 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* * Caller must provide valid source and destination pointers. Be aware that * destination buffer will not be NULL-terminated, thus caller have to append -* it if needs. The supported flags are:: +* it if needs. The supported flags are:: * * %ESCAPE_SPACE: (special white space, not space itself) * '\f' - form feed
@@ -482,11 +482,18 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* %ESCAPE_ANY: * all previous together * %ESCAPE_NP: -* escape only non-printable characters (checked by isprint) +* escape only non-printable characters, checked by isprint() * %ESCAPE_ANY_NP: * all previous together * %ESCAPE_HEX: * '\xHH' - byte with hexadecimal value HH (2 digits) +* %ESCAPE_NA: +* escape only non-ascii characters, checked by isascii() +* +* One notable caveat, the %ESCAPE_NP and %ESCAPE_NA have higher priority +* than the rest of the flags (%ESCAPE_NP is higher than %ESCAPE_NA). +* It doesn't make much sense to use either of them without %ESCAPE_OCTAL +* or %ESCAPE_HEX, because they cover most of the other character classes. * * Return: * The total size of the escaped output that would be generated for
@@ -510,6 +517,8 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,* character under question * - the character is printable, when @flags has * %ESCAPE_NP bit set +* - the character is ASCII, when @flags has +* %ESCAPE_NA bit set * - the character doesn't fall into a class of symbols * defined by given @flags * In these cases we just pass through a character to the
@@ -523,6 +532,10 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz, flags & ESCAPE_NP && escape_passthrough(c, &p, end))continue ; +if (isascii (c) && + flags &ESCAPE_NA &&escape_passthrough (c, &p, end)) +continue ; +if (flags &ESCAPE_SPACE &&escape_space (c, &p, end))continue ;
Signature · 1 line
2.30.2
PATCH v2 5/14 lib/string_helpers: Introduce ESCAPE_NAP to escape non-ASCII and non-printable
In reply to Andy ShevchenkoSome users may want to have an ASCII based filter for printable only characters, provided by conjunction of isascii() and isprint() functions.
Here is the addition of a such.
--- include/linux/string_helpers.h | 1 + lib/string_helpers.c | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
include/linux/string_helpers.h +1 -0
@@ -53,6 +53,7 @@ static inline int string_unescape_any_inplace(char *buf)#define ESCAPE_ANY_NP (ESCAPE_ANY | ESCAPE_NP)#define ESCAPE_HEX BIT(5)#define ESCAPE_NA BIT(6) +#define ESCAPE_NAP BIT(7)int string_escape_mem (const char *src,size_t isz,char *dst,size_t osz,unsigned int flags,const char *only);
lib/string_helpers.c +16 -4
@@ -454,9 +454,11 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* * 1. The character is not matched to the one from @only string and thus * must go as-is to the output. -* 2. The character is matched to the printable or ASCII class, if asked, +* 2. The character is matched to the printable and ASCII classes, if asked, * and in case of match it passes through to the output. -* 3. The character is checked if it falls into the class given by @flags. +* 3. The character is matched to the printable or ASCII class, if asked, +* and in case of match it passes through to the output. +* 4. The character is checked if it falls into the class given by @flags. * %ESCAPE_OCTAL and %ESCAPE_HEX are going last since they cover any * character. Note that they actually can't go together, otherwise * %ESCAPE_HEX will be ignored.
@@ -489,11 +491,15 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* '\xHH' - byte with hexadecimal value HH (2 digits) * %ESCAPE_NA: * escape only non-ascii characters, checked by isascii() +* %ESCAPE_NAP: +* escape only non-printable or non-ascii characters * -* One notable caveat, the %ESCAPE_NP and %ESCAPE_NA have higher priority -* than the rest of the flags (%ESCAPE_NP is higher than %ESCAPE_NA). +* One notable caveat, the %ESCAPE_NAP, %ESCAPE_NP and %ESCAPE_NA have the +* higher priority than the rest of the flags (%ESCAPE_NAP is the highest). * It doesn't make much sense to use either of them without %ESCAPE_OCTAL * or %ESCAPE_HEX, because they cover most of the other character classes. +* %ESCAPE_NAP can utilize %ESCAPE_SPACE or %ESCAPE_SPECIAL in addition to +* the above. * * Return: * The total size of the escaped output that would be generated for
@@ -515,6 +521,8 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,* Apply rules in the following sequence: * - the @only string is supplied and does not contain a * character under question +* - the character is printable and ASCII, when @flags has +* %ESCAPE_NAP bit set * - the character is printable, when @flags has * %ESCAPE_NP bit set * - the character is ASCII, when @flags has
@@ -528,6 +536,10 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz, escape_passthrough(c, &p, end))continue ; +if (isascii (c) &&isprint (c) && + flags &ESCAPE_NAP &&escape_passthrough (c, &p, end)) +continue ; +if (isprint (c) && flags &ESCAPE_NP &&escape_passthrough (c, &p, end))continue ;
Signature · 1 line
2.30.2
PATCH v2 6/14 lib/string_helpers: Allow to append additional characters to be escaped
In reply to Andy ShevchenkoIntroduce a new flag to append additional characters, passed in 'only' parameter, to be escaped if they fall in the corresponding class.
--- include/linux/string_helpers.h | 1 + lib/string_helpers.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-)
include/linux/string_helpers.h +1 -0
@@ -54,6 +54,7 @@ static inline int string_unescape_any_inplace(char *buf)#define ESCAPE_HEX BIT(5)#define ESCAPE_NA BIT(6)#define ESCAPE_NAP BIT(7) +#define ESCAPE_APPEND BIT(8)int string_escape_mem (const char *src,size_t isz,char *dst,size_t osz,unsigned int flags,const char *only);
lib/string_helpers.c +15 -4
@@ -493,6 +493,11 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* escape only non-ascii characters, checked by isascii() * %ESCAPE_NAP: * escape only non-printable or non-ascii characters +* %ESCAPE_APPEND: +* append characters from @only to be escaped by the given classes +* +* %ESCAPE_APPEND would help to pass additional characters to the escaped, when +* one of %ESCAPE_NP, %ESCAPE_NA, or %ESCAPE_NAP is provided. * * One notable caveat, the %ESCAPE_NAP, %ESCAPE_NP and %ESCAPE_NA have the * higher priority than the rest of the flags (%ESCAPE_NAP is the highest).
@@ -513,9 +518,11 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,char *p = dst;char *end = p + osz;bool is_dict = only && *only; +bool is_append = flags &ESCAPE_APPEND ;while (isz--) {unsigned char c = *src++; +bool in_dict = is_dict &&strchr (only, c);/* * Apply rules in the following sequence:
@@ -531,20 +538,24 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,* defined by given @flags * In these cases we just pass through a character to the * output buffer. +* +* When %ESCAPE_APPEND is passed, the characters from @only +* have been excluded from the %ESCAPE_NAP, %ESCAPE_NP, and +* %ESCAPE_NA cases. */ -if (is_dict && !strchr (only, c) && +if (!(is_append || in_dict) && is_dict &&escape_passthrough (c, &p, end))continue ; -if (isascii (c) &&isprint (c) && +if (!(is_append && in_dict) &&isascii (c) &&isprint (c) && flags &ESCAPE_NAP &&escape_passthrough (c, &p, end))continue ; -if (isprint (c) && +if (!(is_append && in_dict) &&isprint (c) && flags &ESCAPE_NP &&escape_passthrough (c, &p, end))continue ; -if (isascii (c) && +if (!(is_append && in_dict) &&isascii (c) && flags &ESCAPE_NA &&escape_passthrough (c, &p, end))continue ;
Signature · 1 line
2.30.2
PATCH v2 7/14 lib/test-string_helpers: Print flags in hexadecimal format
In reply to Andy ShevchenkoSince flags are bitmapped, it's better to print them in hexadecimal format.
--- lib/test-string_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/test-string_helpers.c +2 -2
@@ -19,7 +19,7 @@ static __init bool test_string_check_buf(const char *name, unsigned int flags,if (q_real == q_test && !memcmp (out_test, out_real, q_test))return true; -pr_warn ("Test '%s' failed: flags = %u\n" , name, flags); +pr_warn ("Test '%s' failed: flags = %#x\n" , name, flags);print_hex_dump (KERN_WARNING ,"Input: " ,DUMP_PREFIX_NONE ,16 ,1 , in, p, true);
@@ -290,7 +290,7 @@ test_string_escape_overflow(const char *in, int p, unsigned int flags, const cha q_real =string_escape_mem (in, p,NULL ,0 , flags, esc);if (q_real != q_test) -pr_warn ("Test '%s' failed: flags = %u, osz = 0, expected %d, got %d\n" , +pr_warn ("Test '%s' failed: flags = %#x, osz = 0, expected %d, got %d\n" , name, flags, q_test, q_real); }
Signature · 1 line
2.30.2
PATCH v2 8/14 lib/test-string_helpers: Get rid of trailing comma in terminators
In reply to Andy ShevchenkoTerminators by definition shouldn't accept anything behind. Make them robust by removing trailing commas.
--- lib/test-string_helpers.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
lib/test-string_helpers.c +6 -6
@@ -136,7 +136,7 @@ static const struct test_string_2 escape0[] __initconst = {{ .flags = ESCAPE_SPACE | ESCAPE_HEX, },{/* terminator */ - }}, + }} },{ .in = "\\h\\\"\a\e\\", .s1 = {{
@@ -150,7 +150,7 @@ static const struct test_string_2 escape0[] __initconst = {{ .flags = ESCAPE_SPECIAL | ESCAPE_HEX, },{/* terminator */ - }}, + }} },{ .in = "\eb \\C\007\"\x90\r]", .s1 = {{
@@ -201,7 +201,7 @@ static const struct test_string_2 escape0[] __initconst = {{ .flags = ESCAPE_NP | ESCAPE_HEX, },{/* terminator */ - }}, + }} },{/* terminator */ }};
@@ -217,7 +217,7 @@ static const struct test_string_2 escape1[] __initconst = {{ .flags = ESCAPE_HEX, },{/* terminator */ - }}, + }} },{ .in = "\\h\\\"\a\e\\", .s1 = {{
@@ -225,7 +225,7 @@ static const struct test_string_2 escape1[] __initconst = {{ .flags = ESCAPE_OCTAL, },{/* terminator */ - }}, + }} },{ .in = "\eb \\C\007\"\x90\r]", .s1 = {{
@@ -233,7 +233,7 @@ static const struct test_string_2 escape1[] __initconst = {{ .flags = ESCAPE_OCTAL, },{/* terminator */ - }}, + }} },{/* terminator */ }};
Signature · 1 line
2.30.2
PATCH v2 9/14 lib/test-string_helpers: Add test cases for new features
In reply to Andy ShevchenkoWe have got new flags and hence new features of string_escape_mem(). Add test cases for that.
--- include/linux/string_helpers.h | 4 + lib/test-string_helpers.c | 141 +++++++++++++++++++++++++++++++-- 2 files changed, 137 insertions(+), 8 deletions(-)
include/linux/string_helpers.h +4 -0
@@ -26,6 +26,8 @@ void string_get_size(u64 size, u64 blk_size, enum string_size_units units,#define UNESCAPE_ANY \ (UNESCAPE_SPACE | UNESCAPE_OCTAL | UNESCAPE_HEX | UNESCAPE_SPECIAL) +#define UNESCAPE_ALL_MASK GENMASK(3, 0) +int string_unescape (char *src,char *dst,size_t size,unsigned int flags);static inline int string_unescape_inplace (char *buf,unsigned int flags)
@@ -56,6 +58,8 @@ static inline int string_unescape_any_inplace(char *buf)#define ESCAPE_NAP BIT(7)#define ESCAPE_APPEND BIT(8) +#define ESCAPE_ALL_MASK GENMASK(8, 0) +int string_escape_mem (const char *src,size_t isz,char *dst,size_t osz,unsigned int flags,const char *only);
lib/test-string_helpers.c +133 -8
189 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH v2 10/14 MAINTAINERS: Add myself as designated reviewer for generic string library
In reply to Andy ShevchenkoAdd myself as designated reviewer for generic string library.
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -7650,6 +7650,14 @@ L: [email protected] S: Maintained F: drivers/input/touchscreen/resistive-adc-touch.c +GENERIC STRING LIBRARY +R: Andy Shevchenko <[email protected]> +S: Maintained +F: lib/string.c +F: lib/string_helpers.c +F: lib/test_string.c +F: lib/test-string_helpers.c + GENERIC UIO DRIVER FOR PCI DEVICES M: "Michael S. Tsirkin" <[email protected]> L: [email protected]
Signature · 1 line
2.30.2
PATCH v2 11/14 seq_file: Introduce seq_escape_mem()
In reply to Andy ShevchenkoIntroduce seq_escape_mem() to allow users to pass additional parameters to string_escape_mem().
--- fs/seq_file.c | 25 +++++++++++++++++++++++++ include/linux/seq_file.h | 2 ++ 2 files changed, 27 insertions(+)
fs/seq_file.c +25 -0
@@ -355,6 +355,31 @@ int seq_release(struct inode *inode, struct file *file) }EXPORT_SYMBOL (seq_release); +/** +* seq_escape_mem - print data into buffer, escaping some characters +* @m: target buffer +* @src: source buffer +* @len: size of source buffer +* @flags: flags to pass to string_escape_mem() +* @esc: set of characters that need escaping +* +* Puts data into buffer, replacing each occurrence of character from +* given class (defined by @flags and @esc) with printable escaped sequence. +* +* Use seq_has_overflowed() to check for errors. +*/ +void seq_escape_mem (struct seq_file *m,const char *src,size_t len, +unsigned int flags,const char *esc) +{ +char *buf; +size_t size =seq_get_buf (m, &buf); +int ret; + + ret =string_escape_mem (src, len, buf, size, flags, esc); +seq_commit (m, ret < size ? ret :-1 ); +} +EXPORT_SYMBOL (seq_escape_mem); +/** * seq_escape - print string into buffer, escaping some characters * @m: target buffer
include/linux/seq_file.h +2 -0
@@ -126,6 +126,8 @@ void seq_put_decimal_ll(struct seq_file *m, const char *delimiter, long long numvoid seq_put_hex_ll (struct seq_file *m,const char *delimiter,unsigned long long v,unsigned int width); +void seq_escape_mem (struct seq_file *m,const char *src,size_t len, +unsigned int flags,const char *esc);void seq_escape (struct seq_file *m,const char *s,const char *esc);void seq_escape_mem_ascii (struct seq_file *m,const char *src,size_t isz);
Signature · 1 line
2.30.2
PATCH v2 12/14 seq_file: Replace seq_escape() with inliner
In reply to Andy ShevchenkoConvert seq_escape() to use seq_escape_mem() rather than using a separate symbol. At the same time move it to header as inliner.
--- fs/seq_file.c | 21 --------------------- include/linux/seq_file.h | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 22 deletions(-)
fs/seq_file.c +0 -21
@@ -380,27 +380,6 @@ void seq_escape_mem(struct seq_file *m, const char *src, size_t len, }EXPORT_SYMBOL (seq_escape_mem); -/** -* seq_escape - print string into buffer, escaping some characters -* @m: target buffer -* @s: string -* @esc: set of characters that need escaping -* -* Puts string into buffer, replacing each occurrence of character from -* @esc with usual octal escape. -* Use seq_has_overflowed() to check for errors. -*/ -void seq_escape (struct seq_file *m,const char *s,const char *esc) -{ -char *buf; -size_t size =seq_get_buf (m, &buf); -int ret; - - ret =string_escape_str (s, buf, size,ESCAPE_OCTAL , esc); -seq_commit (m, ret < size ? ret :-1 ); -} -EXPORT_SYMBOL (seq_escape); -void seq_escape_mem_ascii (struct seq_file *m,const char *src,size_t isz) {char *buf;
include/linux/seq_file.h +18 -1
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/string.h> +#include <linux/string_helpers.h> #include <linux/bug.h> #include <linux/mutex.h> #include <linux/cpumask.h>
@@ -128,7 +129,23 @@ void seq_put_hex_ll(struct seq_file *m, const char *delimiter,void seq_escape_mem (struct seq_file *m,const char *src,size_t len,unsigned int flags,const char *esc); -void seq_escape (struct seq_file *m,const char *s,const char *esc); + +/** +* seq_escape - print string into buffer, escaping some characters +* @m: target buffer +* @s: NULL-terminated string +* @esc: set of characters that need escaping +* +* Puts string into buffer, replacing each occurrence of character from +* @esc with usual octal escape. +* +* Use seq_has_overflowed() to check for errors. +*/ +static inline void seq_escape (struct seq_file *m,const char *s,const char *esc) +{ +seq_escape_mem (m, s,strlen (s),ESCAPE_OCTAL , esc); +} +void seq_escape_mem_ascii (struct seq_file *m,const char *src,size_t isz); void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
Signature · 1 line
2.30.2
kernel test robot
build botRe: [PATCH v2 12/14] seq_file: Replace seq_escape() with inliner
I love your patch! Perhaps something to improve:
Hi Andy,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linux/master]
[also build test WARNING on linus/master nfsd/nfsd-next v5.12 next-20210504] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1fe5501ba1abf2b7e78295df73675423bd6899a0 config: sparc-randconfig-p002-20210504 (attached as .config) compiler: sparc-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/047508aa8c09cb58cf304e9025283021731b3921
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 git checkout 047508aa8c09cb58cf304e9025283021731b3921
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross W=1 ARCH=sparc
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from drivers/atm/iphase.c:67:
>> drivers/atm/iphase.h:127: warning: "isprint" redefined
127 | #define isprint(a) ((a >=' ')&&(a <= '~'))
|
In file included from include/linux/string_helpers.h:6,
from include/linux/seq_file.h:7,
from include/linux/seq_file_net.h:5,
from include/net/net_namespace.h:188,
from include/linux/netdevice.h:37,
from include/net/sock.h:46,
from include/linux/atmdev.h:13,
from drivers/atm/iphase.c:49:
include/linux/ctype.h:30: note: this is the location of the previous definition
30 | #define isprint(c) ((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0)
| vim +/isprint +127 drivers/atm/iphase.h
^1da177e4c3f41 Linus Torvalds 2005-04-16 126
^1da177e4c3f41 Linus Torvalds 2005-04-16 @127 #define isprint@ ((a >=' ')&&(a <= '~')) ^1da177e4c3f41 Linus Torvalds 2005-04-16 128 #define ATM_DESC(skb) (skb->protocol) ^1da177e4c3f41 Linus Torvalds 2005-04-16 129 #define IA_SKB_STATE(skb) (skb->protocol) ^1da177e4c3f41 Linus Torvalds 2005-04-16 130 #define IA_DLED 1 ^1da177e4c3f41 Linus Torvalds 2005-04-16 131 #define IA_TX_DONE 2
^1da177e4c3f41 Linus Torvalds 2005-04-16 132
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v2 12/14] seq_file: Replace seq_escape() with inliner
In reply to Andy ShevchenkoI love your patch! Perhaps something to improve:
Hi Andy,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linux/master]
[also build test WARNING on linus/master v5.12 next-20210504] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1fe5501ba1abf2b7e78295df73675423bd6899a0 config: s390-randconfig-r033-20210504 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 8f5a2a5836cc8e4c1def2bdeb022e7b496623439)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install s390 cross compiling tool for clang build
# apt-get install binutils-s390x-linux-gnu
# https://github.com/0day-ci/linux/commit/047508aa8c09cb58cf304e9025283021731b3921
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 git checkout 047508aa8c09cb58cf304e9025283021731b3921
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=s390
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/tty/vt/selection.c:36:9: warning: 'isspace' macro redefined [-Wmacro-redefined]
#define isspace(c) ((c) == ' ')
^
include/linux/ctype.h:33:9: note: previous definition is here
#define isspace(c) ((__ismask(c)&(_S)) != 0)
^1 warning generated.
vim +/isspace +36 drivers/tty/vt/selection.c
687bff0cd08f79 drivers/tty/vt/selection.c Jiri Slaby 2020-02-10 34
^1da177e4c3f41 drivers/char/selection.c Linus Torvalds 2005-04-16 35 /* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ ^1da177e4c3f41 drivers/char/selection.c Linus Torvalds 2005-04-16 @36 #define isspace(c) ((c) == ' ') ^1da177e4c3f41 drivers/char/selection.c Linus Torvalds 2005-04-16 37
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v2 12/14] seq_file: Replace seq_escape() with inliner
Quoted 26 lines · kernel test robot
Hi Andy,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linux/master]
[also build test WARNING on linus/master v5.12 next-20210504] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/0day-ci/linux/commits/Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1fe5501ba1abf2b7e78295df73675423bd6899a0 config: s390-randconfig-r033-20210504 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 8f5a2a5836cc8e4c1def2bdeb022e7b496623439)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install s390 cross compiling tool for clang build
# apt-get install binutils-s390x-linux-gnu
# https://github.com/0day-ci/linux/commit/047508aa8c09cb58cf304e9025283021731b3921
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 git checkout047508aa8c09cb58cf304e9025283021731b3921
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=s390
Quoted 7 lines
If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
drivers/tty/vt/selection.c:36:9: warning: 'isspace' macro redefined [-Wmacro-redefined]#define isspace(c) ((c) == ' ')
Nice!
Also for the rest of redefinitions...
I'll prepare fixes.
Signature · 2 lines
With Best Regards, Andy Shevchenko
kernel test robot
build botRe: [PATCH v2 12/14] seq_file: Replace seq_escape() with inliner
In reply to Andy ShevchenkoI love your patch! Yet something to improve:
Hi Andy,
I love your patch! Yet something to improve:
[auto build test ERROR on linux/master]
[also build test ERROR on linus/master nfsd/nfsd-next v5.12 next-20210504] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1fe5501ba1abf2b7e78295df73675423bd6899a0 config: powerpc64-randconfig-r035-20210504 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 8f5a2a5836cc8e4c1def2bdeb022e7b496623439)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install powerpc64 cross compiling tool for clang build
# apt-get install binutils-powerpc64-linux-gnu
# https://github.com/0day-ci/linux/commit/047508aa8c09cb58cf304e9025283021731b3921
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Andy-Shevchenko/lib-string_helpers-get-rid-of-ugly-_escape_mem_ascii/20210504-182828 git checkout 047508aa8c09cb58cf304e9025283021731b3921
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=powerpc64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from arch/powerpc/kernel/prom_init.c:24:
In file included from include/linux/pci.h:38:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:45:1: error: performing pointer arithmetic on a null pointer has undefined behavior [-Werror,-Wnull-pointer-arithmetic] DEF_PCI_AC_NORET(insw, (unsigned long p, void *b, unsigned long c), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:79:1: note: expanded from here
__do_insw
^
arch/powerpc/include/asm/io.h:557:56: note: expanded from macro '__do_insw'
#define __do_insw(p, b, n) readsw((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from arch/powerpc/kernel/prom_init.c:24:
In file included from include/linux/pci.h:38:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:47:1: error: performing pointer arithmetic on a null pointer has undefined behavior [-Werror,-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(insl, (unsigned long p, void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:81:1: note: expanded from here
__do_insl
^
arch/powerpc/include/asm/io.h:558:56: note: expanded from macro '__do_insl'
#define __do_insl(p, b, n) readsl((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from arch/powerpc/kernel/prom_init.c:24:
In file included from include/linux/pci.h:38:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:49:1: error: performing pointer arithmetic on a null pointer has undefined behavior [-Werror,-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsb, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:83:1: note: expanded from here
__do_outsb
^
arch/powerpc/include/asm/io.h:559:58: note: expanded from macro '__do_outsb'
#define __do_outsb(p, b, n) writesb((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from arch/powerpc/kernel/prom_init.c:24:
In file included from include/linux/pci.h:38:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:51:1: error: performing pointer arithmetic on a null pointer has undefined behavior [-Werror,-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsw, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:85:1: note: expanded from here
__do_outsw
^
arch/powerpc/include/asm/io.h:560:58: note: expanded from macro '__do_outsw'
#define __do_outsw(p, b, n) writesw((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from arch/powerpc/kernel/prom_init.c:24:
In file included from include/linux/pci.h:38:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:619:
arch/powerpc/include/asm/io-defs.h:53:1: error: performing pointer arithmetic on a null pointer has undefined behavior [-Werror,-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsl, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:616:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:87:1: note: expanded from here
__do_outsl
^
arch/powerpc/include/asm/io.h:561:58: note: expanded from macro '__do_outsl'
#define __do_outsl(p, b, n) writesl((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
>> arch/powerpc/kernel/prom_init.c:704:9: error: 'isxdigit' macro redefined [-Werror,-Wmacro-redefined]
#define isxdigit(c) (('0' <= (c) && (c) <= '9') \
^
include/linux/ctype.h:35:9: note: previous definition is here
#define isxdigit(c) ((__ismask(c)&(_D|_X)) != 0)
^
>> arch/powerpc/kernel/prom_init.c:709:9: error: 'islower' macro redefined [-Werror,-Wmacro-redefined]
#define islower(c) ('a' <= (c) && (c) <= 'z')
^
include/linux/ctype.h:29:9: note: previous definition is here
#define islower(c) ((__ismask(c)&(_L)) != 0)
^
>> arch/powerpc/kernel/prom_init.c:710:9: error: 'toupper' macro redefined [-Werror,-Wmacro-redefined]
#define toupper(c) (islower(c) ? ((c) - 'a' + 'A') : (c))
^
include/linux/ctype.h:64:9: note: previous definition is here
#define toupper(c) __toupper(c)
^9 errors generated.
vim +/isxdigit +704 arch/powerpc/kernel/prom_init.c
9b6b563c0d2d25 Paul Mackerras 2005-10-06 702
5827d4165ac608 Anton Blanchard 2012-11-26 703 /* We can't use the standard versions because of relocation headaches. */
cf68787b68a201 Benjamin Krill 2009-07-27 @704 #define isxdigit(c) (('0' <= (c) && (c) <= '9') \
cf68787b68a201 Benjamin Krill 2009-07-27 705 || ('a' <= (c) && (c) <= 'f') \
cf68787b68a201 Benjamin Krill 2009-07-27 706 || ('A' <= (c) && (c) <= 'F'))
cf68787b68a201 Benjamin Krill 2009-07-27 707
cf68787b68a201 Benjamin Krill 2009-07-27 708 #define isdigit(c) ('0' <= (c) && (c) <= '9')
cf68787b68a201 Benjamin Krill 2009-07-27 @709 #define islower(c) ('a' <= (c) && (c) <= 'z')
cf68787b68a201 Benjamin Krill 2009-07-27 @710 #define toupper(c) (islower(c) ? ((c) - 'a' + 'A') : (c))
cf68787b68a201 Benjamin Krill 2009-07-27 711 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Re: [PATCH v2 12/14] seq_file: Replace seq_escape() with inliner
In reply to Andy ShevchenkoQuoted 2 lines · Andy Shevchenko
Convert
seq_escape()to useseq_escape_mem()rather than using a separate symbol. At the same time move it to header as inliner.
Seems making it an inliner opened a can of worms. So, for now, I will drop that part from the series, while keeping fixes in my tree for the issues that have been reported by LKP.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v2 13/14 nfsd: Avoid non-flexible API in seq_quote_mem()
In reply to Andy ShevchenkoThe seq_escape_mem_ascii() is completely non-flexible and shouldn't be used. Replace it with properly called seq_escape_mem().
--- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4state.c +1 -1
@@ -2351,7 +2351,7 @@ static struct nfs4_client *get_nfsdfs_clp(struct inode *inode)static void seq_quote_mem (struct seq_file *m,char *data,int len) {seq_printf (m,"\"" ); -seq_escape_mem_ascii (m, data, len); +seq_escape_mem (m, data, len,ESCAPE_HEX |ESCAPE_NAP |ESCAPE_APPEND ,"\"\\" );seq_printf (m,"\"" ); }
Signature · 1 line
2.30.2
PATCH v2 14/14 seq_file: Drop unused *_escape_mem_ascii()
In reply to Andy ShevchenkoThere are no more users of the seq_escape_mem_ascii() followed by string_escape_mem_ascii().
Remove them for good.
--- fs/seq_file.c | 11 ----------- include/linux/seq_file.h | 2 -- include/linux/string_helpers.h | 3 --- lib/string_helpers.c | 19 ------------------- 4 files changed, 35 deletions(-)
fs/seq_file.c +0 -11
@@ -380,17 +380,6 @@ void seq_escape_mem(struct seq_file *m, const char *src, size_t len, }EXPORT_SYMBOL (seq_escape_mem); -void seq_escape_mem_ascii (struct seq_file *m,const char *src,size_t isz) -{ -char *buf; -size_t size =seq_get_buf (m, &buf); -int ret; - - ret =string_escape_mem_ascii (src, isz, buf, size); -seq_commit (m, ret < size ? ret :-1 ); -} -EXPORT_SYMBOL (seq_escape_mem_ascii); -void seq_vprintf (struct seq_file *m,const char *f,va_list args) {int len;
include/linux/seq_file.h +0 -2
@@ -146,8 +146,6 @@ static inline void seq_escape(struct seq_file *m, const char *s, const char *escseq_escape_mem (m, s,strlen (s),ESCAPE_OCTAL , esc); } -void seq_escape_mem_ascii (struct seq_file *m,const char *src,size_t isz); -void seq_hex_dump (struct seq_file *m,const char *prefix_str,int prefix_type,int rowsize,int groupsize,const void *buf,size_t len,bool ascii);
include/linux/string_helpers.h +0 -3
@@ -63,9 +63,6 @@ static inline int string_unescape_any_inplace(char *buf)int string_escape_mem (const char *src,size_t isz,char *dst,size_t osz,unsigned int flags,const char *only); -int string_escape_mem_ascii (const char *src,size_t isz,char *dst, -size_t osz); -static inline int string_escape_mem_any_np (const char *src,size_t isz,char *dst,size_t osz,const char *only) {
lib/string_helpers.c +0 -19
@@ -582,25 +582,6 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz, }EXPORT_SYMBOL (string_escape_mem); -int string_escape_mem_ascii (const char *src,size_t isz,char *dst, -size_t osz) -{ -char *p = dst; -char *end = p + osz; - -while (isz--) { -unsigned char c = *src++; - -if (!isprint (c) || !isascii (c) || c =='"' || c =='\\' ) -escape_hex (c, &p, end); -else -escape_passthrough (c, &p, end); - } - -return p - dst; -} -EXPORT_SYMBOL (string_escape_mem_ascii); -/* * Return an allocated string that has been escaped of special characters * and double quotes, making it safe to log in quotes.
Signature · 1 line
2.30.2