From patchwork Mon Jan 20 03:23:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11340943 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6223D109A for ; Mon, 20 Jan 2020 03:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 409C32073D for ; Mon, 20 Jan 2020 03:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579490594; bh=K7xZMmjWVKCT25PyjZdyGvQdXmOSlwcrsLU8kIcTW70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YYla6pJIyXz0pi43NnJUKWQGsMr1KYhvDRgK6rlTzX6asdvTqI4w8wb8dRJv474lo H7Om+rXbWQ1HewQLc3QM48xmYBVbFnvqKcKPphkA9w/glrarKB+9n4IR6h+ot5Ob4O GqADjQEb0U27uY3AW7fRwrxCWplOZA8hjo/5q1IQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729092AbgATDXH (ORCPT ); Sun, 19 Jan 2020 22:23:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:51546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728949AbgATDXH (ORCPT ); Sun, 19 Jan 2020 22:23:07 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 119BF2073A; Mon, 20 Jan 2020 03:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579490586; bh=K7xZMmjWVKCT25PyjZdyGvQdXmOSlwcrsLU8kIcTW70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nQfbeMNtQSCiuows61nUsvrS3a5EztfhYbHVK+L3clubDXRJTeiPMGRaiAZxlI8a1 BR/stCU+1lL3Rgxzjb2c9GevFOheshReJkxlO5HCBda7XQl9BxwoSMOhP2danWU2tY WVRDUGxrjORfUaR/ZmAlGsbY7noIwoZBa/0BL4E0= From: Masami Hiramatsu To: Steven Rostedt Cc: Ingo Molnar , Randy Dunlap , Frank Rowand , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] bootconfig: Fix Kconfig help message for BOOT_CONFIG Date: Mon, 20 Jan 2020 12:23:00 +0900 Message-Id: <157949058031.25888.18399447161895787505.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157949056842.25888.12912764773767908046.stgit@devnote2> References: <157949056842.25888.12912764773767908046.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Fix Kconfig help message since the bootconfig file is only available to be appended to initramfs. And also add a reference to the documentation. Reported-by: Randy Dunlap Signed-off-by: Masami Hiramatsu --- init/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index ffd240fb88c3..9506299a53e3 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1223,7 +1223,9 @@ config BOOT_CONFIG help Extra boot config allows system admin to pass a config file as complemental extension of kernel cmdline when booting. - The boot config file is usually attached at the end of initramfs. + The boot config file must be attached at the end of initramfs + with checksum and size. + See for details. If unsure, say Y. From patchwork Mon Jan 20 03:23:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11340945 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06A25109A for ; Mon, 20 Jan 2020 03:23:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9AB6207FD for ; Mon, 20 Jan 2020 03:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579490604; bh=MKn5Cznp3PMqaBXd9TGds8qNk4W8AABAuCaIwfqDjj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M4i0bKLY8vQdaTh8n80Agr8lvjzciPiyFybvO72tT3ZHd2nlfBTBaGG0cWBVRaMZP 5pp2Bu0iSYxLTYf0/mO6gZJ1g/Rz7o7pcGR0eVXuVxJDUubS1ZMmzZXejkGLfPonnw 7K4BGny51WKFMgmILHXYFoiHZFVYAoip4XMAH3Mg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729122AbgATDXT (ORCPT ); Sun, 19 Jan 2020 22:23:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:52470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728949AbgATDXT (ORCPT ); Sun, 19 Jan 2020 22:23:19 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 842F02073D; Mon, 20 Jan 2020 03:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579490598; bh=MKn5Cznp3PMqaBXd9TGds8qNk4W8AABAuCaIwfqDjj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qKLD7kVDum2dkbQys+xNuSdNm1AXY+9DeSYpNJ45uC17+iM4s0Y8v4CLCQl2c1iJN bIIBvSXLaN6QDVSmpVM65TiYZqSBc5H33knX6AVTlKDhT10HK2nBUPJLknAkr+b2lN 3v0uzeVuh9F/pmwJjskxpmvQsvSUt7XuszldYTqY= From: Masami Hiramatsu To: Steven Rostedt Cc: Ingo Molnar , Randy Dunlap , Frank Rowand , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] Documentation: bootconfig: Fix typos in bootconfig documentation Date: Mon, 20 Jan 2020 12:23:12 +0900 Message-Id: <157949059219.25888.16939971423610233631.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157949056842.25888.12912764773767908046.stgit@devnote2> References: <157949056842.25888.12912764773767908046.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Fix typos in bootconfig.rst according to Randy's suggestions. Suggested-by: Randy Dunlap Signed-off-by: Masami Hiramatsu --- Documentation/admin-guide/bootconfig.rst | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Documentation/admin-guide/bootconfig.rst b/Documentation/admin-guide/bootconfig.rst index c8f7cd4cf44e..4d617693c0c8 100644 --- a/Documentation/admin-guide/bootconfig.rst +++ b/Documentation/admin-guide/bootconfig.rst @@ -11,20 +11,22 @@ Boot Configuration Overview ======== -The boot configuration is expanding current kernel cmdline to support -additional key-value data when boot the kernel in an efficient way. -This allows adoministrators to pass a structured-Key config file. +The boot configuration expands the current kernel command line to support +additional key-value data when booting the kernel in an efficient way. +This allows administrators to pass a structured-Key config file. Config File Syntax ================== The boot config syntax is a simple structured key-value. Each key consists -of dot-connected-words, and key and value are connected by "=". The value +of dot-connected-words, and key and value are connected by ``=``. The value has to be terminated by semi-colon (``;``) or newline (``\n``). For array value, array entries are separated by comma (``,``). :: KEY[.WORD[...]] = VALUE[, VALUE2[...]][;] +Unlike the kernel command line syntax, spaces are OK around the comma and ``=``. + Each key word must contain only alphabets, numbers, dash (``-``) or underscore (``_``). And each value only contains printable characters or spaces except for delimiters such as semi-colon (``;``), new-line (``\n``), comma (``,``), @@ -35,7 +37,7 @@ quotes (``"VALUE"``) or single-quotes (``'VALUE'``) to quote it. Note that you can not escape these quotes. There can be a key which doesn't have value or has an empty value. Those keys -are used for checking the key exists or not (like a boolean). +are used for checking if the key exists or not (like a boolean). Key-Value Syntax ---------------- @@ -63,7 +65,7 @@ at boot time. So you can append similar trees or key-values. Comments -------- -The config syntax accepts shell-script style comments. The comments start +The config syntax accepts shell-script style comments. The comments starting with hash ("#") until newline ("\n") will be ignored. :: @@ -108,7 +110,7 @@ update the boot loader and the kernel image itself. To do this operation, Linux kernel provides "bootconfig" command under tools/bootconfig, which allows admin to apply or delete the config file -to/from initrd image. You can build it by follwoing command:: +to/from initrd image. You can build it by the following command:: # make -C tools/bootconfig @@ -122,7 +124,7 @@ To remove the config from the image, you can use -d option as below:: # tools/bootconfig/bootconfig -d /boot/initrd.img-X.Y.Z -C onfig File Limitation +Config File Limitation ====================== Currently the maximum config size size is 32KB and the total key-words (not @@ -145,10 +147,10 @@ User can query or loop on key-value pairs, also it is possible to find a root (prefix) key node and find key-values under that node. If you have a key string, you can query the value directly with the key -using xbc_find_value(). If you want to know what keys exist in the SKC -tree, you can use xbc_for_each_key_value() to iterate key-value pairs. +using xbc_find_value(). If you want to know what keys exist in the boot +config, you can use xbc_for_each_key_value() to iterate key-value pairs. Note that you need to use xbc_array_for_each_value() for accessing -each arraies value, e.g.:: +each array's value, e.g.:: vnode = NULL; xbc_find_value("key.word", &vnode); @@ -157,8 +159,8 @@ each arraies value, e.g.:: printk("%s ", value); } -If you want to focus on keys which has a prefix string, you can use -xbc_find_node() to find a node which prefix key words, and iterate +If you want to focus on keys which have a prefix string, you can use +xbc_find_node() to find a node by the prefix string, and iterate keys under the prefix node with xbc_node_for_each_key_value(). But the most typical usage is to get the named value under prefix @@ -174,8 +176,8 @@ or get the named array under prefix as below:: This accesses a value of "key.prefix.option" and an array of "key.prefix.array-option". -Locking is not needed, since after initialized, the config becomes readonly. -All data and keys must be copied if you need to modify it. +Locking is not needed, since after initialization, the config becomes +read-only. All data and keys must be copied if you need to modify it. Functions and structures From patchwork Mon Jan 20 03:23:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11340947 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 016DD14B7 for ; Mon, 20 Jan 2020 03:23:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D466A207FD for ; Mon, 20 Jan 2020 03:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579490610; bh=bFXtcmrmYQ5EaV0kOE8JiB2aYQ31SgC7NfzQHg2UPxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FNol8i7bE30foZXhcyiczkKHdLz7yHP7YWBIr9aS3al6+UtHHAZEtx0+SCvmZ21e0 hxe3O50wP7YPX7PUWiB1/PEHLFR2ECVCZHyVGmfiX1Yg9Jg/GAW+Hgnd6LcUSlm4KL aF82ENNCQM+SI/kn5tCHSYI9dScQoCoe0KlR7G6Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729143AbgATDXa (ORCPT ); Sun, 19 Jan 2020 22:23:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:53298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728949AbgATDXa (ORCPT ); Sun, 19 Jan 2020 22:23:30 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9BCE92077C; Mon, 20 Jan 2020 03:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579490609; bh=bFXtcmrmYQ5EaV0kOE8JiB2aYQ31SgC7NfzQHg2UPxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c9mJ5Agwkp77r+U0PAZA20yEaLWLW1G83oaMKpAcUmGMJbknhrDgbWn2+FCXaERMG wWrIV2dbKH5ue/OgJqIQZOTU7MZ7zSMCogcHleY7kBaA9T6/eq4irSk/krw20a0q7v VHzfzYyM/lt4m0h0P/S/fZp7f/W3LskHFv40ENS0= From: Masami Hiramatsu To: Steven Rostedt Cc: Ingo Molnar , Randy Dunlap , Frank Rowand , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] Documentation: tracing: Fix typos in boot-time tracing documentation Date: Mon, 20 Jan 2020 12:23:23 +0900 Message-Id: <157949060335.25888.13153184562531693684.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157949056842.25888.12912764773767908046.stgit@devnote2> References: <157949056842.25888.12912764773767908046.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Fix typos in boottime-trace.rst according to Randy's suggestions. Suggested-by: Randy Dunlap Signed-off-by: Masami Hiramatsu --- Documentation/trace/boottime-trace.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/trace/boottime-trace.rst b/Documentation/trace/boottime-trace.rst index 1d10fdebf1b2..dcb390075ca1 100644 --- a/Documentation/trace/boottime-trace.rst +++ b/Documentation/trace/boottime-trace.rst @@ -13,7 +13,7 @@ Boot-time tracing allows users to trace boot-time process including device initialization with full features of ftrace including per-event filter and actions, histograms, kprobe-events and synthetic-events, and trace instances. -Since kernel cmdline is not enough to control these complex features, +Since kernel command line is not enough to control these complex features, this uses bootconfig file to describe tracing feature programming. Options in the Boot Config @@ -21,7 +21,7 @@ Options in the Boot Config Here is the list of available options list for boot time tracing in boot config file [1]_. All options are under "ftrace." or "kernel." -refix. See kernel parameters for the options which starts +prefix. See kernel parameters for the options which starts with "kernel." prefix [2]_. .. [1] See :ref:`Documentation/admin-guide/bootconfig.rst ` @@ -50,7 +50,7 @@ kernel.fgraph_filters = FILTER[, FILTER2...] Add fgraph tracing function filters. kernel.fgraph_notraces = FILTER[, FILTER2...] - Add fgraph non tracing function filters. + Add fgraph non-tracing function filters. Ftrace Per-instance Options @@ -81,10 +81,10 @@ ftrace.[instance.INSTANCE.]tracer = TRACER Set TRACER to current tracer on boot. (e.g. function) ftrace.[instance.INSTANCE.]ftrace.filters - This will take an array of tracing function filter rules + This will take an array of tracing function filter rules. ftrace.[instance.INSTANCE.]ftrace.notraces - This will take an array of NON-tracing function filter rules + This will take an array of NON-tracing function filter rules. Ftrace Per-Event Options @@ -93,7 +93,7 @@ Ftrace Per-Event Options These options are setting per-event options. ftrace.[instance.INSTANCE.]event.GROUP.EVENT.enable - Enables GROUP:EVENT tracing. + Enable GROUP:EVENT tracing. ftrace.[instance.INSTANCE.]event.GROUP.EVENT.filter = FILTER Set FILTER rule to the GROUP:EVENT. @@ -145,10 +145,10 @@ below:: } } -Also, boottime tracing supports "instance" node, which allows us to run +Also, boot-time tracing supports "instance" node, which allows us to run several tracers for different purpose at once. For example, one tracer -is for tracing functions start with "user\_", and others tracing "kernel\_" -functions, you can write boot config as below:: +is for tracing functions starting with "user\_", and others tracing +"kernel\_" functions, you can write boot config as below:: ftrace.instance { foo {