Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932164AbbDHSm0 (ORCPT ); Wed, 8 Apr 2015 14:42:26 -0400 Received: from cavan.codon.org.uk ([93.93.128.6]:54347 "EHLO cavan.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753903AbbDHSmY (ORCPT ); Wed, 8 Apr 2015 14:42:24 -0400 From: Matthew Garrett To: x86@kernel.org Cc: hpa@zytor.com, mingo@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, Matthew Garrett Date: Wed, 8 Apr 2015 11:41:52 -0700 Message-Id: <1428518512-13460-1-git-send-email-mjg59@coreos.com> X-Mailer: git-send-email 2.3.4 X-cavan-blacklisted-at: zen.spamhaus.org X-SA-Do-Not-Run: Yes X-SA-Exim-Connect-IP: 67.169.119.23 X-SA-Exim-Mail-From: mjg59@coreos.com X-Spam-ASN: Subject: [PATCH] x86: Allow built-in command line to work in early kernel init X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:54:46 +0000) X-SA-Exim-Scanned: Yes (on cavan.codon.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 12845 Lines: 390 The kernel supports having a command line built into it. Unfortunately this doesn't work in all cases - the built-in command line is only appended after we've jumped to the kernel proper, but various parts of the early boot process also pay attention to the command line. This patch moves the command line override code from the kernel itself to the early init code. Unfortunately the kernel can be executed by jumping to the 16-bit entry point, the UEFI entry point or directly to the 32-bit entry point, and there is no guarantee that any of these will have access to data held in the others. As a result, three copies of the command line will be embedded in the kernel. This patch also adds a new flag to the xloadflags field of the setup header in order to allow the 16-bit and UEFI entry points to inform the generic setup code that the command line has already been appended and so shouldn't be added once more. Signed-off-by: Matthew Garrett --- Documentation/x86/boot.txt | 4 +++ arch/x86/boot/boot.h | 10 ++++++ arch/x86/boot/cmdline.c | 37 +++++++++++++++++++ arch/x86/boot/compressed/cmdline.c | 18 +++++++++- arch/x86/boot/compressed/eboot.c | 4 ++- arch/x86/boot/compressed/misc.c | 2 ++ arch/x86/boot/compressed/misc.h | 3 +- arch/x86/boot/main.c | 3 ++ arch/x86/include/uapi/asm/bootparam.h | 1 + arch/x86/kernel/asm-offsets.c | 1 + arch/x86/kernel/setup.c | 16 --------- drivers/firmware/efi/libstub/efi-stub-helper.c | 49 ++++++++++++++++++++++++-- 12 files changed, 127 insertions(+), 21 deletions(-) diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index ed98366..44fedd3 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -611,6 +611,10 @@ Protocol: 2.12+ Bit 4 (read): XLF_EFI_KEXEC - If 1, the kernel supports kexec EFI boot with EFI runtime support. + Bit 5 (reserved): XLF_CMDLINE_APPENDED + - If 1, CONFIG_CMDLINE has already been appended to the cmdline. + For internal use only, ignored by bootloaders. + Field name: cmdline_size Type: read Offset/size: 0x238/4 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index bd49ec6..45fc708 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -273,6 +273,7 @@ void intcall(u8 int_no, const struct biosregs *ireg, struct biosregs *oreg); /* cmdline.c */ int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize); int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option); +int __cmdline_init(unsigned long cmdline_ptr, struct setup_header *hdr); static inline int cmdline_find_option(const char *option, char *buffer, int bufsize) { unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr; @@ -293,6 +294,15 @@ static inline int cmdline_find_option_bool(const char *option) return __cmdline_find_option_bool(cmd_line_ptr, option); } +static inline int cmdline_init(void) +{ + unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr; + + if (cmd_line_ptr >= 0x100000) + return -1; /* inaccessible */ + + return __cmdline_init(cmd_line_ptr, &boot_params.hdr); +} /* cpu.c, cpucheck.c */ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr); int validate_cpu(void); diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c index 625d21b..aadc192 100644 --- a/arch/x86/boot/cmdline.c +++ b/arch/x86/boot/cmdline.c @@ -14,6 +14,10 @@ #include "boot.h" +#ifdef CONFIG_CMDLINE_BOOL +static char builtin_cmdline[] = CONFIG_CMDLINE; +#endif + static inline int myisspace(u8 c) { return c <= ' '; /* Close enough approximation */ @@ -156,3 +160,36 @@ int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option) return 0; /* Buffer overrun */ } + +int __cmdline_init(unsigned long cmdline_ptr, struct setup_header *hdr) +{ +#ifdef CONFIG_CMDLINE_BOOL + addr_t cptr; + int i = 0; + + if (!cmdline_ptr) + return -1; /* No command line */ + + set_fs(cmdline_ptr >> 4); + cptr = cmdline_ptr & 0xf; + +#ifndef CONFIG_CMDLINE_OVERRIDE + while (cptr < 0x10000) { + char c = rdfs8(cptr); + if (!c) { + wrfs8(' ', cptr++); + break; + } + cptr++; + } +#endif /* !CONFIG_CMDLINE_OVERRIDE */ + while (builtin_cmdline[i] && cptr < 0xffff) + wrfs8(builtin_cmdline[i++], cptr++); + + wrfs8('\0', cptr); + + hdr->xloadflags |= XLF_CMDLINE_APPENDED; +#endif /* CONFIG_CMDLINE_BOOL */ + + return 0; +} diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c index b68e303..e1b4b60 100644 --- a/arch/x86/boot/compressed/cmdline.c +++ b/arch/x86/boot/compressed/cmdline.c @@ -1,6 +1,6 @@ #include "misc.h" -#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE +#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE || CONFIG_CMDLINE_BOOL static unsigned long fs; static inline void set_fs(unsigned long seg) @@ -12,6 +12,10 @@ static inline char rdfs8(addr_t addr) { return *((char *)(fs + addr)); } +static inline void wrfs8(u8 v, addr_t addr) +{ + *((char *)(fs + addr)) = v; +} #include "../cmdline.c" static unsigned long get_cmd_line_ptr(void) { @@ -30,4 +34,16 @@ int cmdline_find_option_bool(const char *option) return __cmdline_find_option_bool(get_cmd_line_ptr(), option); } +int cmdline_init(void) +{ + if (!(real_mode->hdr.xloadflags & XLF_CMDLINE_APPENDED)) + return __cmdline_init(get_cmd_line_ptr(), &real_mode->hdr); + return 0; +} +#else +int cmdline_init(void) +{ +#error "BAD" + return 0; +} #endif diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index ef17683..cf373c2 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -1109,7 +1109,9 @@ struct boot_params *make_boot_params(struct efi_config *c) if (!cmdline_ptr) goto fail; hdr->cmd_line_ptr = (unsigned long)cmdline_ptr; - +#ifdef CONFIG_CMDLINE_BOOL + hdr->xloadflags |= XLF_CMDLINE_APPENDED; +#endif hdr->ramdisk_image = 0; hdr->ramdisk_size = 0; diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index a950864..dc8a287 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -390,6 +390,8 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, lines = real_mode->screen_info.orig_video_lines; cols = real_mode->screen_info.orig_video_cols; + cmdline_init(); + console_init(); debug_putstr("early console in decompress_kernel\n"); diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 04477d6..9cbec86 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -48,10 +48,11 @@ static inline void debug_putstr(const char *s) #endif -#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE +#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE || CONFIG_CMDLINE_BOOL /* cmdline.c */ int cmdline_find_option(const char *option, char *buffer, int bufsize); int cmdline_find_option_bool(const char *option); +int cmdline_init(void); #endif diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c index fd6c9f2..7c24862 100644 --- a/arch/x86/boot/main.c +++ b/arch/x86/boot/main.c @@ -137,6 +137,9 @@ void main(void) /* First, copy the boot header into the "zeropage" */ copy_boot_params(); + /* Handle built-in command line */ + cmdline_init(); + /* Initialize the early-boot console */ console_init(); if (cmdline_find_option_bool("debug")) diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 89a033a..524498a 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -26,6 +26,7 @@ #define XLF_EFI_HANDOVER_32 (1<<2) #define XLF_EFI_HANDOVER_64 (1<<3) #define XLF_EFI_KEXEC (1<<4) +#define XLF_CMDLINE_APPENDED (1<<5) #ifndef __ASSEMBLY__ diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index 9f6b934..c10ab92 100644 --- a/arch/x86/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c @@ -68,6 +68,7 @@ void common(void) { OFFSET(BP_kernel_alignment, boot_params, hdr.kernel_alignment); OFFSET(BP_pref_address, boot_params, hdr.pref_address); OFFSET(BP_code32_start, boot_params, hdr.code32_start); + OFFSET(BP_xloadflags, boot_params, hdr.xloadflags); BLANK(); DEFINE(PTREGS_SIZE, sizeof(struct pt_regs)); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0a2421c..1f68d32 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -232,9 +232,6 @@ unsigned long saved_video_mode; #define RAMDISK_LOAD_FLAG 0x4000 static char __initdata command_line[COMMAND_LINE_SIZE]; -#ifdef CONFIG_CMDLINE_BOOL -static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE; -#endif #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) struct edd edd; @@ -968,19 +965,6 @@ void __init setup_arch(char **cmdline_p) bss_resource.start = __pa_symbol(__bss_start); bss_resource.end = __pa_symbol(__bss_stop)-1; -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE - strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); -#else - if (builtin_cmdline[0]) { - /* append boot loader cmdline to builtin */ - strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); - strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); - strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); - } -#endif -#endif - strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c index f07d4a6..54afe1f 100644 --- a/drivers/firmware/efi/libstub/efi-stub-helper.c +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c @@ -12,9 +12,14 @@ #include #include +#include #include "efistub.h" +#ifdef CONFIG_CMDLINE_BOOL +static char builtin_cmdline[] = CONFIG_CMDLINE; +#endif + /* * Some firmware implementations have problems reading files in one go. * A read chunk size of 1MB seems to work for most platforms. @@ -649,6 +654,21 @@ static u8 *efi_utf16_to_utf8(u8 *dst, const u16 *src, int n) return dst; } +static size_t efi_strlcat(char *dest, const char *src, size_t count) +{ + size_t dsize = strlen(dest); + size_t len = strlen(src); + size_t res = dsize + len; + + dest += dsize; + count -= dsize; + if (len >= count) + len = count-1; + memcpy(dest, src, len); + dest[len] = 0; + return res; +} + /* * Convert the unicode UEFI command line to ASCII to pass to kernel. * Size of memory allocated return in *cmd_line_len. @@ -658,14 +678,16 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg, efi_loaded_image_t *image, int *cmd_line_len) { + unsigned long cmdline_addr = 0; + int i; + efi_status_t status; +#ifndef CONFIG_CMDLINE_OVERRIDE const u16 *s2; u8 *s1 = NULL; - unsigned long cmdline_addr = 0; int load_options_chars = image->load_options_size / 2; /* UTF-16 */ const u16 *options = image->load_options; int options_bytes = 0; /* UTF-8 bytes */ int options_chars = 0; /* UTF-16 chars */ - efi_status_t status; u16 zero = 0; if (options) { @@ -684,6 +706,12 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg, options_bytes++; /* NUL termination */ +#ifdef CONFIG_CMDLINE_BOOL + /* Add length of the built-in command line, plus a space */ + options_bytes += strlen(builtin_cmdline); + options_bytes++; +#endif + status = efi_low_alloc(sys_table_arg, options_bytes, 0, &cmdline_addr); if (status != EFI_SUCCESS) return NULL; @@ -694,6 +722,23 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg, s1 = efi_utf16_to_utf8(s1, s2, options_chars); *s1 = '\0'; +#ifdef CONFIG_CMDLINE_BOOL + efi_strlcat((char *)cmdline_addr, " ", COMMAND_LINE_SIZE); + efi_strlcat((char *)cmdline_addr, builtin_cmdline, COMMAND_LINE_SIZE); +#endif *cmd_line_len = options_bytes; +#else /* CONFIG_CMDLINE_OVERRIDE */ + status = efi_low_alloc(sys_table_arg, strlen(builtin_cmdline), 0, + &cmdline_addr); + if (status != EFI_SUCCESS) + return NULL; + while (builtin_cmdline[i] && i < COMMAND_LINE_SIZE) { + ((char *)cmdline_addr)[i] = builtin_cmdline[i]; + i++; + } + ((char *)cmdline_addr)[i] = '\0'; + *cmd_line_len = strlen(builtin_cmdline); +#endif /* CONFIG_CMDLINE_OVERRIDE */ + return (char *)cmdline_addr; } -- 2.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/