From patchwork Wed Feb 13 17:46:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10810541 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 2E7FB6C2 for ; Wed, 13 Feb 2019 17:46:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 192B42DA6F for ; Wed, 13 Feb 2019 17:46:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CFCA2E144; Wed, 13 Feb 2019 17:46:56 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63E412DA44 for ; Wed, 13 Feb 2019 17:46:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 856B38E0008; Wed, 13 Feb 2019 12:46:52 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 806C18E0002; Wed, 13 Feb 2019 12:46:52 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CBC18E0008; Wed, 13 Feb 2019 12:46:52 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 328378E0002 for ; Wed, 13 Feb 2019 12:46:52 -0500 (EST) Received: by mail-pf1-f199.google.com with SMTP id x134so2409384pfd.18 for ; Wed, 13 Feb 2019 09:46:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xvt6WU53rbr8sNdP0Yb1NGTBLO4wbx68oDDxR14icuI=; b=df4RYMb0t9eBV555+yuwj1J14MVL74tCPMUQKzQGbStkCU8Wn3QB5JzPvX8Ydi9ufH HfetdgWlLCaDt45dH4l+QEGdkIKGe6FmyCGU9a8WQjB0TidLsWPpvM943hFKF0C2ZPAT 4IgaoI2k8KglEV4jAO0w4+SLnZ8bmmF97/mo/DjVwmlqTe6e+XND0HzoudSNdpIZnTTg u8t4dJsAwrE2TqI3IAK+K5eWW21N5RcsCYlmJmqPJD8cz5VNxpDxKhPj2Ywegw8tewXu R6eVXWsBq5saJi5jKCMZx//Yu0WdlxPyyeVUwXOJDrKYNrgjAfBd8sv+4yrL86cH6yWD TUxg== X-Gm-Message-State: AHQUAubkrEPy9MztN7kXaFyi8Ue9Md/yCRpkpxb5fSIEcjbOkC3/pptN 5rM2v/VQhWnvoVXAv3BOCxgs715NCaz6Sp2EQv/ccw0qWMMg97Y6bSrb3S59+u0/cWpfGb5ssgZ LHZOZY00K/9x1aihfDb4ufYAULTd0qLT0VRtIaKDpNKWgmXifDxUk/0b9WUZlTZY= X-Received: by 2002:a17:902:b190:: with SMTP id s16mr1664647plr.262.1550080011839; Wed, 13 Feb 2019 09:46:51 -0800 (PST) X-Google-Smtp-Source: AHgI3IYKy1CAKNZfI8jcTT4yG8P0HRKRwPkOH304uiY0fyRJ5Bxh3cgm2brg+XRWYcoJ/FVgtjp5 X-Received: by 2002:a17:902:b190:: with SMTP id s16mr1664591plr.262.1550080010958; Wed, 13 Feb 2019 09:46:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550080010; cv=none; d=google.com; s=arc-20160816; b=xvUS2CnH1GBB6FSWgQwC1HQ2sXpkiHBifIeG99SwuHL14hQ+jduqEKCQ4YWpv+xVWZ 8uRqGGS9wkrTpq6sMrhJQE/vIbYyVSm5UhyU7FvIpMcsZVy0hacf2zxooFL7viQ6QpNE MCBDLJPyjsIGuygtTKoepQ67PXHau5Bg3VjERsE+E4FkWR5tZKQkB37r7s2Dg/HN5Mpz FVU3AFGPiJh48I4ajInyQDwsysZmHTlSeYLUa443GvUKDG6UVwZ2JvrjP6GpPXoIEzcy 3we4g3lS04eVICeVGdOT+s4daxlan4amopydveHBvt1YQ1Qi21p/NI9E8ZkOoIg4YLdm J+Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xvt6WU53rbr8sNdP0Yb1NGTBLO4wbx68oDDxR14icuI=; b=lT62k5rz3EXiQIyB2kg8tcvnGUuSOAsgwnpSc6VYvlZTrwWxHzIoyC/LgDPnUY+xwv T7q+utz1fTDiMtnEMUj6JgqHPAhfc/HOxl5WfJHe6IGkURCvDExZuzOaHkDWguB2mTPg UWFbB/pnoJp/4sft01/PCDpmyaBcpE0YR3FBb69GBxqkAd6wa7KqQHXN5EyQKKyrY/8W uqiiuG5TfFfi2KtphQ06a7lMJqPlDW+bfISm+QOkudHtV+KQRd8bSSXyTIZPMyeUqak/ m25Hk3f185OPbmAeciQuq0uj40Htl7KMblaexJ/G9wOrpC7ScxQzfv9t+9Kyy2V2ET9+ 5bXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=S9a+FpHz; spf=pass (google.com: best guess record for domain of batv+b68490c3fe13e616ccfb+5652+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+b68490c3fe13e616ccfb+5652+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id c24si3268134pgj.60.2019.02.13.09.46.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Feb 2019 09:46:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of batv+b68490c3fe13e616ccfb+5652+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=S9a+FpHz; spf=pass (google.com: best guess record for domain of batv+b68490c3fe13e616ccfb+5652+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+b68490c3fe13e616ccfb+5652+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xvt6WU53rbr8sNdP0Yb1NGTBLO4wbx68oDDxR14icuI=; b=S9a+FpHz9N7pHPMLFcQrjIrVde 2FSeyLwLkJxfNzZOyzDImwRp8/FeSFdTaCC4uWFz2EhvuPdsxDfnLPBBsUB1oVKhZsWUfvReA0hU6 LlgoGq1VPbK11Sm/6h/uNQYtWK0yQmfSWxJgO5JRr8o6nshpRcrygSLUptwIxd8QyIn//z6RwO0jg ki0yErJygvCwZVIgZwc6kdA3PCjYqf1oUFOZK9h0XgKcHI0YaLXRjnVkG2H9PnK6V0gB+aiGwDAqX U8T/OyCycuiG1IabDteq9CsVkZdw97Ntn/VMTw+fowZHqF2QN35VcHI2G8wmvdKox5GosMv5A3LSG N8TqdOpQ==; Received: from 089144210182.atnat0019.highway.a1.net ([89.144.210.182] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtycG-0006nL-7m; Wed, 13 Feb 2019 17:46:36 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Alexander Viro , Russell King , Catalin Marinas , Will Deacon , Guan Xuetao , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/8] initramfs: move the legacy keepinitrd parameter to core code Date: Wed, 13 Feb 2019 18:46:19 +0100 Message-Id: <20190213174621.29297-7-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213174621.29297-1-hch@lst.de> References: <20190213174621.29297-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP No need to handle the freeing disable in arch code when we already have a core hook (and a different name for the option) for it. Signed-off-by: Christoph Hellwig Acked-by: Catalin Marinas --- arch/Kconfig | 7 +++++++ arch/arm/Kconfig | 1 + arch/arm/mm/init.c | 25 ++++++------------------- arch/arm64/Kconfig | 1 + arch/arm64/mm/init.c | 17 ++--------------- arch/unicore32/Kconfig | 1 + arch/unicore32/mm/init.c | 14 +------------- init/initramfs.c | 9 +++++++++ 8 files changed, 28 insertions(+), 47 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 4cfb6de48f79..d2bf5db0805f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -245,6 +245,13 @@ config ARCH_HAS_FORTIFY_SOURCE An architecture should select this when it can successfully build and run with CONFIG_FORTIFY_SOURCE. +# +# Select if the arch provides a historic keepinit alias for the retain_initrd +# command line option +# +config ARCH_HAS_KEEPINITRD + bool + # Select if arch has all set_memory_ro/rw/x/nx() functions in asm/cacheflush.h config ARCH_HAS_SET_MEMORY bool diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 664e918e2624..4c99a29a8ec7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -8,6 +8,7 @@ config ARM select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_FORTIFY_SOURCE + select ARCH_HAS_KEEPINITRD select ARCH_HAS_KCOV select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_PTE_SPECIAL if ARM_LPAE diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 478ea8b7db87..d0ccbfab94db 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -752,27 +752,14 @@ void free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD - -static int keep_initrd; - void free_initrd_mem(unsigned long start, unsigned long end) { - if (!keep_initrd) { - if (start == initrd_start) - start = round_down(start, PAGE_SIZE); - if (end == initrd_end) - end = round_up(end, PAGE_SIZE); + if (start == initrd_start) + start = round_down(start, PAGE_SIZE); + if (end == initrd_end) + end = round_up(end, PAGE_SIZE); - poison_init_mem((void *)start, PAGE_ALIGN(end) - start); - free_reserved_area((void *)start, (void *)end, -1, "initrd"); - } + poison_init_mem((void *)start, PAGE_ALIGN(end) - start); + free_reserved_area((void *)start, (void *)end, -1, "initrd"); } - -static int __init keepinitrd_setup(char *__unused) -{ - keep_initrd = 1; - return 1; -} - -__setup("keepinitrd", keepinitrd_setup); #endif diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a4168d366127..74c89b628afd 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -19,6 +19,7 @@ config ARM64 select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA + select ARCH_HAS_KEEPINITRD select ARCH_HAS_KCOV select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_PTE_SPECIAL diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 7205a9085b4d..019c790d8d56 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -622,24 +622,11 @@ void free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD - -static int keep_initrd __initdata; - void __init free_initrd_mem(unsigned long start, unsigned long end) { - if (!keep_initrd) { - free_reserved_area((void *)start, (void *)end, 0, "initrd"); - memblock_free(__virt_to_phys(start), end - start); - } -} - -static int __init keepinitrd_setup(char *__unused) -{ - keep_initrd = 1; - return 1; + free_reserved_area((void *)start, (void *)end, 0, "initrd"); + memblock_free(__virt_to_phys(start), end - start); } - -__setup("keepinitrd", keepinitrd_setup); #endif /* diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index c3a41bfe161b..b924c11e3ff9 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -2,6 +2,7 @@ config UNICORE32 def_bool y select ARCH_HAS_DEVMEM_IS_ALLOWED + select ARCH_HAS_KEEPINITRD select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select HAVE_GENERIC_DMA_COHERENT diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c index 85ef2c624090..e3f4f791e10a 100644 --- a/arch/unicore32/mm/init.c +++ b/arch/unicore32/mm/init.c @@ -318,20 +318,8 @@ void free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD - -static int keep_initrd; - void free_initrd_mem(unsigned long start, unsigned long end) { - if (!keep_initrd) - free_reserved_area((void *)start, (void *)end, -1, "initrd"); -} - -static int __init keepinitrd_setup(char *__unused) -{ - keep_initrd = 1; - return 1; + free_reserved_area((void *)start, (void *)end, -1, "initrd"); } - -__setup("keepinitrd", keepinitrd_setup); #endif diff --git a/init/initramfs.c b/init/initramfs.c index c55e08f72fad..cf8bf014873f 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -513,6 +513,15 @@ static int __init retain_initrd_param(char *str) } __setup("retain_initrd", retain_initrd_param); +#ifdef CONFIG_ARCH_HAS_KEEPINITRD +static int __init keepinitrd_setup(char *__unused) +{ + do_retain_initrd = 1; + return 1; +} +__setup("keepinitrd", keepinitrd_setup); +#endif + extern char __initramfs_start[]; extern unsigned long __initramfs_size; #include