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 7D7E3D35E5D for ; Wed, 6 Nov 2024 02:08:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C9F16B0085; Tue, 5 Nov 2024 21:08:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 04FE06B008C; Tue, 5 Nov 2024 21:08:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E58856B0092; Tue, 5 Nov 2024 21:08:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C3F336B0085 for ; Tue, 5 Nov 2024 21:08:54 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 766FAADB55 for ; Wed, 6 Nov 2024 02:08:54 +0000 (UTC) X-FDA: 82754035728.25.8E15075 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf21.hostedemail.com (Postfix) with ESMTP id C54411C000D for ; Wed, 6 Nov 2024 02:07:48 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dypJVbS4; spf=pass (imf21.hostedemail.com: domain of sashal@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730858709; 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=sFM318je7p+SuZxn8UglxiCMl9YiFdEqiKdJvm0Zc/4=; b=wDGQOZMWmWyERMeKSbH18jQXb1+xn5rmY+J1scW0s3B1eCjkKv3FRacf8Gm6xj+K+1tr60 p5Va504W9qUU+4EzOPJKO3NMZ8u95Qinbs4L3RbX01wxAt0EhBdG9Z2jHfi1gXicOHxwrB /ZEYh023Xl9TE7jNOFM8ICJfgcUUcDA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dypJVbS4; spf=pass (imf21.hostedemail.com: domain of sashal@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730858709; a=rsa-sha256; cv=none; b=S44CsCAq6IaSlL6QJsbHfH4lQZ5a2lFl/CrjnZ3ldDlCsLv4hrQIborSoCmrEV7K69nh1K KDuR9v0vPDLaT8Yee9DoJG7uD+L8zimttAPClcY+ow2FRoizOkRf6KMhcQyFVOwIe6cUCY NVbt8/8lMhvYPfyqrKagKQmwrHtTBuk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 3F099A41B30; Wed, 6 Nov 2024 02:06:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4786C4CECF; Wed, 6 Nov 2024 02:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730858931; bh=eNKDvFM9I+ksQdkaL8Q2vFoYiN47/P3HtWvaJX1cbI8=; h=From:To:Cc:Subject:Date:From; b=dypJVbS4/YRSf07/VfIrGx14mEBGuXz6sUwnKJWtwajGSH8+xY+Rxkx7acnFtQLRk 86cSoS+ZuVLBh4ZZTZqAm3SKbqgGWeGSi/A6eerFVZxzsbqtDcnD1gf1zffGJAqO/O Q4qK7UceMmMgln7MZ2khYORpWRsv2oaEi8sF/wYEnTQa39ldOci/t3qxQ+tJVuWYpX 6EpSSrG1gw6YUA2g5eS2oFpp/dZLXthF9YU59OpPt+lXNlt0lq1OFOzDyMiG6iPez7 rlKeKNNPa5dDGQF8uzRAp3XY9lbuADFPxxbCGhkjPCQ8AWmK67+9G3OBO32j5bsw3X k3WOceZdxANQg== 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.11-stable tree Date: Tue, 5 Nov 2024 21:08:48 -0500 Message-ID: <20241106020849.164447-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-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C54411C000D X-Stat-Signature: 5u6rzppfnkdjk7m3xngaf5kaferirduy X-Rspam-User: X-HE-Tag: 1730858868-978981 X-HE-Meta: U2FsdGVkX1/5dAwitfs0WMjFddYJlTfEM8f7VeP0pGJtiYoJKP3ZHAoY6KxJ44l56qyNLfuaozeJFFSFUExtc9zeKDuYLF+CKSBVp/bm8sVLZPKUkRrXozb3l+JJCvUtqp9nCpYuLtZHoWHyq9F5mq+JnQDOLfL5vaS4+zgr87uXquxE6hfG7arUSXS1ghJnAjhR8wrA9fdhpzUb/ekf94cuzdgCTvHkKBq+FtyBi469rP6q4BSm+auBoaeaUUrDBuad5ZmFXALPqTt1bEK7dqZGLktP8MEFD6zmFmxnpUN0mRUIpmmLSdTYQKLD+NvmzW0MzN6QgyGVDzYh8T+5kItEib8MwQ3zW2GtfTmJ2sncBFK3d1bMzGkMVlvpGBgduryC80QrwOLMYg5bKxgxPepeKB92D5bj4RJDahffpVbGrR0XSCLYxMaWgXiIPF50Jn4NdUGGGelGYpvIJndJBNeP59kvQcLLZCdza4T2fqyJ62KN/n4t8l9KQ2rALwPoDwhElKfvTp+fn3IOuXB/DkDhScW6iZbdCpbhz7PbyqxfvSJeUMVXM1zgNlyli1XFk9zft+/vjOLekuw/vXWqszJ5v3xRhXwSQox5HguHDKUOXhsFbp9lraiFyze60RsAu8ZQez+Gnwe582HdeQH9Oh1pCTHIePznsYhOa59Z2ypO+eIz7ie2DPGq6Clvvs4Ij2njrGVElaAaNkfFcz94y0d+Q2rYgbkB1FfmhJ3g4umNukoSohUDQ3XScA1wwCNLmogHpJiRTyKcttU5xgC3IV1fSu0H9V8tcLXmCtRKHblV/qb8cfBRXbfUYAJaAAbqwCGBlRpJVq1TJF+NT2w1eeqtnaSwuMA7OqAZwtBGnOfDGpF2aj9YnGpBCnjgjLHGgVrjEgwObvM3o17uUJ1z66hLITq5yg/YT/rMVtGwwhD4Be8IJo1B3p79r//Z2VLaxdjyLTuOS5wzMN40bVg dHE+47Ls muYAZ1D7e4yGilCMe4P0Zhf1yy2WhNKKeDXz9ys9ej18QdMRMOSjTQWI7ZkU0hPbvVQe7eXW4Bdrs2apxVUuZz/QwBA3Q0G8hhS/F7UNSh/QMBJul/wyA2ISsjGt9aka4bjOMN9ZscuoLP2A0ylTuenb1B+OBO49eHkiVK4VzJ3sYrYaBK4h3fA1fJd6rYIYvoZTpJE2DKgYudUpmklg9kJD3Qr6U1Hin6WAqi7YDzwq5IXEz7elpp+lwrawwGcmxyF/m5YHVoU5bCsmyOumtcbeiPkxDd4WgORlsgmmpAz+orZzmAe9MFz5axO8mT9iLLIopYlh8YYKMiNdANw5VebVlPdKyZ2viIijMve5WhrLUnWa4xAVVyZ2n+ZRcKl6Y3o8Wkaubyk46VKWx+FWMHCesImFSULDCesXtjsnnEk7Rlio= 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.11-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