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 C0200C8303D for ; Fri, 4 Jul 2025 10:26:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71A296B800A; Fri, 4 Jul 2025 06:26:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C9F76B8035; Fri, 4 Jul 2025 06:26:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 544ED6B800A; Fri, 4 Jul 2025 06:26:34 -0400 (EDT) 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 3E0BA6B8035 for ; Fri, 4 Jul 2025 06:26:34 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 04E9116025A for ; Fri, 4 Jul 2025 10:26:33 +0000 (UTC) X-FDA: 83626203108.10.0F00337 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id CB1E2140006 for ; Fri, 4 Jul 2025 10:26:31 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="CzJ/dXwT"; spf=pass (imf09.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751624791; 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=oIfhqplW92Whs4rQ5a+bzpcvmYNnoFDclaHeGz5GfJE=; b=VHl8DSaKx3YssWV64Fu4SvIF7EGS24LcymhMIAqjJLqnqPW5Bs9tkxEBZeyYsqtw0vTZOO spaJ2GLEj44GcVWdoyyPo9kA3Jexeqc2UQq/Q3opV0BCGXTGdXMtGE8mdwqLZg/B4Im4fp AQ9zDC4RMsgcytLxkdMWwDDd+Cw0IAU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="CzJ/dXwT"; spf=pass (imf09.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751624791; a=rsa-sha256; cv=none; b=CGleSR8n3Eyc+BVg8MPpNUeNvIMYsFadPjPGAaZR36OsW6khdL9siW8X2lL54XIzpDz3pt tHfgx22cq8t021Sx3ZJN8RjUF0ABFM49FfsCrR716HWKTpun4dTV8dEWib7NhAEjeRUJyz R/zeFWwxhSpcm7f21b42H5DhZN9a0ag= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624791; 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=oIfhqplW92Whs4rQ5a+bzpcvmYNnoFDclaHeGz5GfJE=; b=CzJ/dXwTEnVQNEQyLY72vxXz5hdcFZKATZK2YV0/FU3tLO5r2T82zSbVRdLUr12j8i3a1l f//fG+xh8aLSkzEzNkAW+tj21OAi0K2XR4ZHo7xA0gjrSbt0i4q+gkjGcKG5llhj9sENyc wMHQ7vxuR1/Ckpt3Nyiq7OgoF1FJ7SQ= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-530-iJ7xQWFDNvy2U-FJ4zK6zA-1; Fri, 04 Jul 2025 06:26:30 -0400 X-MC-Unique: iJ7xQWFDNvy2U-FJ4zK6zA-1 X-Mimecast-MFC-AGG-ID: iJ7xQWFDNvy2U-FJ4zK6zA_1751624789 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-454acc74f22so5106325e9.2 for ; Fri, 04 Jul 2025 03:26:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624789; x=1752229589; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oIfhqplW92Whs4rQ5a+bzpcvmYNnoFDclaHeGz5GfJE=; b=iXj55tWliFsik02li9/yYdZFGpRtQNpFtQ6jhnsKIizsFKRu/HXHlz2nLfPHbjf51z hQwYJpUJeN8VM7jircu0wivS7zNifRUbWvGDbtHPLummHiuL0UXnCDiLUT0NFuzlf6lV vSZwku+Zv7KRy8jPol67uSoReJaEgbtAUvkYB7YGcfm80TKGXcBwQE17hig8tzhC+gSl h+MOQ+ixSirCPi16gEGf9qJbA4dYynj6j8EJtX/srrqLZ0EhZzhQVUAVuTp2n63wB5E/ 8JhupqHX94vsCQHpfODBj/fDVoGRLCvGEHuxCRFTr5rOZo2bSsmakDr30Jky/QArN8YK L6pw== X-Gm-Message-State: AOJu0YxVvOfJZwyGEFZgShYbXuqw02MkqC0aM1lqgIV5sWtt0p1UG6g3 aXDHvl7kYdcqmPJDyGv6gIJTxfg9Z26BO3c674fsPE9/g9KqhpnFQCMDzPld0e+p8cpzFlq2zeC yLXOvrZ0tsXqJ6NyFMU3Wr4chhMlJe+4/deBWRXTzKP0nJPeIc/Wo X-Gm-Gg: ASbGncu91dz3xjA7CD27NBjRoqfrglwhRGkux08XD3NzjoJmdrEFYgJhFrSrHDu/C24 JQeGzGUDwZZ6fejVCJ1V0zI6VXKuyFt0lj7fnPCzEZsHFiwcRn6Alwl4+pUIaTZMIc/RnQVNp0z LDQOfKe+oLSSSSczCny5Rz1jh1YBrc7kLo9pXY5WlMc1atQc2ZX64uQCn2hevK0Ue91Q3EBsU/Y /bY3rgfhGoYFLclSEyD7jhbs+EfC5ArRa1IGQBeVdWNPUuqWJqByPu9gtAtC4jsU82MuFHv/hX+ l1mZ7TOKbdhdWq3fZ8Ctd6FZGEp52+fe4R9tEbb2DNY6asufAzN1AhN7G9CZGWptjxKOGn6Ul7a CKSP9ig== X-Received: by 2002:a05:6000:3ce:b0:3b2:ef53:5818 with SMTP id ffacd0b85a97d-3b4964eb1dfmr1524557f8f.5.1751624788874; Fri, 04 Jul 2025 03:26:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6/dh0H9/LpgMHN6+E5K8aCm2QgibuKB8jFRjnybENn7lard2NaLBEO46u6eT1pnDUCzj4ag== X-Received: by 2002:a05:6000:3ce:b0:3b2:ef53:5818 with SMTP id ffacd0b85a97d-3b4964eb1dfmr1524493f8f.5.1751624788372; Fri, 04 Jul 2025 03:26:28 -0700 (PDT) Received: from localhost (p200300d82f2c5500098823f9faa07232.dip0.t-ipconnect.de. [2003:d8:2f2c:5500:988:23f9:faa0:7232]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-454a9bde954sm50967885e9.33.2025.07.04.03.26.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:26:27 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux.dev, linux-fsdevel@vger.kernel.org, David Hildenbrand , Andrew Morton , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Jerrin Shaji George , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Alexander Viro , Christian Brauner , Jan Kara , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , "Matthew Wilcox (Oracle)" , Minchan Kim , Sergey Senozhatsky , Brendan Jackman , Johannes Weiner , Jason Gunthorpe , John Hubbard , Peter Xu , Xu Xin , Chengming Zhou , Miaohe Lin , Naoya Horiguchi , Oscar Salvador , Rik van Riel , Harry Yoo , Qi Zheng , Shakeel Butt Subject: [PATCH v2 21/29] mm: rename PG_isolated to PG_movable_ops_isolated Date: Fri, 4 Jul 2025 12:25:15 +0200 Message-ID: <20250704102524.326966-22-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250704102524.326966-1-david@redhat.com> References: <20250704102524.326966-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6OpPURnTSvuzyeyKTo17raC1w8kBBt_V4G27sUNeZIE_1751624789 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: ay7mgqrrcw5etjsaf6bpfooxzz8q8fi7 X-Rspamd-Queue-Id: CB1E2140006 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751624791-212215 X-HE-Meta: U2FsdGVkX1+KX+K26l2myRwU2npWPQYLeNgSEsY+dXvz/xpCJql/PCeQ8o3T0nL2ThoO+d+JWJ4GQBcgcTbbO/VxyzZyc2jxIQ5e7k4w4leWsVYmVIt1Di+UG7mrrycbqD9GNzpLTWWpk5+Kdhx+FwSa1Ky4zXkmx6h9sVrriVgZgTDQGpFnRFKOP3gd09dxhZyYz74x9+wn3tKqiRD97lY3Vj9DhXjOVopL447a/Xi/JyXRe87uY2zPoo9iIrfpDj9CFExZeXo9mxExWMLebhORwV9t3b3qTGdOWCn2HDBI4bre3K5+3aqO9fffubo/pwjdYPsYNy6BpmBqdmfYB89RTVynN3jz7dqhE3Mt7cNtzSGF+TGd72PbFhKfDT7yhpq4HxvijxL6wFMjY4Ukq7jJaq+KErZCRt/77oI2ctVB9NkMnrS2W0NuR/bZQQM0jzVm2sqUw8pgQZ8j0jbUKVDfSHGWWtPj9zdKqM/YgGTSExLR6tCGDzcBPsRujcAVhbjyB7mWumzOLEgtj5r4LgnZHUkHehItRqOeSllXXjOIJfVcUUYtzblSMGBxhR7v6m9+awfwoJs4KfSOuIUwtrkkTW+6gHLKF+xR6FmMSdzcd2uupGcrOxla6qCm1M9Ae+TXbVanV6OEFVYJnpGTLXj51yYXz6PyLHG01+OTeVXIpHfmRuA4zCWZCV6hBoXa+wD9UZfF76nAHs4jUyPgUR/QiJOSzsFdyFIGbTQbH6M2nhhZhwSlUDpPjJtoigyOOhhEGlHnlyWXrR8nlInJhLA6B8TdQ1TF1dTS/kFzyn3pPXHmyKuvbBFibVGzsKj47xhPfimVTowd+O7wFchuktl7c7QTDcv2xhX9VEH5UA3jAGT6dR4qT+kZIAW8J2mk+cXW8yi0IAuxE+UCKtKlnYHWqhWTPloAoI6P85CCnVAVx4C0tcUcQfAqs7CR66RwuADAZ05o2mtpjGFw/Wh 4yQk8/A4 r66esfjGx0+hZOoQ/NMaYObuET5cL5rQahb6xDF0GjsMHkRf2gQzikq2yoBiXjpbz2YGLz1wm3yXVNOEQdt7/aD7WE9kePZ/JTtARGgsIKf/Xnx4iymJxDBNfZ1xCYeZS58k+N0pyFogcL1XAZHyoW0tfLq+XU8mra2Sncbske+pjWN0L2UhRX86nYOB6o+lvFq3HsSbmyeO5SUd0gBl1oSTPToGP2J2DOe9e4O2UGlRTgbx6pPBMDEMVyGRuvcH4LuXKVRwC+YPxR20RUbblLaRJsYrOCwXE6dqwK1G2gK8c7pODSZmHpgfoILiH7hQohwoYq+nsfc1lwPLINdwNQy35iVyGjgux0wGN8jaxqXX1yztI98hwSUp7oU3XARkEwOP16gRhec8R7A3E4IyECsEJCIfaT4v97i+EPu6Qvqt9u97GdOlG1Mk3J5ShLVFEK9rJZN0irVmylI5I0WohAC8uYtSMUpq8HE8TZDs3CLaddmI3YDZ7lhVHgfM1RqzFLQ0cNi7QJ0tlehZiof8SIkaVIwAH2Bqc7cgxjscepCmu4gsEGTfwMl8bGLhU/0fPYP4zMH2b20JeNXYh6G1rwBHYh/nH+ynzwW8ChioLaYzrHVTdHELOmt7ra+yycd+akLAtQRky9N1ixsbcOkD/SeEmNz8Ob+IOvYc91auYC05OHZ1VdjdLcgYpVbHs8qHTedi/8eEaR+cTGpQ= 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: Let's rename the flag to make it clearer where it applies (not folios ...). While at it, define the flag only with CONFIG_MIGRATION. Reviewed-by: Zi Yan Reviewed-by: Lorenzo Stoakes Reviewed-by: Harry Yoo Signed-off-by: David Hildenbrand --- include/linux/page-flags.h | 16 +++++++++++----- mm/compaction.c | 2 +- mm/migrate.c | 14 +++++++------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 5f2b570735852..8b0e5c7371e67 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -167,10 +167,9 @@ enum pageflags { /* Remapped by swiotlb-xen. */ PG_xen_remapped = PG_owner_priv_1, - /* non-lru isolated movable page */ - PG_isolated = PG_reclaim, - #ifdef CONFIG_MIGRATION + /* movable_ops page that is isolated for migration */ + PG_movable_ops_isolated = PG_reclaim, /* this is a movable_ops page (for selected typed pages only) */ PG_movable_ops = PG_uptodate, #endif @@ -1126,8 +1125,6 @@ static inline bool folio_contain_hwpoisoned_page(struct folio *folio) bool is_free_buddy_page(const struct page *page); -PAGEFLAG(Isolated, isolated, PF_ANY); - #ifdef CONFIG_MIGRATION /* * This page is migratable through movable_ops (for selected typed pages @@ -1147,9 +1144,18 @@ PAGEFLAG(Isolated, isolated, PF_ANY); */ TESTPAGEFLAG(MovableOps, movable_ops, PF_NO_TAIL); SETPAGEFLAG(MovableOps, movable_ops, PF_NO_TAIL); +/* + * A movable_ops page has this flag set while it is isolated for migration. + * This flag primarily protects against concurrent migration attempts. + * + * Once migration ended (success or failure), the flag is cleared. The + * flag is managed by the migration core. + */ +PAGEFLAG(MovableOpsIsolated, movable_ops_isolated, PF_NO_TAIL); #else /* !CONFIG_MIGRATION */ TESTPAGEFLAG_FALSE(MovableOps, movable_ops); SETPAGEFLAG_NOOP(MovableOps, movable_ops); +PAGEFLAG_FALSE(MovableOpsIsolated, movable_ops_isolated); #endif /* CONFIG_MIGRATION */ /** diff --git a/mm/compaction.c b/mm/compaction.c index 349f4ea0ec3e5..bf021b31c7ece 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1051,7 +1051,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, if (!PageLRU(page)) { /* Isolation code will deal with any races. */ if (unlikely(page_has_movable_ops(page)) && - !PageIsolated(page)) { + !PageMovableOpsIsolated(page)) { if (locked) { unlock_page_lruvec_irqrestore(locked, flags); locked = NULL; diff --git a/mm/migrate.c b/mm/migrate.c index fde6221562399..7fd3d38410c42 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -135,7 +135,7 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) goto out_putfolio; VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); - if (PageIsolated(page)) + if (PageMovableOpsIsolated(page)) goto out_no_isolated; mops = page_movable_ops(page); @@ -146,8 +146,8 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) goto out_no_isolated; /* Driver shouldn't use the isolated flag */ - VM_WARN_ON_ONCE_PAGE(PageIsolated(page), page); - SetPageIsolated(page); + VM_WARN_ON_ONCE_PAGE(PageMovableOpsIsolated(page), page); + SetPageMovableOpsIsolated(page); folio_unlock(folio); return true; @@ -177,10 +177,10 @@ static void putback_movable_ops_page(struct page *page) struct folio *folio = page_folio(page); VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page); - VM_WARN_ON_ONCE_PAGE(!PageIsolated(page), page); + VM_WARN_ON_ONCE_PAGE(!PageMovableOpsIsolated(page), page); folio_lock(folio); page_movable_ops(page)->putback_page(page); - ClearPageIsolated(page); + ClearPageMovableOpsIsolated(page); folio_unlock(folio); folio_put(folio); } @@ -216,10 +216,10 @@ static int migrate_movable_ops_page(struct page *dst, struct page *src, int rc = MIGRATEPAGE_SUCCESS; VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(src), src); - VM_WARN_ON_ONCE_PAGE(!PageIsolated(src), src); + VM_WARN_ON_ONCE_PAGE(!PageMovableOpsIsolated(src), src); rc = page_movable_ops(src)->migrate_page(dst, src, mode); if (rc == MIGRATEPAGE_SUCCESS) - ClearPageIsolated(src); + ClearPageMovableOpsIsolated(src); return rc; } -- 2.49.0