From: Baskov Evgeniy <baskov@ispras.ru>
To: Borislav Petkov <bp@alien8.de>
Cc: Baskov Evgeniy <baskov@ispras.ru>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] x86: Parse CONFIG_CMDLINE in compressed kernel
Date: Wed, 4 May 2022 23:41:23 +0300 [thread overview]
Message-ID: <20220504204123.22967-3-baskov@ispras.ru> (raw)
In-Reply-To: <20220504204123.22967-1-baskov@ispras.ru>
CONFIG_CMDLINE, CONFIG_CMDLINE_BOOL, and CONFIG_CMDLINE_OVERRIDE were
ignored during options lookup in compressed kernel.
Parse CONFIG_CMDLINE-related options correctly in compressed kernel
code.
cmd_line_ptr is explicitly placed in .data section since it is used
and expected to be equal to zero before .bss section is cleared.
Signed-off-by: Baskov Evgeniy <baskov@ispras.ru>
diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c
index f1add5d85da9..58723983933d 100644
--- a/arch/x86/boot/compressed/cmdline.c
+++ b/arch/x86/boot/compressed/cmdline.c
@@ -1,22 +1,46 @@
// SPDX-License-Identifier: GPL-2.0
#include "misc.h"
+#define COMMAND_LINE_SIZE 2048
+
static unsigned long fs;
+
static inline void set_fs(unsigned long seg)
{
fs = seg << 4; /* shift it back */
}
+
typedef unsigned long addr_t;
+
static inline char rdfs8(addr_t addr)
{
return *((char *)(fs + addr));
}
+
#include "../cmdline.c"
+
+static unsigned long cmd_line_ptr __section(".data");
+#ifdef CONFIG_CMDLINE_BOOL
+static char builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
+#endif
+
unsigned long get_cmd_line_ptr(void)
{
- unsigned long cmd_line_ptr = boot_params->hdr.cmd_line_ptr;
+ if (!cmd_line_ptr) {
+ cmd_line_ptr = boot_params->hdr.cmd_line_ptr;
+
+ cmd_line_ptr |= (u64)boot_params->ext_cmd_line_ptr << 32;
+
+#ifdef CONFIG_CMDLINE_BOOL
+ if (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE)) {
+ strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);
+ strlcat(builtin_cmdline,
+ (char *)cmd_line_ptr, COMMAND_LINE_SIZE);
+ }
- cmd_line_ptr |= (u64)boot_params->ext_cmd_line_ptr << 32;
+ cmd_line_ptr = (unsigned long)builtin_cmdline;
+#endif
+ }
return cmd_line_ptr;
}
--
2.36.0
next prev parent reply other threads:[~2022-05-04 20:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 2:40 [PATCH] " Baskov Evgeniy
2022-05-04 8:59 ` Borislav Petkov
2022-05-04 20:40 ` baskov
2022-05-04 20:41 ` [PATCH v2 0/2] " Baskov Evgeniy
2022-05-04 20:41 ` [PATCH v2 1/2] x86: add strlcat() to " Baskov Evgeniy
2022-05-04 20:41 ` Baskov Evgeniy [this message]
2022-05-05 10:32 ` [PATCH v3 0/2] x86: Parse CONFIG_CMDLINE in " Baskov Evgeniy
2022-05-05 10:32 ` [PATCH v3 1/2] x86: Add strlcat() to " Baskov Evgeniy
2022-05-12 11:10 ` Borislav Petkov
2022-05-25 5:18 ` baskov
2022-05-05 10:32 ` [PATCH v3 2/2] x86: Parse CONFIG_CMDLINE in " Baskov Evgeniy
2022-05-12 11:21 ` Borislav Petkov
2022-05-25 5:25 ` baskov
2022-05-25 8:22 ` Borislav Petkov
2022-05-25 9:41 ` baskov
2022-05-25 10:10 ` [PATCH v4 0/5] " Evgeniy Baskov
2022-05-25 10:10 ` [PATCH v4 1/5] x86/boot: Add strlcat() to " Evgeniy Baskov
2022-05-25 10:10 ` [PATCH v4 2/5] x86: Add resolve_cmdline() helper Evgeniy Baskov
2022-08-26 11:35 ` Borislav Petkov
2022-08-27 1:51 ` Evgeniy Baskov
2022-05-25 10:10 ` [PATCH v4 3/5] x86/setup: Use resolve_cmdline() in setup.c Evgeniy Baskov
2022-05-25 10:10 ` [PATCH v4 4/5] x86/boot: Use resolve_cmdline() in compressed kernel Evgeniy Baskov
2022-05-25 10:10 ` [PATCH v4 5/5] x86/boot: Remove no longer needed includes Evgeniy Baskov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220504204123.22967-3-baskov@ispras.ru \
--to=baskov@ispras.ru \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®