Add support of hh length modifier for printk
Subsystems (2)
PATCH 1/2 Add support of hh length modifier for printk
hh is used as length modifier for signed char or unsigned char. It is supported by glibc, we add kernel support now.
--- lib/vsprintf.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-)
lib/vsprintf.c +32 -5
@@ -408,6 +408,8 @@ enum format_type {FORMAT_TYPE_LONG_LONG ,FORMAT_TYPE_ULONG ,FORMAT_TYPE_LONG , +FORMAT_TYPE_UBYTE , +FORMAT_TYPE_BYTE ,FORMAT_TYPE_USHORT ,FORMAT_TYPE_SHORT , FORMAT_TYPE_UINT,
@@ -853,11 +855,15 @@ qualifier: spec->qualifier =-1 ;if (*fmt =='h' || *fmt =='l' || *fmt =='L' || *fmt =='Z' || *fmt =='z' || *fmt =='t' ) { - spec->qualifier = *fmt; - ++fmt; -if (spec->qualifier =='l' && *fmt =='l' ) { - spec->qualifier ='L' ; - ++fmt; + spec->qualifier = *fmt++; +if (unlikely (spec->qualifier == *fmt)) { +if (spec->qualifier =='l' ) { + spec->qualifier ='L' ; + ++fmt; + }else if (spec->qualifier =='h' ) { + spec->qualifier ='H' ; + ++fmt; + } } }
@@ -919,6 +925,11 @@ qualifier: spec->type =FORMAT_TYPE_SIZE_T ; }else if (spec->qualifier =='t' ) { spec->type =FORMAT_TYPE_PTRDIFF ; + }else if (spec->qualifier =='H' ) { +if (spec->flags &SIGN ) + spec->type =FORMAT_TYPE_BYTE ; +else + spec->type =FORMAT_TYPE_UBYTE ; }else if (spec->qualifier =='h' ) {if (spec->flags &SIGN ) spec->type =FORMAT_TYPE_SHORT ;
@@ -1094,6 +1105,12 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)case FORMAT_TYPE_PTRDIFF : num =va_arg (args, ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = (unsigned char )va_arg (args, int); +break ; +case FORMAT_TYPE_BYTE : + num = (signed char )va_arg (args, int); +break ;case FORMAT_TYPE_USHORT : num = (unsigned short )va_arg (args, int);break ;
@@ -1372,6 +1389,10 @@ do { \case FORMAT_TYPE_PTRDIFF :save_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : +case FORMAT_TYPE_BYTE : +save_arg (char); +break ;case FORMAT_TYPE_USHORT :case FORMAT_TYPE_SHORT :save_arg (short);
@@ -1554,6 +1575,12 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)case FORMAT_TYPE_PTRDIFF : num =get_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = get_arg(unsigned char); +break ; +case FORMAT_TYPE_BYTE : + num = get_arg(signed char); +break ;case FORMAT_TYPE_USHORT : num = get_arg(unsigned short);break ;
Signature · 1 line
1.5.5.3
PATCH 2/2 Fix wrong format string iter for printk
printk("%Q");
Output before patch:
%QQ
Output after patch:
%Q
--- lib/vsprintf.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
lib/vsprintf.c +0 -16
@@ -1062,13 +1062,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS : {
@@ -1356,8 +1349,6 @@ do { \break ;case FORMAT_TYPE_INVALID : -if (!*fmt) - --fmt;break ;case FORMAT_TYPE_NRCHARS : {
@@ -1544,13 +1535,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS :
Signature · 1 line
1.5.5.3
Quoted 81 lines · Zhaolei
hh is used as length modifier for signed char or unsigned char. It is supported by glibc, we add kernel support now.
Signed-off-by Zhao Lei <[email protected]>--- lib/vsprintf.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-)lib/vsprintf.c +26
-5@@ -408,6 +408,8 @@ enum format_type {FORMAT_TYPE_LONG_LONG ,FORMAT_TYPE_ULONG ,FORMAT_TYPE_LONG , +FORMAT_TYPE_UBYTE , +FORMAT_TYPE_BYTE ,FORMAT_TYPE_USHORT ,FORMAT_TYPE_SHORT , FORMAT_TYPE_UINT,@@ -853,11 +855,15 @@ qualifier: spec->qualifier =-1 ;if (*fmt =='h' || *fmt =='l' || *fmt =='L' || *fmt =='Z' || *fmt =='z' || *fmt =='t' ) { - spec->qualifier = *fmt; - ++fmt; -if (spec->qualifier =='l' && *fmt =='l' ) { - spec->qualifier ='L' ; - ++fmt; + spec->qualifier = *fmt++; +if (unlikely (spec->qualifier == *fmt)) { +if (spec->qualifier =='l' ) { + spec->qualifier ='L' ; + ++fmt; + }else if (spec->qualifier =='h' ) { + spec->qualifier ='H' ; + ++fmt; + } } }@@ -919,6 +925,11 @@ qualifier: spec->type =FORMAT_TYPE_SIZE_T ; }else if (spec->qualifier =='t' ) { spec->type =FORMAT_TYPE_PTRDIFF ; + }else if (spec->qualifier =='H' ) { +if (spec->flags &SIGN ) + spec->type =FORMAT_TYPE_BYTE ; +else + spec->type =FORMAT_TYPE_UBYTE ; }else if (spec->qualifier =='h' ) {if (spec->flags &SIGN ) spec->type =FORMAT_TYPE_SHORT ;@@ -1094,6 +1105,12 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)case FORMAT_TYPE_PTRDIFF : num =va_arg (args, ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = (unsigned char )va_arg (args, int); +break ; +case FORMAT_TYPE_BYTE : + num = (signed char )va_arg (args, int); +break ;case FORMAT_TYPE_USHORT : num = (unsigned short )va_arg (args, int);break ;@@ -1372,6 +1389,10 @@ do { \case FORMAT_TYPE_PTRDIFF :save_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : +case FORMAT_TYPE_BYTE : +save_arg (char); +break ;case FORMAT_TYPE_USHORT :case FORMAT_TYPE_SHORT :save_arg (short);@@ -1554,6 +1575,12 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)case FORMAT_TYPE_PTRDIFF : num =get_arg (ptrdiff_t);
lib/vsprintf.c int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) · line 1586
Quoted 10 lines
lib/vsprintf.c +6
-0break ; +case FORMAT_TYPE_UBYTE : + num = get_arg(unsigned char); +break ; +case FORMAT_TYPE_BYTE : + num = get_arg(signed char); +break ;case FORMAT_TYPE_USHORT : num = get_arg(unsigned short);break ;
It's fine. hh modifier is supported by ISO C99. And for vbin_printf(), it will consume less memory.
Re: [PATCH 2/2] Fix wrong format string iter for printk
In reply to ZhaoleiQuoted 42 lines · Zhaolei
printk("%Q");
Output before patch:
Output after patch:
%QSigned-off-by Zhao Lei <[email protected]>--- lib/vsprintf.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)lib/vsprintf.c +0
-9@@ -1062,13 +1062,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS : {@@ -1356,8 +1349,6 @@ do { \break ;case FORMAT_TYPE_INVALID : -if (!*fmt) - --fmt;break ;case FORMAT_TYPE_NRCHARS : {@@ -1544,13 +1535,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)if (str < end) *str ='%' ; ++str;
lib/vsprintf.c int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) · line 1540
Quoted 10 lines
lib/vsprintf.c +0
-7-if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS :
It's nice.
Quoted 95 lines · Zhaolei
hh is used as length modifier for signed char or unsigned char. It is supported by glibc, we add kernel support now.
Signed-off-by Zhao Lei <[email protected]>--- lib/vsprintf.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-)lib/vsprintf.c +32
-5@@ -408,6 +408,8 @@ enum format_type {FORMAT_TYPE_LONG_LONG ,FORMAT_TYPE_ULONG ,FORMAT_TYPE_LONG , +FORMAT_TYPE_UBYTE , +FORMAT_TYPE_BYTE ,FORMAT_TYPE_USHORT ,FORMAT_TYPE_SHORT , FORMAT_TYPE_UINT,@@ -853,11 +855,15 @@ qualifier: spec->qualifier =-1 ;if (*fmt =='h' || *fmt =='l' || *fmt =='L' || *fmt =='Z' || *fmt =='z' || *fmt =='t' ) { - spec->qualifier = *fmt; - ++fmt; -if (spec->qualifier =='l' && *fmt =='l' ) { - spec->qualifier ='L' ; - ++fmt; + spec->qualifier = *fmt++; +if (unlikely (spec->qualifier == *fmt)) { +if (spec->qualifier =='l' ) { + spec->qualifier ='L' ; + ++fmt; + }else if (spec->qualifier =='h' ) { + spec->qualifier ='H' ; + ++fmt; + } } }@@ -919,6 +925,11 @@ qualifier: spec->type =FORMAT_TYPE_SIZE_T ; }else if (spec->qualifier =='t' ) { spec->type =FORMAT_TYPE_PTRDIFF ; + }else if (spec->qualifier =='H' ) { +if (spec->flags &SIGN ) + spec->type =FORMAT_TYPE_BYTE ; +else + spec->type =FORMAT_TYPE_UBYTE ; }else if (spec->qualifier =='h' ) {if (spec->flags &SIGN ) spec->type =FORMAT_TYPE_SHORT ;@@ -1094,6 +1105,12 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)case FORMAT_TYPE_PTRDIFF : num =va_arg (args, ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = (unsigned char )va_arg (args, int); +break ; +case FORMAT_TYPE_BYTE : + num = (signed char )va_arg (args, int); +break ;case FORMAT_TYPE_USHORT : num = (unsigned short )va_arg (args, int);break ;@@ -1372,6 +1389,10 @@ do { \case FORMAT_TYPE_PTRDIFF :save_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : +case FORMAT_TYPE_BYTE : +save_arg (char); +break ;case FORMAT_TYPE_USHORT :case FORMAT_TYPE_SHORT :save_arg (short);@@ -1554,6 +1575,12 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)case FORMAT_TYPE_PTRDIFF : num =get_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = get_arg(unsigned char); +break ; +case FORMAT_TYPE_BYTE : + num = get_arg(signed char); +break ;case FORMAT_TYPE_USHORT : num = get_arg(unsigned short);break ;Signature · 1 line
1.5.5.3
Looks good.
Re: [PATCH 2/2] Fix wrong format string iter for printk
In reply to ZhaoleiQuoted 56 lines · Zhaolei
printk("%Q");
Output before patch:
Output after patch:
%QSigned-off-by Zhao Lei <[email protected]>--- lib/vsprintf.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)lib/vsprintf.c +0
-16@@ -1062,13 +1062,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS : {@@ -1356,8 +1349,6 @@ do { \break ;case FORMAT_TYPE_INVALID : -if (!*fmt) - --fmt;break ;case FORMAT_TYPE_NRCHARS : {@@ -1544,13 +1535,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS :Signature · 1 line
1.5.5.3
Thanks for fixing this!
[tip:core/urgent] printk: fix wrong format string iter for printk
In reply to ZhaoleiCommit-ID: 022624a758dc9489388a99ad29577b4c8c09237c Gitweb: http://git.kernel.org/tip/022624a758dc9489388a99ad29577b4c8c09237c Author: Zhaolei <[email protected]> AuthorDate: Fri, 27 Mar 2009 17:09:10 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 17:03:44 +0200
printk: fix wrong format string iter for printk
printk("%Q");
Output before patch: %QQ
Output after patch: %Q
LKML-Reference: <[email protected]>
--- lib/vsprintf.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
lib/vsprintf.c +0 -16
@@ -1051,13 +1051,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS : {
@@ -1339,8 +1332,6 @@ do { \break ;case FORMAT_TYPE_INVALID : -if (!*fmt) - --fmt;break ;case FORMAT_TYPE_NRCHARS : {
@@ -1523,13 +1514,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)if (str < end) *str ='%' ; ++str; -if (*fmt) { -if (str < end) - *str = *fmt; - ++str; - }else { - --fmt; - }break ;case FORMAT_TYPE_NRCHARS :
[tip:core/printk] printk: add support of hh length modifier for printk
In reply to ZhaoleiCommit-ID: a4e94ef0dd391eae05bdeacd12b8da3510957a97 Gitweb: http://git.kernel.org/tip/a4e94ef0dd391eae05bdeacd12b8da3510957a97 Author: Zhaolei <[email protected]> AuthorDate: Fri, 27 Mar 2009 17:07:05 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 17:04:30 +0200
printk: add support of hh length modifier for printk
Impact: new feature, extend vsprintf format strings
hh is used as length modifier for signed char or unsigned char. It is supported by glibc, we add kernel support now.
LKML-Reference: <[email protected]>
--- lib/vsprintf.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-)
lib/vsprintf.c +32 -5
@@ -408,6 +408,8 @@ enum format_type {FORMAT_TYPE_LONG_LONG ,FORMAT_TYPE_ULONG ,FORMAT_TYPE_LONG , +FORMAT_TYPE_UBYTE , +FORMAT_TYPE_BYTE ,FORMAT_TYPE_USHORT ,FORMAT_TYPE_SHORT , FORMAT_TYPE_UINT,
@@ -853,11 +855,15 @@ qualifier: spec->qualifier =-1 ;if (*fmt =='h' || *fmt =='l' || *fmt =='L' || *fmt =='Z' || *fmt =='z' || *fmt =='t' ) { - spec->qualifier = *fmt; - ++fmt; -if (spec->qualifier =='l' && *fmt =='l' ) { - spec->qualifier ='L' ; - ++fmt; + spec->qualifier = *fmt++; +if (unlikely (spec->qualifier == *fmt)) { +if (spec->qualifier =='l' ) { + spec->qualifier ='L' ; + ++fmt; + }else if (spec->qualifier =='h' ) { + spec->qualifier ='H' ; + ++fmt; + } } }
@@ -919,6 +925,11 @@ qualifier: spec->type =FORMAT_TYPE_SIZE_T ; }else if (spec->qualifier =='t' ) { spec->type =FORMAT_TYPE_PTRDIFF ; + }else if (spec->qualifier =='H' ) { +if (spec->flags &SIGN ) + spec->type =FORMAT_TYPE_BYTE ; +else + spec->type =FORMAT_TYPE_UBYTE ; }else if (spec->qualifier =='h' ) {if (spec->flags &SIGN ) spec->type =FORMAT_TYPE_SHORT ;
@@ -1087,6 +1098,12 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)case FORMAT_TYPE_PTRDIFF : num =va_arg (args, ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = (unsigned char )va_arg (args, int); +break ; +case FORMAT_TYPE_BYTE : + num = (signed char )va_arg (args, int); +break ;case FORMAT_TYPE_USHORT : num = (unsigned short )va_arg (args, int);break ;
@@ -1363,6 +1380,10 @@ do { \case FORMAT_TYPE_PTRDIFF :save_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : +case FORMAT_TYPE_BYTE : +save_arg (char); +break ;case FORMAT_TYPE_USHORT :case FORMAT_TYPE_SHORT :save_arg (short);
@@ -1538,6 +1559,12 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)case FORMAT_TYPE_PTRDIFF : num =get_arg (ptrdiff_t);break ; +case FORMAT_TYPE_UBYTE : + num = get_arg(unsigned char); +break ; +case FORMAT_TYPE_BYTE : + num = get_arg(signed char); +break ;case FORMAT_TYPE_USHORT : num = get_arg(unsigned short);break ;