2023-02-21 05:12:12

by Marc Aurèle La France

[permalink] [raw]
Subject: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

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 <[email protected]>

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


2023-02-21 08:36:56

by John Ogness

[permalink] [raw]
Subject: Re: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

(Added the rest of the printk team CC.)

On 2023-02-20, Marc Aurèle La France <[email protected]> wrote:
> 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 <[email protected]>

Reviewed-by: John Ogness <[email protected]>

> 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

Thanks!

John Ogness

2023-02-21 08:42:47

by Sergey Senozhatsky

[permalink] [raw]
Subject: Re: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

On (23/02/21 09:39), John Ogness wrote:
> (Added the rest of the printk team CC.)
>
> On 2023-02-20, Marc Aur?le La France <[email protected]> wrote:
> > 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 <[email protected]>
>
> Reviewed-by: John Ogness <[email protected]>

Reviewed-by: Sergey Senozhatsky <[email protected]>

2023-02-21 15:08:45

by Petr Mladek

[permalink] [raw]
Subject: Re: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

On Mon 2023-02-20 22:10:32, Marc Aur?le La France wrote:
> 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.

Great catch!

Reviewed-by: Petr Mladek <[email protected]>

I have already sent pull request with printk changes for 6.3.
I am going to queue this patch either for 6.3-rc or 6.4.

Best Regards,
Petr

2023-03-27 11:31:32

by Petr Mladek

[permalink] [raw]
Subject: Re: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

On Tue 2023-02-21 16:08:37, Petr Mladek wrote:
> On Mon 2023-02-20 22:10:32, Marc Aur?le La France wrote:
> > 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.
>
> Great catch!
>
> Reviewed-by: Petr Mladek <[email protected]>
>
> I have already sent pull request with printk changes for 6.3.
> I am going to queue this patch either for 6.3-rc or 6.4.

JFYI, the patch has been committed into printk/linux.git,
branch for-6.4.

Best Regards,
Petr

2023-03-27 13:22:31

by Marc Aurèle La France

[permalink] [raw]
Subject: Re: [PATCH] Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT

On Mon, 27 Mar 2023, Petr Mladek wrote:
> On Tue 2023-02-21 16:08:37, Petr Mladek wrote:
>> On Mon 2023-02-20 22:10:32, Marc Aurèle La France wrote:
>>> 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.

>> Great catch!
>> Reviewed-by: Petr Mladek <[email protected]>

>> I have already sent pull request with printk changes for 6.3.
>> I am going to queue this patch either for 6.3-rc or 6.4.

> JFYI, the patch has been committed into printk/linux.git,
> branch for-6.4.

Thanks and have a great day.

Marc.