Re: [PATCH] depmod: sort output according to modules.order, take #2

[Rusty Russell]

On Wednesday 02 January 2008 22:13:52 Tejun Heo wrote:
> Tejun Heo wrote:
> > Tejun Heo wrote:
> >> Kbuild now generates and installs modules.order along with modules.
> >> This patch updates depmod such that it sorts module list according to
> >> the file before generating output files.  Modules which aren't on
> >> modules.order are put after modules which are ordered by
> >> modules.order.
> >>
> >> This makes modprobe to prioritize modules according to kernel
> >> Makefile's just as built-in modules are link-ordered by them.
> >>
> > The kernel part is in now.  Rusty Russell, what do you think about this
> > depmod change?
>
> Ping?

Oh, sorry.  Jon is now module-init-tools maintainer, and I've cc'd him and 
forwarded your original patch.

Thanks,
Rusty.



> --- Begin Message ---
> Kbuild now generates and installs modules.order along with modules.
> This patch updates depmod such that it sorts module list according to
> the file before generating output files.  Modules which aren't on
> modules.order are put after modules which are ordered by
> modules.order.
>
> This makes modprobe to prioritize modules according to kernel
> Makefile's just as built-in modules are link-ordered by them.
>
> This patch is against module-init-tools 3.3-pre1.
>
> Signed-off-by: Tejun Heo <htejun@xxxxxxxxx>
> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Cc: Bill Nottingham <notting@xxxxxxxxxx>
> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Cc: Kay Sievers <kay.sievers@xxxxxxxx>
> ---
> Comment added and path comparion logic slightly modified such that
> dirname part of mode->pathname is ignored instead of prepending
> dirname to lines read from modules.order.  Behavior-wise it's
> identical to the previous version.
>
> Thanks.
>
>  depmod.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 49 insertions(+)
>
> diff --git a/depmod.c b/depmod.c
> index ea7ad05..c3ae5a2 100644
> --- a/depmod.c
> +++ b/depmod.c
> @@ -585,6 +585,54 @@ static struct module *grab_basedir(const char *dirname)
>  	return list;
>  }
>  
> +static void sort_modules(const char *dirname, struct module **listp)
> +{
> +	struct module *list = *listp, *tlist = NULL, **tpos = &tlist;
> +	FILE *modorder;
> +	int dir_len = strlen(dirname) + 1;
> +	char file_name[dir_len + strlen("modules.order") + 1];
> +	char line[10240];
> +
> +	sprintf(file_name, "%s/%s", dirname, "modules.order");
> +
> +	modorder = fopen(file_name, "r");
> +	if (!modorder) {
> +		/* Older kernels don't generate modules.order.  Just
> +		   return if the file doesn't exist. */
> +		if (errno == ENOENT)
> +			return;
> +		fatal("Could not open '%s': %s\n", file_name, strerror(errno));
> +	}
> +
> +	sprintf(line, "%s/", dirname);
> +
> +	/* move modules listed in modorder file to tlist in order */
> +	while (fgets(line, sizeof(line), modorder)) {
> +		struct module **pos, *mod;
> +		int len = strlen(line);
> +
> +		if (line[len - 1] == '\n')
> +			line[len - 1] = '\0';
> +
> +		for (pos = &list; (mod = *pos); pos = &(*pos)->next) {
> +			if (strcmp(line, mod->pathname + dir_len) == 0) {
> +				*pos = mod->next;
> +				mod->next = NULL;
> +				*tpos = mod;
> +				tpos = &mod->next;
> +				break;
> +			}
> +		}
> +	}
> +
> +	/* append the rest */
> +	*tpos = list;
> +
> +	fclose(modorder);
> +
> +	*listp = tlist;
> +}
> +
>  static void parse_modules(struct module *list)
>  {
>  	struct module *i;
> @@ -857,6 +905,7 @@ int main(int argc, char *argv[])
>  	} else {
>  		list = grab_basedir(dirname);
>  	}
> +	sort_modules(dirname, &list);
>  	parse_modules(list);
>  
>  	for (i = 0; i < sizeof(depfiles)/sizeof(depfiles[0]); i++) {
>
> --- End Message ---