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 EC3E1D36129 for ; Wed, 6 Nov 2024 02:09:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 840216B009B; Tue, 5 Nov 2024 21:09:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C9796B009C; Tue, 5 Nov 2024 21:09:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66AB46B009D; Tue, 5 Nov 2024 21:09:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 459966B009B for ; Tue, 5 Nov 2024 21:09:55 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E717A1C7917 for ; Wed, 6 Nov 2024 02:09:54 +0000 (UTC) X-FDA: 82754038542.24.B6BE9AA Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id AAE6A4001E for ; Wed, 6 Nov 2024 02:09:11 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=t1sX9AKJ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of sashal@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730858934; a=rsa-sha256; cv=none; b=tCnxhmGbdwBm6iaoT+LEGNPQh7rqhZEm5J9/kyND1O9bHCv5MstfO7niw+LF+voxxnbiZK C+DWiJFACG0ofRHmR7SsZutiLvhmz9evJVztdLdyyPr0Gicnr18cBUtZjkmMr9JsY4CHil chEj9Mmf5dEAtUNLTbWv20AvoFtEpSA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=t1sX9AKJ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of sashal@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730858934; 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=QthN6T4gT1JO7lxF76TdLgys9qf9Sp/JAAsYF9Dk+m8=; b=OuWvT34v7QDqwiNIOoBhDljKTS0f5vcwXq79dgAwCwjxSewWNo5wRNfOWwHCovrYHmXLuS gIdYk5i8sm6kmKQvsBieNedGCQGzDVER7ygHHpZetD2/dLlWu4wlKqgis05zVXkqDoF3u6 JUPW5EsfBFcdOsCDyTFobN6vg3cSy6M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id C62C3A41BDC; Wed, 6 Nov 2024 02:07:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 009BBC4CECF; Wed, 6 Nov 2024 02:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730858992; bh=kV2fAIghnGPusjLtFBOK8Mq7voh7UMy0XjPiuOjfqxA=; h=From:To:Cc:Subject:Date:From; b=t1sX9AKJaAohFfzzOys5q67cFM4mKBUnw1428X65MqzJ2doIRj8H9bpL4lbQYIfyd 0U2k/LGt1UuwWJ0y5g6yf0cMKUj2gfi8nFrYzpEhMh59tvh/sZWXAXRReYZqrQc8PX haGeMymGgN9TijsxGN8tYNYlkHYpgC+rE2JDtmzJ/i2fxrQIudC6ndg9uXu6I5CMwf iUNmsQ6jIF+ze6/G1mbM4qFVCJWUi+/zMdKfDjtaPuAPc8Ri4wp8owatiKheT2nm96 ecHuliMwsRaboMPN3CCSsidXKesWQG10CkBXmcry+0APlUc+id+Q3nwsNY1uei37BR zOFkhazq9+NIA== From: Sasha Levin To: stable@vger.kernel.org, yuzhao@google.com Cc: Matthew Wilcox , Muchun Song , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "mm: allow set/clear page_type again" failed to apply to v6.6-stable tree Date: Tue, 5 Nov 2024 21:09:48 -0500 Message-ID: <20241106020949.173366-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: AAE6A4001E X-Rspamd-Server: rspam01 X-Stat-Signature: gzn3h6x79uay4udy7mdkgraifokcrudk X-HE-Tag: 1730858951-763983 X-HE-Meta: U2FsdGVkX1/BCzLatAXz4BD05nwWw4evL5T4jMvpX+eq5w5ZPZ662ufDOf7ZE7FwoOeHAegm8RslEMey1yH2viwqW2zhatxg6sgUYAPz+pcM8nQkxFsQ0LOmeqA8sLzCMQipPhCyyGdatVZrjAcc6/wlNYzGAE4j1rPg/zad083CqOAQVdx38cnFN4m5g8CF3SxCe1jPJQZBUbBretu8PZLEC+t9urRA/h0woQh4cuAbdWe62tAR3GPcmFtsT+g5rBb4mlpWmdEnOTq2nUaLJLejA2F6gVJzLO8GYFFN1gGANzPvIociKf8INb2TSC/9kA6AUrThjICHgvNx+Cu7J7U3oiZeWsLNWNTKUhkdAiNgB3c3tIh9FFP78QGEqKyYI6vEh+DyhLBscWKL05JAfufNnk32gghKZa67E4zTs+6cLzKJc3cbak4ZCD6jRBSRuf5pOs2Ri4kKL79jsqJeTYCm9Gbiy3jHCRd/eDSImME+rXh4mgrfoDdT3qTSjrUug9amQz9msbhRkBQSZGvuTG27eKO1jdfRngrpXlc/J1+v2wz5HoYSx0sIN3gkms2T+DvmrZTx1rDC6ATUypbUtzJ3T/KtzSiYujmRRMLNPbpoRyJzvsR/28zbpp3dhPYieDCpCp6+lG5LWhKUayfX4d+kmDN6Jem9nSNYE9AZ44yUW6NejGtx4t9hiQaCMoCZLe/3apz8CVEZNDy099S4oUINaXxxIa0DYOGw4oSVJd26jMsGKAheroIP0ze1v1mRlk6PyjaQ1RG9M7UadP+mEV87/gja0lxxVRWoyhbn28hlU6qwTygiLC1fguFqbnwUiK7ZVT3kl6pk0w8HBSerLW/DAmMj1KmHkGwa+GuE9+tZOmaL17CIAIJRcJn9Lp8gAbqq7GFiAPfye2xd659mQnJrLWKe/qAo4OyxxUe3GG8bXs5Jx4KKfKq/5xEiBhtAi+5/irJTBOKDT5Q+hwb U95Am2yT BrLmdpcN74eN3whihspxFrWDTI8s8dlQmlkuJvYKd6eXGSbUFOWNJrj6gKh+AIXMOMKcrtzZ/oseQAK9mwLkfWumnZmzwjpmrm3yGsUJwQNfntrpwZv3Soz3Huhw2S/w+KlliRWkzw9cmKVsi5Drupz1uxSmbAEvUwWWHpcguSkTyhd/oz8c1IUZIxxwNrCvbzKDXdnSCQB34BHQNqwxJ/NkmZAdy6JxB8gXNhe1MGYmQ7TWJH7kJ18UnRc47eO+W55MHz9spe+gdBMQrwXwzb40b9a6JPzlhQ9VFCkLQ/qdGTiUFgjDZ5NmXXxsL6+7yTjrsH6Bf2GHEkcyR3sRA9VTOHqn15+JVKZkzjew36ghuuDMLel0ZU89l8bwqy4J+plpPFcw6lgtAa3Uf/g79BRmg8Z6rQnmea8oRP0FF6Tnfweo= 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: The patch below does not apply to the v6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 9d08ec41a0645283d79a2e642205d488feaceacf Mon Sep 17 00:00:00 2001 From: Yu Zhao Date: Sat, 19 Oct 2024 22:22:12 -0600 Subject: [PATCH] mm: allow set/clear page_type again Some page flags (page->flags) were converted to page types (page->page_types). A recent example is PG_hugetlb. >From the exclusive writer's perspective, e.g., a thread doing __folio_set_hugetlb(), there is a difference between the page flag and type APIs: the former allows the same non-atomic operation to be repeated whereas the latter does not. For example, calling __folio_set_hugetlb() twice triggers VM_BUG_ON_FOLIO(), since the second call expects the type (PG_hugetlb) not to be set previously. Using add_hugetlb_folio() as an example, it calls __folio_set_hugetlb() in the following error-handling path. And when that happens, it triggers the aforementioned VM_BUG_ON_FOLIO(). if (folio_test_hugetlb(folio)) { rc = hugetlb_vmemmap_restore_folio(h, folio); if (rc) { spin_lock_irq(&hugetlb_lock); add_hugetlb_folio(h, folio, false); ... It is possible to make hugeTLB comply with the new requirements from the page type API. However, a straightforward fix would be to just allow the same page type to be set or cleared again inside the API, to avoid any changes to its callers. Link: https://lkml.kernel.org/r/20241020042212.296781-1-yuzhao@google.com Fixes: d99e3140a4d3 ("mm: turn folio_test_hugetlb into a PageType") Signed-off-by: Yu Zhao Cc: Matthew Wilcox (Oracle) Cc: Muchun Song Cc: Signed-off-by: Andrew Morton --- include/linux/page-flags.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 1b3a767104878..cc839e4365c18 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -975,12 +975,16 @@ static __always_inline bool folio_test_##fname(const struct folio *folio) \ } \ static __always_inline void __folio_set_##fname(struct folio *folio) \ { \ + if (folio_test_##fname(folio)) \ + return; \ VM_BUG_ON_FOLIO(data_race(folio->page.page_type) != UINT_MAX, \ folio); \ folio->page.page_type = (unsigned int)PGTY_##lname << 24; \ } \ static __always_inline void __folio_clear_##fname(struct folio *folio) \ { \ + if (folio->page.page_type == UINT_MAX) \ + return; \ VM_BUG_ON_FOLIO(!folio_test_##fname(folio), folio); \ folio->page.page_type = UINT_MAX; \ } @@ -993,11 +997,15 @@ static __always_inline int Page##uname(const struct page *page) \ } \ static __always_inline void __SetPage##uname(struct page *page) \ { \ + if (Page##uname(page)) \ + return; \ VM_BUG_ON_PAGE(data_race(page->page_type) != UINT_MAX, page); \ page->page_type = (unsigned int)PGTY_##lname << 24; \ } \ static __always_inline void __ClearPage##uname(struct page *page) \ { \ + if (page->page_type == UINT_MAX) \ + return; \ VM_BUG_ON_PAGE(!Page##uname(page), page); \ page->page_type = UINT_MAX; \ } -- 2.43.0