modpost: rename merror() to error()
PATCH 1/5 modpost: rename merror() to error()
The log function names, warn(), merror(), fatal() are inconsistent.
Commit 2a11665945d5 ("kbuild: distinguish between errors and warnings in modpost") intentionally chose merror() to avoid the conflict with the library function error(). See man page of error(3).
But, we are already causing the conflict with warn() because it is also a library function. See man page of warn(3). err() would be a problem for the same reason.
The common technique to work around name conflicts is to use macros.
#define error __error
void __error(const char *fmt, ...)
{
<our own implementation>
}
#define warn __warn
void __warn(const char *fmt, ...)
{
<our own implementation>
}In this way, we can implement our own warn() and error(), still we can include <error.h> and <err.h> with no problem.
And, commit 93c95e526a4e ("modpost: rework and consolidate logging interface") already did that.
Since the log functions are all macros, we can use error() without causing "conflicting types" errors.
---
scripts/mod/modpost.c | 10 +++++----- scripts/mod/modpost.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
scripts/mod/modpost.c +5 -5
@@ -403,8 +403,8 @@ static void sym_update_namespace(const char *symname, const char *namespace)* actually an assertion. */ if (!s) { -merror ("Could not update namespace(%s) for symbol %s\n" , - namespace, symname); +error ("Could not update namespace(%s) for symbol %s\n" , + namespace, symname);return ; }
@@ -2226,7 +2226,7 @@ static int check_modname_len(struct module *mod)else mod_name++;if (strlen (mod_name) >=MODULE_NAME_LEN ) { -merror ("module name is too long [%s.ko]\n" , mod->name); +error ("module name is too long [%s.ko]\n" , mod->name);return 1 ; }
@@ -2319,8 +2319,8 @@ static int add_versions(struct buffer *b, struct module *mod)continue ; }if (strlen (s->name) >=MODULE_NAME_LEN ) { -merror ("too long symbol \"%s\" [%s.ko]\n" , - s->name, mod->name); +error ("too long symbol \"%s\" [%s.ko]\n" , + s->name, mod->name); err =1 ;break ; }
scripts/mod/modpost.h +1 -1
@@ -202,5 +202,5 @@ enum loglevel {void modpost_log (enum loglevel loglevel,const char *fmt, ...); #define warn(fmt, args...) modpost_log(LOG_WARN, fmt, ##args) -#define merror(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args) +#define error(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args) #define fatal(fmt, args...) modpost_log(LOG_FATAL, fmt, ##args)
Signature · 1 line
2.27.0
PATCH 2/5 modpost: refactor error handling and clarify error/fatal difference
We have 3 log functions. fatal() is special because it lets modpost bail out immediately. The difference between warn() and error() is the only prefix parts ("WARNING:" vs "ERROR:").
The intended usage of error() is probably to propagate the return code from the function to the exit code of modpost, as check_exports() etc. already does. This is a good manner because we should display as many issues as possible in a single run of modpost.
What is annoying about fatal() is that it kills modpost at the first error. People would need to run Kbuild again and again until they fix all errors.
But, unfortunately, people tend to do:
"This case should not be allowed. Let's replace warn() with fatal()."
One of the reasons is probably it is tedious to manually carry the error code back to the main() function.
This commit refactors error() so any single call for it automatically makes modpost return the error code.
I also added comments in modpost.h for warn(), error(), and fatal().
Again, please use fatal() only when you have a strong reason to do so. For example:
- Memory shortage (i.e. malloc() etc. has failed)
- The ELF file is broken, and there is no point to continue parsing
- Something really odd has happened
For general coding errors, please use error().
---
scripts/mod/modpost.c | 43 ++++++++++++++----------------------------- scripts/mod/modpost.h | 13 +++++++++++++ 2 files changed, 27 insertions(+), 29 deletions(-)
scripts/mod/modpost.c +14 -29
@@ -40,6 +40,8 @@ static int ignore_missing_files;/* If set to 1, only warn (instead of error) about missing ns imports */ static int allow_missing_ns_imports; +static bool error_occurred; +enum export { export_plain, export_unused, export_gpl, export_unused_gpl, export_gpl_future, export_unknown
@@ -78,6 +80,8 @@ modpost_log(enum loglevel loglevel, const char *fmt, ...)if (loglevel ==LOG_FATAL )exit (1 ); +if (loglevel ==LOG_ERROR ) + error_occurred = true; }static inline bool strends (const char *str,const char *postfix)
@@ -2174,22 +2178,18 @@ static void check_for_unused(enum export exp, const char *m, const char *s) } } -static int check_exports (struct module *mod) +static void check_exports (struct module *mod) {struct symbol *s, *exp; -int err =0 ;for (s = mod->unres; s; s = s->next) {const char *basename; exp =find_symbol (s->name);if (!exp || exp->module == mod) { -if (have_vmlinux && !s->weak) { +if (have_vmlinux && !s->weak)modpost_log (warn_unresolved ?LOG_WARN :LOG_ERROR ,"\"%s\" [%s.ko] undefined!\n" , s->name, mod->name); -if (!warn_unresolved) - err =1 ; - }continue ; } basename =strrchr (mod->name,'/' );
@@ -2203,8 +2203,6 @@ static int check_exports(struct module *mod)modpost_log (allow_missing_ns_imports ?LOG_WARN :LOG_ERROR ,"module %s uses symbol %s from namespace %s, but does not import it.\n" , basename, exp->name, exp->namespace); -if (!allow_missing_ns_imports) - err =1 ;add_namespace (&mod->missing_namespaces, exp->namespace); }
@@ -2212,11 +2210,9 @@ static int check_exports(struct module *mod)check_for_gpl_usage (exp->export, basename, exp->name);check_for_unused (exp->export, basename, exp->name); } - -return err; } -static int check_modname_len (struct module *mod) +static void check_modname_len (struct module *mod) {const char *mod_name;
@@ -2225,12 +2221,8 @@ static int check_modname_len(struct module *mod) mod_name = mod->name; else mod_name++; -if (strlen (mod_name) >=MODULE_NAME_LEN ) { +if (strlen (mod_name) >=MODULE_NAME_LEN )error ("module name is too long [%s.ko]\n" , mod->name); -return 1 ; - } - -return 0 ; }/**
@@ -2289,10 +2281,9 @@ static void add_staging_flag(struct buffer *b, const char *name)/** * Record CRCs for unresolved symbols **/ -static int add_versions (struct buffer *b,struct module *mod) +static void add_versions (struct buffer *b,struct module *mod) {struct symbol *s, *exp; -int err =0 ;for (s = mod->unres; s; s = s->next) { exp =find_symbol (s->name);
@@ -2304,7 +2295,7 @@ static int add_versions(struct buffer *b, struct module *mod) }if (!modversions) -return err; +return ;buf_printf (b,"\n" );buf_printf (b,"static const struct modversion_info ____versions[]\n" );
@@ -2321,7 +2312,6 @@ static int add_versions(struct buffer *b, struct module *mod)if (strlen (s->name) >=MODULE_NAME_LEN ) {error ("too long symbol \"%s\" [%s.ko]\n" , s->name, mod->name); - err =1 ;break ; } buf_printf(b, "\t{ %#8x, \"%s\" },\n",
@@ -2329,8 +2319,6 @@ static int add_versions(struct buffer *b, struct module *mod) }buf_printf (b,"};\n" ); - -return err; }static void add_depends (struct buffer *b,struct module *mod)
@@ -2554,7 +2542,6 @@ int main(int argc, char **argv)char *missing_namespace_deps =NULL ;char *dump_write =NULL , *files_source =NULL ;int opt; -int err;int n;struct dump_list *dump_read_start =NULL ;struct dump_list **dump_read_iter = &dump_read_start;
@@ -2624,8 +2611,6 @@ int main(int argc, char **argv)if (!have_vmlinux)warn ("Symbol info of vmlinux is missing. Unresolved symbol check will be entirely skipped.\n" ); - err =0 ; -for (mod = modules; mod; mod = mod->next) {char fname[PATH_MAX ];
@@ -2634,14 +2619,14 @@ int main(int argc, char **argv) buf.pos =0 ; - err |=check_modname_len (mod); - err |=check_exports (mod); +check_modname_len (mod); +check_exports (mod);add_header (&buf, mod);add_intree_flag (&buf, !external_module);add_retpoline (&buf);add_staging_flag (&buf, mod->name); - err |=add_versions (&buf, mod); +add_versions (&buf, mod);add_depends (&buf, mod);add_moddevtable (&buf, mod);add_srcversion (&buf, mod);
@@ -2671,5 +2656,5 @@ int main(int argc, char **argv)free (buf.p); -return err; +return error_occurred ?1 :0 ; }
scripts/mod/modpost.h +13 -0
@@ -201,6 +201,19 @@ enum loglevel {void modpost_log (enum loglevel loglevel,const char *fmt, ...); +/* +* warn - show the given message, then let modpost continue running, still +* allowing modpost to exit successfully. This should be used when +* we still allow to generate vmlinux and modules. +* +* error - show the given message, then let modpost continue running, but fail +* in the end. This should be used when we should stop building vmlinux +* or modules, but we can continue running modpost to catch as many +* issues as possible. +* +* fatal - show the given message, and bail out immediately. This should be +* used when there is no point to continue running modpost. +*/ #define warn(fmt, args...) modpost_log(LOG_WARN, fmt, ##args) #define error(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args) #define fatal(fmt, args...) modpost_log(LOG_FATAL, fmt, ##args)
Signature · 1 line
2.27.0
Re: [PATCH 2/5] modpost: refactor error handling and clarify error/fatal difference
Quoted 9 lines · Masahiro Yamada
We have 3 log functions.
fatal()is special because it lets modpost bail out immediately. The difference betweenwarn()anderror()is the only prefix parts ("WARNING:" vs "ERROR:").The intended usage of
error()is probably to propagate the return code from the function to the exit code of modpost, ascheck_exports()etc. already does. This is a good manner because we should display as many issues as possible in a single run of modpost.
Quoted 6 lines
What is annoying about
fatal()is that it kills modpost at the first error. People would need to runKbuildagain and again until they fix all errors.But, unfortunately, people tend to do:
"This case should not be allowed. Let's replacewarn()withfatal()."
Indeed :-)
Quoted 2 lines
One of the reasons is probably it is tedious to manually carry the error code back to the
main()function.
And yes, that was the reason.
Quoted 8 lines
This commit refactors
error()so any single call for it automatically makes modpost return the error code.I also added comments in
modpost.hforwarn(),error(), andfatal().Again, please use
fatal()only when you have a strong reason to do so. For example:
Quoted 7 lines
- Memory shortage (i.e.
malloc()etc. has failed)
- The ELF file is broken, and there is no point to continue parsing
- Something really odd has happenedFor general coding errors, please use
error().Signed-off-by Masahiro Yamada <[email protected]>
I gave it a go and the error is propagated correctly, so FWIW:
Thanks,
Quentin
PATCH 3/5 modpost: turn missing MODULE_LICENSE() into error
In reply to Masahiro YamadaDo not create modules with no license tag.
---
scripts/mod/modpost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mod/modpost.c +1 -1
@@ -2018,7 +2018,7 @@ static void read_symbols(const char *modname)if (!mod->is_vmlinux) { license =get_modinfo (&info,"license" );if (!license) -warn ("missing MODULE_LICENSE() in %s\n" , modname); +error ("missing MODULE_LICENSE() in %s\n" , modname);while (license) {if (license_is_gpl_compatible (license)) mod->gpl_compatible =1 ;
Signature · 1 line
2.27.0
PATCH 4/5 modpost: change license incompatibility to error() from fatal()
In reply to Masahiro YamadaChange fatal() to error() to continue running to report more possible issues.
There is no difference in the fact that modpost will fail anyway.
---
scripts/mod/modpost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/mod/modpost.c +2 -2
@@ -2145,11 +2145,11 @@ static void check_for_gpl_usage(enum export exp, const char *m, const char *s) {switch (exp) {case export_gpl: -fatal ("GPL-incompatible module %s.ko uses GPL-only symbol '%s'\n" , +error ("GPL-incompatible module %s.ko uses GPL-only symbol '%s'\n" , m, s);break ;case export_unused_gpl: -fatal ("GPL-incompatible module %s.ko uses GPL-only symbol marked UNUSED '%s'\n" , +error ("GPL-incompatible module %s.ko uses GPL-only symbol marked UNUSED '%s'\n" , m, s);break ;case export_gpl_future:
Signature · 1 line
2.27.0
PATCH 5/5 modpost: turn section mismatches to error from fatal()
In reply to Masahiro YamadaThere is code that reports static EXPORT_SYMBOL a few lines below. It is not a good idea to bail out here.
I renamed sec_mismatch_fatal to sec_mismatch_warn_only (with logical inversion) to match to CONFIG_SECTION_MISMATCH_WARN_ONLY.
---
scripts/mod/modpost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/mod/modpost.c +4 -4
@@ -34,7 +34,7 @@ static int external_module = 0;static int warn_unresolved =0 ;/* How a symbol is exported */ static int sec_mismatch_count =0 ; -static int sec_mismatch_fatal =0 ; +static int sec_mismatch_warn_only = true;/* ignore missing files */ static int ignore_missing_files;/* If set to 1, only warn (instead of error) about missing ns imports */
@@ -2576,7 +2576,7 @@ int main(int argc, char **argv) warn_unresolved =1 ;break ;case 'E' : - sec_mismatch_fatal =1 ; + sec_mismatch_warn_only = false;break ;case 'N' : allow_missing_ns_imports =1 ;
@@ -2640,8 +2640,8 @@ int main(int argc, char **argv)if (dump_write)write_dump (dump_write); -if (sec_mismatch_count && sec_mismatch_fatal) -fatal ("Section mismatches detected.\n" +if (sec_mismatch_count && !sec_mismatch_warn_only) +error ("Section mismatches detected.\n" "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n" );for (n =0 ; n <SYMBOL_HASH_SIZE ; n++) {struct symbol *s;
Signature · 1 line
2.27.0
Quoted 28 lines · Masahiro Yamada
The log function names,
warn(),merror(),fatal()are inconsistent.Commit
2a11665945d5("kbuild: distinguish between errors and warnings in modpost") intentionally chosemerror()to avoid the conflict with the library functionerror(). See man page of error(3).But, we are already causing the conflict with
warn()because it is also a library function. See man page of warn(3).err()would be a problem for the same reason.The common technique to work around name conflicts is to use macros.
#define error __error void __error(const char *fmt, ...) { <our own implementation> } #define warn __warn void __warn(const char *fmt, ...) { <our own implementation> }In this way, we can implement our own
warn()anderror(), still we can include <error.h> and <err.h> with no problem.
Quoted 7 lines
And, commit
93c95e526a4e("modpost: rework and consolidate logging interface") already did that.Since the log functions are all macros, we can use
error()without causing "conflicting types" errors.Signed-off-by Masahiro Yamada <[email protected]>
This series, applied to linux-kbuild.
Quoted 55 lines
---
scripts/mod/modpost.c | 10 +++++----- scripts/mod/modpost.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)scripts/mod/modpost.c +5
-5@@ -403,8 +403,8 @@ static void sym_update_namespace(const char *symname, const char *namespace)* actually an assertion. */ if (!s) { -merror ("Could not update namespace(%s) for symbol %s\n" , - namespace, symname); +error ("Could not update namespace(%s) for symbol %s\n" , + namespace, symname);return ; }@@ -2226,7 +2226,7 @@ static int check_modname_len(struct module *mod)else mod_name++;if (strlen (mod_name) >=MODULE_NAME_LEN ) { -merror ("module name is too long [%s.ko]\n" , mod->name); +error ("module name is too long [%s.ko]\n" , mod->name);return 1 ; }@@ -2319,8 +2319,8 @@ static int add_versions(struct buffer *b, struct module *mod)continue ; }if (strlen (s->name) >=MODULE_NAME_LEN ) { -merror ("too long symbol \"%s\" [%s.ko]\n" , - s->name, mod->name); +error ("too long symbol \"%s\" [%s.ko]\n" , + s->name, mod->name); err =1 ;break ; }scripts/mod/modpost.h +1
-2@@ -202,5 +202,5 @@ enum loglevel {void modpost_log (enum loglevel loglevel,const char *fmt, ...); #define warn(fmt, args...) modpost_log(LOG_WARN, fmt, ##args) -#define merror(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args) +#define error(fmt, args...) modpost_log(LOG_ERROR, fmt, ##args) #define fatal(fmt, args...) modpost_log(LOG_FATAL, fmt, ##args) --2.27.0
Signature · 2 lines
Best Regards Masahiro Yamada