From patchwork Tue May 18 09:06:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12264245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E662C433B4 for ; Tue, 18 May 2021 09:08:12 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E7A16108D for ; Tue, 18 May 2021 09:08:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E7A16108D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vs+Yh1aq2QkIEuYeYYuKKx2R5/pDLmOe9MCxJRpJ3cM=; b=Elh3xFAtbmtxQKINWe5Xo/nlF GjpqgUM6TRbq1Mwfrs02XlzIvd+feMsjnlggeq3exQLb5DGnMofhz+9NlWlYEen0lupzWnndv1dT+ Koc9NozBFxqOMAMZucmJ0z7WjYC91V0OXoypOljukmqt2ZHRj/7RJOme2QSgat5wb4rH8FLpG4GIl 140juGkRxiPTJi/ujytZDt0Jifz4wZ6sCToYgMjm6vFKxFvUJnCuaUTeA/e8m1V6YB7rfKaPjm5UW ECAUg0f8rNN/kZTiWJXHhRqMKYOdQezT+xfwKsXJXEIo4Np7kQVeA7DBdXHdGDHO9XLP7yeXbf47F Pcmx+WG3A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1livgf-0002Tc-23; Tue, 18 May 2021 09:06:49 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1livgL-0002PX-Ja for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:06:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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; bh=6B4X+w0gstcYRgmA/S9+I4BaeY2ESvlDWN9mSom1Hqo=; b=s671xEvpCFk+Wb3JHMlRhQ9iqw Fjmxvv6GRZT5IfGkvdguZs9i5mX/0uC/tP2LghKPJ0LNx9NJuvxkxM0R0gtuqatuv023iyz3ASDVX DfbopYSEjBd+TzgNW4FmuHwC4Q0YxkfesxlLw7XSlu/5CPW4KARzG/7+DJ/j9NAKcPhRpWeztagVa Nd24QjIJEQCF74URGMKbyJhTbLde8VnxXiav0t55we0U3/yPn632JJGIoIhOTnjKsqbMHJMAyJ3J/ Wpg8ypG5BdOMHZYNGAcd71v55TdTAiwfEzZ0umfvzJPtKGfHmVlsjCFvOxNJxkVm87SxrdL6c+iEL 07UY3+9Q==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1livgJ-00EUQa-4U for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:06:28 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 34AC86108D; Tue, 18 May 2021 09:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621328786; bh=8S/jBfuQqPw5Y9SjeyOmElG9wuJ/AnCGL+Y38mTgWSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GiPSzD3EHlwQp2twmDYDpgwIJ+zYdl24Jne4bvdQbA/dO2SFfZoDD0RBu/OB1oFBM Gnzin6LGBxpmo/uJqT0ZQtLQReJHKqBVUUfi/dCG8iL5c/miJdVGl7ZtN2BaswRMfM dwJsiZvxb3ObGV60edfQNhVqmbHcZ0GLl5gmqUja1gSsVkCalkXG1yeKLSGeDQWt33 +YRwhxPRnSYIFoviTH0GkegVHUEAxDVqo3siMMTcm84PHk3AYo8BbvCuIi1v08B2Jj plXqKlFXodC8Z54ua1hfiYSBgglKyKY7yd5B2gBNZfsLbz1YH3LGwFwP3R+x2ZXFXM nFXFz2y5tzF3Q== From: Mike Rapoport To: linux-arm-kernel@lists.infradead.org Cc: Andrew Morton , Kefeng Wang , Mike Rapoport , Mike Rapoport , Russell King , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/3] memblock: align freed memory map on pageblock boundaries with SPARSEMEM Date: Tue, 18 May 2021 12:06:12 +0300 Message-Id: <20210518090613.21519-3-rppt@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210518090613.21519-1-rppt@kernel.org> References: <20210518090613.21519-1-rppt@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_020627_214880_48AFC45A X-CRM114-Status: GOOD ( 13.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mike Rapoport When CONFIG_SPARSEMEM=y the ranges of the memory map that are freed are not aligned to the pageblock boundaries which breaks assumptions about homogeneity of the memory map throughout core mm code. Make sure that the freed memory map is always aligned on pageblock boundaries regardless of the memory model selection. Signed-off-by: Mike Rapoport --- mm/memblock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 97fa87541b5f..2e25d69739e0 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1941,14 +1941,13 @@ static void __init free_unused_memmap(void) * due to SPARSEMEM sections which aren't present. */ start = min(start, ALIGN(prev_end, PAGES_PER_SECTION)); -#else +#endif /* * Align down here since many operations in VM subsystem * presume that there are no holes in the memory map inside * a pageblock */ start = round_down(start, pageblock_nr_pages); -#endif /* * If we had a previous bank, and there is a space @@ -1966,8 +1965,10 @@ static void __init free_unused_memmap(void) } #ifdef CONFIG_SPARSEMEM - if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) + if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) { + prev_end = ALIGN(end, pageblock_nr_pages); free_memmap(prev_end, ALIGN(prev_end, PAGES_PER_SECTION)); + } #endif }