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 B7253291C3E 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=GP45uR1GhmqGTtdfXbWapnaEHxu+G3uNJWZpDyzZnkmUO13oTL/aQl2Mt8qT5KUFy4Vl03JxD6k3CJT/1DjdgHETlnsze8Kuq8lYKsH1J5Ci5UuEM/FiigsMwitrjLicK5yWMvA6pB5LPoTyBb24zdRjCSZAbhgvuPGdBOK1GOg= 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:content-type; b=bRTPKLSF10B+6f4sC7yuHzvbdVe3VlW/koXcPrFYf/1IZYmPuneFNwFkXuajlP2gJVRALtwD+4DZ9DsK0AFTcPrQ7bDVyOcPEn0f5FR+P6Uri8AJmELGWpB3Fc3b97qPTVhJCQ/N8xG6Vdc/idorYOIiRURn58/eP9XlVXmMfrk= 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=GS+4p21g; 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="GS+4p21g" 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uh556eqkqkK5IlF5dOoZ8tKW5iYbjU9GjHiIRIfOQPo=; b=GS+4p21gSjzKLjVGo9l37mqVgh8fokgtiC9hcjuI10JpFGEARGNq7nFHlvwAYQIeszZyZO l/KaIVQiPzg9mj/pmX+Eo+avibLpHUyP8GmbolJRx7RrjjaV9lmgcLFPLahy4LNE34372j vzL073nWUKrXfb3BgI11rCKohmDIGLU= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-fMR460DwMS6McCs0nG_RPA-1; Mon, 30 Jun 2025 09:01:18 -0400 X-MC-Unique: fMR460DwMS6McCs0nG_RPA-1 X-Mimecast-MFC-AGG-ID: fMR460DwMS6McCs0nG_RPA_1751288478 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4eeed54c2so1643997f8f.3 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=stwQJuvrSVuxQnUEtpHH88JAg3foBCxNvjIs/allZGkip+V3D5GeaYtkikKJI4yXnc M7Snlj4s9BG/nSWxtrxh8UGE27QcGTsZTSzygEGjO5cWg85E80Q0rJZJStNq0ASVcHre A5I4L+Sb0fK1nlOcXFLiTmk5o4PpHoY6H2R6Cr/X+u3wB/1se9MMB639jTfw3Qm0qGIa 1HciyN1Esrs0TbYUqa8OHZQN0+9O+IC+9sZNPGZbDgOeoGx4nFBI01FJ76OOwwDNNpZr SX2tQFIMSBzrllKZFbblpgJPG0dO+3YGs8MoEO71VMAITgZDywfs8bRp8JFMgR9YflYC +S+g== X-Forwarded-Encrypted: i=1; AJvYcCUv2migJvw7T3ubInZaGG2/ZzWOh6hNwE3XAMdVWa2M1T4vxtDgKGz8v/lLpdgLvw6gbTWus+IC5vLZVhrmpg==@lists.linux.dev X-Gm-Message-State: AOJu0YxMtDBqQOxYaZVu29kI3RoginOMyf79oN9QL4Acno5B6dL8SShk pME0KAYixBJFFXZ7EZsnx3ENEKGkctVU2Jj3pL4hjWa6HN2Pgc73QI5GHBYd9dNqXZSKXV5cHuK StQ4ipNXSPViCpg2A8NzhRh/blDhPLsbiTBAfn1hvY3HWNYI/k1v7Q9j8vj1ukEeox4nC X-Gm-Gg: ASbGnctCEXolKJxf7Dqmsaguzso/qZJMhbYAgc16LidVjKCgtdJzOjsyR2yQMyPRUPC 3bEq6FS3RzedHwLx6f61oV/pogcz33yRtW0de3QVsit9FtWAEdI2FN+FwLNmDHHpbe+4IDUbxxH AsT4UU1L1N9+X0+8ydtKURRWpT5suA22BYxWfrL/rsmB2/aBiTVSowb04kh/r56sFugBQ/c7YZ6 ZFw5GwzbQyq/SynnI30deJBYzZKf7j4qpVI8zxPslbAcMinW6rgHwIPOGbnfiIcbwtmcB0LBeGo Jf5UUyNv+aEKSRpYoONscR9FhzwzuKIZtjbKo+MWOyYfdwbSe++NcPYKCt4b45SXglS4Z9WKehZ DhjNOU/s= X-Received: by 2002:a05:6000:2112:b0:3a5:298a:3207 with SMTP id ffacd0b85a97d-3a8ffadfademr8628920f8f.48.1751288477083; 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: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _vIRNfbDumoK45X1Ug_KukwVjqSEBmolU1Wug1Reg3o_1751288478 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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