Date:   Mon, 20 Feb 2023 22:10:32 -0700 (MST)
From:   =?UTF-8?Q?Marc_Aur=C3=A8le_La_France?= <tsi@tuyoix.net>
To:     John Ogness <john.ogness@linutronix.de>,
        linux-kernel@vger.kernel.org
Subject: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
Message-ID: <5c19e248-1b6b-330c-7c4c-a824688daefe@tuyoix.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="-1463807856-701356714-1676956233=:15533"
Precedence: bulk

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

---1463807856-701356714-1676956233=:15533
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT

After 93d102f094be9beab28e5afb656c188b16a3793b "printk: remove safe buffers",
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT is no longer useful.  Remove it.

This change is not eligible for stable@.

Please Reply-To-All.

Marc.

Signed-off-by: Marc Aurèle La France <tsi@tuyoix.net>

diff -aNpRruz -X /etc/diff.excludes linux-6.2.0/arch/powerpc/configs/microwatt_defconfig devel-6.2.0/arch/powerpc/configs/microwatt_defconfig
--- linux-6.2.0/arch/powerpc/configs/microwatt_defconfig	2023-02-19 15:24:22.000000000 -0700
+++ devel-6.2.0/arch/powerpc/configs/microwatt_defconfig	2023-02-20 21:39:39.057268798 -0700
@@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_CGROUPS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
diff -aNpRruz -X /etc/diff.excludes linux-6.2.0/arch/riscv/configs/nommu_k210_defconfig devel-6.2.0/arch/riscv/configs/nommu_k210_defconfig
--- linux-6.2.0/arch/riscv/configs/nommu_k210_defconfig	2023-02-19 15:24:22.000000000 -0700
+++ devel-6.2.0/arch/riscv/configs/nommu_k210_defconfig	2023-02-20 21:40:01.349181760 -0700
@@ -1,6 +1,5 @@
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_LOG_BUF_SHIFT=13
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_GZIP is not set
 # CONFIG_RD_BZIP2 is not set
diff -aNpRruz -X /etc/diff.excludes linux-6.2.0/arch/riscv/configs/nommu_k210_sdcard_defconfig devel-6.2.0/arch/riscv/configs/nommu_k210_sdcard_defconfig
--- linux-6.2.0/arch/riscv/configs/nommu_k210_sdcard_defconfig	2023-02-19 15:24:22.000000000 -0700
+++ devel-6.2.0/arch/riscv/configs/nommu_k210_sdcard_defconfig	2023-02-20 21:39:46.721238871 -0700
@@ -1,6 +1,5 @@
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_LOG_BUF_SHIFT=13
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SYSFS_SYSCALL is not set
 # CONFIG_FHANDLE is not set
diff -aNpRruz -X /etc/diff.excludes linux-6.2.0/arch/riscv/configs/nommu_virt_defconfig devel-6.2.0/arch/riscv/configs/nommu_virt_defconfig
--- linux-6.2.0/arch/riscv/configs/nommu_virt_defconfig	2023-02-19 15:24:22.000000000 -0700
+++ devel-6.2.0/arch/riscv/configs/nommu_virt_defconfig	2023-02-20 21:39:55.329205262 -0700
@@ -1,6 +1,5 @@
 # CONFIG_CPU_ISOLATION is not set
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
diff -aNpRruz -X /etc/diff.excludes linux-6.2.0/init/Kconfig devel-6.2.0/init/Kconfig
--- linux-6.2.0/init/Kconfig	2023-02-19 15:24:22.000000000 -0700
+++ devel-6.2.0/init/Kconfig	2023-02-20 21:40:23.329095967 -0700
@@ -769,30 +769,6 @@ config LOG_CPU_MAX_BUF_SHIFT
 		     13 =>   8 KB for each CPU
 		     12 =>   4 KB for each CPU

-config PRINTK_SAFE_LOG_BUF_SHIFT
-	int "Temporary per-CPU printk log buffer size (12 => 4KB, 13 => 8KB)"
-	range 10 21
-	default 13
-	depends on PRINTK
-	help
-	  Select the size of an alternate printk per-CPU buffer where messages
-	  printed from unsafe contexts are temporary stored. One example would
-	  be NMI messages, another one - printk recursion. The messages are
-	  copied to the main log buffer in a safe context to avoid a deadlock.
-	  The value defines the size as a power of 2.
-
-	  Those messages are rare and limited. The largest one is when
-	  a backtrace is printed. It usually fits into 4KB. Select
-	  8KB if you want to be on the safe side.
-
-	  Examples:
-		     17 => 128 KB for each CPU
-		     16 =>  64 KB for each CPU
-		     15 =>  32 KB for each CPU
-		     14 =>  16 KB for each CPU
-		     13 =>   8 KB for each CPU
-		     12 =>   4 KB for each CPU
-
 config PRINTK_INDEX
 	bool "Printk indexing debugfs interface"
 	depends on PRINTK && DEBUG_FS
---1463807856-701356714-1676956233=:15533--