Commit c13e02d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bootconfig-fixes-v6.3-rc3' of... 

Merge tag 'bootconfig-fixes-v6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull bootconfig fixes from Masami Hiramatsu:

 - Fix bootconfig test script to test increased maximum number (8192)
   node correctly

 - Change the console message if there is no bootconfig data and the
   kernel is compiled with CONFIG_BOOT_CONFIG_FORCE=y

* tag 'bootconfig-fixes-v6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: Change message if no bootconfig with CONFIG_BOOT_CONFIG_FORCE=y
  bootconfig: Fix testcase to increase max node
parents a1effab7 caa0708a

init/main.c

+7 −3
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static char *extra_init_args; 


#ifdef CONFIG_BOOT_CONFIG

/* Is bootconfig on command line? */

static bool bootconfig_found = IS_ENABLED(CONFIG_BOOT_CONFIG_FORCE);

static bool bootconfig_found;

static size_t initargs_offs;

#else

# define bootconfig_found false
@@ -429,7 +429,7 @@ static void __init setup_boot_config(void) 
	err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,

			 bootconfig_params);



	if (IS_ERR(err) || !bootconfig_found)

	if (IS_ERR(err) || !(bootconfig_found || IS_ENABLED(CONFIG_BOOT_CONFIG_FORCE)))

		return;



	/* parse_args() stops at the next param of '--' and returns an address */
@@ -437,7 +437,11 @@ static void __init setup_boot_config(void) 
		initargs_offs = err - tmp_cmdline;



	if (!data) {

		/* If user intended to use bootconfig, show an error level message */

		if (bootconfig_found)

			pr_err("'bootconfig' found on command line, but no bootconfig found\n");

		else

			pr_info("No bootconfig data provided, so skipping bootconfig");

		return;

	}

tools/bootconfig/test-bootconfig.sh

+8 −4
Original line number Diff line number Diff line
@@ -87,10 +87,14 @@ xfail grep -i "error" $OUTFILE 


echo "Max node number check"



echo -n > $TEMPCONF

for i in `seq 1 1024` ; do

   echo "node$i" >> $TEMPCONF

done

awk '

BEGIN {

  for (i = 0; i < 26; i += 1)

      printf("%c\n", 65 + i % 26)

  for (i = 26; i < 8192; i += 1)

      printf("%c%c%c\n", 65 + i % 26, 65 + (i / 26) % 26, 65 + (i / 26 / 26))

}

' > $TEMPCONF

xpass $BOOTCONF -a $TEMPCONF $INITRD



echo "badnode" >> $TEMPCONF