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=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,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 30A93C4320E for ; Wed, 25 Aug 2021 12:13:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D442F610E6 for ; Wed, 25 Aug 2021 12:13:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D442F610E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 672FA6B006C; Wed, 25 Aug 2021 08:13:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 622B56B0071; Wed, 25 Aug 2021 08:13:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C3286B0072; Wed, 25 Aug 2021 08:13:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0027.hostedemail.com [216.40.44.27]) by kanga.kvack.org (Postfix) with ESMTP id 301BA6B006C for ; Wed, 25 Aug 2021 08:13:52 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D6A28253AD for ; Wed, 25 Aug 2021 12:13:51 +0000 (UTC) X-FDA: 78513494262.16.17CD7AD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 76D5C9000250 for ; Wed, 25 Aug 2021 12:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629893631; 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=T+mWtET0VJRoDSwpOU4ZXSont0R34OAjtdYQ/JJ1WlU=; b=E8nkONnqAckjf6GgG2Ee4PknJ0u/uH2iMKpwjYfE7h+NKIG0Sb4+uaavgKXMqfhhVpgg8P WmF0pzvv4ZV4renZwm3Tsc8MHj27tTnHkp0GOJ6ds/ixr4LGgN6+JkC1fl4E0teHI7XqUL N6oILgBAawomfIRDnehn6YR+BnAAI7E= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-184-uARTsYgmMBqOtzPuGpB_rg-1; Wed, 25 Aug 2021 08:13:47 -0400 X-MC-Unique: uARTsYgmMBqOtzPuGpB_rg-1 Received: by mail-wr1-f70.google.com with SMTP id b7-20020a5d4d87000000b001575d1053d2so1724840wru.23 for ; Wed, 25 Aug 2021 05:13:47 -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=T+mWtET0VJRoDSwpOU4ZXSont0R34OAjtdYQ/JJ1WlU=; b=qSBaUFGn3u+AVVX1rEyupYsw4Xah54TSTBYNy3rkaFKL4M1Qs0DAquQSbCUJaheXUZ NnyhfAEiTHNSfkWlpkalkV5XxajEUomr6xVMVPUu9GVLZK8t+aT9slQeDYG+eXotYBDN bbzBq0sC3poT3ZbVVVtN60XLoZIWofDpdQ7/KyQp7A6mlmdfK2ir7/+3+eInKKAn7h9U ixoPepKSgF0VTfobHNjtBAPocbA7bUbx8sTSjazwAQhp84jgI52ryuS0mYWjqzSPEJIX BKvTN5x9TDwhLiXdX+B6N64O3gJuLh7coITJBf4tGFrWR6cHgf31Q+DZYUlVK3w/PPtJ wvLQ== X-Gm-Message-State: AOAM533hTxX0AwI3JBPezttmjZ0mROiRD+VzvH75rvrjz4G7RORzVAO2 L/eEB711+ezUGRoWfPFtUMOUNWcujLGq5ZJmCjyWLolzagQGqFgrSt8NsNEfEXMAxKbdo6lIJB/ oTKiIrPbCkpLUttKCO1RkF3rfIefqPOG3GlMZ2wBWw6WYxgaFKi3NIjT0b54= X-Received: by 2002:a7b:c316:: with SMTP id k22mr8896512wmj.56.1629893626715; Wed, 25 Aug 2021 05:13:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0KaHNPQm3HvatLTHztCmId4RLKJb1rPmJ4P0sk4rpSiu4Hwf3yk4JWqhdkOcTUQf/ieo+dg== X-Received: by 2002:a7b:c316:: with SMTP id k22mr8896490wmj.56.1629893626505; Wed, 25 Aug 2021 05:13:46 -0700 (PDT) Received: from [192.168.3.132] (p4ff23d6b.dip0.t-ipconnect.de. [79.242.61.107]) by smtp.gmail.com with ESMTPSA id a77sm5408941wmd.31.2021.08.25.05.13.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Aug 2021 05:13:46 -0700 (PDT) Subject: Re: [PATCH 2/4] microblaze: simplify pte_alloc_one_kernel() To: Mike Rapoport , Andrew Morton Cc: Michal Simek , Mike Rapoport , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20210714123739.16493-1-rppt@kernel.org> <20210714123739.16493-3-rppt@kernel.org> From: David Hildenbrand Organization: Red Hat Message-ID: Date: Wed, 25 Aug 2021 14:13:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210714123739.16493-3-rppt@kernel.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E8nkONnq; spf=none (imf29.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Stat-Signature: qpng5uwyahff8fxm4fz3py6mcnuuodz6 X-Rspamd-Queue-Id: 76D5C9000250 X-Rspamd-Server: rspam04 X-HE-Tag: 1629893631-809940 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: On 14.07.21 14:37, Mike Rapoport wrote: > From: Mike Rapoport > > The microblaze's implementation of pte_alloc_one_kernel() used > memblock_alloc_try_nid_raw() along with clear_page() to allocated a zeroed > page during early setup. > > Replace calls of these functions with a call to memblock_alloc_try_nid() > that already returns zeroed page and respects the same allocation limits as > memblock_alloc_try_nid_raw(). > > While on it drop early_get_page() wrapper that was only used in > pte_alloc_one_kernel(). > > Signed-off-by: Mike Rapoport > --- > arch/microblaze/include/asm/pgtable.h | 2 -- > arch/microblaze/mm/init.c | 12 ------------ > arch/microblaze/mm/pgtable.c | 17 ++++++++--------- > 3 files changed, 8 insertions(+), 23 deletions(-) > > diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h > index 71cd547655d9..c136a01e467e 100644 > --- a/arch/microblaze/include/asm/pgtable.h > +++ b/arch/microblaze/include/asm/pgtable.h > @@ -443,8 +443,6 @@ extern int mem_init_done; > > asmlinkage void __init mmu_init(void); > > -void __init *early_get_page(void); > - > #endif /* __ASSEMBLY__ */ > #endif /* __KERNEL__ */ > > diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c > index ab55c70380a5..952f35b335b2 100644 > --- a/arch/microblaze/mm/init.c > +++ b/arch/microblaze/mm/init.c > @@ -265,18 +265,6 @@ asmlinkage void __init mmu_init(void) > dma_contiguous_reserve(memory_start + lowmem_size - 1); > } > > -/* This is only called until mem_init is done. */ > -void __init *early_get_page(void) > -{ > - /* > - * Mem start + kernel_tlb -> here is limit > - * because of mem mapping from head.S > - */ > - return memblock_alloc_try_nid_raw(PAGE_SIZE, PAGE_SIZE, > - MEMBLOCK_LOW_LIMIT, memory_start + kernel_tlb, > - NUMA_NO_NODE); > -} > - > void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask) > { > void *p; > diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c > index 38ccb909bc9d..c1833b159d3b 100644 > --- a/arch/microblaze/mm/pgtable.c > +++ b/arch/microblaze/mm/pgtable.c > @@ -33,6 +33,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -242,15 +243,13 @@ unsigned long iopa(unsigned long addr) > > __ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm) > { > - pte_t *pte; > - if (mem_init_done) { > - pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); > - } else { > - pte = (pte_t *)early_get_page(); > - if (pte) > - clear_page(pte); > - } > - return pte; > + if (mem_init_done) > + return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); > + else > + return memblock_alloc_try_nid(PAGE_SIZE, PAGE_SIZE, > + MEMBLOCK_LOW_LIMIT, > + memory_start + kernel_tlb, > + NUMA_NO_NODE); > } > > void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb