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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCC5ACD11BF for ; Tue, 19 Mar 2024 15:50:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 397846B0083; Tue, 19 Mar 2024 11:50:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3209C6B0088; Tue, 19 Mar 2024 11:50:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C1276B008A; Tue, 19 Mar 2024 11:50:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 07DCE6B0083 for ; Tue, 19 Mar 2024 11:50:29 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C0C4314077A for ; Tue, 19 Mar 2024 15:50:28 +0000 (UTC) X-FDA: 81914225736.20.CE97BE1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id 21A371A0007 for ; Tue, 19 Mar 2024 15:50:26 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GhsftalN; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710863427; a=rsa-sha256; cv=none; b=kAhWhxzLtUMlHODLR6w+5L4QGl/IAnqQEwWJaNxq5pEkku9e4mn0CpagHjLfnJxVa78+iw vLnFEGjxi9beRmkrwpPBDZgL0gXcbsC4QCEll0+cl5n7ffjR6EawkhxzQDRr3DT6A1SjDS WJK9UwIOTj6B3um+/0BjPlt+HVCr5bI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GhsftalN; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710863427; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=w/Zqxh1yGB43VIY4x4XUSG5B9T68QUQyf9izR7i4Flc=; b=5zrC9CUn/MZpvr22LSM6joiyx0eTCC1exQi64EjG5g4rLxLjvhJq9uO7L07jMxTEEscOzW TD56qRdXiWVegr7aaFpjk78n42nXkAxN35Fc32wtP0RsQ7/zIP3bpHr+13BxKLBheVqNR+ WmMjUZVQKV2p6OlEHF2TB8B+mIRM8G8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2087560E2C; Tue, 19 Mar 2024 15:50:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 749F8C43390; Tue, 19 Mar 2024 15:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710863425; bh=apyBLSMY17l5k6YmL7tgRw2duWfuFRcprZhgOcvDx3U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GhsftalN+s41C0DoGW2lRZ49nObKvR14d7JIS8aFWR3rzkuY2+Zpu6QTzkRkCDGiV D8vwJOePyyu65N3VDgupFhy1/U/JqfI1I0oFo5YftYtp8LwboRYl0OD0xbH5IOSIq+ 5AuBuACNWUmCc9vmgoONrHeDDNdQkDd17u7+6yeylmST3y4pTYrE5E7f77np/rN7Tb dum6Ntxc1qsM20Ra+kbucPT4ORsI8QJ7UQVkOZDG1kCeJadUlW8c12K9WSJka5dZQD NjwEFpKTJQuYe8jKAmV5R480Sta75swVTBGOo8Mn/FTrKu1aHj5G8vrv6w8iTLx3Xl RpnOyaP5pxPRg== Date: Tue, 19 Mar 2024 17:49:19 +0200 From: Mike Rapoport To: Baoquan He Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org Subject: Re: [PATCH 2/6] x86: remove memblock_find_dma_reserve() Message-ID: References: <20240318142138.783350-1-bhe@redhat.com> <20240318142138.783350-3-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240318142138.783350-3-bhe@redhat.com> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 21A371A0007 X-Stat-Signature: esarp7kuwm8dsx1kipksqypydiujjcgy X-HE-Tag: 1710863426-425216 X-HE-Meta: U2FsdGVkX19tipWxIA7h9+zQJZxWlnEvXwamzcE/nYwyNjBc81IBuWB5f8bxj0HCcf1YQaE14GWO+bzxBhvnBa/MIYhXaE8LUl+6lGF05nGVOhmkVrnaLJCKHl1aq9YWASr3/tZoO2qcFanDQJXzJjCz6JluaxYwo4ySm62x0GPWn2VMHTjQHuB2Y/ull2rgwAppRphVIWBNMD5cm86Kpnu6pe8Hpi0rnwFFvEttz1FzoIZUuZfZe9d5LSIxXOsX4Oj1CX0uSWFXm2R5qYxzMEWl2zebhvHH/xK6hW859UY8rCM1h/Xy3pm7/m7btZscIyT5M5rloKX8ZADXaWjaMhXeSL38R+4RGToCQ3TkU5MaoiRGDNvd1vSt2QFF0sNsClcRRNgTR7h2xosX2MKKkvL9i4hMSs4zd0UbYuIVu4pyx7lW38Mu/hgnf6kmg6T0Bg1mGegUUenPmjbPVh8VTjghUuKe8E5Gpjc4hGVtDVariddqEAqqSJKnyvh17+NtGbEnQ+2miNQ2ma9h4cYRcdlZ1slNg8JM5pzBB7XcVjdeLDN9F6b4aGCwQ6NkFb123ig4m2tJG4fEHpUkGaqt6G9lD/lIei9GK8svp7Bglb4DI8W9RkzKZP0RbQ81Uk4kFOhZ3lLqb+SFLAMjPCk+p//e4+Xp4gV1nVZbGAWh4zFdp6MXgupj8dJWpxu4i+NNGbOjMFkd5a2i04dHedK/WYonqJTFrpZ26BiweSmWJrtOF9yyl05UHdRipjKkKR+RVvZ4ZLOnDamv8g+ER2lT4fj6Lexkzob4QCSQOQR9b9Sbn9Z+gUHAmCaqbaK3d0RWj2kwkMQY1efuDeYp5co6sk0m2rnfWR8frBwNegZr3mbl9TVhNS08BalF86mW5ZEgO1NAfPmPGtnV08iFAgmRCm8Vkw+sTnaAAieDZvtiu7gU6HTPGiz/qgY3chjZtqIm68mVsfGkcDUAm48bHsq kskHcedT 4sXlul0riYj6RtBcrxkQ4HfnDLWhpWC0mJhBRaRbsEBc7UWIHzcFI5r/6+nIYGvjn+58Yrc3YBoHSOOub49rhVYLZdSV+OknNa2kxXcl3eqbjgjtu7ii9BYn5Mcb7VGsUVvZM7xjjOkjmbZgic36prj1mdnCmlweaVzM00rygGCZvwMjdaKyfzAJ004tB7xEJK/AmubnQO9oIZSqrilDxrstYcczAUlTgqndPdwXm4bc49xRcjPQ4Hq8z6RBICdi7Psws 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: List-Subscribe: List-Unsubscribe: Hi Baoquan, On Mon, Mar 18, 2024 at 10:21:34PM +0800, Baoquan He wrote: > This is not needed any more. I'd swap this and the first patch, so that the first patch would remove memblock_find_dma_reserve() and it's changelog will explain why it's not needed and then the second patch will simply drop unused set_dma_reserve() > Signed-off-by: Baoquan He > --- > arch/x86/include/asm/pgtable.h | 1 - > arch/x86/kernel/setup.c | 2 -- > arch/x86/mm/init.c | 45 ---------------------------------- > 3 files changed, 48 deletions(-) > > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index 315535ffb258..cefc7a84f7a4 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -1200,7 +1200,6 @@ static inline int pgd_none(pgd_t pgd) > extern int direct_gbpages; > void init_mem_mapping(void); > void early_alloc_pgt_buf(void); > -extern void memblock_find_dma_reserve(void); > void __init poking_init(void); > unsigned long init_memory_mapping(unsigned long start, > unsigned long end, pgprot_t prot); > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index 3e1e96efadfe..5aa00938051f 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -1106,8 +1106,6 @@ void __init setup_arch(char **cmdline_p) > */ > arch_reserve_crashkernel(); > > - memblock_find_dma_reserve(); > - > if (!early_xdbc_setup_hardware()) > early_xdbc_register_console(); > > diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c > index 5209549e8192..615f0bf4bda6 100644 > --- a/arch/x86/mm/init.c > +++ b/arch/x86/mm/init.c > @@ -990,51 +990,6 @@ void __init free_initrd_mem(unsigned long start, unsigned long end) > } > #endif > > -/* > - * Calculate the precise size of the DMA zone (first 16 MB of RAM), > - * and pass it to the MM layer - to help it set zone watermarks more > - * accurately. > - * > - * Done on 64-bit systems only for the time being, although 32-bit systems > - * might benefit from this as well. > - */ > -void __init memblock_find_dma_reserve(void) > -{ > -#ifdef CONFIG_X86_64 > - u64 nr_pages = 0, nr_free_pages = 0; > - unsigned long start_pfn, end_pfn; > - phys_addr_t start_addr, end_addr; > - int i; > - u64 u; > - > - /* > - * Iterate over all memory ranges (free and reserved ones alike), > - * to calculate the total number of pages in the first 16 MB of RAM: > - */ > - nr_pages = 0; > - for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) { > - start_pfn = min(start_pfn, MAX_DMA_PFN); > - end_pfn = min(end_pfn, MAX_DMA_PFN); > - > - nr_pages += end_pfn - start_pfn; > - } > - > - /* > - * Iterate over free memory ranges to calculate the number of free > - * pages in the DMA zone, while not counting potential partial > - * pages at the beginning or the end of the range: > - */ > - nr_free_pages = 0; > - for_each_free_mem_range(u, NUMA_NO_NODE, MEMBLOCK_NONE, &start_addr, &end_addr, NULL) { > - start_pfn = min_t(unsigned long, PFN_UP(start_addr), MAX_DMA_PFN); > - end_pfn = min_t(unsigned long, PFN_DOWN(end_addr), MAX_DMA_PFN); > - > - if (start_pfn < end_pfn) > - nr_free_pages += end_pfn - start_pfn; > - } > -#endif > -} > - > void __init zone_sizes_init(void) > { > unsigned long max_zone_pfns[MAX_NR_ZONES]; > -- > 2.41.0 > -- Sincerely yours, Mike.