From patchwork Thu Aug 2 11:53:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10553525 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 358B0174A for ; Thu, 2 Aug 2018 11:56:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 229E72BD0E for ; Thu, 2 Aug 2018 11:56:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16C9F2BD10; Thu, 2 Aug 2018 11:56:24 +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.9 required=2.0 tests=BAYES_00,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 997832BD0E for ; Thu, 2 Aug 2018 11:56:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B39646B026D; Thu, 2 Aug 2018 07:56:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AE94D6B026E; Thu, 2 Aug 2018 07:56:22 -0400 (EDT) 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 98C626B026F; Thu, 2 Aug 2018 07:56:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by kanga.kvack.org (Postfix) with ESMTP id 686796B026D for ; Thu, 2 Aug 2018 07:56:22 -0400 (EDT) Received: by mail-oi0-f72.google.com with SMTP id w185-v6so1653016oig.19 for ; Thu, 02 Aug 2018 04:56:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=8Q/DTBXfiqQFx1JkU/h8bYjJ9ccm6XR5dsQ+GZ5JJeA=; b=plBRaIHavXsll1AA0uUOySyE4qIYz5OPvQ02YtI9RccVXeDHOKICXuSJhSjcpsgPXo vBAPii1Z74x/AmACEwkEx4KPauBEI6GyMZPyvTnNA7L7gOBmiag6adiNU8OECQMutNsl FfcVJgQxE/j5mcY6m82TIrj8LBOEP2qihpT2SpWcR+gznPiGA7ANVXiXwmZLyjAoX/Yu xAtmXN2c38iZplBHK+gOvSYYInEn0AZMbneTTpFOvaL5eA8Nvx++UInsQPbvkxltEnnz pNbeHcYpqM8H3r781sGyC1+xC3WXtgqN9+VcSvXsRbTMnPOO/DDqxxDHTa9UaRPUg8ZM KBhw== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AOUpUlH/WwwKziDCCMm7wo1KL7qSvQHyLdiH7kvXgooFBwkMo/zmsIcH 0f3JJZ3yYLL0+AZYYBFiy7a4KPQGLiXk6s6w0JTag/v5TvEhBh6TikB3NI4nOLPfcEmz+bphMh+ 4fgr65yQLp2kzBVuGZvbIMIx+J9iGmVEj61Vwx+WHo0atL+oPbESM/iCvkay+6qw= X-Received: by 2002:aca:ce85:: with SMTP id e127-v6mr1068486oig.169.1533210982224; Thu, 02 Aug 2018 04:56:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe76TRA9c0Aua4BNpzSQIiDbplWqTmhg/FMffNaaszQyKQ0Vj7u3MRE88KHKU8dmJRCV2bM X-Received: by 2002:aca:ce85:: with SMTP id e127-v6mr1068430oig.169.1533210981391; Thu, 02 Aug 2018 04:56:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533210981; cv=none; d=google.com; s=arc-20160816; b=egcPokXlUp8qco4H+I2KA8spDwcWA9ZASRu3NxkIMLVSBLAAFYMJf/XTbYWo5H8V8J fegCx1BPyAl1JDj+Gx0HnzSoQEYtYT0vjd/MNmGlzzhjMSIDpN5drkm3VBKE0BAO9+IB KzC3v9N+gde6Uwz/GPTgR1zHYVrsjrxDfda5kuX21/QUFyGygkeSjIaecLRhbJRj1lKt KbD8CzS3+m0g//h52NICjoyw0K4gC2xcnwGSPmQwtcWKxiGzlmdCDvyJYUNXI5+OW3uu TLq9l/+3uESv8eVJdfGBoRtJJQCKbp6JLvOdijNQ2KY1VGqhO1Oyl455K3oXQX44lA7w +smg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=8Q/DTBXfiqQFx1JkU/h8bYjJ9ccm6XR5dsQ+GZ5JJeA=; b=J1qFzU4uDG7XftvsV59UMo+jZ1lieqgiMfrIeh36sgTQNwgMGKW+oyeApVY0d1cRGo UvFxfVM3VAATsqTYh/7bJJfQbWzHwvmt3z46CL5xPZaMaI2BxZ6Zb2i1Wq683+7c+rkX tBetw/x4DsolM9Rqo+n+cW6umHZn40M7m6TVLtao4Ga+VffSWHV8j73RViWC+FPbqLuj 5/rFMRXjgVuqEhLqLXGsnNouWOXoD4SO1bdzDo0SB0BQmd6XSp79rjeKrrBMRZOIBdIZ AGvZu/JmxYwcIE7/nB779nUDwx34n7802W3cz3OaElzNH1LLa5R1btgnlX9oMzMqTWLr 3yzg== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id c134-v6si1048834oig.261.2018.08.02.04.56.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Aug 2018 04:56:21 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w72Bu0QD137890 for ; Thu, 2 Aug 2018 07:56:20 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kky4qe8j0-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 02 Aug 2018 07:56:13 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 2 Aug 2018 12:54:07 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 2 Aug 2018 12:54:04 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w72Bs32U28639266 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 2 Aug 2018 11:54:03 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5E74C42042; Thu, 2 Aug 2018 14:54:14 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 88E4B4204B; Thu, 2 Aug 2018 14:54:12 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.207.181]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Thu, 2 Aug 2018 14:54:12 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Thu, 02 Aug 2018 14:54:00 +0300 From: Mike Rapoport To: "David S. Miller" Cc: Sam Ravnborg , Michal Hocko , sparclinux@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH 2/2] sparc32: tidy up ramdisk memory reservation Date: Thu, 2 Aug 2018 14:53:53 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533210833-14748-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1533210833-14748-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18080211-0020-0000-0000-000002AFF0A7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080211-0021-0000-0000-000020FC1D25 Message-Id: <1533210833-14748-3-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-02_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=896 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1808020125 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 The detection and reservation of ramdisk memory were separated to allow bootmem bitmap initialization after the ramdisk boundaries are detected. Since the bootmem initialization is removed, the reservation of ramdisk memory can be done immediately after its boundaries are found. Signed-off-by: Mike Rapoport --- arch/sparc/mm/init_32.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 5117a5e..b5d8f90 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -161,6 +161,8 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) high_pages >> (20 - PAGE_SHIFT)); } + *pages_avail = (memblock_phys_mem_size() >> PAGE_SHIFT) - high_pages; + #ifdef CONFIG_BLK_DEV_INITRD /* * Now have to check initial ramdisk, so that it won't pass @@ -176,23 +178,17 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) "(0x%016lx > 0x%016lx)\ndisabling initrd\n", initrd_end, end_of_phys_memory); initrd_start = 0; + } else { + /* Reserve the initrd image area. */ + size = initrd_end - initrd_start; + memblock_reserve(initrd_start, size); + *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; + + initrd_start = (initrd_start - phys_base) + PAGE_OFFSET; + initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; } } #endif - - *pages_avail = (memblock_phys_mem_size() >> PAGE_SHIFT) - high_pages; - -#ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) { - /* Reserve the initrd image area. */ - size = initrd_end - initrd_start; - memblock_reserve(initrd_start, size); - *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; - - initrd_start = (initrd_start - phys_base) + PAGE_OFFSET; - initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; - } -#endif /* Reserve the kernel text/data/bss. */ size = (start_pfn << PAGE_SHIFT) - phys_base; memblock_reserve(phys_base, size);