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=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 50BE2C433B4 for ; Wed, 21 Apr 2021 07:51:46 +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 A769D61182 for ; Wed, 21 Apr 2021 07:51:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A769D61182 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kZ3PyXYBxt0q2W4rA7cTfUphxNBNmtvA9w7lVAgryZw=; b=C8BlQjkThVp69mFIzDq2BnDaO Xhz1QOhn+e2rCeoWHntl974E4NCmnTWePEeWGaClUlw/iFqxEPSkJaPgGtAYQAjMLeFEPW7pMeS6E 655Uohr9LNkTZMJtOtkT7tn+v8wpM8O0wO3CZzFXmaYuM854HuDYU/1ZGWUdEQBJ3brvCdjfAaNFL 3mIf0wKXJdqTtovFtn/90r87LPgK1Kok3xp/j0+ybmDSPadJI8PVTAmtnn4pJiaiWaIET+1M5pKrH 9iH3tKFIc/h5vr3hBbdJHabu1PjTgZ7JHJGNFKRP85nBvcCH5l23GAg98jb1zZ/ebfzSbFiWrGtAW OYSRGB7aw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZ7cI-00DvJE-6V; Wed, 21 Apr 2021 07:49:46 +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 1lZ7cD-00DvIr-G2 for linux-arm-kernel@desiato.infradead.org; Wed, 21 Apr 2021 07:49:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=JAnhPgTmK2rneM8QtGU7sZ7Ohw+rHF0KbVh21PjcnDI=; b=PYJdNrnGIb3eaiw+Km+wczjnvy ytcoG6ptc9R937VsuKFNfpOPXeOu2HhpwGJJFUi0A7Be2dXF9blrm9YL+2wRthmwtk7S2wZzxX+Io phvBjYZx5orasX5sbIPmQ5jwiYm7o68AxSXFxi1+p2rVtOjowdhs0rPR/b5NMprwHY5NDSmDODb55 RzR59g5EF74rHJFYGyUPVz/5BuSrcgVAfIU+9suWJStlVDp6v3dko4JrBNvShaoiWm314H1eJQHqy 6049DlzHNCpKKunDikJVYnblNFobgkaiBUq5MjlOBVgeWoQafqBs4jyG82y/B71JaoaAXwp3NYRG+ UeELOVvA==; Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZ7c8-00CgVU-1b for linux-arm-kernel@lists.infradead.org; Wed, 21 Apr 2021 07:49:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618991375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAnhPgTmK2rneM8QtGU7sZ7Ohw+rHF0KbVh21PjcnDI=; b=EKGfKXLkIT9eoWjjPjoEupJ8n7jtnNWLspEuTZA0Ni7wpHOC1cBX7XOZnMv7QpAVhDxxWO 4AJW38vVSyybud6ABqxn9qfz/EJRZz/mB2+E+g6g9jVBbDft2RaupMBZRFDllnjtJfgGRB RFdhZhoGDGJcoeDt/rUyVBYStHpjrOk= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-533-9QK7frGCP_qzLMgovrSpeA-1; Wed, 21 Apr 2021 03:49:26 -0400 X-MC-Unique: 9QK7frGCP_qzLMgovrSpeA-1 Received: by mail-ed1-f70.google.com with SMTP id m18-20020a0564025112b0290378d2a266ebso14540661edd.15 for ; Wed, 21 Apr 2021 00:49:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=JAnhPgTmK2rneM8QtGU7sZ7Ohw+rHF0KbVh21PjcnDI=; b=hCchE6aXqIsmjnhLdTWT2cSvatBGzw1Iu18xBwK1y1k199ulcDg1s1Xne5j3uKrZUa wBYCsFUq9yiwYZp0X1aBTTREd6xgQW35/NpepLlYlIhsLXYb246gktroB8Pz4Pad9oYU TJNG1JSXuu1xAFU6T6tJkiQMH9yTygGknQQgKYgLg/s6UrFomUGWGy+nnkJ6Hvg+jJPm 2n1+9IILOlmaCiS9Qp+t/RxqCVviQZbUhIiR4Fm/kJ3IBDZuMAZH2bP4+YDBJcYEv60b 3v4Kz2VagTJUJy9WfV1DNQufgMqylEHTvQNWqq3i+P5P1klAUj+QukUNuObFIhHV3H78 ODYg== X-Gm-Message-State: AOAM531SSeWoA8Mbuap1KfJxM+4Rl9QBmaFOc3uQiDRxr8/Vyh/mZC1I zgLLgOiY+uf4c1Cyd5OwXKdCfs2//qor91hqi4j1QAtdg/k7WTNbs1yVDrWSggoa7JXrKoXdhM7 mNhuLnCOaXoZb7nbuXtGLlGuf1aCXkL2VEog= X-Received: by 2002:a05:6402:78d:: with SMTP id d13mr36472247edy.277.1618991365288; Wed, 21 Apr 2021 00:49:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPQEw8LMNntsFe7QRyIPhtcWOmJcDhJxCGo22DUKTe+vv1GhR0JyZ5rACKKiobJsNfEOkgTA== X-Received: by 2002:a05:6402:78d:: with SMTP id d13mr36472231edy.277.1618991365082; Wed, 21 Apr 2021 00:49:25 -0700 (PDT) Received: from [192.168.3.132] (p5b0c64b8.dip0.t-ipconnect.de. [91.12.100.184]) by smtp.gmail.com with ESMTPSA id t1sm1510968eju.88.2021.04.21.00.49.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Apr 2021 00:49:24 -0700 (PDT) Subject: Re: [PATCH v2 2/4] memblock: update initialization of reserved pages To: Mike Rapoport , linux-arm-kernel@lists.infradead.org Cc: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , Marc Zyngier , Mark Rutland , Mike Rapoport , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20210421065108.1987-1-rppt@kernel.org> <20210421065108.1987-3-rppt@kernel.org> From: David Hildenbrand Organization: Red Hat Message-ID: <752fd822-6479-53f1-81fb-24b55500e963@redhat.com> Date: Wed, 21 Apr 2021 09:49:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210421065108.1987-3-rppt@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210421_004936_179883_9FD86F23 X-CRM114-Status: GOOD ( 33.71 ) 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 21.04.21 08:51, Mike Rapoport wrote: > From: Mike Rapoport > > The struct pages representing a reserved memory region are initialized > using reserve_bootmem_range() function. This function is called for each > reserved region just before the memory is freed from memblock to the buddy > page allocator. > > The struct pages for MEMBLOCK_NOMAP regions are kept with the default > values set by the memory map initialization which makes it necessary to > have a special treatment for such pages in pfn_valid() and > pfn_valid_within(). > > Split out initialization of the reserved pages to a function with a > meaningful name and treat the MEMBLOCK_NOMAP regions the same way as the > reserved regions and mark struct pages for the NOMAP regions as > PageReserved. > > Signed-off-by: Mike Rapoport > --- > include/linux/memblock.h | 4 +++- > mm/memblock.c | 28 ++++++++++++++++++++++++++-- > 2 files changed, 29 insertions(+), 3 deletions(-) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index 5984fff3f175..634c1a578db8 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -30,7 +30,9 @@ extern unsigned long long max_possible_pfn; > * @MEMBLOCK_NONE: no special request > * @MEMBLOCK_HOTPLUG: hotpluggable region > * @MEMBLOCK_MIRROR: mirrored region > - * @MEMBLOCK_NOMAP: don't add to kernel direct mapping > + * @MEMBLOCK_NOMAP: don't add to kernel direct mapping and treat as > + * reserved in the memory map; refer to memblock_mark_nomap() description > + * for futher details > */ > enum memblock_flags { > MEMBLOCK_NONE = 0x0, /* No special request */ > diff --git a/mm/memblock.c b/mm/memblock.c > index afaefa8fc6ab..3abf2c3fea7f 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -906,6 +906,11 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) > * @base: the base phys addr of the region > * @size: the size of the region > * > + * The memory regions marked with %MEMBLOCK_NOMAP will not be added to the > + * direct mapping of the physical memory. These regions will still be > + * covered by the memory map. The struct page representing NOMAP memory > + * frames in the memory map will be PageReserved() > + * > * Return: 0 on success, -errno on failure. > */ > int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) > @@ -2002,6 +2007,26 @@ static unsigned long __init __free_memory_core(phys_addr_t start, > return end_pfn - start_pfn; > } > > +static void __init memmap_init_reserved_pages(void) > +{ > + struct memblock_region *region; > + phys_addr_t start, end; > + u64 i; > + > + /* initialize struct pages for the reserved regions */ > + for_each_reserved_mem_range(i, &start, &end) > + reserve_bootmem_region(start, end); > + > + /* and also treat struct pages for the NOMAP regions as PageReserved */ > + for_each_mem_region(region) { > + if (memblock_is_nomap(region)) { > + start = region->base; > + end = start + region->size; > + reserve_bootmem_region(start, end); > + } > + } > +} > + > static unsigned long __init free_low_memory_core_early(void) > { > unsigned long count = 0; > @@ -2010,8 +2035,7 @@ static unsigned long __init free_low_memory_core_early(void) > > memblock_clear_hotplug(0, -1); > > - for_each_reserved_mem_range(i, &start, &end) > - reserve_bootmem_region(start, end); > + memmap_init_reserved_pages(); > > /* > * We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel