* [PATCH 0/3] improve error handling for module load
@ 2022-09-06 11:54 Claudio Fontana
2022-09-06 11:54 ` [PATCH 1/3] module: removed unused function argument "mayfail" Claudio Fontana
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-06 11:54 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé,
Claudio Fontana
while investigating a permission issue in accel, where accel-tcg-x86_64.so
was not accessible, I noticed that no errors were produced regarding the
module load failure.
This series attempts to improve module_load_one and module_load_qom_one
to handle the error cases better and produce some errors.
Patch 1 is already reviewed and is about removing an unused existing
argument "mayfail" from the call stack.
Patch 2 is the real meat, and that one I would say is RFC.
Will follow up with comments on the specific questions I have.
Patch 3 finally adds a simple check in accel/, aborting if a module
is not found, but relying on the existing error report from
module_load_qom_one.
Claudio Fontana (3):
module: removed unused function argument "mayfail"
module: add Error arguments to module_load_one and module_load_qom_one
accel: abort if we fail to load the accelerator plugin
accel/accel-softmmu.c | 8 ++-
audio/audio.c | 6 +-
block.c | 12 +++-
block/dmg.c | 10 ++-
hw/core/qdev.c | 10 ++-
include/qemu/module.h | 10 +--
qom/object.c | 15 +++-
softmmu/qtest.c | 6 +-
ui/console.c | 19 ++++-
util/module.c | 157 ++++++++++++++++++++++++++++++------------
10 files changed, 189 insertions(+), 64 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] module: removed unused function argument "mayfail"
2022-09-06 11:54 [PATCH 0/3] improve error handling for module load Claudio Fontana
@ 2022-09-06 11:54 ` Claudio Fontana
2022-09-06 11:55 ` [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one Claudio Fontana
2022-09-06 11:55 ` [PATCH 3/3] accel: abort if we fail to load the accelerator plugin Claudio Fontana
2 siblings, 0 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-06 11:54 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé,
Claudio Fontana, Philippe Mathieu-Daudé
mayfail is always passed as false for every invocation throughout the program.
It controls whether to printf or not to printf an error on
g_module_open failure.
Remove this unused argument.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/qemu/module.h | 8 ++++----
softmmu/qtest.c | 2 +-
util/module.c | 20 +++++++++-----------
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index bd73607104..8c012bbe03 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -61,15 +61,15 @@ typedef enum {
#define fuzz_target_init(function) module_init(function, \
MODULE_INIT_FUZZ_TARGET)
#define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
-#define block_module_load_one(lib) module_load_one("block-", lib, false)
-#define ui_module_load_one(lib) module_load_one("ui-", lib, false)
-#define audio_module_load_one(lib) module_load_one("audio-", lib, false)
+#define block_module_load_one(lib) module_load_one("block-", lib)
+#define ui_module_load_one(lib) module_load_one("ui-", lib)
+#define audio_module_load_one(lib) module_load_one("audio-", lib)
void register_module_init(void (*fn)(void), module_init_type type);
void register_dso_module_init(void (*fn)(void), module_init_type type);
void module_call_init(module_init_type type);
-bool module_load_one(const char *prefix, const char *lib_name, bool mayfail);
+bool module_load_one(const char *prefix, const char *lib_name);
void module_load_qom_one(const char *type);
void module_load_qom_all(void);
void module_allow_arch(const char *arch);
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index f8acef2628..76eb7bac56 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -756,7 +756,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
g_assert(words[1] && words[2]);
qtest_send_prefix(chr);
- if (module_load_one(words[1], words[2], false)) {
+ if (module_load_one(words[1], words[2])) {
qtest_sendf(chr, "OK\n");
} else {
qtest_sendf(chr, "FAIL\n");
diff --git a/util/module.c b/util/module.c
index 8ddb0e18f5..8563edd626 100644
--- a/util/module.c
+++ b/util/module.c
@@ -144,7 +144,7 @@ static bool module_check_arch(const QemuModinfo *modinfo)
return true;
}
-static int module_load_file(const char *fname, bool mayfail, bool export_symbols)
+static int module_load_file(const char *fname, bool export_symbols)
{
GModule *g_module;
void (*sym)(void);
@@ -172,10 +172,8 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols
}
g_module = g_module_open(fname, flags);
if (!g_module) {
- if (!mayfail) {
- fprintf(stderr, "Failed to open module: %s\n",
- g_module_error());
- }
+ fprintf(stderr, "Failed to open module: %s\n",
+ g_module_error());
ret = -EINVAL;
goto out;
}
@@ -208,7 +206,7 @@ out:
}
#endif
-bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
+bool module_load_one(const char *prefix, const char *lib_name)
{
bool success = false;
@@ -256,7 +254,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
if (strcmp(modinfo->name, module_name) == 0) {
/* we depend on other module(s) */
for (sl = modinfo->deps; *sl != NULL; sl++) {
- module_load_one("", *sl, false);
+ module_load_one("", *sl);
}
} else {
for (sl = modinfo->deps; *sl != NULL; sl++) {
@@ -287,7 +285,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
for (i = 0; i < n_dirs; i++) {
fname = g_strdup_printf("%s/%s%s",
dirs[i], module_name, CONFIG_HOST_DSOSUF);
- ret = module_load_file(fname, mayfail, export_symbols);
+ ret = module_load_file(fname, export_symbols);
g_free(fname);
fname = NULL;
/* Try loading until loaded a module file */
@@ -333,7 +331,7 @@ void module_load_qom_one(const char *type)
}
for (sl = modinfo->objs; *sl != NULL; sl++) {
if (strcmp(type, *sl) == 0) {
- module_load_one("", modinfo->name, false);
+ module_load_one("", modinfo->name);
}
}
}
@@ -354,7 +352,7 @@ void module_load_qom_all(void)
if (!module_check_arch(modinfo)) {
continue;
}
- module_load_one("", modinfo->name, false);
+ module_load_one("", modinfo->name);
}
module_loaded_qom_all = true;
}
@@ -370,7 +368,7 @@ void qemu_load_module_for_opts(const char *group)
}
for (sl = modinfo->opts; *sl != NULL; sl++) {
if (strcmp(group, *sl) == 0) {
- module_load_one("", modinfo->name, false);
+ module_load_one("", modinfo->name);
}
}
}
--
2.26.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-06 11:54 [PATCH 0/3] improve error handling for module load Claudio Fontana
2022-09-06 11:54 ` [PATCH 1/3] module: removed unused function argument "mayfail" Claudio Fontana
@ 2022-09-06 11:55 ` Claudio Fontana
2022-09-06 12:32 ` Claudio Fontana
` (2 more replies)
2022-09-06 11:55 ` [PATCH 3/3] accel: abort if we fail to load the accelerator plugin Claudio Fontana
2 siblings, 3 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-06 11:55 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé,
Claudio Fontana
improve error handling during module load, by changing:
bool module_load_one(const char *prefix, const char *lib_name);
void module_load_qom_one(const char *type);
to:
bool module_load_one(const char *prefix, const char *name, Error **errp);
bool module_load_qom_one(const char *type, Error **errp);
module_load_qom_one has been introduced in:
commit 28457744c345 ("module: qom module support"), which built on top of
module_load_one, but discarded the bool return value. Restore it.
Adapt all callers to emit errors, or ignore them, or fail hard,
as appropriate in each context.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
audio/audio.c | 6 +-
block.c | 12 +++-
block/dmg.c | 10 ++-
hw/core/qdev.c | 10 ++-
include/qemu/module.h | 10 +--
qom/object.c | 15 +++-
softmmu/qtest.c | 6 +-
ui/console.c | 19 +++++-
util/module.c | 155 ++++++++++++++++++++++++++++++------------
9 files changed, 182 insertions(+), 61 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 76b8735b44..4f4bb10cce 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
audio_driver *audio_driver_lookup(const char *name)
{
struct audio_driver *d;
+ Error *local_err = NULL;
QLIST_FOREACH(d, &audio_drivers, next) {
if (strcmp(name, d->name) == 0) {
@@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
}
}
- audio_module_load_one(name);
+ if (!audio_module_load_one(name, &local_err) && local_err) {
+ error_report_err(local_err);
+ }
+
QLIST_FOREACH(d, &audio_drivers, next) {
if (strcmp(name, d->name) == 0) {
return d;
diff --git a/block.c b/block.c
index bc85f46eed..85c3742d7a 100644
--- a/block.c
+++ b/block.c
@@ -464,7 +464,11 @@ BlockDriver *bdrv_find_format(const char *format_name)
/* The driver isn't registered, maybe we need to load a module */
for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
if (!strcmp(block_driver_modules[i].format_name, format_name)) {
- block_module_load_one(block_driver_modules[i].library_name);
+ Error *local_err = NULL;
+ if (!block_module_load_one(block_driver_modules[i].library_name,
+ &local_err) && local_err) {
+ error_report_err(local_err);
+ }
break;
}
}
@@ -976,7 +980,11 @@ BlockDriver *bdrv_find_protocol(const char *filename,
for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
if (block_driver_modules[i].protocol_name &&
!strcmp(block_driver_modules[i].protocol_name, protocol)) {
- block_module_load_one(block_driver_modules[i].library_name);
+ Error *local_err = NULL;
+ if (!block_module_load_one(block_driver_modules[i].library_name,
+ &local_err) && local_err) {
+ error_report_err(local_err);
+ }
break;
}
}
diff --git a/block/dmg.c b/block/dmg.c
index 98db18d82a..349b05d20b 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -434,6 +434,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
uint64_t plist_xml_offset, plist_xml_length;
int64_t offset;
int ret;
+ Error *local_err = NULL;
ret = bdrv_apply_auto_read_only(bs, NULL, errp);
if (ret < 0) {
@@ -446,8 +447,13 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
return -EINVAL;
}
- block_module_load_one("dmg-bz2");
- block_module_load_one("dmg-lzfse");
+ if (!block_module_load_one("dmg-bz2", &local_err) && local_err) {
+ error_report_err(local_err);
+ }
+ local_err = NULL;
+ if (!block_module_load_one("dmg-lzfse", &local_err) && local_err) {
+ error_report_err(local_err);
+ }
s->n_chunks = 0;
s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 0806d8fcaa..5902c59c94 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -148,7 +148,15 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp)
DeviceState *qdev_new(const char *name)
{
if (!object_class_by_name(name)) {
- module_load_qom_one(name);
+ Error *local_err = NULL;
+ if (!module_load_qom_one(name, &local_err)) {
+ if (local_err) {
+ error_report_err(local_err);
+ } else {
+ error_report("could not find a module for type '%s'", name);
+ }
+ abort();
+ }
}
return DEVICE(object_new(name));
}
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 8c012bbe03..7893922aba 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -61,16 +61,16 @@ typedef enum {
#define fuzz_target_init(function) module_init(function, \
MODULE_INIT_FUZZ_TARGET)
#define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
-#define block_module_load_one(lib) module_load_one("block-", lib)
-#define ui_module_load_one(lib) module_load_one("ui-", lib)
-#define audio_module_load_one(lib) module_load_one("audio-", lib)
+#define block_module_load_one(lib, errp) module_load_one("block-", lib, errp)
+#define ui_module_load_one(lib, errp) module_load_one("ui-", lib, errp)
+#define audio_module_load_one(lib, errp) module_load_one("audio-", lib, errp)
void register_module_init(void (*fn)(void), module_init_type type);
void register_dso_module_init(void (*fn)(void), module_init_type type);
void module_call_init(module_init_type type);
-bool module_load_one(const char *prefix, const char *lib_name);
-void module_load_qom_one(const char *type);
+bool module_load_one(const char *prefix, const char *name, Error **errp);
+bool module_load_qom_one(const char *type, Error **errp);
void module_load_qom_all(void);
void module_allow_arch(const char *arch);
diff --git a/qom/object.c b/qom/object.c
index d34608558e..6a74e6a478 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -526,8 +526,14 @@ void object_initialize(void *data, size_t size, const char *typename)
#ifdef CONFIG_MODULES
if (!type) {
- module_load_qom_one(typename);
- type = type_get_by_name(typename);
+ Error *local_err = NULL;
+ if (!module_load_qom_one(typename, &local_err)) {
+ if (local_err) {
+ error_report_err(local_err);
+ }
+ } else {
+ type = type_get_by_name(typename);
+ }
}
#endif
if (!type) {
@@ -1033,7 +1039,10 @@ ObjectClass *module_object_class_by_name(const char *typename)
oc = object_class_by_name(typename);
#ifdef CONFIG_MODULES
if (!oc) {
- module_load_qom_one(typename);
+ Error *local_err = NULL;
+ if (!module_load_qom_one(typename, &local_err) && local_err) {
+ error_report_err(local_err);
+ }
oc = object_class_by_name(typename);
}
#endif
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index 76eb7bac56..bb83c7aae9 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -753,12 +753,16 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
qtest_sendf(chr, "OK %"PRIi64"\n",
(int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
} else if (strcmp(words[0], "module_load") == 0) {
+ Error *local_err = NULL;
g_assert(words[1] && words[2]);
qtest_send_prefix(chr);
- if (module_load_one(words[1], words[2])) {
+ if (module_load_one(words[1], words[2], &local_err)) {
qtest_sendf(chr, "OK\n");
} else {
+ if (local_err) {
+ error_report_err(local_err);
+ }
qtest_sendf(chr, "FAIL\n");
}
} else if (qtest_enabled() && strcmp(words[0], "clock_set") == 0) {
diff --git a/ui/console.c b/ui/console.c
index 765892f84f..9c5f6d5c30 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2632,7 +2632,11 @@ bool qemu_display_find_default(DisplayOptions *opts)
for (i = 0; i < (int)ARRAY_SIZE(prio); i++) {
if (dpys[prio[i]] == NULL) {
- ui_module_load_one(DisplayType_str(prio[i]));
+ Error *local_err = NULL;
+ if (!ui_module_load_one(DisplayType_str(prio[i]), &local_err)
+ && local_err) {
+ error_report_err(local_err);
+ }
}
if (dpys[prio[i]] == NULL) {
continue;
@@ -2650,7 +2654,11 @@ void qemu_display_early_init(DisplayOptions *opts)
return;
}
if (dpys[opts->type] == NULL) {
- ui_module_load_one(DisplayType_str(opts->type));
+ Error *local_err = NULL;
+ if (!ui_module_load_one(DisplayType_str(opts->type), &local_err)
+ && local_err) {
+ error_report_err(local_err);
+ }
}
if (dpys[opts->type] == NULL) {
error_report("Display '%s' is not available.",
@@ -2680,7 +2688,12 @@ void qemu_display_help(void)
printf("none\n");
for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) {
if (!dpys[idx]) {
- ui_module_load_one(DisplayType_str(idx));
+ Error *local_err = NULL;
+ if (!ui_module_load_one(DisplayType_str(idx), &local_err)
+ && local_err) {
+ /* don't clutter the help text, no error report emitted */
+ error_free(local_err);
+ }
}
if (dpys[idx]) {
printf("%s\n", DisplayType_str(dpys[idx]->type));
diff --git a/util/module.c b/util/module.c
index 8563edd626..7b838ee4a1 100644
--- a/util/module.c
+++ b/util/module.c
@@ -21,6 +21,7 @@
#include "qemu/module.h"
#include "qemu/cutils.h"
#include "qemu/config-file.h"
+#include "qapi/error.h"
#ifdef CONFIG_MODULE_UPGRADES
#include "qemu-version.h"
#endif
@@ -144,7 +145,22 @@ static bool module_check_arch(const QemuModinfo *modinfo)
return true;
}
-static int module_load_file(const char *fname, bool export_symbols)
+/*
+ * module_load_file: attempt to load a dso file
+ *
+ * fname: full pathname of the file to load
+ * export_symbols: if true, add the symbols to the global name space
+ * errp: error to set.
+ *
+ * Return value: 0 on success (found and loaded), < 0 on failure.
+ * A return value of -ENOENT or -ENOTDIR means 'not found'.
+ * -EINVAL is used as the generic error condition.
+ *
+ * Error: If fname is found, but could not be loaded, errp is set
+ * with the error encountered during load.
+ */
+static int module_load_file(const char *fname, bool export_symbols,
+ Error **errp)
{
GModule *g_module;
void (*sym)(void);
@@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
int len = strlen(fname);
int suf_len = strlen(dsosuf);
ModuleEntry *e, *next;
- int ret, flags;
+ int flags;
if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
- /* wrong suffix */
- ret = -EINVAL;
- goto out;
+ error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
+ return -EINVAL;
}
- if (access(fname, F_OK)) {
- ret = -ENOENT;
- goto out;
+ if (access(fname, F_OK) != 0) {
+ int ret = errno;
+ if (ret != ENOENT && ret != ENOTDIR) {
+ error_setg_errno(errp, ret, "error trying to access %s", fname);
+ }
+ /* most likely is EACCES here */
+ return -ret;
}
assert(QTAILQ_EMPTY(&dso_init_list));
@@ -172,41 +191,52 @@ static int module_load_file(const char *fname, bool export_symbols)
}
g_module = g_module_open(fname, flags);
if (!g_module) {
- fprintf(stderr, "Failed to open module: %s\n",
- g_module_error());
- ret = -EINVAL;
- goto out;
+ error_setg(errp, "failed to open module: %s", g_module_error());
+ return -EINVAL;
}
if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) {
- fprintf(stderr, "Failed to initialize module: %s\n",
- fname);
- /* Print some info if this is a QEMU module (but from different build),
- * this will make debugging user problems easier. */
+ error_setg(errp, "failed to initialize module: %s", fname);
+ /*
+ * Print some info if this is a QEMU module (but from different build),
+ * this will make debugging user problems easier.
+ */
if (g_module_symbol(g_module, "qemu_module_dummy", (gpointer *)&sym)) {
- fprintf(stderr,
- "Note: only modules from the same build can be loaded.\n");
+ error_append_hint(errp,
+ "Only modules from the same build can be loaded");
}
g_module_close(g_module);
- ret = -EINVAL;
- } else {
- QTAILQ_FOREACH(e, &dso_init_list, node) {
- e->init();
- register_module_init(e->init, e->type);
- }
- ret = 0;
+ return -EINVAL;
}
+ QTAILQ_FOREACH(e, &dso_init_list, node) {
+ e->init();
+ register_module_init(e->init, e->type);
+ }
trace_module_load_module(fname);
QTAILQ_FOREACH_SAFE(e, &dso_init_list, node, next) {
QTAILQ_REMOVE(&dso_init_list, e, node);
g_free(e);
}
-out:
- return ret;
+ return 0;
}
-#endif
+#endif /* CONFIG_MODULES */
-bool module_load_one(const char *prefix, const char *lib_name)
+/*
+ * module_load_one: attempt to load a module from a set of directories
+ *
+ * directories searched are:
+ * - getenv("QEMU_MODULE_DIR")
+ * - get_relocated_path(CONFIG_QEMU_MODDIR);
+ * - /var/run/qemu/${version_dir}
+ *
+ * prefix: a subsystem prefix, or the empty string ("audio-", "")
+ * name: name of the module
+ * errp: error to set.
+ *
+ * Return value: true on success (found and loaded), false on failure.
+ * If module is found, but could not be loaded, errp will be set
+ */
+bool module_load_one(const char *prefix, const char *name, Error **errp)
{
bool success = false;
@@ -226,7 +256,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
const char **sl;
if (!g_module_supported()) {
- fprintf(stderr, "Module is not supported by system.\n");
+ error_setg(errp, "%s", "this platform does not support GLib modules");
return false;
}
@@ -234,7 +264,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
loaded_modules = g_hash_table_new(g_str_hash, g_str_equal);
}
- module_name = g_strdup_printf("%s%s", prefix, lib_name);
+ module_name = g_strdup_printf("%s%s", prefix, name);
if (g_hash_table_contains(loaded_modules, module_name)) {
g_free(module_name);
@@ -246,6 +276,8 @@ bool module_load_one(const char *prefix, const char *lib_name)
if (modinfo->arch) {
if (strcmp(modinfo->name, module_name) == 0) {
if (!module_check_arch(modinfo)) {
+ error_setg(errp, "module arch does not match: "
+ "expected '%s', got '%s'", module_arch, modinfo->arch);
return false;
}
}
@@ -254,7 +286,9 @@ bool module_load_one(const char *prefix, const char *lib_name)
if (strcmp(modinfo->name, module_name) == 0) {
/* we depend on other module(s) */
for (sl = modinfo->deps; *sl != NULL; sl++) {
- module_load_one("", *sl);
+ if (!(module_load_one("", *sl, errp))) {
+ return false;
+ }
}
} else {
for (sl = modinfo->deps; *sl != NULL; sl++) {
@@ -285,14 +319,20 @@ bool module_load_one(const char *prefix, const char *lib_name)
for (i = 0; i < n_dirs; i++) {
fname = g_strdup_printf("%s/%s%s",
dirs[i], module_name, CONFIG_HOST_DSOSUF);
- ret = module_load_file(fname, export_symbols);
+ ret = module_load_file(fname, export_symbols, errp);
g_free(fname);
fname = NULL;
- /* Try loading until loaded a module file */
- if (!ret) {
- success = true;
- break;
+ /*
+ * Try to find the file in all directories until we either fail badly,
+ * load the file successfully, or exhaust all directories in the list.
+ */
+ if (ret == -ENOENT || ret == -ENOTDIR) {
+ continue;
}
+ if (ret == 0) {
+ success = true;
+ }
+ break;
}
if (!success) {
@@ -312,13 +352,25 @@ bool module_load_one(const char *prefix, const char *lib_name)
static bool module_loaded_qom_all;
-void module_load_qom_one(const char *type)
+/*
+ * module_load_qom_one: attempt to load a module to provide a QOM type
+ *
+ * type: the type to be provided
+ * errp: error to set.
+ *
+ * Return value: true on success (found and loaded), false on failure.
+ * If a module is simply not found for the type,
+ * errp will not be set.
+ */
+bool module_load_qom_one(const char *type, Error **errp)
{
+ bool found = false;
const QemuModinfo *modinfo;
const char **sl;
if (!type) {
- return;
+ error_setg(errp, "%s", "type is NULL");
+ return false;
}
trace_module_lookup_object_type(type);
@@ -331,15 +383,26 @@ void module_load_qom_one(const char *type)
}
for (sl = modinfo->objs; *sl != NULL; sl++) {
if (strcmp(type, *sl) == 0) {
- module_load_one("", modinfo->name);
+ if (found) {
+ error_setg(errp, "multiple modules providing '%s'", type);
+ found = false;
+ break;
+ }
+ found = module_load_one("", modinfo->name, errp);
+ if (!found) {
+ /* errp optionally set in module_load_one */
+ break;
+ }
}
}
}
+ return found;
}
void module_load_qom_all(void)
{
const QemuModinfo *modinfo;
+ Error *local_err = NULL;
if (module_loaded_qom_all) {
return;
@@ -352,7 +415,9 @@ void module_load_qom_all(void)
if (!module_check_arch(modinfo)) {
continue;
}
- module_load_one("", modinfo->name);
+ if (!module_load_one("", modinfo->name, &local_err) && local_err) {
+ error_report_err(local_err);
+ }
}
module_loaded_qom_all = true;
}
@@ -368,7 +433,11 @@ void qemu_load_module_for_opts(const char *group)
}
for (sl = modinfo->opts; *sl != NULL; sl++) {
if (strcmp(group, *sl) == 0) {
- module_load_one("", modinfo->name);
+ Error *local_err = NULL;
+ if (!module_load_one("", modinfo->name, &local_err)
+ && local_err) {
+ error_report_err(local_err);
+ }
}
}
}
@@ -378,7 +447,7 @@ void qemu_load_module_for_opts(const char *group)
void module_allow_arch(const char *arch) {}
void qemu_load_module_for_opts(const char *group) {}
-void module_load_qom_one(const char *type) {}
+bool module_load_qom_one(const char *type, Error **errp) { return true; }
void module_load_qom_all(void) {}
#endif
--
2.26.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] accel: abort if we fail to load the accelerator plugin
2022-09-06 11:54 [PATCH 0/3] improve error handling for module load Claudio Fontana
2022-09-06 11:54 ` [PATCH 1/3] module: removed unused function argument "mayfail" Claudio Fontana
2022-09-06 11:55 ` [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one Claudio Fontana
@ 2022-09-06 11:55 ` Claudio Fontana
2 siblings, 0 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-06 11:55 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé,
Claudio Fontana
if QEMU is configured with modules enabled, it is possible that the
load of an accelerator module will fail.
Abort in this case, relying on module_object_class_by_name to report
the specific load error if any.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
accel/accel-softmmu.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/accel/accel-softmmu.c b/accel/accel-softmmu.c
index 67276e4f52..9fa4849f2c 100644
--- a/accel/accel-softmmu.c
+++ b/accel/accel-softmmu.c
@@ -66,6 +66,7 @@ void accel_init_ops_interfaces(AccelClass *ac)
{
const char *ac_name;
char *ops_name;
+ ObjectClass *oc;
AccelOpsClass *ops;
ac_name = object_class_get_name(OBJECT_CLASS(ac));
@@ -73,8 +74,13 @@ void accel_init_ops_interfaces(AccelClass *ac)
ops_name = g_strdup_printf("%s" ACCEL_OPS_SUFFIX, ac_name);
ops = ACCEL_OPS_CLASS(module_object_class_by_name(ops_name));
+ oc = module_object_class_by_name(ops_name);
+ if (!oc) {
+ error_report("fatal: could not load module for type '%s'", ops_name);
+ abort();
+ }
g_free(ops_name);
-
+ ops = ACCEL_OPS_CLASS(oc);
/*
* all accelerators need to define ops, providing at least a mandatory
* non-NULL create_vcpu_thread operation.
--
2.26.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-06 11:55 ` [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one Claudio Fontana
@ 2022-09-06 12:32 ` Claudio Fontana
2022-09-06 14:21 ` Philippe Mathieu-Daudé via
2022-09-07 7:36 ` Gerd Hoffmann
2022-09-07 9:42 ` Claudio Fontana
2022-09-08 8:11 ` Richard Henderson
2 siblings, 2 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-06 12:32 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé
On 9/6/22 13:55, Claudio Fontana wrote:
> improve error handling during module load, by changing:
>
> bool module_load_one(const char *prefix, const char *lib_name);
> void module_load_qom_one(const char *type);
>
> to:
>
> bool module_load_one(const char *prefix, const char *name, Error **errp);
> bool module_load_qom_one(const char *type, Error **errp);
>
> module_load_qom_one has been introduced in:
>
> commit 28457744c345 ("module: qom module support"), which built on top of
> module_load_one, but discarded the bool return value. Restore it.
>
> Adapt all callers to emit errors, or ignore them, or fail hard,
> as appropriate in each context.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
> audio/audio.c | 6 +-
> block.c | 12 +++-
> block/dmg.c | 10 ++-
> hw/core/qdev.c | 10 ++-
> include/qemu/module.h | 10 +--
> qom/object.c | 15 +++-
> softmmu/qtest.c | 6 +-
> ui/console.c | 19 +++++-
> util/module.c | 155 ++++++++++++++++++++++++++++++------------
> 9 files changed, 182 insertions(+), 61 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 76b8735b44..4f4bb10cce 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
> audio_driver *audio_driver_lookup(const char *name)
> {
> struct audio_driver *d;
> + Error *local_err = NULL;
>
> QLIST_FOREACH(d, &audio_drivers, next) {
> if (strcmp(name, d->name) == 0) {
> @@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
> }
> }
>
> - audio_module_load_one(name);
> + if (!audio_module_load_one(name, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> +
> QLIST_FOREACH(d, &audio_drivers, next) {
> if (strcmp(name, d->name) == 0) {
> return d;
> diff --git a/block.c b/block.c
> index bc85f46eed..85c3742d7a 100644
> --- a/block.c
> +++ b/block.c
> @@ -464,7 +464,11 @@ BlockDriver *bdrv_find_format(const char *format_name)
> /* The driver isn't registered, maybe we need to load a module */
> for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
> if (!strcmp(block_driver_modules[i].format_name, format_name)) {
> - block_module_load_one(block_driver_modules[i].library_name);
> + Error *local_err = NULL;
> + if (!block_module_load_one(block_driver_modules[i].library_name,
> + &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> break;
> }
> }
> @@ -976,7 +980,11 @@ BlockDriver *bdrv_find_protocol(const char *filename,
> for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
> if (block_driver_modules[i].protocol_name &&
> !strcmp(block_driver_modules[i].protocol_name, protocol)) {
> - block_module_load_one(block_driver_modules[i].library_name);
> + Error *local_err = NULL;
> + if (!block_module_load_one(block_driver_modules[i].library_name,
> + &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> break;
> }
> }
> diff --git a/block/dmg.c b/block/dmg.c
> index 98db18d82a..349b05d20b 100644
> --- a/block/dmg.c
> +++ b/block/dmg.c
> @@ -434,6 +434,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
> uint64_t plist_xml_offset, plist_xml_length;
> int64_t offset;
> int ret;
> + Error *local_err = NULL;
>
> ret = bdrv_apply_auto_read_only(bs, NULL, errp);
> if (ret < 0) {
> @@ -446,8 +447,13 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
> return -EINVAL;
> }
>
> - block_module_load_one("dmg-bz2");
> - block_module_load_one("dmg-lzfse");
> + if (!block_module_load_one("dmg-bz2", &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> + local_err = NULL;
> + if (!block_module_load_one("dmg-lzfse", &local_err) && local_err) {
> + error_report_err(local_err);
> + }
>
> s->n_chunks = 0;
> s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 0806d8fcaa..5902c59c94 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -148,7 +148,15 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp)
> DeviceState *qdev_new(const char *name)
> {
> if (!object_class_by_name(name)) {
> - module_load_qom_one(name);
> + Error *local_err = NULL;
> + if (!module_load_qom_one(name, &local_err)) {
> + if (local_err) {
> + error_report_err(local_err);
> + } else {
> + error_report("could not find a module for type '%s'", name);
> + }
> + abort();
Are we ok abort() ing here for qdev?
In my understanding of this, qdev_new is expected to always succeed,
while we have qdev_try_new for allowing continuing the program even on failure.
Can someone confirm this?
> + }
> }
> return DEVICE(object_new(name));
> }
> diff --git a/include/qemu/module.h b/include/qemu/module.h
> index 8c012bbe03..7893922aba 100644
> --- a/include/qemu/module.h
> +++ b/include/qemu/module.h
> @@ -61,16 +61,16 @@ typedef enum {
> #define fuzz_target_init(function) module_init(function, \
> MODULE_INIT_FUZZ_TARGET)
> #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
> -#define block_module_load_one(lib) module_load_one("block-", lib)
> -#define ui_module_load_one(lib) module_load_one("ui-", lib)
> -#define audio_module_load_one(lib) module_load_one("audio-", lib)
> +#define block_module_load_one(lib, errp) module_load_one("block-", lib, errp)
> +#define ui_module_load_one(lib, errp) module_load_one("ui-", lib, errp)
> +#define audio_module_load_one(lib, errp) module_load_one("audio-", lib, errp)
>
> void register_module_init(void (*fn)(void), module_init_type type);
> void register_dso_module_init(void (*fn)(void), module_init_type type);
>
> void module_call_init(module_init_type type);
> -bool module_load_one(const char *prefix, const char *lib_name);
> -void module_load_qom_one(const char *type);
> +bool module_load_one(const char *prefix, const char *name, Error **errp);
> +bool module_load_qom_one(const char *type, Error **errp);
> void module_load_qom_all(void);
> void module_allow_arch(const char *arch);
>
> diff --git a/qom/object.c b/qom/object.c
> index d34608558e..6a74e6a478 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -526,8 +526,14 @@ void object_initialize(void *data, size_t size, const char *typename)
>
> #ifdef CONFIG_MODULES
> if (!type) {
> - module_load_qom_one(typename);
> - type = type_get_by_name(typename);
> + Error *local_err = NULL;
> + if (!module_load_qom_one(typename, &local_err)) {
> + if (local_err) {
> + error_report_err(local_err);
> + }
> + } else {
> + type = type_get_by_name(typename);
> + }
> }
> #endif
> if (!type) {
> @@ -1033,7 +1039,10 @@ ObjectClass *module_object_class_by_name(const char *typename)
> oc = object_class_by_name(typename);
> #ifdef CONFIG_MODULES
> if (!oc) {
> - module_load_qom_one(typename);
> + Error *local_err = NULL;
> + if (!module_load_qom_one(typename, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> oc = object_class_by_name(typename);
> }
> #endif
> diff --git a/softmmu/qtest.c b/softmmu/qtest.c
> index 76eb7bac56..bb83c7aae9 100644
> --- a/softmmu/qtest.c
> +++ b/softmmu/qtest.c
> @@ -753,12 +753,16 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
> qtest_sendf(chr, "OK %"PRIi64"\n",
> (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
> } else if (strcmp(words[0], "module_load") == 0) {
> + Error *local_err = NULL;
> g_assert(words[1] && words[2]);
>
> qtest_send_prefix(chr);
> - if (module_load_one(words[1], words[2])) {
> + if (module_load_one(words[1], words[2], &local_err)) {
> qtest_sendf(chr, "OK\n");
> } else {
> + if (local_err) {
> + error_report_err(local_err);
> + }
> qtest_sendf(chr, "FAIL\n");
> }
> } else if (qtest_enabled() && strcmp(words[0], "clock_set") == 0) {
> diff --git a/ui/console.c b/ui/console.c
> index 765892f84f..9c5f6d5c30 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -2632,7 +2632,11 @@ bool qemu_display_find_default(DisplayOptions *opts)
>
> for (i = 0; i < (int)ARRAY_SIZE(prio); i++) {
> if (dpys[prio[i]] == NULL) {
> - ui_module_load_one(DisplayType_str(prio[i]));
> + Error *local_err = NULL;
> + if (!ui_module_load_one(DisplayType_str(prio[i]), &local_err)
> + && local_err) {
> + error_report_err(local_err);
> + }
> }
> if (dpys[prio[i]] == NULL) {
> continue;
> @@ -2650,7 +2654,11 @@ void qemu_display_early_init(DisplayOptions *opts)
> return;
> }
> if (dpys[opts->type] == NULL) {
> - ui_module_load_one(DisplayType_str(opts->type));
> + Error *local_err = NULL;
> + if (!ui_module_load_one(DisplayType_str(opts->type), &local_err)
> + && local_err) {
> + error_report_err(local_err);
> + }
> }
> if (dpys[opts->type] == NULL) {
> error_report("Display '%s' is not available.",
> @@ -2680,7 +2688,12 @@ void qemu_display_help(void)
> printf("none\n");
> for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) {
> if (!dpys[idx]) {
> - ui_module_load_one(DisplayType_str(idx));
> + Error *local_err = NULL;
> + if (!ui_module_load_one(DisplayType_str(idx), &local_err)
> + && local_err) {
> + /* don't clutter the help text, no error report emitted */
> + error_free(local_err);
> + }
> }
> if (dpys[idx]) {
> printf("%s\n", DisplayType_str(dpys[idx]->type));
> diff --git a/util/module.c b/util/module.c
> index 8563edd626..7b838ee4a1 100644
> --- a/util/module.c
> +++ b/util/module.c
> @@ -21,6 +21,7 @@
> #include "qemu/module.h"
> #include "qemu/cutils.h"
> #include "qemu/config-file.h"
> +#include "qapi/error.h"
> #ifdef CONFIG_MODULE_UPGRADES
> #include "qemu-version.h"
> #endif
> @@ -144,7 +145,22 @@ static bool module_check_arch(const QemuModinfo *modinfo)
> return true;
> }
>
> -static int module_load_file(const char *fname, bool export_symbols)
> +/*
> + * module_load_file: attempt to load a dso file
> + *
> + * fname: full pathname of the file to load
> + * export_symbols: if true, add the symbols to the global name space
> + * errp: error to set.
> + *
> + * Return value: 0 on success (found and loaded), < 0 on failure.
> + * A return value of -ENOENT or -ENOTDIR means 'not found'.
Here I accepted both ENOENT and ENOTDIR, because the idea was,
if the pathname provided as argument contains directories that are actually not directories,
it means that we can't find any module with the provided path.
We want to distinguish "found but an error occurred during load" from "not found" in my understanding:
"found and loaded" -> return value 0 (no error set in errp obviously).
"not found" -> return value -ENOENT or -ENOTDIR, no error set in errp.
"found and error during load" -> return value -errno or a generic -EINVAL, with error set in errp.
> + * -EINVAL is used as the generic error condition.
> + *
> + * Error: If fname is found, but could not be loaded, errp is set
> + * with the error encountered during load.
> + */
> +static int module_load_file(const char *fname, bool export_symbols,
> + Error **errp)
> {
> GModule *g_module;
> void (*sym)(void);
> @@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
> int len = strlen(fname);
> int suf_len = strlen(dsosuf);
> ModuleEntry *e, *next;
> - int ret, flags;
> + int flags;
>
> if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
> - /* wrong suffix */
> - ret = -EINVAL;
> - goto out;
> + error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
> + return -EINVAL;
> }
> - if (access(fname, F_OK)) {
> - ret = -ENOENT;
> - goto out;
> + if (access(fname, F_OK) != 0) {
> + int ret = errno;
> + if (ret != ENOENT && ret != ENOTDIR) {
> + error_setg_errno(errp, ret, "error trying to access %s", fname);
> + }
> + /* most likely is EACCES here */
> + return -ret;
> }
>
> assert(QTAILQ_EMPTY(&dso_init_list));
> @@ -172,41 +191,52 @@ static int module_load_file(const char *fname, bool export_symbols)
> }
> g_module = g_module_open(fname, flags);
> if (!g_module) {
> - fprintf(stderr, "Failed to open module: %s\n",
> - g_module_error());
> - ret = -EINVAL;
> - goto out;
> + error_setg(errp, "failed to open module: %s", g_module_error());
> + return -EINVAL;
> }
> if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) {
> - fprintf(stderr, "Failed to initialize module: %s\n",
> - fname);
> - /* Print some info if this is a QEMU module (but from different build),
> - * this will make debugging user problems easier. */
> + error_setg(errp, "failed to initialize module: %s", fname);
> + /*
> + * Print some info if this is a QEMU module (but from different build),
> + * this will make debugging user problems easier.
> + */
> if (g_module_symbol(g_module, "qemu_module_dummy", (gpointer *)&sym)) {
> - fprintf(stderr,
> - "Note: only modules from the same build can be loaded.\n");
> + error_append_hint(errp,
> + "Only modules from the same build can be loaded");
> }
> g_module_close(g_module);
> - ret = -EINVAL;
> - } else {
> - QTAILQ_FOREACH(e, &dso_init_list, node) {
> - e->init();
> - register_module_init(e->init, e->type);
> - }
> - ret = 0;
> + return -EINVAL;
> }
>
> + QTAILQ_FOREACH(e, &dso_init_list, node) {
> + e->init();
> + register_module_init(e->init, e->type);
> + }
> trace_module_load_module(fname);
> QTAILQ_FOREACH_SAFE(e, &dso_init_list, node, next) {
> QTAILQ_REMOVE(&dso_init_list, e, node);
> g_free(e);
> }
> -out:
> - return ret;
> + return 0;
> }
> -#endif
> +#endif /* CONFIG_MODULES */
>
> -bool module_load_one(const char *prefix, const char *lib_name)
> +/*
> + * module_load_one: attempt to load a module from a set of directories
> + *
> + * directories searched are:
> + * - getenv("QEMU_MODULE_DIR")
> + * - get_relocated_path(CONFIG_QEMU_MODDIR);
> + * - /var/run/qemu/${version_dir}
I found it quite complex to understand what exactly this version_dir is from the code below...
> + *
> + * prefix: a subsystem prefix, or the empty string ("audio-", "")
> + * name: name of the module
> + * errp: error to set.
> + *
> + * Return value: true on success (found and loaded), false on failure.
> + * If module is found, but could not be loaded, errp will be set
> + */
> +bool module_load_one(const char *prefix, const char *name, Error **errp)
> {
> bool success = false;
>
> @@ -226,7 +256,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
> const char **sl;
>
> if (!g_module_supported()) {
> - fprintf(stderr, "Module is not supported by system.\n");
> + error_setg(errp, "%s", "this platform does not support GLib modules");
> return false;
> }
>
> @@ -234,7 +264,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
> loaded_modules = g_hash_table_new(g_str_hash, g_str_equal);
> }
>
> - module_name = g_strdup_printf("%s%s", prefix, lib_name);
> + module_name = g_strdup_printf("%s%s", prefix, name);
>
> if (g_hash_table_contains(loaded_modules, module_name)) {
> g_free(module_name);
> @@ -246,6 +276,8 @@ bool module_load_one(const char *prefix, const char *lib_name)
> if (modinfo->arch) {
> if (strcmp(modinfo->name, module_name) == 0) {
> if (!module_check_arch(modinfo)) {
> + error_setg(errp, "module arch does not match: "
> + "expected '%s', got '%s'", module_arch, modinfo->arch);
> return false;
> }
> }
> @@ -254,7 +286,9 @@ bool module_load_one(const char *prefix, const char *lib_name)
> if (strcmp(modinfo->name, module_name) == 0) {
> /* we depend on other module(s) */
> for (sl = modinfo->deps; *sl != NULL; sl++) {
> - module_load_one("", *sl);
> + if (!(module_load_one("", *sl, errp))) {
> + return false;
> + }
> }
> } else {
> for (sl = modinfo->deps; *sl != NULL; sl++) {
> @@ -285,14 +319,20 @@ bool module_load_one(const char *prefix, const char *lib_name)
> for (i = 0; i < n_dirs; i++) {
> fname = g_strdup_printf("%s/%s%s",
> dirs[i], module_name, CONFIG_HOST_DSOSUF);
> - ret = module_load_file(fname, export_symbols);
> + ret = module_load_file(fname, export_symbols, errp);
> g_free(fname);
> fname = NULL;
> - /* Try loading until loaded a module file */
> - if (!ret) {
> - success = true;
> - break;
> + /*
> + * Try to find the file in all directories until we either fail badly,
> + * load the file successfully, or exhaust all directories in the list.
> + */
> + if (ret == -ENOENT || ret == -ENOTDIR) {
> + continue;
> }
> + if (ret == 0) {
> + success = true;
> + }
> + break;
> }
>
> if (!success) {
> @@ -312,13 +352,25 @@ bool module_load_one(const char *prefix, const char *lib_name)
>
> static bool module_loaded_qom_all;
>
> -void module_load_qom_one(const char *type)
> +/*
> + * module_load_qom_one: attempt to load a module to provide a QOM type
> + *
> + * type: the type to be provided
> + * errp: error to set.
> + *
> + * Return value: true on success (found and loaded), false on failure.
> + * If a module is simply not found for the type,
> + * errp will not be set.
> + */
> +bool module_load_qom_one(const char *type, Error **errp)
> {
> + bool found = false;
> const QemuModinfo *modinfo;
> const char **sl;
>
> if (!type) {
> - return;
> + error_setg(errp, "%s", "type is NULL");
> + return false;
> }
>
> trace_module_lookup_object_type(type);
> @@ -331,15 +383,26 @@ void module_load_qom_one(const char *type)
> }
> for (sl = modinfo->objs; *sl != NULL; sl++) {
> if (strcmp(type, *sl) == 0) {
> - module_load_one("", modinfo->name);
> + if (found) {
> + error_setg(errp, "multiple modules providing '%s'", type);
> + found = false;
> + break;
I added this one, as it does not otherwise make sense to continue the loop.
Either we loop through all modules in order to find duplicates, or we bail out as soon as we find one;
in this patch I chose to keep the existing idea to loop through all modules, but then added the check to report an error if multiple mods try to handle the same type.
> + }
> + found = module_load_one("", modinfo->name, errp);
> + if (!found) {
> + /* errp optionally set in module_load_one */
> + break;
> + }
> }
> }
> }
> + return found;
> }
>
> void module_load_qom_all(void)
> {
> const QemuModinfo *modinfo;
> + Error *local_err = NULL;
>
> if (module_loaded_qom_all) {
> return;
> @@ -352,7 +415,9 @@ void module_load_qom_all(void)
> if (!module_check_arch(modinfo)) {
> continue;
> }
> - module_load_one("", modinfo->name);
> + if (!module_load_one("", modinfo->name, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> }
> module_loaded_qom_all = true;
> }
> @@ -368,7 +433,11 @@ void qemu_load_module_for_opts(const char *group)
> }
> for (sl = modinfo->opts; *sl != NULL; sl++) {
> if (strcmp(group, *sl) == 0) {
> - module_load_one("", modinfo->name);
> + Error *local_err = NULL;
> + if (!module_load_one("", modinfo->name, &local_err)
> + && local_err) {
> + error_report_err(local_err);
> + }
> }
> }
> }
For this module_load_qom_all() maybe Gerd has a bit more context on was should be the error reporting here?
Thanks,
Claudio
> @@ -378,7 +447,7 @@ void qemu_load_module_for_opts(const char *group)
>
> void module_allow_arch(const char *arch) {}
> void qemu_load_module_for_opts(const char *group) {}
> -void module_load_qom_one(const char *type) {}
> +bool module_load_qom_one(const char *type, Error **errp) { return true; }
> void module_load_qom_all(void) {}
>
> #endif
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-06 12:32 ` Claudio Fontana
@ 2022-09-06 14:21 ` Philippe Mathieu-Daudé via
2022-09-07 7:36 ` Gerd Hoffmann
1 sibling, 0 replies; 12+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-09-06 14:21 UTC (permalink / raw)
To: Claudio Fontana, Paolo Bonzini, Richard Henderson, Markus Armbruster
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé
+Markus
On 6/9/22 14:32, Claudio Fontana wrote:
> On 9/6/22 13:55, Claudio Fontana wrote:
>> improve error handling during module load, by changing:
>>
>> bool module_load_one(const char *prefix, const char *lib_name);
>> void module_load_qom_one(const char *type);
>>
>> to:
>>
>> bool module_load_one(const char *prefix, const char *name, Error **errp);
>> bool module_load_qom_one(const char *type, Error **errp);
>>
>> module_load_qom_one has been introduced in:
>>
>> commit 28457744c345 ("module: qom module support"), which built on top of
>> module_load_one, but discarded the bool return value. Restore it.
>>
>> Adapt all callers to emit errors, or ignore them, or fail hard,
>> as appropriate in each context.
>>
>> Signed-off-by: Claudio Fontana <cfontana@suse.de>
>> ---
>> audio/audio.c | 6 +-
>> block.c | 12 +++-
>> block/dmg.c | 10 ++-
>> hw/core/qdev.c | 10 ++-
>> include/qemu/module.h | 10 +--
>> qom/object.c | 15 +++-
>> softmmu/qtest.c | 6 +-
>> ui/console.c | 19 +++++-
>> util/module.c | 155 ++++++++++++++++++++++++++++++------------
>> 9 files changed, 182 insertions(+), 61 deletions(-)
>>
>> diff --git a/audio/audio.c b/audio/audio.c
>> index 76b8735b44..4f4bb10cce 100644
>> --- a/audio/audio.c
>> +++ b/audio/audio.c
>> @@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
>> audio_driver *audio_driver_lookup(const char *name)
>> {
>> struct audio_driver *d;
>> + Error *local_err = NULL;
>>
>> QLIST_FOREACH(d, &audio_drivers, next) {
>> if (strcmp(name, d->name) == 0) {
>> @@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
>> }
>> }
>>
>> - audio_module_load_one(name);
>> + if (!audio_module_load_one(name, &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>> +
>> QLIST_FOREACH(d, &audio_drivers, next) {
>> if (strcmp(name, d->name) == 0) {
>> return d;
>> diff --git a/block.c b/block.c
>> index bc85f46eed..85c3742d7a 100644
>> --- a/block.c
>> +++ b/block.c
>> @@ -464,7 +464,11 @@ BlockDriver *bdrv_find_format(const char *format_name)
>> /* The driver isn't registered, maybe we need to load a module */
>> for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
>> if (!strcmp(block_driver_modules[i].format_name, format_name)) {
>> - block_module_load_one(block_driver_modules[i].library_name);
>> + Error *local_err = NULL;
>> + if (!block_module_load_one(block_driver_modules[i].library_name,
>> + &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>> break;
>> }
>> }
>> @@ -976,7 +980,11 @@ BlockDriver *bdrv_find_protocol(const char *filename,
>> for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
>> if (block_driver_modules[i].protocol_name &&
>> !strcmp(block_driver_modules[i].protocol_name, protocol)) {
>> - block_module_load_one(block_driver_modules[i].library_name);
>> + Error *local_err = NULL;
>> + if (!block_module_load_one(block_driver_modules[i].library_name,
>> + &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>> break;
>> }
>> }
>> diff --git a/block/dmg.c b/block/dmg.c
>> index 98db18d82a..349b05d20b 100644
>> --- a/block/dmg.c
>> +++ b/block/dmg.c
>> @@ -434,6 +434,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
>> uint64_t plist_xml_offset, plist_xml_length;
>> int64_t offset;
>> int ret;
>> + Error *local_err = NULL;
>>
>> ret = bdrv_apply_auto_read_only(bs, NULL, errp);
>> if (ret < 0) {
>> @@ -446,8 +447,13 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
>> return -EINVAL;
>> }
>>
>> - block_module_load_one("dmg-bz2");
>> - block_module_load_one("dmg-lzfse");
>> + if (!block_module_load_one("dmg-bz2", &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>> + local_err = NULL;
>> + if (!block_module_load_one("dmg-lzfse", &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>>
>> s->n_chunks = 0;
>> s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
>> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
>> index 0806d8fcaa..5902c59c94 100644
>> --- a/hw/core/qdev.c
>> +++ b/hw/core/qdev.c
>> @@ -148,7 +148,15 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp)
>> DeviceState *qdev_new(const char *name)
>> {
>> if (!object_class_by_name(name)) {
>> - module_load_qom_one(name);
>> + Error *local_err = NULL;
>> + if (!module_load_qom_one(name, &local_err)) {
>> + if (local_err) {
>> + error_report_err(local_err);
>> + } else {
>> + error_report("could not find a module for type '%s'", name);
>> + }
>> + abort();
>
> Are we ok abort() ing here for qdev?
>
> In my understanding of this, qdev_new is expected to always succeed,
> while we have qdev_try_new for allowing continuing the program even on failure.
>
> Can someone confirm this?
>
>> + }
>> }
>> return DEVICE(object_new(name));
>> }
>> diff --git a/include/qemu/module.h b/include/qemu/module.h
>> index 8c012bbe03..7893922aba 100644
>> --- a/include/qemu/module.h
>> +++ b/include/qemu/module.h
>> @@ -61,16 +61,16 @@ typedef enum {
>> #define fuzz_target_init(function) module_init(function, \
>> MODULE_INIT_FUZZ_TARGET)
>> #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
>> -#define block_module_load_one(lib) module_load_one("block-", lib)
>> -#define ui_module_load_one(lib) module_load_one("ui-", lib)
>> -#define audio_module_load_one(lib) module_load_one("audio-", lib)
>> +#define block_module_load_one(lib, errp) module_load_one("block-", lib, errp)
>> +#define ui_module_load_one(lib, errp) module_load_one("ui-", lib, errp)
>> +#define audio_module_load_one(lib, errp) module_load_one("audio-", lib, errp)
>>
>> void register_module_init(void (*fn)(void), module_init_type type);
>> void register_dso_module_init(void (*fn)(void), module_init_type type);
>>
>> void module_call_init(module_init_type type);
>> -bool module_load_one(const char *prefix, const char *lib_name);
>> -void module_load_qom_one(const char *type);
>> +bool module_load_one(const char *prefix, const char *name, Error **errp);
>> +bool module_load_qom_one(const char *type, Error **errp);
>> void module_load_qom_all(void);
>> void module_allow_arch(const char *arch);
>>
>> diff --git a/qom/object.c b/qom/object.c
>> index d34608558e..6a74e6a478 100644
>> --- a/qom/object.c
>> +++ b/qom/object.c
>> @@ -526,8 +526,14 @@ void object_initialize(void *data, size_t size, const char *typename)
>>
>> #ifdef CONFIG_MODULES
>> if (!type) {
>> - module_load_qom_one(typename);
>> - type = type_get_by_name(typename);
>> + Error *local_err = NULL;
>> + if (!module_load_qom_one(typename, &local_err)) {
>> + if (local_err) {
>> + error_report_err(local_err);
>> + }
>> + } else {
>> + type = type_get_by_name(typename);
>> + }
>> }
>> #endif
>> if (!type) {
>> @@ -1033,7 +1039,10 @@ ObjectClass *module_object_class_by_name(const char *typename)
>> oc = object_class_by_name(typename);
>> #ifdef CONFIG_MODULES
>> if (!oc) {
>> - module_load_qom_one(typename);
>> + Error *local_err = NULL;
>> + if (!module_load_qom_one(typename, &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>> oc = object_class_by_name(typename);
>> }
>> #endif
>> diff --git a/softmmu/qtest.c b/softmmu/qtest.c
>> index 76eb7bac56..bb83c7aae9 100644
>> --- a/softmmu/qtest.c
>> +++ b/softmmu/qtest.c
>> @@ -753,12 +753,16 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
>> qtest_sendf(chr, "OK %"PRIi64"\n",
>> (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
>> } else if (strcmp(words[0], "module_load") == 0) {
>> + Error *local_err = NULL;
>> g_assert(words[1] && words[2]);
>>
>> qtest_send_prefix(chr);
>> - if (module_load_one(words[1], words[2])) {
>> + if (module_load_one(words[1], words[2], &local_err)) {
>> qtest_sendf(chr, "OK\n");
>> } else {
>> + if (local_err) {
>> + error_report_err(local_err);
>> + }
>> qtest_sendf(chr, "FAIL\n");
>> }
>> } else if (qtest_enabled() && strcmp(words[0], "clock_set") == 0) {
>> diff --git a/ui/console.c b/ui/console.c
>> index 765892f84f..9c5f6d5c30 100644
>> --- a/ui/console.c
>> +++ b/ui/console.c
>> @@ -2632,7 +2632,11 @@ bool qemu_display_find_default(DisplayOptions *opts)
>>
>> for (i = 0; i < (int)ARRAY_SIZE(prio); i++) {
>> if (dpys[prio[i]] == NULL) {
>> - ui_module_load_one(DisplayType_str(prio[i]));
>> + Error *local_err = NULL;
>> + if (!ui_module_load_one(DisplayType_str(prio[i]), &local_err)
>> + && local_err) {
>> + error_report_err(local_err);
>> + }
>> }
>> if (dpys[prio[i]] == NULL) {
>> continue;
>> @@ -2650,7 +2654,11 @@ void qemu_display_early_init(DisplayOptions *opts)
>> return;
>> }
>> if (dpys[opts->type] == NULL) {
>> - ui_module_load_one(DisplayType_str(opts->type));
>> + Error *local_err = NULL;
>> + if (!ui_module_load_one(DisplayType_str(opts->type), &local_err)
>> + && local_err) {
>> + error_report_err(local_err);
>> + }
>> }
>> if (dpys[opts->type] == NULL) {
>> error_report("Display '%s' is not available.",
>> @@ -2680,7 +2688,12 @@ void qemu_display_help(void)
>> printf("none\n");
>> for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) {
>> if (!dpys[idx]) {
>> - ui_module_load_one(DisplayType_str(idx));
>> + Error *local_err = NULL;
>> + if (!ui_module_load_one(DisplayType_str(idx), &local_err)
>> + && local_err) {
>> + /* don't clutter the help text, no error report emitted */
>> + error_free(local_err);
>> + }
>> }
>> if (dpys[idx]) {
>> printf("%s\n", DisplayType_str(dpys[idx]->type));
>> diff --git a/util/module.c b/util/module.c
>> index 8563edd626..7b838ee4a1 100644
>> --- a/util/module.c
>> +++ b/util/module.c
>> @@ -21,6 +21,7 @@
>> #include "qemu/module.h"
>> #include "qemu/cutils.h"
>> #include "qemu/config-file.h"
>> +#include "qapi/error.h"
>> #ifdef CONFIG_MODULE_UPGRADES
>> #include "qemu-version.h"
>> #endif
>> @@ -144,7 +145,22 @@ static bool module_check_arch(const QemuModinfo *modinfo)
>> return true;
>> }
>>
>> -static int module_load_file(const char *fname, bool export_symbols)
>> +/*
>> + * module_load_file: attempt to load a dso file
>> + *
>> + * fname: full pathname of the file to load
>> + * export_symbols: if true, add the symbols to the global name space
>> + * errp: error to set.
>> + *
>> + * Return value: 0 on success (found and loaded), < 0 on failure.
>> + * A return value of -ENOENT or -ENOTDIR means 'not found'.
>
> Here I accepted both ENOENT and ENOTDIR, because the idea was,
> if the pathname provided as argument contains directories that are actually not directories,
> it means that we can't find any module with the provided path.
>
> We want to distinguish "found but an error occurred during load" from "not found" in my understanding:
>
> "found and loaded" -> return value 0 (no error set in errp obviously).
> "not found" -> return value -ENOENT or -ENOTDIR, no error set in errp.
> "found and error during load" -> return value -errno or a generic -EINVAL, with error set in errp.
>
>> + * -EINVAL is used as the generic error condition.
>> + *
>> + * Error: If fname is found, but could not be loaded, errp is set
>> + * with the error encountered during load.
>> + */
>> +static int module_load_file(const char *fname, bool export_symbols,
>> + Error **errp)
>> {
>> GModule *g_module;
>> void (*sym)(void);
>> @@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
>> int len = strlen(fname);
>> int suf_len = strlen(dsosuf);
>> ModuleEntry *e, *next;
>> - int ret, flags;
>> + int flags;
>>
>> if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
>> - /* wrong suffix */
>> - ret = -EINVAL;
>> - goto out;
>> + error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
>> + return -EINVAL;
>> }
>> - if (access(fname, F_OK)) {
>> - ret = -ENOENT;
>> - goto out;
>> + if (access(fname, F_OK) != 0) {
>> + int ret = errno;
>> + if (ret != ENOENT && ret != ENOTDIR) {
>> + error_setg_errno(errp, ret, "error trying to access %s", fname);
>> + }
>> + /* most likely is EACCES here */
>> + return -ret;
>> }
>>
>> assert(QTAILQ_EMPTY(&dso_init_list));
>> @@ -172,41 +191,52 @@ static int module_load_file(const char *fname, bool export_symbols)
>> }
>> g_module = g_module_open(fname, flags);
>> if (!g_module) {
>> - fprintf(stderr, "Failed to open module: %s\n",
>> - g_module_error());
>> - ret = -EINVAL;
>> - goto out;
>> + error_setg(errp, "failed to open module: %s", g_module_error());
>> + return -EINVAL;
>> }
>> if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) {
>> - fprintf(stderr, "Failed to initialize module: %s\n",
>> - fname);
>> - /* Print some info if this is a QEMU module (but from different build),
>> - * this will make debugging user problems easier. */
>> + error_setg(errp, "failed to initialize module: %s", fname);
>> + /*
>> + * Print some info if this is a QEMU module (but from different build),
>> + * this will make debugging user problems easier.
>> + */
>> if (g_module_symbol(g_module, "qemu_module_dummy", (gpointer *)&sym)) {
>> - fprintf(stderr,
>> - "Note: only modules from the same build can be loaded.\n");
>> + error_append_hint(errp,
>> + "Only modules from the same build can be loaded");
>> }
>> g_module_close(g_module);
>> - ret = -EINVAL;
>> - } else {
>> - QTAILQ_FOREACH(e, &dso_init_list, node) {
>> - e->init();
>> - register_module_init(e->init, e->type);
>> - }
>> - ret = 0;
>> + return -EINVAL;
>> }
>>
>> + QTAILQ_FOREACH(e, &dso_init_list, node) {
>> + e->init();
>> + register_module_init(e->init, e->type);
>> + }
>> trace_module_load_module(fname);
>> QTAILQ_FOREACH_SAFE(e, &dso_init_list, node, next) {
>> QTAILQ_REMOVE(&dso_init_list, e, node);
>> g_free(e);
>> }
>> -out:
>> - return ret;
>> + return 0;
>> }
>> -#endif
>> +#endif /* CONFIG_MODULES */
>>
>> -bool module_load_one(const char *prefix, const char *lib_name)
>> +/*
>> + * module_load_one: attempt to load a module from a set of directories
>> + *
>> + * directories searched are:
>> + * - getenv("QEMU_MODULE_DIR")
>> + * - get_relocated_path(CONFIG_QEMU_MODDIR);
>> + * - /var/run/qemu/${version_dir}
>
> I found it quite complex to understand what exactly this version_dir is from the code below...
>> + *
>> + * prefix: a subsystem prefix, or the empty string ("audio-", "")
>> + * name: name of the module
>> + * errp: error to set.
>> + *
>> + * Return value: true on success (found and loaded), false on failure.
>> + * If module is found, but could not be loaded, errp will be set
>> + */
>> +bool module_load_one(const char *prefix, const char *name, Error **errp)
>> {
>> bool success = false;
>>
>> @@ -226,7 +256,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
>> const char **sl;
>>
>> if (!g_module_supported()) {
>> - fprintf(stderr, "Module is not supported by system.\n");
>> + error_setg(errp, "%s", "this platform does not support GLib modules");
>> return false;
>> }
>>
>> @@ -234,7 +264,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
>> loaded_modules = g_hash_table_new(g_str_hash, g_str_equal);
>> }
>>
>> - module_name = g_strdup_printf("%s%s", prefix, lib_name);
>> + module_name = g_strdup_printf("%s%s", prefix, name);
>>
>> if (g_hash_table_contains(loaded_modules, module_name)) {
>> g_free(module_name);
>> @@ -246,6 +276,8 @@ bool module_load_one(const char *prefix, const char *lib_name)
>> if (modinfo->arch) {
>> if (strcmp(modinfo->name, module_name) == 0) {
>> if (!module_check_arch(modinfo)) {
>> + error_setg(errp, "module arch does not match: "
>> + "expected '%s', got '%s'", module_arch, modinfo->arch);
>> return false;
>> }
>> }
>> @@ -254,7 +286,9 @@ bool module_load_one(const char *prefix, const char *lib_name)
>> if (strcmp(modinfo->name, module_name) == 0) {
>> /* we depend on other module(s) */
>> for (sl = modinfo->deps; *sl != NULL; sl++) {
>> - module_load_one("", *sl);
>> + if (!(module_load_one("", *sl, errp))) {
>> + return false;
>> + }
>> }
>> } else {
>> for (sl = modinfo->deps; *sl != NULL; sl++) {
>> @@ -285,14 +319,20 @@ bool module_load_one(const char *prefix, const char *lib_name)
>> for (i = 0; i < n_dirs; i++) {
>> fname = g_strdup_printf("%s/%s%s",
>> dirs[i], module_name, CONFIG_HOST_DSOSUF);
>> - ret = module_load_file(fname, export_symbols);
>> + ret = module_load_file(fname, export_symbols, errp);
>> g_free(fname);
>> fname = NULL;
>> - /* Try loading until loaded a module file */
>> - if (!ret) {
>> - success = true;
>> - break;
>> + /*
>> + * Try to find the file in all directories until we either fail badly,
>> + * load the file successfully, or exhaust all directories in the list.
>> + */
>> + if (ret == -ENOENT || ret == -ENOTDIR) {
>> + continue;
>> }
>> + if (ret == 0) {
>> + success = true;
>> + }
>> + break;
>> }
>>
>> if (!success) {
>> @@ -312,13 +352,25 @@ bool module_load_one(const char *prefix, const char *lib_name)
>>
>> static bool module_loaded_qom_all;
>>
>> -void module_load_qom_one(const char *type)
>> +/*
>> + * module_load_qom_one: attempt to load a module to provide a QOM type
>> + *
>> + * type: the type to be provided
>> + * errp: error to set.
>> + *
>> + * Return value: true on success (found and loaded), false on failure.
>> + * If a module is simply not found for the type,
>> + * errp will not be set.
>> + */
>> +bool module_load_qom_one(const char *type, Error **errp)
>> {
>> + bool found = false;
>> const QemuModinfo *modinfo;
>> const char **sl;
>>
>> if (!type) {
>> - return;
>> + error_setg(errp, "%s", "type is NULL");
>> + return false;
>> }
>>
>> trace_module_lookup_object_type(type);
>> @@ -331,15 +383,26 @@ void module_load_qom_one(const char *type)
>> }
>> for (sl = modinfo->objs; *sl != NULL; sl++) {
>> if (strcmp(type, *sl) == 0) {
>> - module_load_one("", modinfo->name);
>> + if (found) {
>> + error_setg(errp, "multiple modules providing '%s'", type);
>> + found = false;
>> + break;
>
> I added this one, as it does not otherwise make sense to continue the loop.
> Either we loop through all modules in order to find duplicates, or we bail out as soon as we find one;
>
> in this patch I chose to keep the existing idea to loop through all modules, but then added the check to report an error if multiple mods try to handle the same type.
>
>> + }
>> + found = module_load_one("", modinfo->name, errp);
>> + if (!found) {
>> + /* errp optionally set in module_load_one */
>> + break;
>> + }
>> }
>> }
>> }
>> + return found;
>> }
>>
>> void module_load_qom_all(void)
>> {
>> const QemuModinfo *modinfo;
>> + Error *local_err = NULL;
>>
>> if (module_loaded_qom_all) {
>> return;
>> @@ -352,7 +415,9 @@ void module_load_qom_all(void)
>> if (!module_check_arch(modinfo)) {
>> continue;
>> }
>> - module_load_one("", modinfo->name);
>> + if (!module_load_one("", modinfo->name, &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>> }
>> module_loaded_qom_all = true;
>> }
>> @@ -368,7 +433,11 @@ void qemu_load_module_for_opts(const char *group)
>> }
>> for (sl = modinfo->opts; *sl != NULL; sl++) {
>> if (strcmp(group, *sl) == 0) {
>> - module_load_one("", modinfo->name);
>> + Error *local_err = NULL;
>> + if (!module_load_one("", modinfo->name, &local_err)
>> + && local_err) {
>> + error_report_err(local_err);
>> + }
>> }
>> }
>> }
>
> For this module_load_qom_all() maybe Gerd has a bit more context on was should be the error reporting here?
>
> Thanks,
>
> Claudio
>
>> @@ -378,7 +447,7 @@ void qemu_load_module_for_opts(const char *group)
>>
>> void module_allow_arch(const char *arch) {}
>> void qemu_load_module_for_opts(const char *group) {}
>> -void module_load_qom_one(const char *type) {}
>> +bool module_load_qom_one(const char *type, Error **errp) { return true; }
>> void module_load_qom_all(void) {}
>>
>> #endif
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-06 12:32 ` Claudio Fontana
2022-09-06 14:21 ` Philippe Mathieu-Daudé via
@ 2022-09-07 7:36 ` Gerd Hoffmann
2022-09-07 9:31 ` Claudio Fontana
1 sibling, 1 reply; 12+ messages in thread
From: Gerd Hoffmann @ 2022-09-07 7:36 UTC (permalink / raw)
To: Claudio Fontana
Cc: Paolo Bonzini, Richard Henderson, qemu-devel, dinechin,
Marc-André Lureau, Daniel P . Berrangé,
Philippe Mathieu-Daudé
Hi,
> For this module_load_qom_all() maybe Gerd has a bit more context on
> was should be the error reporting here?
Use case for module_load_qom_all() is someone enumerating the qom
objects available. So we load all modules known to have all object
types registered and can return a complete list.
It could be that some of the known modules are not there. Consider a
distro packaging modules which depend on shared libraries into optional
sub-rpms, to reduce the dependency chain of core qemu. So, with core
qemu installed and (some of) the sub-rpms not installed
module_load_qom_all() will obviously fail to load some modules.
But I don't think those errors should be reported. The object types
implemented by the missing modules will also be missing from the object
type list ...
Example: hw-usb-host.so is not installed.
=> 'qemu -device help' should IMHO not report the module load error
and just not list the 'usb-host' device.
=> 'qemu -device usb-host' should report the module load error.
take care,
Gerd
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-07 7:36 ` Gerd Hoffmann
@ 2022-09-07 9:31 ` Claudio Fontana
0 siblings, 0 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-07 9:31 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Paolo Bonzini, Richard Henderson, qemu-devel, dinechin,
Marc-André Lureau, Daniel P. Berrangé,
Philippe Mathieu-Daudé
On 9/7/22 09:36, Gerd Hoffmann wrote:
> Hi,
>
>> For this module_load_qom_all() maybe Gerd has a bit more context on
>> was should be the error reporting here?
>
> Use case for module_load_qom_all() is someone enumerating the qom
> objects available. So we load all modules known to have all object
> types registered and can return a complete list.
>
> It could be that some of the known modules are not there. Consider a
> distro packaging modules which depend on shared libraries into optional
> sub-rpms, to reduce the dependency chain of core qemu. So, with core
> qemu installed and (some of) the sub-rpms not installed
> module_load_qom_all() will obviously fail to load some modules.
>
> But I don't think those errors should be reported. The object types
> implemented by the missing modules will also be missing from the object
> type list ...
>
> Example: hw-usb-host.so is not installed.
>
> => 'qemu -device help' should IMHO not report the module load error
> and just not list the 'usb-host' device.
> => 'qemu -device usb-host' should report the module load error.
>
> take care,
> Gerd
>
Hi Gerd,
the thing is, we can distinguish between a module not being present (ENOENT, ENOTDIR),
from a module being present, but failing to load.
So the "module not there" thing does not need to be treated separately, because no warning/error will be emitted if the module is not there.
It is up to the user/caller to decide what to do with the condition "module not there", error out and quit, continue on, etc.
Thanks this helped,
Claudio
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-06 11:55 ` [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one Claudio Fontana
2022-09-06 12:32 ` Claudio Fontana
@ 2022-09-07 9:42 ` Claudio Fontana
2022-09-08 8:11 ` Richard Henderson
2 siblings, 0 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-07 9:42 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé
On 9/6/22 13:55, Claudio Fontana wrote:
> improve error handling during module load, by changing:
>
> bool module_load_one(const char *prefix, const char *lib_name);
> void module_load_qom_one(const char *type);
>
> to:
>
> bool module_load_one(const char *prefix, const char *name, Error **errp);
> bool module_load_qom_one(const char *type, Error **errp);
>
> module_load_qom_one has been introduced in:
>
> commit 28457744c345 ("module: qom module support"), which built on top of
> module_load_one, but discarded the bool return value. Restore it.
>
> Adapt all callers to emit errors, or ignore them, or fail hard,
> as appropriate in each context.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
> audio/audio.c | 6 +-
> block.c | 12 +++-
> block/dmg.c | 10 ++-
> hw/core/qdev.c | 10 ++-
> include/qemu/module.h | 10 +--
> qom/object.c | 15 +++-
> softmmu/qtest.c | 6 +-
> ui/console.c | 19 +++++-
> util/module.c | 155 ++++++++++++++++++++++++++++++------------
> 9 files changed, 182 insertions(+), 61 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 76b8735b44..4f4bb10cce 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
> audio_driver *audio_driver_lookup(const char *name)
> {
> struct audio_driver *d;
> + Error *local_err = NULL;
>
> QLIST_FOREACH(d, &audio_drivers, next) {
> if (strcmp(name, d->name) == 0) {
> @@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
> }
> }
>
> - audio_module_load_one(name);
> + if (!audio_module_load_one(name, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> +
> QLIST_FOREACH(d, &audio_drivers, next) {
> if (strcmp(name, d->name) == 0) {
> return d;
> diff --git a/block.c b/block.c
> index bc85f46eed..85c3742d7a 100644
> --- a/block.c
> +++ b/block.c
> @@ -464,7 +464,11 @@ BlockDriver *bdrv_find_format(const char *format_name)
> /* The driver isn't registered, maybe we need to load a module */
> for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
> if (!strcmp(block_driver_modules[i].format_name, format_name)) {
> - block_module_load_one(block_driver_modules[i].library_name);
> + Error *local_err = NULL;
> + if (!block_module_load_one(block_driver_modules[i].library_name,
> + &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> break;
> }
> }
> @@ -976,7 +980,11 @@ BlockDriver *bdrv_find_protocol(const char *filename,
> for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
> if (block_driver_modules[i].protocol_name &&
> !strcmp(block_driver_modules[i].protocol_name, protocol)) {
> - block_module_load_one(block_driver_modules[i].library_name);
> + Error *local_err = NULL;
> + if (!block_module_load_one(block_driver_modules[i].library_name,
> + &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> break;
> }
> }
> diff --git a/block/dmg.c b/block/dmg.c
> index 98db18d82a..349b05d20b 100644
> --- a/block/dmg.c
> +++ b/block/dmg.c
> @@ -434,6 +434,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
> uint64_t plist_xml_offset, plist_xml_length;
> int64_t offset;
> int ret;
> + Error *local_err = NULL;
>
> ret = bdrv_apply_auto_read_only(bs, NULL, errp);
> if (ret < 0) {
> @@ -446,8 +447,13 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
> return -EINVAL;
> }
>
> - block_module_load_one("dmg-bz2");
> - block_module_load_one("dmg-lzfse");
> + if (!block_module_load_one("dmg-bz2", &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> + local_err = NULL;
> + if (!block_module_load_one("dmg-lzfse", &local_err) && local_err) {
> + error_report_err(local_err);
> + }
>
> s->n_chunks = 0;
> s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 0806d8fcaa..5902c59c94 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -148,7 +148,15 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp)
> DeviceState *qdev_new(const char *name)
> {
> if (!object_class_by_name(name)) {
> - module_load_qom_one(name);
> + Error *local_err = NULL;
> + if (!module_load_qom_one(name, &local_err)) {
> + if (local_err) {
> + error_report_err(local_err);
> + } else {
> + error_report("could not find a module for type '%s'", name);
> + }
> + abort();
> + }
> }
> return DEVICE(object_new(name));
> }
> diff --git a/include/qemu/module.h b/include/qemu/module.h
> index 8c012bbe03..7893922aba 100644
> --- a/include/qemu/module.h
> +++ b/include/qemu/module.h
> @@ -61,16 +61,16 @@ typedef enum {
> #define fuzz_target_init(function) module_init(function, \
> MODULE_INIT_FUZZ_TARGET)
> #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
> -#define block_module_load_one(lib) module_load_one("block-", lib)
> -#define ui_module_load_one(lib) module_load_one("ui-", lib)
> -#define audio_module_load_one(lib) module_load_one("audio-", lib)
> +#define block_module_load_one(lib, errp) module_load_one("block-", lib, errp)
> +#define ui_module_load_one(lib, errp) module_load_one("ui-", lib, errp)
> +#define audio_module_load_one(lib, errp) module_load_one("audio-", lib, errp)
>
> void register_module_init(void (*fn)(void), module_init_type type);
> void register_dso_module_init(void (*fn)(void), module_init_type type);
>
> void module_call_init(module_init_type type);
> -bool module_load_one(const char *prefix, const char *lib_name);
> -void module_load_qom_one(const char *type);
> +bool module_load_one(const char *prefix, const char *name, Error **errp);
> +bool module_load_qom_one(const char *type, Error **errp);
> void module_load_qom_all(void);
> void module_allow_arch(const char *arch);
>
> diff --git a/qom/object.c b/qom/object.c
> index d34608558e..6a74e6a478 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -526,8 +526,14 @@ void object_initialize(void *data, size_t size, const char *typename)
>
> #ifdef CONFIG_MODULES
> if (!type) {
> - module_load_qom_one(typename);
> - type = type_get_by_name(typename);
> + Error *local_err = NULL;
> + if (!module_load_qom_one(typename, &local_err)) {
> + if (local_err) {
> + error_report_err(local_err);
> + }
> + } else {
> + type = type_get_by_name(typename);
> + }
> }
> #endif
> if (!type) {
> @@ -1033,7 +1039,10 @@ ObjectClass *module_object_class_by_name(const char *typename)
> oc = object_class_by_name(typename);
> #ifdef CONFIG_MODULES
> if (!oc) {
> - module_load_qom_one(typename);
> + Error *local_err = NULL;
> + if (!module_load_qom_one(typename, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> oc = object_class_by_name(typename);
> }
> #endif
> diff --git a/softmmu/qtest.c b/softmmu/qtest.c
> index 76eb7bac56..bb83c7aae9 100644
> --- a/softmmu/qtest.c
> +++ b/softmmu/qtest.c
> @@ -753,12 +753,16 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
> qtest_sendf(chr, "OK %"PRIi64"\n",
> (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
> } else if (strcmp(words[0], "module_load") == 0) {
> + Error *local_err = NULL;
> g_assert(words[1] && words[2]);
>
> qtest_send_prefix(chr);
> - if (module_load_one(words[1], words[2])) {
> + if (module_load_one(words[1], words[2], &local_err)) {
> qtest_sendf(chr, "OK\n");
> } else {
> + if (local_err) {
> + error_report_err(local_err);
> + }
> qtest_sendf(chr, "FAIL\n");
> }
> } else if (qtest_enabled() && strcmp(words[0], "clock_set") == 0) {
> diff --git a/ui/console.c b/ui/console.c
> index 765892f84f..9c5f6d5c30 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -2632,7 +2632,11 @@ bool qemu_display_find_default(DisplayOptions *opts)
>
> for (i = 0; i < (int)ARRAY_SIZE(prio); i++) {
> if (dpys[prio[i]] == NULL) {
> - ui_module_load_one(DisplayType_str(prio[i]));
> + Error *local_err = NULL;
> + if (!ui_module_load_one(DisplayType_str(prio[i]), &local_err)
> + && local_err) {
> + error_report_err(local_err);
> + }
> }
> if (dpys[prio[i]] == NULL) {
> continue;
> @@ -2650,7 +2654,11 @@ void qemu_display_early_init(DisplayOptions *opts)
> return;
> }
> if (dpys[opts->type] == NULL) {
> - ui_module_load_one(DisplayType_str(opts->type));
> + Error *local_err = NULL;
> + if (!ui_module_load_one(DisplayType_str(opts->type), &local_err)
> + && local_err) {
> + error_report_err(local_err);
> + }
> }
> if (dpys[opts->type] == NULL) {
> error_report("Display '%s' is not available.",
> @@ -2680,7 +2688,12 @@ void qemu_display_help(void)
> printf("none\n");
> for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) {
> if (!dpys[idx]) {
> - ui_module_load_one(DisplayType_str(idx));
> + Error *local_err = NULL;
> + if (!ui_module_load_one(DisplayType_str(idx), &local_err)
> + && local_err) {
> + /* don't clutter the help text, no error report emitted */
> + error_free(local_err);
I'll change this one: I think there is no reason to treat this differently:
when listing available modules for display, if the module is not there we will not display any error anyway.
An error will be displayed only if the module is present, but fails to load correctly, which will signal something broken.
So I would change this to be equal to the other patterns in the respin.
C
> + }
> }
> if (dpys[idx]) {
> printf("%s\n", DisplayType_str(dpys[idx]->type));
> diff --git a/util/module.c b/util/module.c
> index 8563edd626..7b838ee4a1 100644
> --- a/util/module.c
> +++ b/util/module.c
> @@ -21,6 +21,7 @@
> #include "qemu/module.h"
> #include "qemu/cutils.h"
> #include "qemu/config-file.h"
> +#include "qapi/error.h"
> #ifdef CONFIG_MODULE_UPGRADES
> #include "qemu-version.h"
> #endif
> @@ -144,7 +145,22 @@ static bool module_check_arch(const QemuModinfo *modinfo)
> return true;
> }
>
> -static int module_load_file(const char *fname, bool export_symbols)
> +/*
> + * module_load_file: attempt to load a dso file
> + *
> + * fname: full pathname of the file to load
> + * export_symbols: if true, add the symbols to the global name space
> + * errp: error to set.
> + *
> + * Return value: 0 on success (found and loaded), < 0 on failure.
> + * A return value of -ENOENT or -ENOTDIR means 'not found'.
> + * -EINVAL is used as the generic error condition.
> + *
> + * Error: If fname is found, but could not be loaded, errp is set
> + * with the error encountered during load.
> + */
> +static int module_load_file(const char *fname, bool export_symbols,
> + Error **errp)
> {
> GModule *g_module;
> void (*sym)(void);
> @@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
> int len = strlen(fname);
> int suf_len = strlen(dsosuf);
> ModuleEntry *e, *next;
> - int ret, flags;
> + int flags;
>
> if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
> - /* wrong suffix */
> - ret = -EINVAL;
> - goto out;
> + error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
> + return -EINVAL;
> }
> - if (access(fname, F_OK)) {
> - ret = -ENOENT;
> - goto out;
> + if (access(fname, F_OK) != 0) {
> + int ret = errno;
> + if (ret != ENOENT && ret != ENOTDIR) {
> + error_setg_errno(errp, ret, "error trying to access %s", fname);
> + }
> + /* most likely is EACCES here */
> + return -ret;
> }
>
> assert(QTAILQ_EMPTY(&dso_init_list));
> @@ -172,41 +191,52 @@ static int module_load_file(const char *fname, bool export_symbols)
> }
> g_module = g_module_open(fname, flags);
> if (!g_module) {
> - fprintf(stderr, "Failed to open module: %s\n",
> - g_module_error());
> - ret = -EINVAL;
> - goto out;
> + error_setg(errp, "failed to open module: %s", g_module_error());
> + return -EINVAL;
> }
> if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) {
> - fprintf(stderr, "Failed to initialize module: %s\n",
> - fname);
> - /* Print some info if this is a QEMU module (but from different build),
> - * this will make debugging user problems easier. */
> + error_setg(errp, "failed to initialize module: %s", fname);
> + /*
> + * Print some info if this is a QEMU module (but from different build),
> + * this will make debugging user problems easier.
> + */
> if (g_module_symbol(g_module, "qemu_module_dummy", (gpointer *)&sym)) {
> - fprintf(stderr,
> - "Note: only modules from the same build can be loaded.\n");
> + error_append_hint(errp,
> + "Only modules from the same build can be loaded");
> }
> g_module_close(g_module);
> - ret = -EINVAL;
> - } else {
> - QTAILQ_FOREACH(e, &dso_init_list, node) {
> - e->init();
> - register_module_init(e->init, e->type);
> - }
> - ret = 0;
> + return -EINVAL;
> }
>
> + QTAILQ_FOREACH(e, &dso_init_list, node) {
> + e->init();
> + register_module_init(e->init, e->type);
> + }
> trace_module_load_module(fname);
> QTAILQ_FOREACH_SAFE(e, &dso_init_list, node, next) {
> QTAILQ_REMOVE(&dso_init_list, e, node);
> g_free(e);
> }
> -out:
> - return ret;
> + return 0;
> }
> -#endif
> +#endif /* CONFIG_MODULES */
>
> -bool module_load_one(const char *prefix, const char *lib_name)
> +/*
> + * module_load_one: attempt to load a module from a set of directories
> + *
> + * directories searched are:
> + * - getenv("QEMU_MODULE_DIR")
> + * - get_relocated_path(CONFIG_QEMU_MODDIR);
> + * - /var/run/qemu/${version_dir}
> + *
> + * prefix: a subsystem prefix, or the empty string ("audio-", "")
> + * name: name of the module
> + * errp: error to set.
> + *
> + * Return value: true on success (found and loaded), false on failure.
> + * If module is found, but could not be loaded, errp will be set
> + */
> +bool module_load_one(const char *prefix, const char *name, Error **errp)
> {
> bool success = false;
>
> @@ -226,7 +256,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
> const char **sl;
>
> if (!g_module_supported()) {
> - fprintf(stderr, "Module is not supported by system.\n");
> + error_setg(errp, "%s", "this platform does not support GLib modules");
> return false;
> }
>
> @@ -234,7 +264,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
> loaded_modules = g_hash_table_new(g_str_hash, g_str_equal);
> }
>
> - module_name = g_strdup_printf("%s%s", prefix, lib_name);
> + module_name = g_strdup_printf("%s%s", prefix, name);
>
> if (g_hash_table_contains(loaded_modules, module_name)) {
> g_free(module_name);
> @@ -246,6 +276,8 @@ bool module_load_one(const char *prefix, const char *lib_name)
> if (modinfo->arch) {
> if (strcmp(modinfo->name, module_name) == 0) {
> if (!module_check_arch(modinfo)) {
> + error_setg(errp, "module arch does not match: "
> + "expected '%s', got '%s'", module_arch, modinfo->arch);
> return false;
> }
> }
> @@ -254,7 +286,9 @@ bool module_load_one(const char *prefix, const char *lib_name)
> if (strcmp(modinfo->name, module_name) == 0) {
> /* we depend on other module(s) */
> for (sl = modinfo->deps; *sl != NULL; sl++) {
> - module_load_one("", *sl);
> + if (!(module_load_one("", *sl, errp))) {
> + return false;
> + }
> }
> } else {
> for (sl = modinfo->deps; *sl != NULL; sl++) {
> @@ -285,14 +319,20 @@ bool module_load_one(const char *prefix, const char *lib_name)
> for (i = 0; i < n_dirs; i++) {
> fname = g_strdup_printf("%s/%s%s",
> dirs[i], module_name, CONFIG_HOST_DSOSUF);
> - ret = module_load_file(fname, export_symbols);
> + ret = module_load_file(fname, export_symbols, errp);
> g_free(fname);
> fname = NULL;
> - /* Try loading until loaded a module file */
> - if (!ret) {
> - success = true;
> - break;
> + /*
> + * Try to find the file in all directories until we either fail badly,
> + * load the file successfully, or exhaust all directories in the list.
> + */
> + if (ret == -ENOENT || ret == -ENOTDIR) {
> + continue;
> }
> + if (ret == 0) {
> + success = true;
> + }
> + break;
> }
>
> if (!success) {
> @@ -312,13 +352,25 @@ bool module_load_one(const char *prefix, const char *lib_name)
>
> static bool module_loaded_qom_all;
>
> -void module_load_qom_one(const char *type)
> +/*
> + * module_load_qom_one: attempt to load a module to provide a QOM type
> + *
> + * type: the type to be provided
> + * errp: error to set.
> + *
> + * Return value: true on success (found and loaded), false on failure.
> + * If a module is simply not found for the type,
> + * errp will not be set.
> + */
> +bool module_load_qom_one(const char *type, Error **errp)
> {
> + bool found = false;
> const QemuModinfo *modinfo;
> const char **sl;
>
> if (!type) {
> - return;
> + error_setg(errp, "%s", "type is NULL");
> + return false;
> }
>
> trace_module_lookup_object_type(type);
> @@ -331,15 +383,26 @@ void module_load_qom_one(const char *type)
> }
> for (sl = modinfo->objs; *sl != NULL; sl++) {
> if (strcmp(type, *sl) == 0) {
> - module_load_one("", modinfo->name);
> + if (found) {
> + error_setg(errp, "multiple modules providing '%s'", type);
> + found = false;
> + break;
> + }
> + found = module_load_one("", modinfo->name, errp);
> + if (!found) {
> + /* errp optionally set in module_load_one */
> + break;
> + }
> }
> }
> }
> + return found;
> }
>
> void module_load_qom_all(void)
> {
> const QemuModinfo *modinfo;
> + Error *local_err = NULL;
>
> if (module_loaded_qom_all) {
> return;
> @@ -352,7 +415,9 @@ void module_load_qom_all(void)
> if (!module_check_arch(modinfo)) {
> continue;
> }
> - module_load_one("", modinfo->name);
> + if (!module_load_one("", modinfo->name, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
> }
> module_loaded_qom_all = true;
> }
> @@ -368,7 +433,11 @@ void qemu_load_module_for_opts(const char *group)
> }
> for (sl = modinfo->opts; *sl != NULL; sl++) {
> if (strcmp(group, *sl) == 0) {
> - module_load_one("", modinfo->name);
> + Error *local_err = NULL;
> + if (!module_load_one("", modinfo->name, &local_err)
> + && local_err) {
> + error_report_err(local_err);
> + }
> }
> }
> }
> @@ -378,7 +447,7 @@ void qemu_load_module_for_opts(const char *group)
>
> void module_allow_arch(const char *arch) {}
> void qemu_load_module_for_opts(const char *group) {}
> -void module_load_qom_one(const char *type) {}
> +bool module_load_qom_one(const char *type, Error **errp) { return true; }
> void module_load_qom_all(void) {}
>
> #endif
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-06 11:55 ` [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one Claudio Fontana
2022-09-06 12:32 ` Claudio Fontana
2022-09-07 9:42 ` Claudio Fontana
@ 2022-09-08 8:11 ` Richard Henderson
2022-09-08 8:28 ` Claudio Fontana
2022-09-08 13:58 ` Claudio Fontana
2 siblings, 2 replies; 12+ messages in thread
From: Richard Henderson @ 2022-09-08 8:11 UTC (permalink / raw)
To: Claudio Fontana, Paolo Bonzini
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé
On 9/6/22 12:55, Claudio Fontana wrote:
> improve error handling during module load, by changing:
>
> bool module_load_one(const char *prefix, const char *lib_name);
> void module_load_qom_one(const char *type);
>
> to:
>
> bool module_load_one(const char *prefix, const char *name, Error **errp);
> bool module_load_qom_one(const char *type, Error **errp);
>
> module_load_qom_one has been introduced in:
>
> commit 28457744c345 ("module: qom module support"), which built on top of
> module_load_one, but discarded the bool return value. Restore it.
>
> Adapt all callers to emit errors, or ignore them, or fail hard,
> as appropriate in each context.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
> audio/audio.c | 6 +-
> block.c | 12 +++-
> block/dmg.c | 10 ++-
> hw/core/qdev.c | 10 ++-
> include/qemu/module.h | 10 +--
> qom/object.c | 15 +++-
> softmmu/qtest.c | 6 +-
> ui/console.c | 19 +++++-
> util/module.c | 155 ++++++++++++++++++++++++++++++------------
> 9 files changed, 182 insertions(+), 61 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 76b8735b44..4f4bb10cce 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
> audio_driver *audio_driver_lookup(const char *name)
> {
> struct audio_driver *d;
> + Error *local_err = NULL;
>
> QLIST_FOREACH(d, &audio_drivers, next) {
> if (strcmp(name, d->name) == 0) {
> @@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
> }
> }
>
> - audio_module_load_one(name);
> + if (!audio_module_load_one(name, &local_err) && local_err) {
> + error_report_err(local_err);
> + }
Why would local_err not be set on failure? Is this the NOTDIR thing? I guess this is
sufficient to distinguish the two cases... The urge to bikeshed the return value is
strong. :-)
> +bool module_load_one(const char *prefix, const char *name, Error **errp);
> +bool module_load_qom_one(const char *type, Error **errp);
Doc comments go in the header file.
> +/*
> + * module_load_file: attempt to load a dso file
> + *
> + * fname: full pathname of the file to load
> + * export_symbols: if true, add the symbols to the global name space
> + * errp: error to set.
> + *
> + * Return value: 0 on success (found and loaded), < 0 on failure.
> + * A return value of -ENOENT or -ENOTDIR means 'not found'.
> + * -EINVAL is used as the generic error condition.
> + *
> + * Error: If fname is found, but could not be loaded, errp is set
> + * with the error encountered during load.
> + */
> +static int module_load_file(const char *fname, bool export_symbols,
> + Error **errp)
> {
> GModule *g_module;
> void (*sym)(void);
> @@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
> int len = strlen(fname);
> int suf_len = strlen(dsosuf);
> ModuleEntry *e, *next;
> - int ret, flags;
> + int flags;
>
> if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
> - /* wrong suffix */
> - ret = -EINVAL;
> - goto out;
> + error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
> + return -EINVAL;
> }
> - if (access(fname, F_OK)) {
> - ret = -ENOENT;
> - goto out;
> + if (access(fname, F_OK) != 0) {
> + int ret = errno;
> + if (ret != ENOENT && ret != ENOTDIR) {
> + error_setg_errno(errp, ret, "error trying to access %s", fname);
> + }
> + /* most likely is EACCES here */
> + return -ret;
> }
I looked at this a couple of days ago and came to the conclusion that the split between
this function and its caller is wrong.
The directory path probe loop is currently split between the two functions. I think the
probe loop should be in the caller (i.e. the access call here moved out). I think
module_load_file should only be called once the file is known to exist. Which then
simplifies the set of errors to be returned from here.
(I might even go so far as to say module_load_file should be moved into module_load_one,
because there's not really much here, and it would reduce ifdefs.)
r~
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-08 8:11 ` Richard Henderson
@ 2022-09-08 8:28 ` Claudio Fontana
2022-09-08 13:58 ` Claudio Fontana
1 sibling, 0 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-08 8:28 UTC (permalink / raw)
To: Richard Henderson, Paolo Bonzini
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé
Hi Richard, thanks for looking at this,
On 9/8/22 10:11, Richard Henderson wrote:
> On 9/6/22 12:55, Claudio Fontana wrote:
>> improve error handling during module load, by changing:
>>
>> bool module_load_one(const char *prefix, const char *lib_name);
>> void module_load_qom_one(const char *type);
>>
>> to:
>>
>> bool module_load_one(const char *prefix, const char *name, Error **errp);
>> bool module_load_qom_one(const char *type, Error **errp);
>>
>> module_load_qom_one has been introduced in:
>>
>> commit 28457744c345 ("module: qom module support"), which built on top of
>> module_load_one, but discarded the bool return value. Restore it.
>>
>> Adapt all callers to emit errors, or ignore them, or fail hard,
>> as appropriate in each context.
>>
>> Signed-off-by: Claudio Fontana <cfontana@suse.de>
>> ---
>> audio/audio.c | 6 +-
>> block.c | 12 +++-
>> block/dmg.c | 10 ++-
>> hw/core/qdev.c | 10 ++-
>> include/qemu/module.h | 10 +--
>> qom/object.c | 15 +++-
>> softmmu/qtest.c | 6 +-
>> ui/console.c | 19 +++++-
>> util/module.c | 155 ++++++++++++++++++++++++++++++------------
>> 9 files changed, 182 insertions(+), 61 deletions(-)
>>
>> diff --git a/audio/audio.c b/audio/audio.c
>> index 76b8735b44..4f4bb10cce 100644
>> --- a/audio/audio.c
>> +++ b/audio/audio.c
>> @@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
>> audio_driver *audio_driver_lookup(const char *name)
>> {
>> struct audio_driver *d;
>> + Error *local_err = NULL;
>>
>> QLIST_FOREACH(d, &audio_drivers, next) {
>> if (strcmp(name, d->name) == 0) {
>> @@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
>> }
>> }
>>
>> - audio_module_load_one(name);
>> + if (!audio_module_load_one(name, &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>
> Why would local_err not be set on failure? Is this the NOTDIR thing? I guess this is
Right, we need to distinguish the case where the module does not exist from the case where
the module exists but an error has occured while trying to load it.
In the distros we build one time with all the modules enabled, but then may deliver those modules
or not deliver them in a specific distro, or the user may or may not have installed the packages
containing those DSOs.
So failing to find a module may be just fine, while we want to report errors if a load goes wrong.
We just encountered a bug where the actual cause was hidden by the fact that no error was produced on module load.
> sufficient to distinguish the two cases... The urge to bikeshed the return value is
> strong. :-)
If you find a better way let me know, this is just the first thing that came to mind to distinguish the cases, ie:
return value true -> loaded successfully
return value false -> not loaded:
local_err set -> error during load
local_err unset -> no error, just not present
>
>> +bool module_load_one(const char *prefix, const char *name, Error **errp);
>> +bool module_load_qom_one(const char *type, Error **errp);
>
> Doc comments go in the header file.
>
>> +/*
>> + * module_load_file: attempt to load a dso file
>> + *
>> + * fname: full pathname of the file to load
>> + * export_symbols: if true, add the symbols to the global name space
>> + * errp: error to set.
>> + *
>> + * Return value: 0 on success (found and loaded), < 0 on failure.
>> + * A return value of -ENOENT or -ENOTDIR means 'not found'.
>> + * -EINVAL is used as the generic error condition.
>> + *
>> + * Error: If fname is found, but could not be loaded, errp is set
>> + * with the error encountered during load.
>> + */
>> +static int module_load_file(const char *fname, bool export_symbols,
>> + Error **errp)
>> {
>> GModule *g_module;
>> void (*sym)(void);
>> @@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
>> int len = strlen(fname);
>> int suf_len = strlen(dsosuf);
>> ModuleEntry *e, *next;
>> - int ret, flags;
>> + int flags;
>>
>> if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
>> - /* wrong suffix */
>> - ret = -EINVAL;
>> - goto out;
>> + error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
>> + return -EINVAL;
>> }
>> - if (access(fname, F_OK)) {
>> - ret = -ENOENT;
>> - goto out;
>> + if (access(fname, F_OK) != 0) {
>> + int ret = errno;
>> + if (ret != ENOENT && ret != ENOTDIR) {
>> + error_setg_errno(errp, ret, "error trying to access %s", fname);
>> + }
>> + /* most likely is EACCES here */
>> + return -ret;
>> }
>
> I looked at this a couple of days ago and came to the conclusion that the split between
> this function and its caller is wrong.
>
> The directory path probe loop is currently split between the two functions. I think the
> probe loop should be in the caller (i.e. the access call here moved out). I think
> module_load_file should only be called once the file is known to exist. Which then
> simplifies the set of errors to be returned from here.
>
> (I might even go so far as to say module_load_file should be moved into module_load_one,
> because there's not really much here, and it would reduce ifdefs.)
I'll attempt to integrate your suggestions.
>
>
> r~
Thanks!
Claudio
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one
2022-09-08 8:11 ` Richard Henderson
2022-09-08 8:28 ` Claudio Fontana
@ 2022-09-08 13:58 ` Claudio Fontana
1 sibling, 0 replies; 12+ messages in thread
From: Claudio Fontana @ 2022-09-08 13:58 UTC (permalink / raw)
To: Richard Henderson, Paolo Bonzini
Cc: qemu-devel, dinechin, Gerd Hoffmann, Marc-André Lureau,
Daniel P . Berrangé, Philippe Mathieu-Daudé
On 9/8/22 10:11, Richard Henderson wrote:
> On 9/6/22 12:55, Claudio Fontana wrote:
>> improve error handling during module load, by changing:
>>
>> bool module_load_one(const char *prefix, const char *lib_name);
>> void module_load_qom_one(const char *type);
>>
>> to:
>>
>> bool module_load_one(const char *prefix, const char *name, Error **errp);
>> bool module_load_qom_one(const char *type, Error **errp);
>>
>> module_load_qom_one has been introduced in:
>>
>> commit 28457744c345 ("module: qom module support"), which built on top of
>> module_load_one, but discarded the bool return value. Restore it.
>>
>> Adapt all callers to emit errors, or ignore them, or fail hard,
>> as appropriate in each context.
>>
>> Signed-off-by: Claudio Fontana <cfontana@suse.de>
>> ---
>> audio/audio.c | 6 +-
>> block.c | 12 +++-
>> block/dmg.c | 10 ++-
>> hw/core/qdev.c | 10 ++-
>> include/qemu/module.h | 10 +--
>> qom/object.c | 15 +++-
>> softmmu/qtest.c | 6 +-
>> ui/console.c | 19 +++++-
>> util/module.c | 155 ++++++++++++++++++++++++++++++------------
>> 9 files changed, 182 insertions(+), 61 deletions(-)
>>
>> diff --git a/audio/audio.c b/audio/audio.c
>> index 76b8735b44..4f4bb10cce 100644
>> --- a/audio/audio.c
>> +++ b/audio/audio.c
>> @@ -72,6 +72,7 @@ void audio_driver_register(audio_driver *drv)
>> audio_driver *audio_driver_lookup(const char *name)
>> {
>> struct audio_driver *d;
>> + Error *local_err = NULL;
>>
>> QLIST_FOREACH(d, &audio_drivers, next) {
>> if (strcmp(name, d->name) == 0) {
>> @@ -79,7 +80,10 @@ audio_driver *audio_driver_lookup(const char *name)
>> }
>> }
>>
>> - audio_module_load_one(name);
>> + if (!audio_module_load_one(name, &local_err) && local_err) {
>> + error_report_err(local_err);
>> + }
>
> Why would local_err not be set on failure? Is this the NOTDIR thing? I guess this is
> sufficient to distinguish the two cases... The urge to bikeshed the return value is
> strong. :-)
>
>> +bool module_load_one(const char *prefix, const char *name, Error **errp);
>> +bool module_load_qom_one(const char *type, Error **errp);
>
> Doc comments go in the header file.
>
>> +/*
>> + * module_load_file: attempt to load a dso file
>> + *
>> + * fname: full pathname of the file to load
>> + * export_symbols: if true, add the symbols to the global name space
>> + * errp: error to set.
>> + *
>> + * Return value: 0 on success (found and loaded), < 0 on failure.
>> + * A return value of -ENOENT or -ENOTDIR means 'not found'.
>> + * -EINVAL is used as the generic error condition.
>> + *
>> + * Error: If fname is found, but could not be loaded, errp is set
>> + * with the error encountered during load.
>> + */
>> +static int module_load_file(const char *fname, bool export_symbols,
>> + Error **errp)
>> {
>> GModule *g_module;
>> void (*sym)(void);
>> @@ -152,16 +168,19 @@ static int module_load_file(const char *fname, bool export_symbols)
>> int len = strlen(fname);
>> int suf_len = strlen(dsosuf);
>> ModuleEntry *e, *next;
>> - int ret, flags;
>> + int flags;
>>
>> if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) {
>> - /* wrong suffix */
>> - ret = -EINVAL;
>> - goto out;
>> + error_setg(errp, "wrong filename, missing suffix %s", dsosuf);
>> + return -EINVAL;
>> }
>> - if (access(fname, F_OK)) {
>> - ret = -ENOENT;
>> - goto out;
>> + if (access(fname, F_OK) != 0) {
>> + int ret = errno;
>> + if (ret != ENOENT && ret != ENOTDIR) {
>> + error_setg_errno(errp, ret, "error trying to access %s", fname);
>> + }
>> + /* most likely is EACCES here */
>> + return -ret;
>> }
>
> I looked at this a couple of days ago and came to the conclusion that the split between
> this function and its caller is wrong.
>
> The directory path probe loop is currently split between the two functions. I think the
> probe loop should be in the caller (i.e. the access call here moved out). I think
> module_load_file should only be called once the file is known to exist. Which then
> simplifies the set of errors to be returned from here.
>
> (I might even go so far as to say module_load_file should be moved into module_load_one,
> because there's not really much here, and it would reduce ifdefs.)
>
>
> r~
I missed that module_load_one contains basically an #ifdef CONFIG_MODULES inside it. It's just a big #ifdef CONFIG_MDOULES in disguise,
it is really confusing. I'll try to make things more explicit.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-09-08 13:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-06 11:54 [PATCH 0/3] improve error handling for module load Claudio Fontana
2022-09-06 11:54 ` [PATCH 1/3] module: removed unused function argument "mayfail" Claudio Fontana
2022-09-06 11:55 ` [PATCH 2/3] module: add Error arguments to module_load_one and module_load_qom_one Claudio Fontana
2022-09-06 12:32 ` Claudio Fontana
2022-09-06 14:21 ` Philippe Mathieu-Daudé via
2022-09-07 7:36 ` Gerd Hoffmann
2022-09-07 9:31 ` Claudio Fontana
2022-09-07 9:42 ` Claudio Fontana
2022-09-08 8:11 ` Richard Henderson
2022-09-08 8:28 ` Claudio Fontana
2022-09-08 13:58 ` Claudio Fontana
2022-09-06 11:55 ` [PATCH 3/3] accel: abort if we fail to load the accelerator plugin Claudio Fontana
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.