On 12.12.21 12:56, Dario Binacchi wrote:
> Both functions, implemented and used for the net, are general purpose
> and therefore can be useful in other parts of the application with the
> application of minimal changes.
>
> Signed-off-by: Dario Binacchi <dario...@libero.it>
>
> ---
>
> Changes in v4:
> - Add the patch to the series.
>
> include/smokey/smokey.h | 6 +-
> lib/smokey/helpers.c | 99 +++++++++++++++++++++++++++++
> testsuite/smokey/net_common/setup.c | 68 +-------------------
> 3 files changed, 106 insertions(+), 67 deletions(-)
>
> diff --git a/include/smokey/smokey.h b/include/smokey/smokey.h
> index 185fd3a8b..0ac1e8df4 100644
> --- a/include/smokey/smokey.h
> +++ b/include/smokey/smokey.h
> @@ -254,7 +254,11 @@ int smokey_barrier_timedwait(struct smokey_barrier *b,
> void smokey_barrier_release(struct smokey_barrier *b);
>
> int smokey_fork_exec(const char *path, const char *arg);
> -
> +
> +int smokey_modprobe(const char *name, bool silent);
> +
> +int smokey_rmmod(const char *name);
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/lib/smokey/helpers.c b/lib/smokey/helpers.c
> index da84c863c..dc0bb5d0c 100644
> --- a/lib/smokey/helpers.c
> +++ b/lib/smokey/helpers.c
> @@ -292,3 +292,102 @@ int smokey_fork_exec(const char *path, const char *arg)
> return 1;
>
> }
> +
> +#define SMOKEY_MOD_NUM 32
> +static char *smokey_modules[SMOKEY_MOD_NUM];
> +
> +int smokey_modprobe(const char *name, bool silent)
> +{
> + char buffer[128];
> + int err, len, i, midx = -1;
> + FILE *fp;
> +
> + fp = fopen("/proc/modules", "r");
> + if (fp == NULL)
> + return -errno;
> +
> + len = strlen(name);
> +
> + while (fgets(buffer, sizeof(buffer), fp)) {
> + if (strncmp(buffer, name, len) == 0 &&
> + len < sizeof(buffer) && buffer[len] == ' ') {
> + smokey_trace("%s module already loaded", name);
> + fclose(fp);
> + return 0;
> + }
> + }
> +
> + fclose(fp);
> +
> + for (i = 0; i < SMOKEY_MOD_NUM; i++) {
> + if (!smokey_modules[i]) {
> + midx = i;
> + break;
> + }
> + }
> +
> + if (midx < 0)
> + return -EFAULT;
> +
> + smokey_trace("%s module not there: modprobing", name);
> +
> + err = smokey_check_errno(
> + snprintf(buffer, sizeof(buffer), "modprobe %s %s", name,
> + silent ? "2>/dev/null" : ""));
> + if (err < 0)
> + return err;
> +
> + err = smokey_check_errno(system(buffer));
> + if (err < 0)
> + return err;
> +
> + if (!WIFEXITED(err) || WEXITSTATUS(err) != 0) {
> + if (!silent)
> + smokey_warning("%s: abnormal exit", buffer);
> + return -EINVAL;
> + }
> +
> + smokey_modules[midx] = strdup(name);
> + return 0;
> +}
> +
> +int smokey_rmmod(const char *name)
> +{
> + char buffer[128];
> + int i, midx = -1, err;
> +
> + if (!name)
> + return -EINVAL;
> +
> + for (i = 0; i < SMOKEY_MOD_NUM; i++) {
> + if (smokey_modules[i] && !strcmp(smokey_modules[i], name)) {
> + midx = i;
> + break;
> + }
> + }
> +
> + if (midx < 0) {
> + smokey_trace("%s module was there on entry, keeping it", name);
> + return 0;
> + }
> +
> + smokey_trace("unloading %s module", name);
> +
> + err = smokey_check_errno(
> + snprintf(buffer, sizeof(buffer), "rmmod %s", name));
> + if (err < 0)
> + return err;
> +
> + err = smokey_check_errno(system(buffer));
> + if (err < 0)
> + return err;
> +
> + if (!WIFEXITED(err) || WEXITSTATUS(err) != 0) {
> + smokey_warning("%s: abnormal exit", buffer);
> + return -EINVAL;
> + }
> +
> + free(smokey_modules[midx]);
> +
> + return err;
> +}
> diff --git a/testsuite/smokey/net_common/setup.c
> b/testsuite/smokey/net_common/setup.c
> index 44a0cb24b..f97c14823 100644
> --- a/testsuite/smokey/net_common/setup.c
> +++ b/testsuite/smokey/net_common/setup.c
> @@ -28,7 +28,6 @@
> struct module {
> int option;
> const char *name;
> - bool loaded;
> };
>
> #define TIMEOUT 10
> @@ -141,81 +140,18 @@ static int do_down(const char *intf)
> static int smokey_net_modprobe(int modid, bool silent)
> {
> struct module *m = modules + modid;
> - char buffer[128];
> - int err, len;
> - FILE *fp;
>
> if (modid < 0)
> return -EINVAL;
>
> - fp = fopen("/proc/modules", "r");
> - if (fp == NULL)
> - return -errno;
> -
> - len = strlen(m->name);
> -
> - while (fgets(buffer, sizeof(buffer), fp)) {
> - if (strncmp(buffer, m->name, len) == 0 &&
> - len < sizeof(buffer) && buffer[len] == ' ') {
> - smokey_trace("%s module already loaded", m->name);
> - fclose(fp);
> - return 0;
> - }
> - }
> -
> - fclose(fp);
> -
> - smokey_trace("%s module not there: modprobing", m->name);
> -
> - err = smokey_check_errno(
> - snprintf(buffer, sizeof(buffer), "modprobe %s %s", m->name,
> - silent ? "2>/dev/null" : ""));
> - if (err < 0)
> - return err;
> -
> - err = smokey_check_errno(system(buffer));
> - if (err < 0)
> - return err;
> -
> - if (!WIFEXITED(err) || WEXITSTATUS(err) != 0) {
> - if (!silent)
> - smokey_warning("%s: abnormal exit", buffer);
> - return -EINVAL;
> - }
> -
> - m->loaded = true;
> -
> - return err;
> + return smokey_modprobe(m->name, silent);
> }
>
> static int smokey_net_rmmod(int modid)
> {
> struct module *m = modules + modid;
> - char buffer[128];
> - int err;
> -
> - if (!m->loaded) {
> - smokey_trace("%s module was there on entry, keeping it",
> m->name);
> - return 0;
> - }
Reverting the series again: You broke the handling of already loaded (or
built-in) modules, also for the rtnet tests.
With CAN, you now get e.g.
2021-12-13T09:36:48 rmmod: ERROR: Module xeno_can_virt is builtin.
2021-12-13T09:36:48 helpers.c:386, rmmod xeno_can_virt: abnormal exit
2021-12-13T09:36:48 rmmod: ERROR: Module xeno_can is builtin.
2021-12-13T09:36:48 helpers.c:386, rmmod xeno_can: abnormal exit
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
