From patchwork Wed Jan 4 07:43:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Thompson X-Patchwork-Id: 13088233 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 DB319C4332F for ; Wed, 4 Jan 2023 07:43:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A7A78E0001; Wed, 4 Jan 2023 02:43:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 257A6900002; Wed, 4 Jan 2023 02:43:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 120AD8E0003; Wed, 4 Jan 2023 02:43:40 -0500 (EST) 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 0201D8E0001 for ; Wed, 4 Jan 2023 02:43:40 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BA7831C62CF for ; Wed, 4 Jan 2023 07:43:39 +0000 (UTC) X-FDA: 80316326958.21.0B9EC01 Received: from a27-51.smtp-out.us-west-2.amazonses.com (a27-51.smtp-out.us-west-2.amazonses.com [54.240.27.51]) by imf15.hostedemail.com (Postfix) with ESMTP id 278CBA0007 for ; Wed, 4 Jan 2023 07:43:37 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=aaront.org header.s=ude52klaz7ukvnrchdbsicqdl2lnui6h header.b=UE067h7L; dkim=pass header.d=amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=MPGVIN0A; spf=pass (imf15.hostedemail.com: domain of 010101857bbc4d26-d9683bb4-c4f0-465b-aea6-5314dbf0aa01-000000@ses-us-west-2.bounces.aaront.org designates 54.240.27.51 as permitted sender) smtp.mailfrom=010101857bbc4d26-d9683bb4-c4f0-465b-aea6-5314dbf0aa01-000000@ses-us-west-2.bounces.aaront.org; dmarc=pass (policy=quarantine) header.from=aaront.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672818218; 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:in-reply-to:references:references:dkim-signature; bh=nm7ZBamrjIPVpTrWsj0mVH/CoTNVR1jvbpOznxgOoCQ=; b=sxo7crlRD4TPxOi+qEZrMswWDsoEGfx1WFtoncMahCItMxUjpp3qixxMQDaYRTX7hlNnnC pvdoMcEDN3ZHX9KYwiUV7M7fJBz0ODS72ThdlypDmSOhxXuLEBC71/qAYqnYe3G90yNURY Ox29q8pNFeaDuwLpZZ64Cf99nFwL5P0= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=aaront.org header.s=ude52klaz7ukvnrchdbsicqdl2lnui6h header.b=UE067h7L; dkim=pass header.d=amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=MPGVIN0A; spf=pass (imf15.hostedemail.com: domain of 010101857bbc4d26-d9683bb4-c4f0-465b-aea6-5314dbf0aa01-000000@ses-us-west-2.bounces.aaront.org designates 54.240.27.51 as permitted sender) smtp.mailfrom=010101857bbc4d26-d9683bb4-c4f0-465b-aea6-5314dbf0aa01-000000@ses-us-west-2.bounces.aaront.org; dmarc=pass (policy=quarantine) header.from=aaront.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672818218; a=rsa-sha256; cv=none; b=ZiI70+W4NhyJbYzRFP8Yf+l2S5/eG66T/W/8pyYFPBSg2c6foU4WHxSJUnDJmJI8UzXWwE Kw9118nM+FCHl4zOQk09/IMhnDhSQQnmxPSzGuLakCXdTiIqIp3Z7St4uNrxTWYidWaG6I WmWRRWTK6+U0dcF/+iMnodKl6uddars= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ude52klaz7ukvnrchdbsicqdl2lnui6h; d=aaront.org; t=1672818216; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=drHjpr0LHopx3HmqATFGIrCQSSTGv27hzya8Ew0g6V0=; b=UE067h7LNAsgokFSAm1nEPCePx7WT8g/3bIOD+y6aOOanycNXzF3g6NhqJ+TdMfu Z0dE+5Jf9HY1gf1C0KaIXCKQQNJiZzp8ivVv76+e9lUkq1AmGCqI7XdTaeQahAvQPju M7QpFzzlH4xGPzUIeTqAW60oWuliPe9JERUaJptc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1672818216; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID; bh=drHjpr0LHopx3HmqATFGIrCQSSTGv27hzya8Ew0g6V0=; b=MPGVIN0AEOZB7CFSj53TUjTMTZg4ynawBP8navibhP2eOfgrQHo4atsokw6fpbCC GgW/16MjUdZi0cWtdJWDhl506FC61j4wNehQP0ThYihw+sPk3Q25fYFet7q0Jb0F8VC MZ9HXdWgTT4yEiRziU6w6idRY0BNZnRlVyeWdmgc= From: Aaron Thompson To: linux-mm@kvack.org, Mike Rapoport Cc: "H. Peter Anvin" , Alexander Potapenko , Andrew Morton , Andy Shevchenko , Ard Biesheuvel , Borislav Petkov , Darren Hart , Dave Hansen , Dmitry Vyukov , Ingo Molnar , Marco Elver , Thomas Gleixner , kasan-dev@googlegroups.com, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, x86@kernel.org, Aaron Thompson Subject: [PATCH 1/1] mm: Always release pages to the buddy allocator in memblock_free_late(). Date: Wed, 4 Jan 2023 07:43:36 +0000 Message-ID: <010101857bbc4d26-d9683bb4-c4f0-465b-aea6-5314dbf0aa01-000000@us-west-2.amazonses.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104074215.2621-1-dev@aaront.org> References: <20230104074215.2621-1-dev@aaront.org> MIME-Version: 1.0 Feedback-ID: 1.us-west-2.OwdjDcIoZWY+bZWuVZYzryiuW455iyNkDEZFeL97Dng=:AmazonSES X-SES-Outgoing: 2023.01.04-54.240.27.51 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 278CBA0007 X-Rspam-User: X-Stat-Signature: ia7ym6dcebt8tntok4idwhj4mhu8hzsu X-HE-Tag: 1672818217-479636 X-HE-Meta: U2FsdGVkX18pESrz3jYiNqYiWi/ribelzHbslvkBA3ehkB9p1B2dD8Zbt/m2hWYFmbD9pcK14kB1klSMzkmJV10ljQx1lqwzt2mFu9Z3Q4T2MWFH+eRMzLhraI2nerMFHZ4WDP36CCj0RFtLMsuZMwUlXMn/J+9jj74T39eGcihs7KTmiKa1Q0cIQlKCLlFiuAGe4KoOcEe78zCs9BpNnGPcXYGeOOUSiiteesxtAlRilWL2r/QizZOWq2M57GY3/XVWl0p360uysO100htEg8Wj3jQ2V/f82uRa6KCGKx3ubeoZLObFDGRTl2jiDw6jmB/j5RJa7zN3d5W0brkl+Lf9diXlEg2g3TmLiVYySsvz041zwsIPNw3Vj4sKLR3etNiWlQI/cayRDMDjWEl8DWUGjRuC4eFVllSfsOErq6IMtoPZtGOQjDD+YlWz3fyl+G8lo4bPL3BqlfFQIXnOQRIPMQo306fx79Lbp8QiPfyMA7sF4hriPlchFzMYJqeAO5gcmjPAt48Vla1w3IioIoNXP6KufhV7raQ156iJ4gt7lqPGjqslaXVc5G9Aui6iGUgSvjVzUFW4qAX6RuO+ANXjXygzuDVbDaVWEDL78oE3u746RicD6NRTBV04fpC2OV9Hoy4wSrl5NE/ZXozrvF+DpgSD4zj42W6wCppEF2oFLL0SeQ9p6cbJm96sB/RQZt17bM8bp+5gf9sLVVA2fdPCDHZLLRiiUwcMCo373sdpsVXu8U8A+y8ZYKxQkOPJ7WAvp8AekRWn2zMbCFiPxhbYjf+qABPw8HSR/AIAMNH4dD7PlOHC+T0U8yWWLOjWV8IxRNWRe+I8sp4Dc9Q5wP7bCsJDifOX4G+bqoucHHRs2OnTEsOOyVmiEPoeemOGFBb93bcDSFAMqhlSxLAAFY3ubxExOxsChkw7a1JxMVY58kEKQNKjs37lV3Z9yrmVOVk+AerpkLhch1hJNaw yX+WoOjP 1fP6BrmrfgnnAj6wrlfMnSfIMdGpihJO/pNYkU3seur72N+gNlV/x1udWNFpdfUQ//Lhgkm4pmueeBouKsDVm/09/wtvpNiM2vvqj18EdukS+Agmi9/dfTNUNNgf9WTlAZejPr3cDravmo7vw9PNjLRAlX5ACRRIZJUFoRIPrL7Sd1SV2gq7kg0bQS1oA7l4nzQHohyczjmj+Uzj5EsmlU4+gVq7Uao2a7q67Zcv46nPmjGgCFF6mjM5S49B7kjt7uuUoxs1HwuY8RmNemM+FHYxCNcn2TIyeN2xscUfyCC4lqViM9E9hT5TCug/AJ9AWDv5vUqp3bvUmW9aGdtf88cHcdL34oJs/8Y8UiRaLj6K3aEnKFLa0o/qav3CztLkjrDG0evuOtBznJmOBX2HfRcRZu6U0y218WnAqkBLPynlWd6YgTFB+dwWKgw== 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: If CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, memblock_free_pages() only releases pages to the buddy allocator if they are not in the deferred range. This is correct for free pages (as defined by for_each_free_mem_pfn_range_in_zone()) because free pages in the deferred range will be initialized and released as part of the deferred init process. memblock_free_pages() is called by memblock_free_late(), which is used to free reserved ranges after memblock_free_all() has run. memblock_free_all() initializes all pages in reserved ranges, and accordingly, those pages are not touched by the deferred init process. This means that currently, if the pages that memblock_free_late() intends to release are in the deferred range, they will never be released to the buddy allocator. They will forever be reserved. In addition, memblock_free_pages() calls kmsan_memblock_free_pages(), which is also correct for free pages but is not correct for reserved pages. KMSAN metadata for reserved pages is initialized by kmsan_init_shadow(), which runs shortly before memblock_free_all(). For both of these reasons, memblock_free_pages() should only be called for free pages, and memblock_free_late() should call __free_pages_core() directly instead. Fixes: 3a80a7fa7989 ("mm: meminit: initialise a subset of struct pages if CONFIG_DEFERRED_STRUCT_PAGE_INIT is set") Signed-off-by: Aaron Thompson --- mm/memblock.c | 2 +- tools/testing/memblock/internal.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/memblock.c b/mm/memblock.c index 511d4783dcf1..56a5b6086c50 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1640,7 +1640,7 @@ void __init memblock_free_late(phys_addr_t base, phys_addr_t size) end = PFN_DOWN(base + size); for (; cursor < end; cursor++) { - memblock_free_pages(pfn_to_page(cursor), cursor, 0); + __free_pages_core(pfn_to_page(cursor), 0); totalram_pages_inc(); } } diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h index fdb7f5db7308..85973e55489e 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -15,6 +15,10 @@ 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) {