Re: [PATCH] printk: Make printk_emit() local function.
On Sat 2018-11-24 13:10:25, Tetsuo Handa wrote: > Well, moving "__printf(3, 4) __cold" to before > "int devkmsg_emit(int facility, int level, const char *fmt, ...) {" > seems to be working. I did not know... > > >From 86fff21e5fef6d3f7970cf5c07a54a907e582b52 Mon Sep 17 00:00:00 2001 > From: Tetsuo Handa > Date: Sat, 24 Nov 2018 13:05:25 +0900 > Subject: [PATCH v2] printk: Make printk_emit() local function. > > printk_emit() is called from only devkmsg_write() in the same file. > Save object size by making it a local function. > > Signed-off-by: Tetsuo Handa JFYI, I have pushed it into printk.git, for-4.21 branch. Best Regards, Petr
Re: [PATCH] printk: Make printk_emit() local function.
On Sat 2018-11-24 13:10:25, Tetsuo Handa wrote: > Well, moving "__printf(3, 4) __cold" to before > "int devkmsg_emit(int facility, int level, const char *fmt, ...) {" > seems to be working. I did not know... > > >From 86fff21e5fef6d3f7970cf5c07a54a907e582b52 Mon Sep 17 00:00:00 2001 > From: Tetsuo Handa > Date: Sat, 24 Nov 2018 13:05:25 +0900 > Subject: [PATCH v2] printk: Make printk_emit() local function. > > printk_emit() is called from only devkmsg_write() in the same file. > Save object size by making it a local function. > > Signed-off-by: Tetsuo Handa JFYI, I have pushed it into printk.git, for-4.21 branch. Best Regards, Petr
Re: [PATCH] printk: Make printk_emit() local function.
On (11/24/18 13:10), Tetsuo Handa wrote: > Subject: [PATCH v2] printk: Make printk_emit() local function. > > printk_emit() is called from only devkmsg_write() in the same file. > Save object size by making it a local function. > > Signed-off-by: Tetsuo Handa Looks good to me, Reviewed-by: Sergey Senozhatsky -ss
Re: [PATCH] printk: Make printk_emit() local function.
On (11/24/18 13:10), Tetsuo Handa wrote: > Subject: [PATCH v2] printk: Make printk_emit() local function. > > printk_emit() is called from only devkmsg_write() in the same file. > Save object size by making it a local function. > > Signed-off-by: Tetsuo Handa Looks good to me, Reviewed-by: Sergey Senozhatsky -ss
Re: [PATCH] printk: Make printk_emit() local function.
Well, moving "__printf(3, 4) __cold" to before "int devkmsg_emit(int facility, int level, const char *fmt, ...) {" seems to be working. I did not know... >From 86fff21e5fef6d3f7970cf5c07a54a907e582b52 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Sat, 24 Nov 2018 13:05:25 +0900 Subject: [PATCH v2] printk: Make printk_emit() local function. printk_emit() is called from only devkmsg_write() in the same file. Save object size by making it a local function. Signed-off-by: Tetsuo Handa --- include/linux/printk.h | 5 - kernel/printk/printk.c | 30 ++ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index cf3eccf..55aa969 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -166,11 +166,6 @@ int vprintk_emit(int facility, int level, asmlinkage __printf(1, 0) int vprintk(const char *fmt, va_list args); -asmlinkage __printf(5, 6) __cold -int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...); - asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1b2a029..5c2079d 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -752,6 +752,19 @@ struct devkmsg_user { char buf[CONSOLE_EXT_LOG_MAX]; }; +static __printf(3, 4) __cold +int devkmsg_emit(int facility, int level, const char *fmt, ...) +{ + va_list args; + int r; + + va_start(args, fmt); + r = vprintk_emit(facility, level, NULL, 0, fmt, args); + va_end(args); + + return r; +} + static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) { char *buf, *line; @@ -810,7 +823,7 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) } } - printk_emit(facility, level, NULL, 0, "%s", line); + devkmsg_emit(facility, level, "%s", line); kfree(buf); return ret; } @@ -1935,21 +1948,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) } EXPORT_SYMBOL(vprintk); -asmlinkage int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...) -{ - va_list args; - int r; - - va_start(args, fmt); - r = vprintk_emit(facility, level, dict, dictlen, fmt, args); - va_end(args); - - return r; -} -EXPORT_SYMBOL(printk_emit); - int vprintk_default(const char *fmt, va_list args) { int r; -- 1.8.3.1
Re: [PATCH] printk: Make printk_emit() local function.
Well, moving "__printf(3, 4) __cold" to before "int devkmsg_emit(int facility, int level, const char *fmt, ...) {" seems to be working. I did not know... >From 86fff21e5fef6d3f7970cf5c07a54a907e582b52 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Sat, 24 Nov 2018 13:05:25 +0900 Subject: [PATCH v2] printk: Make printk_emit() local function. printk_emit() is called from only devkmsg_write() in the same file. Save object size by making it a local function. Signed-off-by: Tetsuo Handa --- include/linux/printk.h | 5 - kernel/printk/printk.c | 30 ++ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index cf3eccf..55aa969 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -166,11 +166,6 @@ int vprintk_emit(int facility, int level, asmlinkage __printf(1, 0) int vprintk(const char *fmt, va_list args); -asmlinkage __printf(5, 6) __cold -int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...); - asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1b2a029..5c2079d 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -752,6 +752,19 @@ struct devkmsg_user { char buf[CONSOLE_EXT_LOG_MAX]; }; +static __printf(3, 4) __cold +int devkmsg_emit(int facility, int level, const char *fmt, ...) +{ + va_list args; + int r; + + va_start(args, fmt); + r = vprintk_emit(facility, level, NULL, 0, fmt, args); + va_end(args); + + return r; +} + static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) { char *buf, *line; @@ -810,7 +823,7 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) } } - printk_emit(facility, level, NULL, 0, "%s", line); + devkmsg_emit(facility, level, "%s", line); kfree(buf); return ret; } @@ -1935,21 +1948,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) } EXPORT_SYMBOL(vprintk); -asmlinkage int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...) -{ - va_list args; - int r; - - va_start(args, fmt); - r = vprintk_emit(facility, level, dict, dictlen, fmt, args); - va_end(args); - - return r; -} -EXPORT_SYMBOL(printk_emit); - int vprintk_default(const char *fmt, va_list args) { int r; -- 1.8.3.1
Re: [PATCH] printk: Make printk_emit() local function.
On 2018/11/23 21:24, Petr Mladek wrote: > On Thu 2018-11-22 23:59:28, Tetsuo Handa wrote: >> printk_emit() is called from only devkmsg_write() in the same file. >> Save object size by making it a local function. >> >> Signed-off-by: Tetsuo Handa >> --- >> include/linux/printk.h | 5 - >> kernel/printk/printk.c | 31 +++ >> 2 files changed, 15 insertions(+), 21 deletions(-) >> >> --- a/kernel/printk/printk.c >> +++ b/kernel/printk/printk.c >> @@ -752,6 +752,20 @@ struct devkmsg_user { >> char buf[CONSOLE_EXT_LOG_MAX]; >> }; >> >> +static __printf(3, 4) __cold int devkmsg_emit(int facility, int level, >> + const char *fmt, ...); > > There is no need for the forward declaration. __printf(3, 4) > and __cold could be part of the function definition. > Or do I miss anything? If you meant below one, it fails with "error: expected ',' or ';' before '{' token". Attributes annotation needs to be done as the prototype definition. (Though I don't know whether __cold here makes sense...) static int devkmsg_emit(int facility, int level, const char *fmt, ...) __printf(3, 4) __cold { va_list args; int r; va_start(args, fmt); r = vprintk_emit(facility, level, NULL, 0, fmt, args); va_end(args); return r; }
Re: [PATCH] printk: Make printk_emit() local function.
On 2018/11/23 21:24, Petr Mladek wrote: > On Thu 2018-11-22 23:59:28, Tetsuo Handa wrote: >> printk_emit() is called from only devkmsg_write() in the same file. >> Save object size by making it a local function. >> >> Signed-off-by: Tetsuo Handa >> --- >> include/linux/printk.h | 5 - >> kernel/printk/printk.c | 31 +++ >> 2 files changed, 15 insertions(+), 21 deletions(-) >> >> --- a/kernel/printk/printk.c >> +++ b/kernel/printk/printk.c >> @@ -752,6 +752,20 @@ struct devkmsg_user { >> char buf[CONSOLE_EXT_LOG_MAX]; >> }; >> >> +static __printf(3, 4) __cold int devkmsg_emit(int facility, int level, >> + const char *fmt, ...); > > There is no need for the forward declaration. __printf(3, 4) > and __cold could be part of the function definition. > Or do I miss anything? If you meant below one, it fails with "error: expected ',' or ';' before '{' token". Attributes annotation needs to be done as the prototype definition. (Though I don't know whether __cold here makes sense...) static int devkmsg_emit(int facility, int level, const char *fmt, ...) __printf(3, 4) __cold { va_list args; int r; va_start(args, fmt); r = vprintk_emit(facility, level, NULL, 0, fmt, args); va_end(args); return r; }
Re: [PATCH] printk: Make printk_emit() local function.
On Thu 2018-11-22 23:59:28, Tetsuo Handa wrote: > printk_emit() is called from only devkmsg_write() in the same file. > Save object size by making it a local function. > > Signed-off-by: Tetsuo Handa > --- > include/linux/printk.h | 5 - > kernel/printk/printk.c | 31 +++ > 2 files changed, 15 insertions(+), 21 deletions(-) > > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -752,6 +752,20 @@ struct devkmsg_user { > char buf[CONSOLE_EXT_LOG_MAX]; > }; > > +static __printf(3, 4) __cold int devkmsg_emit(int facility, int level, > + const char *fmt, ...); There is no need for the forward declaration. __printf(3, 4) and __cold could be part of the function definition. Or do I miss anything? > +static int devkmsg_emit(int facility, int level, const char *fmt, ...) > +{ > + va_list args; > + int r; > + > + va_start(args, fmt); > + r = vprintk_emit(facility, level, NULL, 0, fmt, args); > + va_end(args); > + > + return r; > +} > + Otherwise, the patch makes sense. I like that it removes one useless EXPORT_SYMBOL(). Best Regards, Petr
Re: [PATCH] printk: Make printk_emit() local function.
On Thu 2018-11-22 23:59:28, Tetsuo Handa wrote: > printk_emit() is called from only devkmsg_write() in the same file. > Save object size by making it a local function. > > Signed-off-by: Tetsuo Handa > --- > include/linux/printk.h | 5 - > kernel/printk/printk.c | 31 +++ > 2 files changed, 15 insertions(+), 21 deletions(-) > > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -752,6 +752,20 @@ struct devkmsg_user { > char buf[CONSOLE_EXT_LOG_MAX]; > }; > > +static __printf(3, 4) __cold int devkmsg_emit(int facility, int level, > + const char *fmt, ...); There is no need for the forward declaration. __printf(3, 4) and __cold could be part of the function definition. Or do I miss anything? > +static int devkmsg_emit(int facility, int level, const char *fmt, ...) > +{ > + va_list args; > + int r; > + > + va_start(args, fmt); > + r = vprintk_emit(facility, level, NULL, 0, fmt, args); > + va_end(args); > + > + return r; > +} > + Otherwise, the patch makes sense. I like that it removes one useless EXPORT_SYMBOL(). Best Regards, Petr
[PATCH] printk: Make printk_emit() local function.
printk_emit() is called from only devkmsg_write() in the same file. Save object size by making it a local function. Signed-off-by: Tetsuo Handa --- include/linux/printk.h | 5 - kernel/printk/printk.c | 31 +++ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index cf3eccf..55aa969 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -166,11 +166,6 @@ int vprintk_emit(int facility, int level, asmlinkage __printf(1, 0) int vprintk(const char *fmt, va_list args); -asmlinkage __printf(5, 6) __cold -int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...); - asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1b2a029..315718b 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -752,6 +752,20 @@ struct devkmsg_user { char buf[CONSOLE_EXT_LOG_MAX]; }; +static __printf(3, 4) __cold int devkmsg_emit(int facility, int level, + const char *fmt, ...); +static int devkmsg_emit(int facility, int level, const char *fmt, ...) +{ + va_list args; + int r; + + va_start(args, fmt); + r = vprintk_emit(facility, level, NULL, 0, fmt, args); + va_end(args); + + return r; +} + static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) { char *buf, *line; @@ -810,7 +824,7 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) } } - printk_emit(facility, level, NULL, 0, "%s", line); + devkmsg_emit(facility, level, "%s", line); kfree(buf); return ret; } @@ -1935,21 +1949,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) } EXPORT_SYMBOL(vprintk); -asmlinkage int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...) -{ - va_list args; - int r; - - va_start(args, fmt); - r = vprintk_emit(facility, level, dict, dictlen, fmt, args); - va_end(args); - - return r; -} -EXPORT_SYMBOL(printk_emit); - int vprintk_default(const char *fmt, va_list args) { int r; -- 1.8.3.1
[PATCH] printk: Make printk_emit() local function.
printk_emit() is called from only devkmsg_write() in the same file. Save object size by making it a local function. Signed-off-by: Tetsuo Handa --- include/linux/printk.h | 5 - kernel/printk/printk.c | 31 +++ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index cf3eccf..55aa969 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -166,11 +166,6 @@ int vprintk_emit(int facility, int level, asmlinkage __printf(1, 0) int vprintk(const char *fmt, va_list args); -asmlinkage __printf(5, 6) __cold -int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...); - asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 1b2a029..315718b 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -752,6 +752,20 @@ struct devkmsg_user { char buf[CONSOLE_EXT_LOG_MAX]; }; +static __printf(3, 4) __cold int devkmsg_emit(int facility, int level, + const char *fmt, ...); +static int devkmsg_emit(int facility, int level, const char *fmt, ...) +{ + va_list args; + int r; + + va_start(args, fmt); + r = vprintk_emit(facility, level, NULL, 0, fmt, args); + va_end(args); + + return r; +} + static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) { char *buf, *line; @@ -810,7 +824,7 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) } } - printk_emit(facility, level, NULL, 0, "%s", line); + devkmsg_emit(facility, level, "%s", line); kfree(buf); return ret; } @@ -1935,21 +1949,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) } EXPORT_SYMBOL(vprintk); -asmlinkage int printk_emit(int facility, int level, - const char *dict, size_t dictlen, - const char *fmt, ...) -{ - va_list args; - int r; - - va_start(args, fmt); - r = vprintk_emit(facility, level, dict, dictlen, fmt, args); - va_end(args); - - return r; -} -EXPORT_SYMBOL(printk_emit); - int vprintk_default(const char *fmt, va_list args) { int r; -- 1.8.3.1