[PATCH v2 1/2] sandbox: barebox cmdline

[PATCH v2 1/2] sandbox: barebox cmdline

[Ahmad Fatoum]

For easier non-interactive use of sandbox, let's add support to execute
arbitrary commands from the command line directly.

Reviewed-by: Yann Sionneau <ysionneau@kalrayinc.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - Add Yann's R-b
---
 arch/sandbox/Kconfig     |  1 +
 arch/sandbox/os/common.c | 18 +++++++++++++++++-
 common/Kconfig           |  7 +++++++
 common/startup.c         | 13 ++++++++++++-
 include/shell.h          |  9 +++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index d82027e75047..52915490ca98 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -20,6 +20,7 @@ config SANDBOX
 	select HAS_DEBUG_LL
 	select ARCH_DMA_DEFAULT_COHERENT
 	select ARCH_WANT_FRAME_POINTERS
+	select BAREBOX_CMDLINE
 	default y
 
 config ARCH_TEXT_BASE
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 3446074f99d0..14018b2a63b0 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -492,12 +492,20 @@ static int add_dtb(const char *file)
 	return -1;
 }
 
+static char *cmdline;
+
+const char *barebox_cmdline_get(void)
+{
+	return cmdline;
+}
+
 static void print_usage(const char*);
 
 static struct option long_options[] = {
 	{"help",     0, 0, 'h'},
 	{"malloc",   1, 0, 'm'},
 	{"image",    1, 0, 'i'},
+	{"command",  1, 0, 'c'},
 	{"env",      1, 0, 'e'},
 	{"dtb",      1, 0, 'd'},
 	{"stdout",   1, 0, 'O'},
@@ -508,7 +516,7 @@ static struct option long_options[] = {
 	{0, 0, 0, 0},
 };
 
-static const char optstring[] = "hm:i:e:d:O:I:B:x:y:";
+static const char optstring[] = "hm:i:c:e:d:O:I:B:x:y:";
 
 int main(int argc, char *argv[])
 {
@@ -516,6 +524,7 @@ int main(int argc, char *argv[])
 	int opt, ret, fd, fd2;
 	int malloc_size = CONFIG_MALLOC_SIZE;
 	int fdno = 0, envno = 0, option_index = 0;
+	char *new_cmdline;
 	char *aux;
 
 #ifdef CONFIG_ASAN
@@ -539,6 +548,12 @@ int main(int argc, char *argv[])
 			break;
 		case 'i':
 			break;
+		case 'c':
+			if (asprintf(&new_cmdline, "%s%s\n", cmdline ?: "", optarg) < 0)
+				exit(1);
+			free(cmdline);
+			cmdline = new_cmdline;
+			break;
 		case 'e':
 			break;
 		case 'd':
@@ -669,6 +684,7 @@ static void print_usage(const char *prgname)
 "  -i, --image=<dev>=<file>\n"
 "                       Same as above, the files will show up as\n"
 "                       /dev/<dev>\n"
+"  -c, --command=<cmd>  Run extra command after init scripts\n"
 "  -e, --env=<file>     Map a file with an environment to barebox. With this \n"
 "                       option, files are mapped as /dev/env0 ... /dev/envx\n"
 "                       and thus are used as the default environment.\n"
diff --git a/common/Kconfig b/common/Kconfig
index 498d219b4de3..9a63556378db 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -422,6 +422,13 @@ config SIMPLE_READLINE
 	default y
 	depends on !CMDLINE_EDITING
 
+config BAREBOX_CMDLINE
+	bool
+	help
+	  Support a barebox command line when running virtualized.
+	  The commands are appended onto /cmdline, which is sourced
+	  after sourcing all init scripts.
+
 config CBSIZE
 	int
 	prompt "Buffer size for input from the Console"
diff --git a/common/startup.c b/common/startup.c
index 9510824a908a..443af653d2a8 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -30,6 +30,7 @@
 #include <magicvar.h>
 #include <linux/reboot-mode.h>
 #include <asm/sections.h>
+#include <libfile.h>
 #include <uncompress.h>
 #include <globalvar.h>
 #include <console_countdown.h>
@@ -245,7 +246,7 @@ postcore_initcall(register_autoboot_vars);
 
 static int run_init(void)
 {
-	const char *bmode;
+	const char *bmode, *cmdline;
 	bool env_bin_init_exists;
 	enum autoboot_state autoboot;
 	struct stat s;
@@ -294,6 +295,16 @@ static int run_init(void)
 		globfree(&g);
 	}
 
+	cmdline = barebox_cmdline_get();
+	if (cmdline) {
+		ret = write_file("/cmdline", cmdline, strlen(cmdline));
+		if (ret)
+			return ret;
+
+		console_ctrlc_allow();
+		run_command("source /cmdline");
+	}
+
 	/* source matching script in /env/bmode/ */
 	bmode = reboot_mode_get();
 	if (bmode) {
diff --git a/include/shell.h b/include/shell.h
index 073f18102b45..b399564ff391 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -19,4 +19,13 @@ static inline char *shell_expand(char *str)
 }
 #endif
 
+#ifdef CONFIG_BAREBOX_CMDLINE
+const char *barebox_cmdline_get(void);
+#else
+static inline const char *barebox_cmdline_get(void)
+{
+	return NULL;
+}
+#endif
+
 #endif /* __SHELL_H__ */
-- 
2.39.5

[PATCH v2 2/2] sandbox: add cpuinfo command

[Ahmad Fatoum]

We have stack dump support in sandbox via AddressSanitizer, if it's
compiled in. To make it easier to test proper operation, let's a cpuinfo
command like we already do on ARM and give it the same -s option.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - Have cpuinfo print uname when called without command line arguments
---
 arch/sandbox/Kconfig                          |  7 +++
 arch/sandbox/board/Makefile                   |  1 +
 arch/sandbox/board/cpuinfo.c                  | 53 +++++++++++++++++++
 .../sandbox/mach-sandbox/include/mach/linux.h |  1 +
 arch/sandbox/os/common.c                      |  5 ++
 5 files changed, 67 insertions(+)
 create mode 100644 arch/sandbox/board/cpuinfo.c

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 52915490ca98..caff3a138fea 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -58,6 +58,13 @@ config SANDBOX_REEXEC
 	  The normal reset handler hangs barebox. On Linux, barebox
 	  instead can exec itself to simulate a reset.
 
+config CMD_SANDBOX_CPUINFO
+	bool "cpuinfo command"
+	depends on COMMAND_SUPPORT
+	default y
+	help
+	  Say yes here to get a dummy cpuinfo command.
+
 config SDL
 	bool
 
diff --git a/arch/sandbox/board/Makefile b/arch/sandbox/board/Makefile
index 8e6e1d2d8843..029bfe7ff163 100644
--- a/arch/sandbox/board/Makefile
+++ b/arch/sandbox/board/Makefile
@@ -10,6 +10,7 @@ obj-y += dtb.o
 obj-y += power.o
 obj-y += dev-random.o
 obj-y += watchdog.o
+obj-$(CONFIG_CMD_SANDBOX_CPUINFO) += cpuinfo.o
 obj-$(CONFIG_LED) += led.o
 
 extra-y += barebox.lds
diff --git a/arch/sandbox/board/cpuinfo.c b/arch/sandbox/board/cpuinfo.c
new file mode 100644
index 000000000000..589135102cd3
--- /dev/null
+++ b/arch/sandbox/board/cpuinfo.c
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <common.h>
+#include <getopt.h>
+#include <command.h>
+#include <complete.h>
+#include <mach/linux.h>
+
+static int do_cpuinfo(int argc, char *argv[])
+{
+	int opt, fd, ret = -ENOENT;
+	char buf[256] = "Unknown host system";
+
+	while ((opt = getopt(argc, argv, "s")) > 0) {
+		switch (opt) {
+		case 's':
+			if (!IS_ENABLED(CONFIG_ARCH_HAS_STACK_DUMP))
+				return -ENOSYS;
+
+			dump_stack();
+			return 0;
+		default:
+			return COMMAND_ERROR_USAGE;
+		}
+	}
+
+	fd = linux_open("/proc/version", false);
+	if (fd >= 0) {
+		ret = linux_read(fd, buf, sizeof(buf));
+		linux_close(fd);
+
+		if (ret > 0)
+			printf("%.*s\n", ret, buf);
+	} else {
+		printf("Unknown host system\n");
+	}
+
+	return ret;
+}
+
+BAREBOX_CMD_HELP_START(cpuinfo)
+BAREBOX_CMD_HELP_TEXT("Shows misc info about CPU")
+BAREBOX_CMD_HELP_OPT ("-s", "print call stack info (if supported)")
+BAREBOX_CMD_HELP_END
+
+BAREBOX_CMD_START(cpuinfo)
+	.cmd            = do_cpuinfo,
+	BAREBOX_CMD_DESC("show info about CPU")
+	BAREBOX_CMD_OPTS("[-s]")
+	BAREBOX_CMD_GROUP(CMD_GRP_INFO)
+	BAREBOX_CMD_COMPLETE(empty_complete)
+	BAREBOX_CMD_HELP(cmd_cpuinfo_help)
+BAREBOX_CMD_END
diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h
index f4d91f08de8e..e09780f09278 100644
--- a/arch/sandbox/mach-sandbox/include/mach/linux.h
+++ b/arch/sandbox/mach-sandbox/include/mach/linux.h
@@ -15,6 +15,7 @@ int linux_register_device(const char *name, void *start, void *end);
 int tap_alloc(const char *dev);
 uint64_t linux_get_time(void);
 int linux_open(const char *filename, int readwrite);
+int linux_close(int fd);
 char *linux_get_stickypage_path(void);
 int linux_open_hostfile(struct hf_info *hf);
 int linux_read(int fd, void *buf, size_t count);
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 14018b2a63b0..d8bb345614ac 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -185,6 +185,11 @@ int linux_open(const char *filename, int readwrite)
 	return open(filename, (readwrite ? O_RDWR : O_RDONLY) | O_CLOEXEC);
 }
 
+int linux_close(int fd)
+{
+	return close(fd);
+}
+
 int linux_read(int fd, void *buf, size_t count)
 {
 	ssize_t ret;
-- 
2.39.5