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=-17.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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=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 60286C4338F for ; Wed, 25 Aug 2021 10:09:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D345E610D1 for ; Wed, 25 Aug 2021 10:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D345E610D1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=monstr.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 503CA6B006C; Wed, 25 Aug 2021 06:09:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B38F6B0071; Wed, 25 Aug 2021 06:09:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35E528D0001; Wed, 25 Aug 2021 06:09:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0009.hostedemail.com [216.40.44.9]) by kanga.kvack.org (Postfix) with ESMTP id 159EF6B006C for ; Wed, 25 Aug 2021 06:09:13 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A8F0625F37 for ; Wed, 25 Aug 2021 10:09:12 +0000 (UTC) X-FDA: 78513180144.17.6E3450B Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by imf24.hostedemail.com (Postfix) with ESMTP id 1E046B0000A1 for ; Wed, 25 Aug 2021 10:09:12 +0000 (UTC) Received: by mail-ej1-f47.google.com with SMTP id mf2so31859853ejb.9 for ; Wed, 25 Aug 2021 03:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=gm/7T3DPPaEUAIQ4BZFY1GxdtYYv7S8x+8TSo/3yiV8=; b=Q6uBBCg2JR9FfJgv/mAMTDC2NIteNz82noKcyzDkKM1BeehCq5hQDrUrHxAOXKReYA +Oe5LJnLxItPz2MAdGPERGKdk5An1LqnGKnk24Mz3Di53LdmzX30w+jf1D3x4RtQ3EWt N44yBZJ5MjJG7nGjptI1q63YUkxyBXD3Y+KqJHOksB21v0foBmNoNTe/lv3zYkMJaNtr BzDQH2r6ItdxOlD718xGyUgnVdjEotkD1Ja0Tr/4yGIvsf0nPzGppwkmjoAYj4w4w+MA HtYQuF6ut0zta0AW4IpAeMIxXgIXd7W0C8l8o3khpxLuCp5lnOz4YkygDxa1LxaJoeZE 6hsQ== 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:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=gm/7T3DPPaEUAIQ4BZFY1GxdtYYv7S8x+8TSo/3yiV8=; b=fFEJujYfzGDnCDJ8uxzbjtMWIJo+k60MLEv40/OkbDmg1j9zRRjeewDag8m7dTZs4p B47RTig92/yO+EemWcTW7QMB6d+fS4HxdqVlfPsKdv5pwUI1tR+7qwe3GidS8o6kMidm rbX2UlR0pnqHGhzl64nrxj5esJgy97Guin+CIaD7JG8H5dIjP2AUYSa8Onm4jYGj3HF3 nmIItKaGpR+c4tlesR/tWNI6verZevgx0vq2kO4Wm9MamUfZDPWCl64a4xTIcPbGacpc OjrJ1NxAHNvKN86R+tcLFx8/843I3A023wPRBvNpeS+MHsK3HphMRh15GydEjcUh18ak /tow== X-Gm-Message-State: AOAM5329d1UDTCNgRLF40NKEI1sAxPzj99ky/ntbxBghkfwBSpc2YubP S0j/SUC7fnVo4Mnro93TN/C2fYp8Fjp9ss58 X-Google-Smtp-Source: ABdhPJxBjm4UXGqykbN84zJa2RTllcDyQSlDDCxd3R3rYhZnZZ/dJ7SafWbQ8JPnEOCLMwkVRlOPYg== X-Received: by 2002:a17:906:a044:: with SMTP id bg4mr45626743ejb.312.1629886150645; Wed, 25 Aug 2021 03:09:10 -0700 (PDT) Received: from ?IPv6:2a02:768:2307:40d6::e05? ([2a02:768:2307:40d6::e05]) by smtp.gmail.com with ESMTPSA id v12sm10773425ejq.36.2021.08.25.03.09.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Aug 2021 03:09:10 -0700 (PDT) Subject: Re: [PATCH 2/4] microblaze: simplify pte_alloc_one_kernel() To: Mike Rapoport , Andrew Morton Cc: 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: Michal Simek Message-ID: <30ca98c1-25ff-a18a-ea03-afa7a4b35ad5@monstr.eu> Date: Wed, 25 Aug 2021 12:09:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210714123739.16493-3-rppt@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=monstr-eu.20150623.gappssmtp.com header.s=20150623 header.b=Q6uBBCg2; dmarc=none; spf=none (imf24.hostedemail.com: domain of monstr@monstr.eu has no SPF policy when checking 209.85.218.47) smtp.mailfrom=monstr@monstr.eu X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 1E046B0000A1 X-Stat-Signature: fmybdhz1a9euyjnpizu88khmpqbawr4e X-HE-Tag: 1629886152-157122 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 7/14/21 2:37 PM, 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) > I have tested 1/4 with/without the fix from Guenter and also 2/4 and I can't see any issue on real HW. That's why feel free to add my Tested-by: Michal Simek Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs