[{"id":2663590,"web_url":"http://patchwork.ozlabs.org/comment/2663590/","msgid":"<20210408194148.GB1724284@robh.at.kernel.org>","date":"2021-04-08T19:41:48","subject":"Re: [PATCH v4 18/20] x86: Convert to GENERIC_CMDLINE","submitter":{"id":62529,"url":"http://patchwork.ozlabs.org/api/people/62529/","name":"Rob Herring (Arm)","email":"robh@kernel.org"},"content":"On Fri, Apr 02, 2021 at 03:18:20PM +0000, Christophe Leroy wrote:\n> This converts the architecture to GENERIC_CMDLINE.\n> \n> Signed-off-by: Christophe Leroy \n> ---\n> arch/x86/Kconfig | 45 ++---------------------------------------\n> arch/x86/kernel/setup.c | 17 ++--------------\n> 2 files changed, 4 insertions(+), 58 deletions(-)\n> \n> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig\n> index a20684d56b4b..66b384228ca3 100644\n> --- a/arch/x86/Kconfig\n> +++ b/arch/x86/Kconfig\n> @@ -104,6 +104,7 @@ config X86\n> \tselect ARCH_USE_QUEUED_SPINLOCKS\n> \tselect ARCH_USE_SYM_ANNOTATIONS\n> \tselect ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH\n> +\tselect ARCH_WANT_CMDLINE_PREPEND_BY_DEFAULT\n\nSeems to be non-existent kconfig option.\n\n> \tselect ARCH_WANT_DEFAULT_BPF_JIT\tif X86_64\n> \tselect ARCH_WANTS_DYNAMIC_TASK_STRUCT\n> \tselect ARCH_WANT_HUGE_PMD_SHARE\n> @@ -118,6 +119,7 @@ config X86\n> \tselect EDAC_SUPPORT\n> \tselect GENERIC_CLOCKEVENTS_BROADCAST\tif X86_64 || (X86_32 && X86_LOCAL_APIC)\n> \tselect GENERIC_CLOCKEVENTS_MIN_ADJUST\n> +\tselect GENERIC_CMDLINE\n> \tselect GENERIC_CMOS_UPDATE\n> \tselect GENERIC_CPU_AUTOPROBE\n> \tselect GENERIC_CPU_VULNERABILITIES\n> @@ -2358,49 +2360,6 @@ choice\n> \n> endchoice\n> \n> -config CMDLINE_BOOL\n> -\tbool \"Built-in kernel command line\"\n> -\thelp\n> -\t Allow for specifying boot arguments to the kernel at\n> -\t build time. On some systems (e.g. embedded ones), it is\n> -\t necessary or convenient to provide some or all of the\n> -\t kernel boot arguments with the kernel itself (that is,\n> -\t to not rely on the boot loader to provide them.)\n> -\n> -\t To compile command line arguments into the kernel,\n> -\t set this option to 'Y', then fill in the\n> -\t boot arguments in CONFIG_CMDLINE.\n> -\n> -\t Systems with fully functional boot loaders (i.e. non-embedded)\n> -\t should leave this option set to 'N'.\n> -\n> -config CMDLINE\n> -\tstring \"Built-in kernel command string\"\n> -\tdepends on CMDLINE_BOOL\n> -\tdefault \"\"\n> -\thelp\n> -\t Enter arguments here that should be compiled into the kernel\n> -\t image and used at boot time. If the boot loader provides a\n> -\t command line at boot time, it is appended to this string to\n> -\t form the full kernel command line, when the system boots.\n> -\n> -\t However, you can use the CONFIG_CMDLINE_FORCE option to\n> -\t change this behavior.\n> -\n> -\t In most cases, the command line (whether built-in or provided\n> -\t by the boot loader) should specify the device for the root\n> -\t file system.\n> -\n> -config CMDLINE_FORCE\n> -\tbool \"Built-in command line overrides boot loader arguments\"\n> -\tdepends on CMDLINE_BOOL && CMDLINE != \"\"\n> -\thelp\n> -\t Set this option to 'Y' to have the kernel ignore the boot loader\n> -\t command line, and use ONLY the built-in command line.\n> -\n> -\t This is used to work around broken boot loaders. This should\n> -\t be set to 'N' under normal conditions.\n> -\n> config MODIFY_LDT_SYSCALL\n> \tbool \"Enable the LDT (local descriptor table)\" if EXPERT\n> \tdefault y\n> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c\n> index 6f2de58eeb54..3f274b02e51c 100644\n> --- a/arch/x86/kernel/setup.c\n> +++ b/arch/x86/kernel/setup.c\n> @@ -5,6 +5,7 @@\n> * This file contains the setup_arch() code, which handles the architecture-dependent\n> * parts of early kernel initialization.\n> */\n> +#include \n> #include \n> #include \n> #include \n> @@ -161,9 +162,6 @@ unsigned long saved_video_mode;\n> #define RAMDISK_LOAD_FLAG\t\t0x4000\n> \n> static char __initdata command_line[COMMAND_LINE_SIZE];\n> -#ifdef CONFIG_CMDLINE_BOOL\n> -static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;\n> -#endif\n> \n> #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)\n> struct edd edd;\n> @@ -883,18 +881,7 @@ void __init setup_arch(char **cmdline_p)\n> \tbss_resource.start = __pa_symbol(__bss_start);\n> \tbss_resource.end = __pa_symbol(__bss_stop)-1;\n> \n> -#ifdef CONFIG_CMDLINE_BOOL\n> -#ifdef CONFIG_CMDLINE_FORCE\n> -\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n> -#else\n> -\tif (builtin_cmdline[0]) {\n> -\t\t/* append boot loader cmdline to builtin */\n> -\t\tstrlcat(builtin_cmdline, \" \", COMMAND_LINE_SIZE);\n> -\t\tstrlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);\n> -\t\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n> -\t}\n> -#endif\n> -#endif\n> +\tcmdline_build(boot_command_line, boot_command_line);\n> \n> \tstrlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);\n> \t*cmdline_p = command_line;\n\nOnce this is all done, I wonder if we can get rid of the strlcpy and \nperhaps also cmdline_p.\n\nRob","headers":{"Return-Path":"\n ","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=)","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=gmail.com (client-ip=209.85.167.176;\n helo=mail-oi1-f176.google.com; envelope-from=robherring2@gmail.com;\n receiver=)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4FGWqj4yQXz9sW5\n\tfor ; Fri, 9 Apr 2021 05:42:09 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FGWqj3t75z3bTn\n\tfor ; Fri, 9 Apr 2021 05:42:09 +1000 (AEST)","from mail-oi1-f176.google.com (mail-oi1-f176.google.com\n [209.85.167.176])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FGWqP59kXz2xZc\n for ; Fri, 9 Apr 2021 05:41:52 +1000 (AEST)","by mail-oi1-f176.google.com with SMTP id n8so3357777oie.10\n for ; Thu, 08 Apr 2021 12:41:52 -0700 (PDT)","from robh.at.kernel.org (24-155-109-49.dyn.grandenetworks.net.\n [24.155.109.49])\n by smtp.gmail.com with ESMTPSA id y10sm72595oto.18.2021.04.08.12.41.49\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 08 Apr 2021 12:41:49 -0700 (PDT)","(nullmailer pid 1844346 invoked by uid 1000);\n Thu, 08 Apr 2021 19:41:48 -0000"],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:date:from:to:cc:subject:message-id:references\n :mime-version:content-disposition:in-reply-to;\n bh=FITwZl80gS3YR2FZtlgpQ5oYWS85Ct2sijj6jggUvFY=;\n b=eE3Q+YQOBRt4JTv1JIIKvcTop2T61jxnJHawZWFCyqwCLvPLQznca6TbbVM/Re6LCp\n SOADJ9Sn6qpkM9tiz3ifCFXzb9fHq5V8sx30RNB8+sgzJ0Jwtx76jFTqw5xQTBj/nNLL\n mitwfYg5uIF29doPZWUTjKIshwmz8XKq2UOdxcELhzgF+bqlIX9sag8x601uPvdMEJN8\n tWjvsR/2skbXJQFVkTOOmiLL0/llBAQLbuPr7DrZAe53mVsFgRghGgYdg44LxyjK8ib1\n n4IFSoyYYQ9fVjVByQFPhbwF0E3jSDxLZ47TUa4kM8WAfuMUft0nF8r05FLAutMvkl9+\n oTyA==","X-Gm-Message-State":"AOAM531vEeZN3Q2qNxWr/XTIjEerY1Z4VpQ99uxK+rsPbYTR3+wP9Nol\n br2GHXV0D2x6VmOPx1rG/g==","X-Google-Smtp-Source":"\n ABdhPJws8AH5mE+MDBnJXs7fKUy6WuwH3lOBsNvmWgFCUyZHpaJjOknPdkw2lABZOuOUgpOplmGZIg==","X-Received":"by 2002:aca:4ad2:: with SMTP id x201mr7515600oia.46.1617910910592;\n Thu, 08 Apr 2021 12:41:50 -0700 (PDT)","Date":"Thu, 8 Apr 2021 14:41:48 -0500","From":"Rob Herring ","To":"Christophe Leroy ","Subject":"Re: [PATCH v4 18/20] x86: Convert to GENERIC_CMDLINE","Message-ID":"<20210408194148.GB1724284@robh.at.kernel.org>","References":"\n ","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"\n ","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"linux-arch@vger.kernel.org, arnd@kernel.org,\n microblaze ,\n daniel@gimpelevich.san-francisco.ca.us, devicetree@vger.kernel.org,\n linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n linux-xtensa@linux-xtensa.org, x86@kernel.org, linux-kernel@vger.kernel.org,\n nios2 , linux-mips@vger.kernel.org,\n linux-mm@kvack.org,\n openrisc@lists.librecores.org, linux-hexagon@vger.kernel.org,\n sparclinux@vger.kernel.org, akpm@linux-foundation.org, will@kernel.org,\n linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org,\n danielwa@cisco.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "}},{"id":2664184,"web_url":"http://patchwork.ozlabs.org/comment/2664184/","msgid":"<834c4850-5541-b5c2-0b7b-d7d960ab2629@csgroup.eu>","date":"2021-04-09T10:20:49","subject":"Re: [PATCH v4 18/20] x86: Convert to GENERIC_CMDLINE","submitter":{"id":79086,"url":"http://patchwork.ozlabs.org/api/people/79086/","name":"Christophe Leroy","email":"christophe.leroy@csgroup.eu"},"content":"Le 08/04/2021 à 21:41, Rob Herring a écrit :\n> On Fri, Apr 02, 2021 at 03:18:20PM +0000, Christophe Leroy wrote:\n>> This converts the architecture to GENERIC_CMDLINE.\n>>\n>> Signed-off-by: Christophe Leroy \n>> ---\n>> arch/x86/Kconfig | 45 ++---------------------------------------\n>> arch/x86/kernel/setup.c | 17 ++--------------\n>> 2 files changed, 4 insertions(+), 58 deletions(-)\n>>\n>> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig\n>> index a20684d56b4b..66b384228ca3 100644\n>> --- a/arch/x86/Kconfig\n>> +++ b/arch/x86/Kconfig\n>> @@ -104,6 +104,7 @@ config X86\n>> \tselect ARCH_USE_QUEUED_SPINLOCKS\n>> \tselect ARCH_USE_SYM_ANNOTATIONS\n>> \tselect ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH\n>> +\tselect ARCH_WANT_CMDLINE_PREPEND_BY_DEFAULT\n> \n> Seems to be non-existent kconfig option.\n\nOops. Added in v5.\n\n>> @@ -883,18 +881,7 @@ void __init setup_arch(char **cmdline_p)\n>> \tbss_resource.start = __pa_symbol(__bss_start);\n>> \tbss_resource.end = __pa_symbol(__bss_stop)-1;\n>> \n>> -#ifdef CONFIG_CMDLINE_BOOL\n>> -#ifdef CONFIG_CMDLINE_FORCE\n>> -\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n>> -#else\n>> -\tif (builtin_cmdline[0]) {\n>> -\t\t/* append boot loader cmdline to builtin */\n>> -\t\tstrlcat(builtin_cmdline, \" \", COMMAND_LINE_SIZE);\n>> -\t\tstrlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);\n>> -\t\tstrlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);\n>> -\t}\n>> -#endif\n>> -#endif\n>> +\tcmdline_build(boot_command_line, boot_command_line);\n>> \n>> \tstrlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);\n>> \t*cmdline_p = command_line;\n> \n> Once this is all done, I wonder if we can get rid of the strlcpy and\n> perhaps also cmdline_p.\n> \n\nIt seems rather complicated, in init/main.c you have heavy manipulations of command lines which \nseems to be done in setup_command_line() which seems to add stuff in front of command lines, at the \nend we end up with several command lines:\n\n/* Untouched saved command line (eg. for /proc) */\nchar *saved_command_line;\n/* Command line for parameter parsing */\nstatic char *static_command_line;\n/* Untouched extra command line */\nstatic char *extra_command_line;\n\nSome of them come from the cmdline_p which others are from boot_command_line.\n\nI think a cleanup on all that stuff would be worth it as a further step.","headers":{"Return-Path":"\n ","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=)","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr;\n envelope-from=christophe.leroy@csgroup.eu; receiver=)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4FGvL64pvjz9sW5\n\tfor ; Fri, 9 Apr 2021 20:21:18 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FGvL63dRwz3brK\n\tfor ; Fri, 9 Apr 2021 20:21:18 +1000 (AEST)","from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FGvKn6R5vz30Kb\n for ; Fri, 9 Apr 2021 20:20:57 +1000 (AEST)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FGvKd22R6z9vBmN;\n Fri, 9 Apr 2021 12:20:53 +0200 (CEST)","from pegase1.c-s.fr ([192.168.12.234])\n by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024)\n with ESMTP id U6kaT8vyPDk2; Fri, 9 Apr 2021 12:20:53 +0200 (CEST)","from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192])\n by pegase1.c-s.fr (Postfix) with ESMTP id 4FGvKd0qpkz9vBmM;\n Fri, 9 Apr 2021 12:20:53 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 449288B7E3;\n Fri, 9 Apr 2021 12:20:54 +0200 (CEST)","from messagerie.si.c-s.fr ([127.0.0.1])\n by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023)\n with ESMTP id 20mYPqZcSrF8; Fri, 9 Apr 2021 12:20:54 +0200 (CEST)","from [192.168.4.90] (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id 0866D8B7E1;\n Fri, 9 Apr 2021 12:20:52 +0200 (CEST)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Subject":"Re: [PATCH v4 18/20] x86: Convert to GENERIC_CMDLINE","To":"Rob Herring ","References":"\n \n <20210408194148.GB1724284@robh.at.kernel.org>","From":"Christophe Leroy ","Message-ID":"<834c4850-5541-b5c2-0b7b-d7d960ab2629@csgroup.eu>","Date":"Fri, 9 Apr 2021 12:20:49 +0200","User-Agent":"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101\n Thunderbird/78.9.0","MIME-Version":"1.0","In-Reply-To":"<20210408194148.GB1724284@robh.at.kernel.org>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Language":"fr","Content-Transfer-Encoding":"8bit","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"linux-arch@vger.kernel.org, arnd@kernel.org,\n microblaze ,\n daniel@gimpelevich.san-francisco.ca.us, devicetree@vger.kernel.org,\n linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n linux-xtensa@linux-xtensa.org, x86@kernel.org, linux-kernel@vger.kernel.org,\n nios2 , linux-mips@vger.kernel.org,\n linux-mm@kvack.org,\n openrisc@lists.librecores.org, linux-hexagon@vger.kernel.org,\n sparclinux@vger.kernel.org, akpm@linux-foundation.org, will@kernel.org,\n linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org,\n danielwa@cisco.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "}}]