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 1C5D4C7115A for ; Wed, 18 Jun 2025 17:41:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 11E9D6B00A1; Wed, 18 Jun 2025 13:41:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 083836B00BF; Wed, 18 Jun 2025 13:41:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E15C76B00C0; Wed, 18 Jun 2025 13:41:20 -0400 (EDT) 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 C97306B00A1 for ; Wed, 18 Jun 2025 13:41:20 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 96A5B5B905 for ; Wed, 18 Jun 2025 17:41:20 +0000 (UTC) X-FDA: 83569237920.21.D5BB1F1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 5AB3540015 for ; Wed, 18 Jun 2025 17:41:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XfZMW6r0; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750268478; a=rsa-sha256; cv=none; b=b8opGMhwiHSEODHVvsM9KNuOMAujdf9upW0LA5g88+O59IhkErlb/+zJpmBEXo6tkcEUo9 /7CcdpAHVzxr4xwr/iqvNPFQY1L+g2AseUTaf9UytLncJqBpSv8o8o5Hu1ZbytT6Gc+N9N YVwRkrMRLyeRb3SbYmS884j0hthtGw0= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XfZMW6r0; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750268478; 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=VgDxyojJlL5XcnaJgd1JoaTm/pUk71nf1V9W9yKY0aE=; b=XS17p1DGpPJwqRZjhzCHrmGyWBgXYEWXKWkd2Wa/1ExQoixudzahm3ZqDKn5fkw2o8ESPL gV4RJ6aN1JrsRq7gkBzc6d4799oxXXdCV3kbjQx48wNWZwD1qmphlS7LI9c08rvz8T4dBW on2XP52FDmwiHTFm4KcO8/TwnQzeerw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268477; 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=VgDxyojJlL5XcnaJgd1JoaTm/pUk71nf1V9W9yKY0aE=; b=XfZMW6r0SZJ2dAZN7O0W3oEZ1YS6pQeajk22MHNtZ7MZ/3mAI3XDpK6fsqotNnB0AWn+xp +3zFGg1eDTNYRoHjtH9mxAVgrPRtOypEh9XjgTcaZ+vtCrK8nuE5elns2iMYr7k+RXhPaB h1vu+cs4BLfGguRGYGV0/d57bxmZi8c= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-321K_tj3OV-SBcPL5hrc1Q-1; Wed, 18 Jun 2025 13:41:16 -0400 X-MC-Unique: 321K_tj3OV-SBcPL5hrc1Q-1 X-Mimecast-MFC-AGG-ID: 321K_tj3OV-SBcPL5hrc1Q_1750268475 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-451ecc3be97so35882325e9.0 for ; Wed, 18 Jun 2025 10:41:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268474; x=1750873274; 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=VgDxyojJlL5XcnaJgd1JoaTm/pUk71nf1V9W9yKY0aE=; b=FvGpQfx7tySiEPGZZe6sAaJCYKdlw1JVunlLEQIiCsxbuvWQ9KSd6kWxrIQ3oEPbpu 4AbUDIyrubgxyhdoFONAis9KM8/3ewdg2/XhTcR6FwOKCyhyYKrFkSlQb1C0OOkEc/9B a+kGqkCgZ4J3nzHtRRVHNirLItOrsJ2K8oaNx/fu+Xd5LLyeVIxL6B9zmZVCS8MAx44N KGBV9afYp6dF6HjLoL+DHxkoJXFDQDQFsHcld/CVq6B61Ts4uXkP9gckL6GIMJtRZK5W zglNZ3MxQvx1ksDUGdkux5nwjkYv2AIDwHSDyewHPxRsTiRRBjnXyIM9wYLu9t9zn80W 2WZQ== X-Gm-Message-State: AOJu0YzWyC8Xp7qkyKVMl6t3ruZq56c5BWkMlMhqOzzRCmMldfoc8SB8 OF+IXyEOI2g+HpajaGflmBGrBJ0Q/4qFobSHGSIHatiK+bxTUwPT7BaiG0nPXmfHnVnkjGSjTZf bRX2SxLPFQ3O7zG4hHuhFgR4ka5Pbs+wtwOWjx0or6V4N9gCNAcW9 X-Gm-Gg: ASbGnctsKLoIQLbZUNAlSsSwZ7CFabhfUjNYlrZ4ODnOJjZUT2VH8ecsXpWwoI6OMtc Z8vBDvJcblEZq761r9+gTkzFRw13xJuZdWhbik5xk5JgarxV7tWXFvRJhSOpPbf15TZ0B8qoBZ3 IIJkeylkefGrTC+rP2W8aTIEXHiEiHrGcvPoZH5Su52NvWyyWaAvt8VAL1sTudq4MlMg7hC0lNe GrJZRNBCSIsW5k+GASESDbXd0n08nrmeNYxZpZlwwFGeyVFc8FGY0mMZd9TW1MwqOkoWxhZdzDr MIONxQPDws6HBc7mE+nQ+OSmNzP3hdXa/swHqlne0XRaD3FMCDkbk05ZPDvAl737AE2uMOytVNj tZtWhgA== X-Received: by 2002:a05:600c:3e19:b0:43d:2313:7b49 with SMTP id 5b1f17b1804b1-4533ca66cd0mr176797875e9.12.1750268474496; Wed, 18 Jun 2025 10:41:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIk5j0XUOc2qfzy9nY3G7Nge7jrVSGi6o08YDSv4Mte+xl8dtPQDJlCzuSsfiSc9/ShViabA== X-Received: by 2002:a05:600c:3e19:b0:43d:2313:7b49 with SMTP id 5b1f17b1804b1-4533ca66cd0mr176797145e9.12.1750268473925; Wed, 18 Jun 2025 10:41:13 -0700 (PDT) Received: from localhost (p200300d82f2d2400405203b5fff94ed0.dip0.t-ipconnect.de. [2003:d8:2f2d:2400:4052:3b5:fff9:4ed0]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4535e993c95sm3729315e9.26.2025.06.18.10.41.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:41:13 -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 RFC 21/29] mm: rename PG_isolated to PG_movable_ops_isolated Date: Wed, 18 Jun 2025 19:40:04 +0200 Message-ID: <20250618174014.1168640-22-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618174014.1168640-1-david@redhat.com> References: <20250618174014.1168640-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8tSuoWM3iGvkBqrqnwBhQ7khrnYHEZ4qnQOz5LYeh4I_1750268475 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: 5AB3540015 X-Rspamd-Server: rspam02 X-Stat-Signature: tqimhcn9tm6g6w7o1c7fjzfju9p9q6hp X-HE-Tag: 1750268478-736018 X-HE-Meta: U2FsdGVkX19BFl0hp43p2cuJQGQjuuTvh1jln9ZjEVnBSzr4pAtqdDiA3ZwifUWbFbKh9Wjn8sadhdLqr9vFWXu1F9rhGCQ+L9YGB/DLD/HjdeorNltdx7qzDOPbNiVH3hjD/6PUjXPr1oHIzUnlJBf26tYvR0fvSr5gvEiU+Pu+0SxEiamLUP8xU2hvCsf2hO2iN/AHvwgf39tFoMGOIwcmbaROd4/Hh5+p8kVaoPZyqg4Px80YEecy1KBbm4CUnguq6E2KJect0Dk7kSImcTXlXS5eNpT7Zlc2FJxUbBVBCj5GODPQrEIRjvYgXZQjOX5pJHCjG3Z3yMPLYN8TfDHi8nJY2G0VGUk2vv1bL8L1h22A1fElv2wL6iiSMS8XGC8PV0W7fgTg4Hl4f1Z3CzIhL0JARVINpqtA7KrUoAO+K7KilmZnIVKdsIx51Y44R8SRvHhqu8PxZ4Md6uhmWxWeg8Czu+0Gn0x46U2w7P6ZqrCtPwwWodRgh7tWcnjKB/Iw8BQ+p6zSZs44+hhAplwXsOXIxi0+whDJgRTBuSmwMet+gzI6Jc2bng6SmTYo0CAmXNJNdJ/KItaw51SsQP579KsIRrROPECRJsbcsfs+eMdBDH/4ukF/BjDu0L2+rOd4l+OxwbF/gkWZ27d357huB7jHMNS/TvWrsmA8evzfCejPcmsFImrsL0fwl4TiF6GxZ/tCD5igJYZ/Jf4MTz8x9gE14GonX/AfbZhHMmKRvI0XKHlugmpIvIY+M10DGgnsQoX0Hx30TDN4zfOCluoDpesO9qwyGEe1CLTT7/NUd+NKgmXctHScgAR4b4+XhFLr/qNaduKUR5XV3YCjU8jNRrtlF9VwzR5KZO7ugr5ZeMH7kKRLeLctpAuNdLWkBGAD0C1pPVPvjVeoc8NjIW2dorZtXxHlARt31t2PfBu0eh8Nrn/+0lek0jlEn19/bT/wxT1W6JEm4NZnkV4 R29NhvHc YBYP8zb6ZKjKlrCl/K/6n3IuBw/EF047qpxIeJZC6wh+axijwpuX++TQp6DAVIaMJYGxZe1CaDy1PY9XGy/BgV4u2vGQx+ax/uhW1fuN0GJil0hkW1fEf6D0C15aeiZ/7kcQMmcYZ/iGAsKtGGw+ijfB0PpJ2qt0V5diGHkQ9fRxvYvvFP22HOXRX9x2tKGuoi5ip0Yj9LhPVZMwyT6qb6yQmB2gISlpiB4Uvg4WWUW4wk+V4soCYpX6Ft0A487K8DqAXH5AdgRROs014WQAkuzGyKrCU2t2lEuraH5hZEVe1zkOTu4i9AluBXxw6whnKDoIUzxwVW9iWRKxn28FkO6lhy/h+Vbw2AtufvIiXOxdDz7Akf66E7rUAavFZ+/abGjNzu7jjXo+jFdActRzT9vzPoaiI1umWL1snKXG1uQBSvLiW/JdNBcztC4cKGsT2Ccr8QZa50cer4befhvN/tzBeweJj5NSsZ6dGFtEa+wtzrjuNSHJkwsbGUBcRGrw4d2EM4JMRh911USVSyqS4S+7FZH64VqODBj2iFGdg+p0Adjo0sqsG4zwCCLLJOtehrWzxqSWIt+MXc/CbIsNZeMPzRDlCfbJyEHye 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. 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 016a6e6fa428a..aa48b05536bca 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 @@ -1146,8 +1143,17 @@ PAGEFLAG(Isolated, isolated, PF_ANY); * page_has_movable_ops() instead. */ PAGEFLAG(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 PAGEFLAG_FALSE(MovableOps, movable_ops); +PAGEFLAG_FALSE(MovableOpsIsolated, movable_ops_isolated); #endif /** diff --git a/mm/compaction.c b/mm/compaction.c index 86d671a520e91..809e4395cadfc 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 will grab the page lock. */ 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 a36030de94f30..f87a998b696e2 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