From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.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,URIBL_BLOCKED autolearn=unavailable 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 00A24C433ED for ; Wed, 19 May 2021 13:27:34 +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 8673060E08 for ; Wed, 19 May 2021 13:27:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8673060E08 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jyCZ4DGZm4itXrGlW25qMK622mN4bU8Vb+HpAdVV1+Q=; b=KBjoGqwvtoNTANmK9fTV2ONM4 LxdYoRW1JLEibSkjn+AjeAdLq0K+GI/ZvPUSJslA5oXzrJHWHBoLngUd4zRGi8+gMt0CSDzUkoux0 D+/Ris3Per2E22X1yCVmS/bNQjFO0sGnHLL0fC+y3DGtN1BJILESS/mLs66JZCptoNbgRyTo6XXv8 9LefUBLZWcdzWkJ5jtYWZV75mx5CgS7M2wZVGT3GMkhtnK5aAZ4B9ZjDK6ZG2OJRpB9MgczZVTWXe avVySGegTmKvRcA7tUvdbev1rdnAXQyvb4UsIYoLl7+2qz4jgFIu2bgbAyG0WseS0FLn1E2b2Tqsd imIaEzGmw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljMCP-0048G5-4w; Wed, 19 May 2021 13:25:21 +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 1ljMCL-0048FV-Q1 for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 13:25:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=RoYoSAdtynGY/nMiSc7QoOzbdTFJ4xgX3KP3z8Q4Xsw=; b=Jtwq2T7bovVRZ+txkqE7XLP2g9 HaJXjlyCrj7pDtgGaBBcMSxcjS63tMLBwO3dbNL1MLFBjhqU7vIPHExy1XtWZgOrd/pph346c4e9l XLXmIOX+lzY1Wr9wmi5i7T1eiqfzHIq6mbMJSSN4qu0czBWm+niNlMO2tCkOtoBc5dSYZMnFQAc/e QFSaXGZACnpPZ6CvInvE8WwWrHtE+S6fZG2musbrtcSaJF7VlLlxYXMfQB8UTiLjprCpBcSZ07wAR K/rTKV21ZAvhtUxhsTEQqouCD9qPWBZhAkWssnculob6S3f7W+NlemFpr8PPEGmJSVpI243wV3XO4 Ok0uBT/w==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljMCI-00FV2q-Uj for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 13:25:16 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5269460FDA; Wed, 19 May 2021 13:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621430713; bh=EVzzh57rehbOK39R2k9GukpiN4HMiF1r3EbBJxvEg3Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=eamEd3MBrSqKDC0vuk6Vdp4/tNPGkq3i4Y3ObKZl3uv35f4rF1LfNY1h11Aeph45O 8HtTwpHiv0xX0od/gf8xL+Io19t9xlWZzG5q/9kh4XdZFAcL8XrvbzOBdKuGHwxWit xiF10XNATvffhIDuD6N1Is4k19sqZSXppf5q+TCtQq7sNGAHe5Uwq4aQ6vQeai30x4 g8uyCdOQm6Dr3LVb63hb+q7d+Ke32hsjJlTmt5quBu1RerTzoH/fN67ZD//Iw25BW1 VyiAfUTQhvdueyHtdwdU6MDY0kG781rxPQ7TJuwEwpf5Q5msQPeVTePLpT+DC/NrWi LXVntDoYnFSIw== Date: Wed, 19 May 2021 16:25:06 +0300 From: Mike Rapoport To: Kefeng Wang Cc: linux-arm-kernel@lists.infradead.org, Andrew Morton , Mike Rapoport , Russell King , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 3/3] arm: extend pfn_valid to take into accound freed memory map alignment Message-ID: References: <20210518090613.21519-1-rppt@kernel.org> <20210518090613.21519-4-rppt@kernel.org> <2d34f990-c609-88aa-1dc0-f8e9e9623fc3@huawei.com> <779d890b-6983-6138-4f74-eef7be0bbd4c@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <779d890b-6983-6138-4f74-eef7be0bbd4c@huawei.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210519_062515_073429_7FA3F8D2 X-CRM114-Status: GOOD ( 33.40 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, May 19, 2021 at 09:50:46AM +0800, Kefeng Wang wrote: > > On 2021/5/18 23:52, Mike Rapoport wrote: > > On Tue, May 18, 2021 at 08:49:43PM +0800, Kefeng Wang wrote: > > > > > > > > > On 2021/5/18 17:06, Mike Rapoport wrote: > > > > From: Mike Rapoport > > > > > > > > When unused memory map is freed the preserved part of the memory map is > > > > extended to match pageblock boundaries because lots of core mm > > > > functionality relies on homogeneity of the memory map within pageblock > > > > boundaries. > > > > > > > > Since pfn_valid() is used to check whether there is a valid memory map > > > > entry for a PFN, make it return true also for PFNs that have memory map > > > > entries even if there is no actual memory populated there. > > > > > > > > Signed-off-by: Mike Rapoport > > > > --- > > > > arch/arm/mm/init.c | 15 ++++++++++++++- > > > > 1 file changed, 14 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > > > > index 9d4744a632c6..bb678c0ba143 100644 > > > > --- a/arch/arm/mm/init.c > > > > +++ b/arch/arm/mm/init.c > > > > @@ -125,11 +125,24 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low, > > > > int pfn_valid(unsigned long pfn) > > > > { > > > > phys_addr_t addr = __pfn_to_phys(pfn); > > > > + unsigned long pageblock_size = PAGE_SIZE * pageblock_nr_pages; > > > > if (__phys_to_pfn(addr) != pfn) > > > > return 0; > > > > - return memblock_is_map_memory(addr); > > > > + if (memblock_is_map_memory(addr)) > > > > + return 1; > > > > + > > > > + /* > > > > + * If address less than pageblock_size bytes away from a present > > > > + * memory chunk there still will be a memory map entry for it > > > > + * because we round freed memory map to the pageblock boundaries > > > > + */ > > > > + if (memblock_is_map_memory(ALIGN(addr + 1, pageblock_size)) || > > > > + memblock_is_map_memory(ALIGN_DOWN(addr, pageblock_size))) > > > > + return 1; > > > > > > Hi Mike, with patch3, the system won't boot. > > > > Hmm, apparently I've miscalculated the ranges... > > > > Can you please check with the below patch on top of this series: > > Yes, it works, > > On node 0 totalpages: 311551 > Normal zone: 1230 pages used for memmap > Normal zone: 0 pages reserved > Normal zone: 157440 pages, LIFO batch:31 > Normal zone: 17152 pages in unavailable ranges > HighMem zone: 154111 pages, LIFO batch:31 > HighMem zone: 513 pages in unavailable ranges > > and the oom testcase could pass. > > Tested-by: Kefeng Wang > > > There is memblock_is_region_reserved(check if a region intersects reserved > memory), it also checks the size, should we add a similar func? We already have memblock_is_region_memory() that checks if the entire region is a subset of memory. :( Let's deal with this mess afterwards. > > > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > > index bb678c0ba143..2fafbbc8e73b 100644 > > --- a/arch/arm/mm/init.c > > +++ b/arch/arm/mm/init.c > > @@ -138,8 +138,9 @@ int pfn_valid(unsigned long pfn) > > * memory chunk there still will be a memory map entry for it > > * because we round freed memory map to the pageblock boundaries > > */ > > - if (memblock_is_map_memory(ALIGN(addr + 1, pageblock_size)) || > > - memblock_is_map_memory(ALIGN_DOWN(addr, pageblock_size))) > > + if (memblock_overlaps_region(&memblock.memory, > > + ALIGN_DOWN(addr, pageblock_size), > > + pageblock_size); > > return 1; > > return 0; > > -- Sincerely yours, Mike. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel