[PATCH 1/2] depmod: do not output .bin to stdout

[PATCH 1/2] depmod: do not output .bin to stdout

[Lucas De Marchi]

index_write() relies on fseek/ftell to manage the position to which we
are write and thus needs the file stream to support it.

Right now when trying to write the index to stdout we fail with:

	depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed.
	Aborted (core dumped)

We have no interest in outputting our index to stdout, so just skip it
like is done with other indexes.

While at it, add/remove some newlines to improve readability.

Reported-by: Yanko Kaneti <yaneti@declera.com>
Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
---
 tools/depmod.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/depmod.c b/tools/depmod.c
index fbbce10..875e314 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
 	struct index_node *idx;
 	struct kmod_list *l, *builtin = NULL;
 
-	idx = index_create();
+	if (out == stdout)
+		return 0;
 
+	idx = index_create();
 	if (idx == NULL) {
 		ret = -ENOMEM;
 		goto fail;
@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
 
 	if (count)
 		index_write(idx, out);
+
 	index_destroy(idx);
+
 fail:
 	if (builtin)
 		kmod_module_unref_list(builtin);
-- 
2.25.1

[PATCH 2/2] depmod: just add .bin suffix to builtin.modinfo

[Lucas De Marchi]

For all the other indexes what we do is to add a .bin to the original
filename to denote it's the indexed version of that file. It was
kernel's decision to name it modules.builtin.modinfo, so respect that.

Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
---
 tools/depmod.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/depmod.c b/tools/depmod.c
index 875e314..fe1c54d 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2402,7 +2402,7 @@ static int output_devname(struct depmod *depmod, FILE *out)
 	return 0;
 }
 
-static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
+static int output_builtin_modinfo_bin(struct depmod *depmod, FILE *out)
 {
 	int ret = 0, count = 0;
 	struct index_node *idx;
@@ -2482,7 +2482,7 @@ static int depmod_output(struct depmod *depmod, FILE *out)
 		{ "modules.symbols", output_symbols },
 		{ "modules.symbols.bin", output_symbols_bin },
 		{ "modules.builtin.bin", output_builtin_bin },
-		{ "modules.builtin.alias.bin", output_builtin_alias_bin },
+		{ "modules.builtin.modinfo.bin", output_builtin_modinfo_bin },
 		{ "modules.devname", output_devname },
 		{ }
 	};
-- 
2.25.1

Re: [PATCH 2/2] depmod: just add .bin suffix to builtin.modinfo

[Alexey Gladkov]

On Thu, Mar 05, 2020 at 11:59:34PM -0800, Lucas De Marchi wrote:
> For all the other indexes what we do is to add a .bin to the original
> filename to denote it's the indexed version of that file. It was
> kernel's decision to name it modules.builtin.modinfo, so respect that.
> 
> Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
> ---
>  tools/depmod.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/depmod.c b/tools/depmod.c
> index 875e314..fe1c54d 100644
> --- a/tools/depmod.c
> +++ b/tools/depmod.c
> @@ -2402,7 +2402,7 @@ static int output_devname(struct depmod *depmod, FILE *out)
>  	return 0;
>  }
>  
> -static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
> +static int output_builtin_modinfo_bin(struct depmod *depmod, FILE *out)
>  {
>  	int ret = 0, count = 0;
>  	struct index_node *idx;
> @@ -2482,7 +2482,7 @@ static int depmod_output(struct depmod *depmod, FILE *out)
>  		{ "modules.symbols", output_symbols },
>  		{ "modules.symbols.bin", output_symbols_bin },
>  		{ "modules.builtin.bin", output_builtin_bin },
> -		{ "modules.builtin.alias.bin", output_builtin_alias_bin },
> +		{ "modules.builtin.modinfo.bin", output_builtin_modinfo_bin },

This file does not contain all whole modinfo. Now the function name and
index name will be confusing. But it's up to you.

>  		{ "modules.devname", output_devname },
>  		{ }
>  	};
> -- 
> 2.25.1
> 

-- 
Rgrds, legion

Re: [PATCH 2/2] depmod: just add .bin suffix to builtin.modinfo

[Lucas De Marchi]

On Fri, Mar 6, 2020 at 1:58 AM Alexey Gladkov <gladkov.alexey@gmail.com> wrote:
>
> On Thu, Mar 05, 2020 at 11:59:34PM -0800, Lucas De Marchi wrote:
> > For all the other indexes what we do is to add a .bin to the original
> > filename to denote it's the indexed version of that file. It was
> > kernel's decision to name it modules.builtin.modinfo, so respect that.
> >
> > Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
> > ---
> >  tools/depmod.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/depmod.c b/tools/depmod.c
> > index 875e314..fe1c54d 100644
> > --- a/tools/depmod.c
> > +++ b/tools/depmod.c
> > @@ -2402,7 +2402,7 @@ static int output_devname(struct depmod *depmod, FILE *out)
> >       return 0;
> >  }
> >
> > -static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
> > +static int output_builtin_modinfo_bin(struct depmod *depmod, FILE *out)
> >  {
> >       int ret = 0, count = 0;
> >       struct index_node *idx;
> > @@ -2482,7 +2482,7 @@ static int depmod_output(struct depmod *depmod, FILE *out)
> >               { "modules.symbols", output_symbols },
> >               { "modules.symbols.bin", output_symbols_bin },
> >               { "modules.builtin.bin", output_builtin_bin },
> > -             { "modules.builtin.alias.bin", output_builtin_alias_bin },
> > +             { "modules.builtin.modinfo.bin", output_builtin_modinfo_bin },
>
> This file does not contain all whole modinfo. Now the function name and
> index name will be confusing. But it's up to you.

Indeed. I'd also have to fix the libkmod counterpart, otherwise it
would look for the wrong file.
This index contains only the alias -> module, like our modules.alias file.

I think it would be better to leave it with this name.  It would
probably be good to output
modules.builtin.alias though to make it similar to the
modules.alias/modules.alias.bin case.
Another option is to just add those aliases to modules.alias and
lookup modules.builtin to decide
if that's builtin, but I  think I prefer to keep them separate.

thanks
Lucas De Marchi


>
> >               { "modules.devname", output_devname },
> >               { }
> >       };
> > --
> > 2.25.1
> >
>
> --
> Rgrds, legion
>


-- 
Lucas De Marchi