From patchwork Mon Mar 18 14:21:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13595400 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 F0958C54E58 for ; Mon, 18 Mar 2024 14:22:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CEC78E0001; Mon, 18 Mar 2024 10:22:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72C9D8D0002; Mon, 18 Mar 2024 10:22:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A6078E0001; Mon, 18 Mar 2024 10:22:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 47A588D0002 for ; Mon, 18 Mar 2024 10:22:01 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1B5491C04F2 for ; Mon, 18 Mar 2024 14:22:01 +0000 (UTC) X-FDA: 81910374042.25.BECB2AB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 621DFA0014 for ; Mon, 18 Mar 2024 14:21:59 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ciMMq23M; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710771719; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xwNlozyVa9wCKfV2gAvZZNhZ5jeQ/QZALXvKTp7xRLg=; b=722HCxqZ6qBVjgHqXMGgMSarUQMQ90wL0Yxgbq4naclq+DIe7e0z1oVAGBf5NGaCM2XrkT nmaS9JJOW7QHuFaMsCgIqG9u2B3byMdY0rNM4bR5Wuxb8mw5vWsE9rqSn/4Gk/PaKGxwCV BGvyyizqXnZ/n27w/69eUyMwwIKGfDU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ciMMq23M; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710771719; a=rsa-sha256; cv=none; b=vPJL7hI2TFwIPEzUIhKEmZL04tXIb0eW3aMeAVWyyZtfrmFLppSp4L3APzrvKxbiZgnXFu iXESNTXaZxzAQgZcGY1RrydUHOKgUR7+KyV4CzMKm07yE5E42xM2soznberqP7gctvSbaK 1LiS0cS2cqMfVx+RMOU9sRwxTLs5HsM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710771718; 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=xwNlozyVa9wCKfV2gAvZZNhZ5jeQ/QZALXvKTp7xRLg=; b=ciMMq23MHVySUD7SE0BY+VLO94klsaQmTtU6cllR7ztYRDOPY1S5vG8Uy7rKhQDJm5SiEv GRc90znVItIdO08pn8+fK8PEZfJB2cdRVf/5QKEi5GXC6XtpLZH4UTX1eTnmIw9KyKxANM h/Y4FWZsQQBevedJ1SbbLcs79uNl9BY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-PMNkGQMOMYiyTf9cUHnhqQ-1; Mon, 18 Mar 2024 10:21:57 -0400 X-MC-Unique: PMNkGQMOMYiyTf9cUHnhqQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AEEC185A58C; Mon, 18 Mar 2024 14:21:56 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 329C1492BC4; Mon, 18 Mar 2024 14:21:52 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org, rppt@kernel.org, Baoquan He Subject: [PATCH 2/6] x86: remove memblock_find_dma_reserve() Date: Mon, 18 Mar 2024 22:21:34 +0800 Message-ID: <20240318142138.783350-3-bhe@redhat.com> In-Reply-To: <20240318142138.783350-1-bhe@redhat.com> References: <20240318142138.783350-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Rspamd-Queue-Id: 621DFA0014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: xes4jwkuq69fswnyfhetkz3r81wgfs9j X-HE-Tag: 1710771719-108444 X-HE-Meta: U2FsdGVkX18Uf20FIJwVsuDZThza4LwLOeNW/Qzxq52r2XdBb6sCEZFuucJjXtQ0i8k9/4LXEE8q/ff+kPrMXwsdyP/5vewzRDlg1dbyZ15gQ8MpkvnlwUx1sL+L/zH+Vx8lYkSHw2ggnX+tDDPYP72QKIIAYelLnY+1UCoENvXTnv670MQQxABheEBTUacyz5zAhrpQ4tjT55JabHCETeQfSlAxzhalZpmbdg0YT3WOjrSA5eC1fbJxZ5NkBeq/VFBDtHdbHgds5cQj0BHYCBcS1oXshoIz1POlNZcML+vl9w8BdZ6dnxdjj4A4X4VDxH8io8jOgLSSak5hQdAx6zZRNsR5OVsF4BR/AY4QP86Dk14bSiGmk+vLD5G9u27qSMt10AWpRFKRHsABbv060ot8BpxyvqOsbPuroJIMnMz5jSU5dJ7yZW0L1U6tbJlx1Jo4/p+bE/orPBgBFFMExzOu+WCxU6XUMiZF3AtlEF97XM0DJBxHw76vx+HbzwWPaigpw+mYPTyTMcGM6GiE/+46oOuSmxYPqXJGW/omhAlnC4wL42f2haJgVp8Whl5Z9kPDzSm8UEDtduFs9kVZtVC/Kz4mbWksfAVte30JBnpCnNJTAK1RWTN6mWfkeVBdY+K9On2dtXehPtk+wrmzaTqaKifjXVQl61TnvpXl+G0kjH2AkgUKbnUkvgzYin7imYqam6mcuv02zB+XMJJX2weLh5J77pazguNpY+G/oR/M0UvyoDSpz9/fuS4nO6Kofl4qtn09a+8wSOwEXodLxd0HjRNZ0lHsTi7qGnn2FInSY5YtU4UONS8Yw7J0Gt8eYlOqSZiHVgidoNu71qBfZzts1G5Rn/+bv1B9VL3GUwwcAJOanybVDyAa9E5av5trhkfWM/gTKd+MXy6mledBgcRsLD+wNzxotZ1inOxbmxEyGTW1qR9n1VDi9y2EE6zRJ5MgCuk7AFd2mWAXoAC HdLaWB0k Icm1cDkHm2Hz3juxMc9wsw8XCm6JhTAP86a+ThNqxAE0Dzka3Dq6T3okMP465Ku6WS3NSQFplPf4hlxeKQiozGLmI9Chw52gkln9sWmvDAl99XB2Coev07M3GERskvnWNbPCsp8dMHI+o6cVSn4r2FocOcnQzff/PCC9G/6+SQUiZuhDtmqWgMZg69MmvUrQi9ireMG8Bw0+lCVvuDN+ZyAcAbw== 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: This is not needed any more. 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];