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 E5370C8302D for ; Mon, 30 Jun 2025 13:01:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60A0A6B0099; Mon, 30 Jun 2025 09:01:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BAB06B00C2; Mon, 30 Jun 2025 09:01:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 482336B00C3; Mon, 30 Jun 2025 09:01:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 358CD6B0099 for ; Mon, 30 Jun 2025 09:01:27 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F41421061AF for ; Mon, 30 Jun 2025 13:01:26 +0000 (UTC) X-FDA: 83612078172.24.A43124C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 9BFB3C001E for ; Mon, 30 Jun 2025 13:01:24 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DzyPRmD7; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751288484; a=rsa-sha256; cv=none; b=mm9xkPbAdIcSRjFcz/uUWtIJmVxTL6HRH5gYX4B9kQRrnzjBHiGHnGs2skgQUhtfSqIhWV zZWzQ6ZvX3kZ5kvpueWR2cW0Npiou5ifJNqq/LKYOS2yBI1yHTZLnUYcKbyB0xP0LIiCsD +26sMeWo+1m15nd25EXzONqUMVIxSnw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DzyPRmD7; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1751288484; 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=Uh556eqkqkK5IlF5dOoZ8tKW5iYbjU9GjHiIRIfOQPo=; b=Ay1Jr/jFNw2rBr7J845QRTEHlbvTsDwcen9+grP2lYFdPCWOIOzlwYrvzzSN1hGeKgGU5j H3D1B45mHkZe1BHbkR+Wz4h3Rum0NU/T65QV9jVQdnQ2Mb9RpDK2IB7PWg31cHbak8cOxN tDDvRk5gNGe7KzwSMeeh7O8fB1OVkTY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288483; 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=Uh556eqkqkK5IlF5dOoZ8tKW5iYbjU9GjHiIRIfOQPo=; b=DzyPRmD700O4J4y2WexCpNTnTgY+Pm6qTFGn4dCfjb2K422oKsDlFMoflIrBb1z/HDI/ak fVNLhE82PYCBdNs6Nj5XclhR4uG9aXj95o4kNaM4IYe9c2T48jyxjS85DQlOhH+cTGiTQd g5JuCkOBoXhZs/r+e3rad9h7P8UDX0s= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-452-tes0civINcmOBDRKZP7KOQ-1; Mon, 30 Jun 2025 09:01:21 -0400 X-MC-Unique: tes0civINcmOBDRKZP7KOQ-1 X-Mimecast-MFC-AGG-ID: tes0civINcmOBDRKZP7KOQ_1751288479 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4f6ba526eso1305811f8f.1 for ; Mon, 30 Jun 2025 06:01:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288479; x=1751893279; 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=Uh556eqkqkK5IlF5dOoZ8tKW5iYbjU9GjHiIRIfOQPo=; b=lSz3ML+4fs/Wcc1FVFUqMgF+1GCXurxL/UcwCtAv3KDGsj1lU9oDqU9ROoOGW36P3q 9+hme44PKfO6Lk6XBWf2mT1dK0CE6ECHEBUAdioyDGWVUi+0HbEYa/2iM7L9qkdJ8Yww ErWdu9uj9+z3008EwvIbExn24uMpZ/GCPWeH4jR/sxGLA3HhU49zyxGWXjtalZd4YVZ6 tyeKjIzx/8rKDgTIml29xTX6978A2eJDs4uc26BX29r1UKdhWGAnLDhr28zL7nrN00Mg 5RGI9UK0AtIz4VYtJfXLUfTw2ytwOfCQcuaA+Nt/L9WO5s4jZ2LWMXVCrrTWwQA+Cwkx YQIg== X-Gm-Message-State: AOJu0Yx20sy6lqCQnh/bK82fkEMYP8JbrmJE3c9k7Wz+AgM9/eskcYgy IrOSCgYQ69GozzIP+rLd25CYkHvDNHY9VT6DK6NSdiAKc38iuQWtskdNw7FUvLFBU7EVED98u6K POa13+f9IElFaUWlDUcovqZaYqPQwsiEhtZABzvHDO/y/98YTkuPS X-Gm-Gg: ASbGncs8t/EipjjEwxbEJofILpsTuCk8FObu/R00iaj0Hj4kplOh6lfCQLKOsvom7Ps Z5gk5+pmhPd1feY9MydqN/n+TcgtapLrUANPokk+cMORWC3eLcazmFfeTzgd5K5lgRPEadFyaKw +kk2Va3dzzh9SRlRG8NPlJ8Sn4oe5aQH5C4eA4vsHRsX6+GmK+n9mgH6j+7B51jaQir03w4TdbR 0hfFdnh8PsjJIPUoLUJFcvqZ6WcEeO9nIW39ddD1mZhLmf24qKI2x80q4BZ98q0RrxlsyHIGaVc m9LEUsdeoCu/BhyhIml0XltinCQOEI9qukaXschv2brvUapelNXqx55dxLytX5EdOJVVCa4MX0b cLDLB/HU= X-Received: by 2002:a05:6000:2112:b0:3a5:298a:3207 with SMTP id ffacd0b85a97d-3a8ffadfademr8628969f8f.48.1751288477139; Mon, 30 Jun 2025 06:01:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFY9r1p0u/0kcCjG+nghTpHrdk2mNLfE9z/HI6liANtRmtIL3dMCa2Pbf5hTgLV/B0o5eULaw== X-Received: by 2002:a05:6000:2112:b0:3a5:298a:3207 with SMTP id ffacd0b85a97d-3a8ffadfademr8628767f8f.48.1751288474943; Mon, 30 Jun 2025 06:01:14 -0700 (PDT) Received: from localhost (p200300d82f40b30053f7d260aff47256.dip0.t-ipconnect.de. [2003:d8:2f40:b300:53f7:d260:aff4:7256]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a892e52a35sm10528754f8f.57.2025.06.30.06.01.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:01:14 -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 v1 21/29] mm: rename PG_isolated to PG_movable_ops_isolated Date: Mon, 30 Jun 2025 15:00:02 +0200 Message-ID: <20250630130011.330477-22-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250630130011.330477-1-david@redhat.com> References: <20250630130011.330477-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QMvZ8tZgmScCFf0rTdZ95mK4U-CBgi0J6o5w4oK3qbc_1751288479 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9BFB3C001E X-Stat-Signature: ms38t4b1hor3r4f7df6xg754f8oye9ef X-HE-Tag: 1751288484-11709 X-HE-Meta: U2FsdGVkX1/dVLftx970vqqbpDjQfqq08VclEPbXsaUl8Q+dyVlBmVyI4515Vi5BapemUwBdxnttRxbWlF+yFvk7Z6AiXnpV1AFM9XY/znr3v7CxtUUOFn8k87xK9THsqOcpNZxiwk0F6uXgE00OyFe4XKQauTdZ8nGyMHeHoj6m3gAVQwbOG2KQt1jIDrjnes0rCvEuWIQ5pE2YVgyEz9RTK9KrPafQKfSaEgT4rwS3faE2ye9m7FLoS4Ya3T/K2dPSxOxW/QIBJaDcH59rLn1LAW/8jlz3e/rovJjBRIXnxv85X2IawA4Es+c3vZWCxDxJWxjaEb8q/Lpjva/4tJyPWYTPoLkZL5t4GtRL41hptAO/0C6+/ELShyLO+jw4ZlQlzBc6wJIPGySMevkhUvPDdXlyBVYy8ntCwWXYH4ntoT6TKAZqEvZhG8GPW7P5EM9wYUB+dzhVjc9zehCEB9xxuQ6T064ig9MC50Hm7FVds638BBUHVUyaKIwl7arh01/Pj41zECqWMtMLHqwfcp2GXhMRXJecV4fTMQLP5kusPxLNUK8F66J29Y/jZxR0r4sXxwRVEwRnHkk1JMSFo7a033ehqa/etE9au+PwR++Bh9UPn2SinwYkn1jdMX734ad+fL3NCkRGnixREynRgr+c3n/EKtGA1cL9Cm50Gt+U4oBHh7qlG4LyjZWpfGgzWC1NB6WgfjR9/6jRbD5SitTbm7lVDXcVR59FQD/wPm1KSY+K47IfRY5z+1aEStoS3nqctM/aKk5MIucAksbCwjTDXawSWt7PxKImrWfkpyvnrw5L2gfiyw0v79JYrr712N3YzZaixqlzPJ0aYwDh95tkuAA7WhWbqbagNNj71Ah1ywHIv1qJGQRvkFLBnCxZUwkaafT93AgJQZ5aLuciOSdalecy0CCVwrdwZ/pdAEJULA/mOyG4KW1HoipJzk+ik6genRPQWK8ptBfG5XF EhXj+Neo V4z6WGD4MRcJ+pkUTbC+fL3Js/Z4s3yE+yJaG7oGfmer9XqIgJTBRkZr35OdLxEu/49NAW9p0sE/xWL9ZkFE7HIBNB08M9jjcUmmYlz76wT/DmzuPT04RdOmjkm8oAPU9kk+uFex4nG8j416UYXrGxV9hZF6QKgNCACv+j9JFuZaGbCsF6bQwxexq3E/+O8YihfbtR631zCdGy9Rbs9SDFQ6+Jl6Oybc76hSHrKq8Q45J2DmFHMJMffwIOpke+4524wsU/YwtQsJKtDnJFe/zpZVWixJervGqSfhG8m+RdJuSIxmpNTDMlz64VPGB7JXXgc+jeaGd6Ty6Pd4xhZTBMraLZQVb9ZWvQv1+zTuIUNwZFJbGmZeQr+WaU1s7CKPcxCEnl3uBPGmar9iGOtZOY5a++JInfjOIU+hjEXeDa6d+AYogY+cE3ciE/3qo31Mza3kVF8vRgyS3S5lqPVYW/iYGlRGlsGE162RTFhyHi5n0ZLM15F5iFXmE5nqah5NLMAsIvfirQTWWPt8VCkgAM//5JaAC6o7n+31aapSshFAYLc2e8FCFSN3OGVq+zSIQGypQ5h8SwBEUXnnUpPliWJeTamdUM9Ed+QX3xmMGXOtZGlCB946ohRBch2c7baSCuFIDo4+AR0Nq68maerMnE5jlvSHzV1GVdHSNkCwf9DorSJPkQJFq5+psUw== 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 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 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 c6c9998014ec8..62a3ee590b245 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