From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Rob Herring <robh@kernel.org>
Cc: Will Deacon <will@kernel.org>, Daniel Walker <danielwa@cisco.com>,
Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>,
"open list:GENERIC INCLUDE/ASM HEADER FILES"
<linux-arch@vger.kernel.org>,
devicetree@vger.kernel.org,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
microblaze <monstr@monstr.eu>,
"open list:MIPS" <linux-mips@vger.kernel.org>,
nios2 <ley.foon.tan@intel.com>,
Openrisc <openrisc@lists.librecores.org>,
linux-hexagon@vger.kernel.org,
linux-riscv <linux-riscv@lists.infradead.org>,
X86 ML <x86@kernel.org>,
linux-xtensa@linux-xtensa.org,
SH-Linux <linux-sh@vger.kernel.org>,
sparclinux <sparclinux@vger.kernel.org>
Subject: Re: [PATCH v3 01/17] cmdline: Add generic function to build command line.
Date: Fri, 2 Apr 2021 17:23:32 +0200 [thread overview]
Message-ID: <53aa0b8c-4ee3-a6af-6fb8-2edc5cd79ea5@csgroup.eu> (raw)
In-Reply-To: <CAL_JsqKr3xekKSo3DtQvOOw_VoGC=FUTagZGY5g=CGGGdUZSMQ@mail.gmail.com>
Le 26/03/2021 à 16:42, Rob Herring a écrit :
> On Fri, Mar 26, 2021 at 7:44 AM Christophe Leroy
> <christophe.leroy@csgroup.eu> wrote:
>>
>> This code provides architectures with a way to build command line
>> based on what is built in the kernel and what is handed over by the
>> bootloader, based on selected compile-time options.
>
> Note that I have this patch pending:
>
> https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20210316193820.3137-1-alex@ghiti.fr/
>
> It's going to need to be adapted for this. I've held off applying to
> see if this gets settled.
When reworking EFI, I found out that they are a similar handling, which in addition takes care of
space inside quotes.
I added something similar now in cmdline_build() function.
>
>>
>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>> ---
>> v3:
>> - Addressed comments from Will
>> - Added capability to have src == dst
>> ---
>> include/linux/cmdline.h | 57 +++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 57 insertions(+)
>> create mode 100644 include/linux/cmdline.h
>>
>> diff --git a/include/linux/cmdline.h b/include/linux/cmdline.h
>> new file mode 100644
>> index 000000000000..dea87edd41be
>> --- /dev/null
>> +++ b/include/linux/cmdline.h
>> @@ -0,0 +1,57 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>> +#ifndef _LINUX_CMDLINE_H
>> +#define _LINUX_CMDLINE_H
>> +
>> +#include <linux/string.h>
>> +
>> +/* Allow architectures to override strlcat, powerpc can't use strings so early */
>> +#ifndef cmdline_strlcat
>> +#define cmdline_strlcat strlcat
>> +#endif
>> +
>> +/*
>> + * This function will append or prepend a builtin command line to the command
>> + * line provided by the bootloader. Kconfig options can be used to alter
>> + * the behavior of this builtin command line.
>> + * @dst: The destination of the final appended/prepended string.
>> + * @src: The starting string or NULL if there isn't one.
>> + * @len: the length of dest buffer.
>> + */
>> +static __always_inline void __cmdline_build(char *dst, const char *src, size_t len)
>> +{
>> + if (!len || src == dst)
>> + return;
>> +
>> + if (IS_ENABLED(CONFIG_CMDLINE_FORCE) || !src) {
>> + dst[0] = 0;
>> + cmdline_strlcat(dst, CONFIG_CMDLINE, len);
>> + return;
>> + }
>> +
>> + if (dst != src)
>> + dst[0] = 0;
>> +
>> + if (IS_ENABLED(CONFIG_CMDLINE_PREPEND))
>> + cmdline_strlcat(dst, CONFIG_CMDLINE " ", len);
>> +
>> + cmdline_strlcat(dst, src, len);
>> +
>> + if (IS_ENABLED(CONFIG_CMDLINE_EXTEND))
>
> Should be APPEND.
>
>> + cmdline_strlcat(dst, " " CONFIG_CMDLINE, len);
>> +}
>> +
>> +#define cmdline_build(dst, src, len) do { \
>
> Perhaps a comment why we need this to be a define.
>
>> + char *__c_dst = (dst); \
>> + const char *__c_src = (src); \
>> + \
>> + if (__c_src == __c_dst) { \
>> + static char __c_tmp[COMMAND_LINE_SIZE] __initdata = ""; \
>> + \
>> + cmdline_strlcat(__c_tmp, __c_src, COMMAND_LINE_SIZE); \
>> + __cmdline_build(__c_dst, __c_tmp, (len)); \
>> + } else { \
>> + __cmdline_build(__c_dst, __c_src, (len)); \
>> + } \
>> +} while (0)
>> +
>> +#endif /* _LINUX_CMDLINE_H */
>> --
>> 2.25.0
>>
next prev parent reply other threads:[~2021-04-02 15:23 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 13:44 [PATCH v3 00/17] Implement GENERIC_CMDLINE Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 01/17] cmdline: Add generic function to build command line Christophe Leroy
2021-03-26 15:42 ` Rob Herring
2021-03-26 15:55 ` Christophe Leroy
2021-04-02 15:23 ` Christophe Leroy [this message]
2021-03-30 17:27 ` Daniel Walker
2021-03-30 18:07 ` H. Nikolaus Schaller
2021-03-30 18:23 ` Daniel Walker
2021-04-02 15:33 ` Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 02/17] drivers: of: use cmdline building function Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 03/17] cmdline: Gives architectures opportunity to use generically defined boot cmdline manipulation Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 04/17] powerpc: Convert to GENERIC_CMDLINE Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 05/17] arm: " Christophe Leroy
2021-03-26 15:47 ` Rob Herring
2021-03-26 15:49 ` Christophe Leroy
2021-03-26 18:22 ` Rob Herring
2021-04-02 15:19 ` Christophe Leroy
2021-04-02 15:24 ` Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 06/17] arm64: " Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 07/17] hexagon: " Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 08/17] microblaze: " Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 09/17] nios2: " Christophe Leroy
2021-03-29 1:35 ` Tan, Ley Foon
2021-04-02 15:33 ` Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 10/17] openrisc: " Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 11/17] riscv: " Christophe Leroy
2021-03-26 14:08 ` Andreas Schwab
2021-03-26 14:20 ` Christophe Leroy
2021-03-26 15:26 ` Rob Herring
2021-03-30 0:52 ` Nick Kossifidis
2021-04-02 15:21 ` Christophe Leroy
2021-03-26 13:44 ` [PATCH v3 12/17] sh: " Christophe Leroy
2021-04-02 15:36 ` Christophe Leroy
2021-03-26 13:45 ` [PATCH v3 13/17] sparc: " Christophe Leroy
2021-03-26 13:45 ` [PATCH v3 14/17] xtensa: " Christophe Leroy
2021-03-26 13:45 ` [PATCH v3 15/17] x86: " Christophe Leroy
2021-03-26 13:45 ` [PATCH v3 16/17] mips: " Christophe Leroy
2021-03-26 13:45 ` [PATCH v3 17/17] cmdline: Remove CONFIG_CMDLINE_EXTEND Christophe Leroy
2021-03-26 15:04 ` [PATCH v3 00/17] Implement GENERIC_CMDLINE Rob Herring
2021-04-02 15:20 ` Christophe Leroy
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=53aa0b8c-4ee3-a6af-6fb8-2edc5cd79ea5@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=daniel@gimpelevich.san-francisco.ca.us \
--cc=danielwa@cisco.com \
--cc=devicetree@vger.kernel.org \
--cc=ley.foon.tan@intel.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=monstr@monstr.eu \
--cc=openrisc@lists.librecores.org \
--cc=robh@kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=will@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).