From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6489628B7E5 for ; Mon, 30 Jun 2025 13:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288487; cv=none; b=f5tY7jHwwXVdl4JdH+V1KxtIodrZV+nDUxmsMcFhZDhUKI2dPWvQjkbNvy86qbMYj17Vu7m/IOQwLjhJPY/K1010j+rJKky6tbungEP5K5/U9ISQ292cht8FDVF8EI72Ke4nGDJcMyxkufn0e/mxl2c6oXJNDb4Qrk73UHBXu3o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288487; c=relaxed/simple; bh=spRVtsrXQeSiPctpyfXJIwnWB6OKPlVJ51M2oKx7H3k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J5bag+aiUStdQlbN6lUuWljX84cz+xvhz2OTE88nhxrdcQICOiOQ/JmGymUowJ6kcCuM+8mqswQzB+yzEmkGAgfV5ZXNFBjJtpAfIc6sO72z0SvOa62L74wMO8jZJ0IOootSAZw8YsWOVIRFcGftoBbtseh5171pSA/nVLo1rps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=PYNOPmKV; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PYNOPmKV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uh556eqkqkK5IlF5dOoZ8tKW5iYbjU9GjHiIRIfOQPo=; b=PYNOPmKVqA5gV7JKoyFAR2N6ea6FGKaFjCn1TK2mWgq9AYM4KC4uVxI1nX5WLRgXEVTgut 8i5GNTBjCBB5979Gb106HpeByt3HG/gA7veU+ht0+y3Hkc/UfuR7UKaHtxUZE56K1Mkt1Y NMZt2AO/4UUionj/lRNMYoDhTGskBG8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-221-6eecLN5gMiOudprurbxTgA-1; Mon, 30 Jun 2025 09:01:18 -0400 X-MC-Unique: 6eecLN5gMiOudprurbxTgA-1 X-Mimecast-MFC-AGG-ID: 6eecLN5gMiOudprurbxTgA_1751288477 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a6da94a532so1368413f8f.2 for ; Mon, 30 Jun 2025 06:01:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288477; x=1751893277; 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=EzNpv/WH3aAkxXWZCk6CLT1/1WEGYnVziKu7HI9BzZWmii7TLMHCFdI6XVQ30XLhYv rZ9bkkqh+d7T1wnqr/Ik49MNawwQWyIRfrWl2dSJT+3do9jaAOuplMx1T/LpQ20BB3tP xjwYpaAaPeqYB05AOvDA2NsxuaeQApdBj80E89/rbJDNvSRWymAaV/hEFbkz6sb4dGzU ugHYJyqQ1F45VFTW3CqYQTT0+SjT2PtIAWgaSXZw7sYoIOx0o+iVOcGm2h+a4oJCfCD+ WsaTQhENpGoxj/LhqFKAORwHX6KVDytCGb9l7SSeXjZg2Ltjdq4DXF4sY/yLJy8/DGi+ x3Og== X-Forwarded-Encrypted: i=1; AJvYcCWfz/QbpOliS92zD/vWBre4d+lnRqttLvdQ2eAuGtrpZb+pjxGKVKVpVysaSyItdksQ078qBmiI4iMHBg+f@vger.kernel.org X-Gm-Message-State: AOJu0Yyv0nUAl46+OcbCdP7efmmx66x/XDaUwdvoJhAsAOvsJ7LMikFY g/442wFfWi0g97H5jeTNx4flVXLzYr5kUhciffiMuX3ZPPMxodKNqy+jYvyOo0+S5jfaf6OiI8j kxerqK/z9mWWBBg2IgeAIjdQZAoq7YMvGzngsL4jGZO6TW8jvj4NAb2ORLbz3dl4wJKI= X-Gm-Gg: ASbGncvliU2JYP7hGKgymRjhhJ2JvrhCSqhsJ2DhHiUWH+rErEoaI6lHrdkZTQMtf8x gPFt1ZDkNsw4UXUB8fewy4mdNWOiYgVCd7Ry1cBXeC5lUcULvyzPYxrBPh5FsW9sRoiLkretWwP IAHYbPrO1yE9jR9gb0YHpJh9wmo+hNLQH/ExxERUik+Q6vgen4wzdvNDkGRdjoNwTLVvyc8ZSzR 4V6wu7PrDiMd6yaanllboOzbdlFwl11g8mlfJXQApCvkgXEcYVhpd6y9Ze0wQsgG0qj/h/oLFkz pf9Jx6Rx/Khfcc5f1GyppSGn95cLSAL5u/dW0I2jvfDeyzSdm6lL6jtZZdkpUaTVg+eSqUPhzAF PB0hUYUI= X-Received: by 2002:a05:6000:2112:b0:3a5:298a:3207 with SMTP id ffacd0b85a97d-3a8ffadfademr8628951f8f.48.1751288477122; 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> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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