[Devel] [PATCH RHEL9 COMMIT] Revert "kdump: port support for crashkernel=auto from RH8"

Konstantin Khorenko khorenko at virtuozzo.com
Wed Feb 9 12:26:10 MSK 2022


The commit is pushed to "branch-rh9-5.14.0-4.vz9.12.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-4.vz9.12.6
------>
commit 2a0c3911333c294a4f3de66bde4b3541b09cc979
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Wed Feb 9 12:24:32 2022 +0300

    Revert "kdump: port support for crashkernel=auto from RH8"
    
    This reverts commit 1183a796a06a64f5f957459fcccfe07a5f5bb451.
    
    It's time to drop kernel "crashkernel=auto" boot option,
    now "crashkernel=..." is configured in userspace.
    
    https://jira.sw.ru/browse/PSBM-135130
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 kernel/crash_core.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index d242c207862a..eb53f5ec62c9 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -251,30 +251,6 @@ static int __init __parse_crashkernel(char *cmdline,
 	if (suffix)
 		return parse_crashkernel_suffix(ck_cmdline, crash_size,
 				suffix);
-
-	if (strncmp(ck_cmdline, "auto", 4) == 0) {
-#if defined(CONFIG_X86_64) || defined(CONFIG_S390)
-#ifndef CONFIG_KASAN
-		ck_cmdline = "1G-4G:192M,4G-64G:256M,64G-:512M";
-#else
-		ck_cmdline = "1G-1T:320M,1T-:512M";
-#endif
-#elif defined(CONFIG_ARM64)
-		ck_cmdline = "2G-:448M";
-#elif defined(CONFIG_PPC64)
-		char *fadump_cmdline;
-
-		fadump_cmdline = get_last_crashkernel(cmdline, "fadump=", NULL);
-		fadump_cmdline = fadump_cmdline ?
-				fadump_cmdline + strlen("fadump=") : NULL;
-		if (!fadump_cmdline || (strncmp(fadump_cmdline, "off", 3) == 0))
-			ck_cmdline = "2G-4G:384M,4G-16G:512M,16G-64G:1G,64G-128G:2G,128G-:4G";
-		else
-			ck_cmdline = "4G-16G:768M,16G-64G:1G,64G-128G:2G,128G-1T:4G,1T-2T:6G,2T-4T:12G,4T-8T:20G,8T-16T:36G,16T-32T:64G,32T-64T:128G,64T-:180G";
-#endif
-		pr_info("Using crashkernel=auto, the size chosen is a best effort estimation.\n");
-	}
-
 	/*
 	 * if the commandline contains a ':', then that's the extended
 	 * syntax -- if not, it must be the classic syntax


More information about the Devel mailing list