From patchwork Fri Apr 19 07:58:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 10909629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CAAEF1515 for ; Fri, 19 Apr 2019 19:14:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B83312884F for ; Fri, 19 Apr 2019 19:14:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB24428985; Fri, 19 Apr 2019 19:14:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C6EC28DFD for ; Fri, 19 Apr 2019 19:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729912AbfDSTOc (ORCPT ); Fri, 19 Apr 2019 15:14:32 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:45591 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727072AbfDSTOZ (ORCPT ); Fri, 19 Apr 2019 15:14:25 -0400 Received: by mail-pf1-f193.google.com with SMTP id e24so2910151pfi.12; Fri, 19 Apr 2019 12:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CXshfHJtKJBB6RqEy0dCa+LvOEJLdnOQQ3VtYxqDG/Q=; b=m+1qD9inpy98UNWdyPrH41Vv6SnLyKdbHpGjQgNBywjaLXYrYFWY8JWoha9TI702ey 9KjrGLavWbVU+nW5V4lfoP/5GloKcxZbQCwWKvJdYQhAUZMyzt2pDleT8WKN2W9N+SJj E3ZkBJr3oFTYkHSXhYFFTvnPOz+Wvy5Gf8C9CxRiGEZMH4JzfjXuGMuNedYBzk0hanop /6XgNVoaAKuy3QOpKOljbI6/wFH5CH8zRjZeHdG2GzIk4m35hNafeoDowTFh6PXvHnEl UpPJ8kGZGazdqef+w5z4Oq7Lw/6V88tF0pf+o1tJYhXf7ZJnJu2UINO8JId9gLLtCSQv P8oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CXshfHJtKJBB6RqEy0dCa+LvOEJLdnOQQ3VtYxqDG/Q=; b=htBA9ZufXMejRzAcmj41xNwVq+QxlgqP+ltV7LrjDeFqN2SwvLrdfas0Lygj2Pvw3C rER9U+siTRpf+ysPVezXxYTmTFdUoVS5aeSZZvCCEnuGzvN5tcXGrzp5o0e/n3t/puWw W0N4JhBuJ0YpODeyiJYlHaE8Fha4E+qS7hDghPIErI5/hI5zT4ECRQP0ey2EclRhVMcT S71xta4i/Bh5lbyhkWbLwXcWiIVJkD14EGWXW5EmAFYNGBlRp8Zi81OMbPKx0FnuWxAg Jfy445+o+zJBLC40o+byK6mcLBpQu6LWrTu3HlyfwcxOI1RyPXd07n2vXIRIk1vNv4US Cx0Q== X-Gm-Message-State: APjAAAVJqgAVkYBTmI27yleXqCQu1RMGsNFXlHWhiqTe2GOt77nIOpqu qohA9cY/DJaytWpycZWx6EYqvSnby1GsZNI= X-Google-Smtp-Source: APXvYqxFW63Fu4eIqRYM7gy4ONzAzxxoT/2sTzVYmEUMdFtfIrWJPhW/PY6EH1932JyZE7+yaVfzaw== X-Received: by 2002:aa7:8b08:: with SMTP id f8mr2551028pfd.146.1555660795554; Fri, 19 Apr 2019 00:59:55 -0700 (PDT) Received: from mylaptop.redhat.com ([2408:8207:782a:91d0:d21b:f3c4:1cf5:d5f7]) by smtp.gmail.com with ESMTPSA id u8sm2250574pgc.10.2019.04.19.00.59.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 00:59:54 -0700 (PDT) From: Pingfan Liu To: linux-kernel@vger.kernel.org Cc: Pingfan Liu , Russell King , Catalin Marinas , Will Deacon , Tony Luck , Fenghua Yu , Ralf Baechle , Paul Burton , James Hogan , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Martin Schwidefsky , Heiko Carstens , Yoshinori Sato , Rich Felker , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Andrew Morton , Julien Thierry , Palmer Dabbelt , Ard Biesheuvel , Florian Fainelli , Logan Gunthorpe , Robin Murphy , Greg Hackmann , Stefan Agner , Johannes Weiner , David Hildenbrand , Jens Axboe , Thomas Bogendoerfer , Greg Kroah-Hartman , Hari Bathini , Ananth N Mavinakayanahalli , Yangtao Li , Dave Young , Baoquan He , x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH] kernel/crash: make parse_crashkernel()'s return value more indicant Date: Fri, 19 Apr 2019 15:58:37 +0800 Message-Id: <1555660717-18731-1-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP At present, both return and crash_size should be checked to guarantee the success of parse_crashkernel(). Simplify the way by returning negative if fail, positive if success. In case of failure, -EINVAL for bad syntax, -1 for the parsing results in crash_size=0. Signed-off-by: Pingfan Liu Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Tony Luck Cc: Fenghua Yu Cc: Ralf Baechle Cc: Paul Burton Cc: James Hogan Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Yoshinori Sato Cc: Rich Felker Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: Andrew Morton Cc: Julien Thierry Cc: Palmer Dabbelt Cc: Ard Biesheuvel Cc: Florian Fainelli Cc: Logan Gunthorpe Cc: Robin Murphy Cc: Greg Hackmann Cc: Stefan Agner Cc: Johannes Weiner Cc: David Hildenbrand Cc: Jens Axboe Cc: Thomas Bogendoerfer Cc: Greg Kroah-Hartman Cc: Hari Bathini Cc: Ananth N Mavinakayanahalli Cc: Yangtao Li Cc: Dave Young Cc: Baoquan He Cc: x86@kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-ia64@vger.kernel.org Cc: linux-mips@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-s390@vger.kernel.org Cc: linux-sh@vger.kernel.org --- arch/arm/kernel/setup.c | 2 +- arch/arm64/mm/init.c | 2 +- arch/ia64/kernel/setup.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/kernel/machine_kexec.c | 2 +- arch/s390/kernel/setup.c | 2 +- arch/sh/kernel/machine_kexec.c | 2 +- arch/x86/kernel/setup.c | 4 ++-- kernel/crash_core.c | 12 ++++++++++-- 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 5d78b6a..2feab13 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -997,7 +997,7 @@ static void __init reserve_crashkernel(void) total_mem = get_total_mem(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base); - if (ret) + if (ret < 0) return; if (crash_base <= 0) { diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 6bc1350..240918c 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -79,7 +79,7 @@ static void __init reserve_crashkernel(void) ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base); /* no crashkernel= or invalid value specified */ - if (ret || !crash_size) + if (ret < 0) return; crash_size = PAGE_ALIGN(crash_size); diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 583a374..99cae33 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -277,7 +277,7 @@ static void __init setup_crashkernel(unsigned long total, int *n) ret = parse_crashkernel(boot_command_line, total, &size, &base); - if (ret == 0 && size > 0) { + if (ret >= 0) { if (!base) { sort_regions(rsvd_region, *n); *n = merge_regions(rsvd_region, *n); diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8d1dc6c..168571b 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -715,7 +715,7 @@ static void __init mips_parse_crashkernel(void) total_mem = get_total_mem(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base); - if (ret != 0 || crash_size <= 0) + if (ret < 0) return; if (!memory_region_available(crash_base, crash_size)) { diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index 45a8d0b..0b626e2 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -376,7 +376,7 @@ static inline unsigned long fadump_calculate_reserve_size(void) */ ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &size, &base); - if (ret == 0 && size > 0) { + if (ret >= 0) { unsigned long max_size; if (fw_dump.reserve_bootvar) diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index 63f5a93..9f3e61a 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c @@ -122,7 +122,7 @@ void __init reserve_crashkernel(void) /* use common parsing */ ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base); - if (ret == 0 && crash_size > 0) { + if (ret >= 0) { crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; } diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 2c642af..d4bd61b 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -671,7 +671,7 @@ static void __init reserve_crashkernel(void) crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN); crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN); - if (rc || crash_size == 0) + if (rc < 0) return; if (memblock.memory.regions[0].size < crash_size) { diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c index 63d63a3..612b21e 100644 --- a/arch/sh/kernel/machine_kexec.c +++ b/arch/sh/kernel/machine_kexec.c @@ -157,7 +157,7 @@ void __init reserve_crashkernel(void) ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base); - if (ret == 0 && crash_size > 0) { + if (ret >= 0) { crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; } diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3d872a5..62d07d4 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -526,11 +526,11 @@ static void __init reserve_crashkernel(void) /* crashkernel=XM */ ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base); - if (ret != 0 || crash_size <= 0) { + if (ret == -EINVAL) { /* crashkernel=X,high */ ret = parse_crashkernel_high(boot_command_line, total_mem, &crash_size, &crash_base); - if (ret != 0 || crash_size <= 0) + if (ret < 0) return; high = true; } diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 093c9f9..563d86d 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -87,7 +87,7 @@ static int __init parse_crashkernel_mem(char *cmdline, cur = tmp; if (size >= system_ram) { pr_warn("crashkernel: invalid size\n"); - return -EINVAL; + return -1; } /* match ? */ @@ -108,8 +108,10 @@ static int __init parse_crashkernel_mem(char *cmdline, return -EINVAL; } } - } else + } else { pr_info("crashkernel size resulted in zero bytes\n"); + return -1; + } return 0; } @@ -139,6 +141,8 @@ static int __init parse_crashkernel_simple(char *cmdline, pr_warn("crashkernel: unrecognized char: %c\n", *cur); return -EINVAL; } + if (*crash_size == 0) + return -1; return 0; } @@ -181,6 +185,8 @@ static int __init parse_crashkernel_suffix(char *cmdline, pr_warn("crashkernel: unrecognized char: %c\n", *cur); return -EINVAL; } + if (*crash_size == 0) + return -1; return 0; } @@ -266,6 +272,8 @@ static int __init __parse_crashkernel(char *cmdline, /* * That function is the entry point for command line parsing and should be * called from the arch-specific code. + * On success 0 or 1 if @offset is given. On error -EINVAL if bad syntax, + * or -1 if the parsing results in crash_size=0. */ int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,