From patchwork Tue Feb 7 08:21:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Thompson X-Patchwork-Id: 13131227 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 2FEE1C636CC for ; Tue, 7 Feb 2023 08:22:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 374386B00A0; Tue, 7 Feb 2023 03:22:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 323EC6B00A1; Tue, 7 Feb 2023 03:22:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2123E6B00A2; Tue, 7 Feb 2023 03:22:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1359C6B00A0 for ; Tue, 7 Feb 2023 03:22:11 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CA813160C9E for ; Tue, 7 Feb 2023 08:22:10 +0000 (UTC) X-FDA: 80439803220.19.26C35D5 Received: from smtp-out1.aaront.org (smtp-out1.aaront.org [52.0.59.53]) by imf13.hostedemail.com (Postfix) with ESMTP id 3BD4220003 for ; Tue, 7 Feb 2023 08:22:09 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=aaront.org header.s=qkjur4vrxk6kmqfk header.b=Ev+TEZ9H; dmarc=pass (policy=quarantine) header.from=aaront.org; spf=pass (imf13.hostedemail.com: domain of dev+gse@aaront.org designates 52.0.59.53 as permitted sender) smtp.mailfrom=dev+gse@aaront.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675758129; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=OIxgZ7NAdVb1A+lM+dm5Tt8b3niG6th8dH3FpWZ/PGI=; b=TkDuy7j54OM/YJCOEGATM29lNc9K41LxlIGYQXX4An1GWWwaVT8LFXhcdFCwaKFRiKs071 y4hVrPlofv+ct0opIiCfBwKLnmev32450xQ15aqbHQoWkQJE70GGRfmkH1z2ggzGepNBpx SLaCfvOVWqNittioVlMXgjueoSpdrDQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=aaront.org header.s=qkjur4vrxk6kmqfk header.b=Ev+TEZ9H; dmarc=pass (policy=quarantine) header.from=aaront.org; spf=pass (imf13.hostedemail.com: domain of dev+gse@aaront.org designates 52.0.59.53 as permitted sender) smtp.mailfrom=dev+gse@aaront.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675758129; a=rsa-sha256; cv=none; b=JcrWtTOa9p5IjOTL/6ULHNIRX+g/XnxBfQT9vXrHXgkAsUQh01PjS/yy280vARvQLmXB2H yJFaGF+0Ek7ge+Mno7unpCvFrnEPRNo7PtQ2/MX0V02+dQD2Z4m25NgesMfn8eea+oU4rI Q+seVKJN57aj0HkQJ4pXm/1Kxec/F1o= Received: by smtp-out1.aaront.org (Postfix) with ESMTP id 4P9x1q2S5kzPy; Tue, 7 Feb 2023 08:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aaront.org; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=qkjur4vrxk6kmqfk; bh=tOntP/lKnUfaa WikAtnq4B5ZEFsg26kBaZ4PbeUZz8I=; b=Ev+TEZ9HTq95nVrDVoAGosIMYfs6X Tl7AMRZUYPXqROqJejhlIA85ctukhiyeCpCFxkmMotHn1OxAbm2AoF1ZUU/z0Y9M gindODTgIFWAdZ0rqE6TGfaDHR+O4FPatu2autzeOpr1r1CuLEBWg+ymSBCj51lm LjXMN7856Sw3iY0cR79TjHYz0K8EAwZFTbPVA8xEaQiAx2D56WIdhlnB2yQXxZ6W iUkyRTWa+x6gxn2lkErb+rimVDWEdCM7q172J8ZV/OMcQ/tsrMXxtuGQB2cs4rEG IOW7bkCPuGrsPO1c3qha6e9h/jNT/h45l5ShxLQisdCJksrTo0HCClGig== From: Aaron Thompson To: Mike Rapoport Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Aaron Thompson Subject: [PATCH] Revert "mm: Always release pages to the buddy allocator in memblock_free_late()." Date: Tue, 7 Feb 2023 08:21:51 +0000 Message-Id: <20230207082151.1303-1-dev@aaront.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Rspamd-Queue-Id: 3BD4220003 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 95dkctde75xg54h3rtpw9ywzg7e7isix X-HE-Tag: 1675758129-949002 X-HE-Meta: U2FsdGVkX1/1K1ctp3cWOwIIS173pS9yYabkHP4IT9N3ZJwYrBcqHujmMDeebaKQJBJ5ENupQ+VWhC+coWoF5eBCzPJ9FTShWcHbrmppEkq1uFdt9JTKJiGLxVWvoT3NHJdL4SfB3tulJZc4/6Jo735yFO+D/oQ7tKs6KWth0E4EUjbys0IXV4x/P+sSXCKUPGuQoTi7hSjF5XhscXdoV1qfrrNnWmyMWX1FvaWYWHiyjvLlkvf0/QdG2UlKI+WEUkum9viiy1dzebEBfv5EDkdfBt3ZmOG0+87+Y/kvRgTmsoam1vyM/81A9GEumW4F2RYkbfbxAaHhq4aNyB1nndcqZiy+s5YG+WGHLVI3tXb2SqAyK6uzSp9Y3wMZhArnz40/DyrL9tFb8X+ojeDYpkN9096KA/aH7AavaLuk1obpQdLITW3WWnRSQhw4OqjW8yFNBtxtxs2pEMm0Zf5EHCZJSvpCGhLjJ88w7WBsu1NXO5esG7iRJ3G1T+JA/aAnp7DawowH8CDMI5D9z/eg7HVYj2gkjcU9OOIoQBjA+pfvDfTcKCG7npwKhEk70Z6w/Yq6dxWLrU9CMhK4gRelfFd0bapxM6NQcd1ScUtaj+4kOZVayxicQMFhvZ22aFF5SuoKdeV1rn/X+OTOSFKDeet6ssjQQN3+gYaWNw87utR7ckRPCgAUn3iuIpXIgfPz4HvPvddwNjsrwK7mSgB5wO1pmJjwXQRIpJU9nJKxR03WmVxic1bG6ZYIlzLL/ZoO7+DqZvOphNDJkCwc2ieoTC6X7o345HDAdKhS3SaRokrOJ+0a3HFXdSN8rfDaGsZdQIZ0ueX+xF0kdxuFguk2LQ2J3lJ2BMFyZ0j9is0V9CLTGvDFdNxbQ1xYnCVRyCXTLym8NIVj9KbapfA5+k5gTYavMkseQRPnoHLATzH2XEQxFpHjyPgCsHfKWzPfr3sHEa7wcMCk6HPo+y4fZTU 9mZ6Cf33 lO3DM/u5tOhJzYI99rlbfyVI9PdghKm+zvugFwtcM0ZBIAdM8bcPIKUn0xdR/YQ4urKnUecXO9hw4yPT0m7ucsDQf3xkHYy1uF7KsF9OMpknhhw05vRmp1hMHIoIapN8W2A6frl0DFpcm/ENClfiKO7Dz8ZUr2Y0AF7Gaxj9XDWlzNDTLj3LQaioCee/uACPlTh+G1Q6fQSVLbpgl1FpcVhHZSSriOzf2aUUj9JdXb0d6wpKooCuL1JvowHgo6D+XRHCwuBgHySZ2Hc2JHpRmFsRfSp7THrWLfeEVDQxHmXLyBaxyyjr42vYyns8MICk1sgpp0Rv3o5EoxSKlxP4rFnuPpIZrA2f4KxGRv/fXhWDlAl7IKW0JkGnfABbJbw1PrR+wuSdJfk5V75A= 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: This reverts commit 115d9d77bb0f9152c60b6e8646369fa7f6167593. The pages being freed by memblock_free_late() have already been initialized, but if they are in the deferred init range, __free_one_page() might access nearby uninitialized pages when trying to coalesce buddies. This can, for example, trigger this BUG: BUG: unable to handle page fault for address: ffffe964c02580c8 RIP: 0010:__list_del_entry_valid+0x3f/0x70 __free_one_page+0x139/0x410 __free_pages_ok+0x21d/0x450 memblock_free_late+0x8c/0xb9 efi_free_boot_services+0x16b/0x25c efi_enter_virtual_mode+0x403/0x446 start_kernel+0x678/0x714 secondary_startup_64_no_verify+0xd2/0xdb A proper fix will be more involved so revert this change for the time being. Fixes: 115d9d77bb0f ("mm: Always release pages to the buddy allocator in memblock_free_late().") Signed-off-by: Aaron Thompson --- mm/memblock.c | 8 +------- tools/testing/memblock/internal.h | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 685e30e6d27c..d036c7861310 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1640,13 +1640,7 @@ void __init memblock_free_late(phys_addr_t base, phys_addr_t size) end = PFN_DOWN(base + size); for (; cursor < end; cursor++) { - /* - * Reserved pages are always initialized by the end of - * memblock_free_all() (by memmap_init() and, if deferred - * initialization is enabled, memmap_init_reserved_pages()), so - * these pages can be released directly to the buddy allocator. - */ - __free_pages_core(pfn_to_page(cursor), 0); + memblock_free_pages(pfn_to_page(cursor), cursor, 0); totalram_pages_inc(); } } diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h index 85973e55489e..fdb7f5db7308 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -15,10 +15,6 @@ bool mirrored_kernelcore = false; struct page {}; -void __free_pages_core(struct page *page, unsigned int order) -{ -} - void memblock_free_pages(struct page *page, unsigned long pfn, unsigned int order) {