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.133.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 291803009B1 for ; Wed, 18 Jun 2025 17:41:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750268468; cv=none; b=cnnFohuQSfAwVoytk5T22a8nnoy54kyjb/SfZunbmRrna7hF+seVh4cykEJ8CDtRA7vjGGzfxTTmh8C2xbgaZuMCS2ni9NBN1dhjVSI4v7sq8i0H45TEUVZq7QCee9waFUiJr+GLdTjNCxTBo7d2qE+X0fTewPl+DryCgZpTnKM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750268468; c=relaxed/simple; bh=medYXpX+TMULRTtTMKcGdqcFj+q0FGabFVW2TyLbuho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZZbOV2g+uXLO9e+1j9cYOriJUNtZeZ/zWwAzmBa4+x1Sb9nTLZ6YjoCzm+2jWy9uN8qqrlbtF1gQsYZFQ5/6shcz0mk4rbTCUxvHwReQC01DKlhwa9qsPhWNxTpY5mt2airvPd6V+0EWK+HT0DS7gA3U0CGK/8Go+opc7yvCUXc= 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=TC4JHm/H; arc=none smtp.client-ip=170.10.133.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="TC4JHm/H" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268463; 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=3ASXfJp4RHbfj4rINsJONSvcqE1rahDwcrPqymsVLDE=; b=TC4JHm/Hr/m3mrIOcF6eCynMhXuGEaJOHGI5dbQc6/cKUWaspyawkAENpxeCepc3EI0HRD ySXXIRav3ZxFn5X6z55SPWTD4m59l6bVVEmrj3AT/B4u4PVwf1BjnYp4Xk5i9cQt9DiVtA ZtQlBDApe1h0umfTF14qcsEX1QD/FCQ= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-438-rVhKmktMOVGP7T14S0IuIQ-1; Wed, 18 Jun 2025 13:41:00 -0400 X-MC-Unique: rVhKmktMOVGP7T14S0IuIQ-1 X-Mimecast-MFC-AGG-ID: rVhKmktMOVGP7T14S0IuIQ_1750268458 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a3696a0d3aso2821017f8f.2 for ; Wed, 18 Jun 2025 10:40:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268458; x=1750873258; 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=3ASXfJp4RHbfj4rINsJONSvcqE1rahDwcrPqymsVLDE=; b=FBD+sVhpXYdKIfHEs16vE7BxTI2Osp2QMZH7sjdCpy8jszBXsP/TVvfCgo9KjC+QIV xi4xbDnJOylLPBF+V5YoJLQoCDZBcJsKZ1RWuR3TegdCeaS/mOHJiZz7okh8e82HOl0G JnK2nd6wm4kuCVfv1Rvorq6T0eBY5k2hrs18Z+/ZlhQ2+L+VIdaDB0RfVbtEx2s4LMkO tgbD/LTLDug4X1PI4wuK10e/j3YgoJeuKNpf97ggF4FdBnXClKVcZ+c+BUgFz04KVzdM HPKZ6UKO10sJ5YiDenv/zd1WTEHyTXBYGNPR+KboAJSB2rmdolSUO/H2OsdTBCa7b2UE 2sFA== X-Forwarded-Encrypted: i=1; AJvYcCWwbaNCMwKKuGukBgBrhPcPfh65RoqmtDFPUm7Mc/kNTIgAPOrJq5g1Wth5SBRPdHewvk+KDi7N+g0Tt9aB@vger.kernel.org X-Gm-Message-State: AOJu0Yx28PYp4v84Krffxb5UvetvJrJURBTW/2ZtmBXDKavpD6wzFQW2 w+UtRfkGgN3bA9OxSHf8PvPZPtEC8qnrhoOZ96k/q655FWXhq2I4/MIHAO0gMQT4cYrpNDyfZhV /Z8YvzOIgU6h5LAmzUN1OSNwhIGKJYnAsFIcFHUEURLladOg2Dn0BAMvc2KosfXjktVw= X-Gm-Gg: ASbGncupw/eRJ6G5uVebVEJlkIUolMrKY0XwQVK3ImsOr3zP+n+s/k22rBg/oIc0Zw+ iVwScfMd46DLpFzncRJBTWYxSZ2wPncCJmKxG1NdZ/wZxv98VFD9eZMnf9SKpTn1nbaBbW1kQLa Y+Ui6wjN6VYm262rGIDSpw69mfRybuQYMwo6MKZBR2hLQ27fnFGs7x2Gg+RPrEjWeLupbzWNug2 cuBn7wSUiBassrUUdI1gsrskLbToUbj3mPI4FrHISMQAAytb++6HAjdhHDVtpufDoqiGCA4R9jp jKdBvCseJDxoAOuHhY7EH95ZjU9VfXi4i2xvlX5zxHTo+kqt8eF8ak6k6PJejNaNVYn62BJQsia VtDjFOA== X-Received: by 2002:a05:6000:402a:b0:3a5:2208:41e3 with SMTP id ffacd0b85a97d-3a572398dcfmr14347281f8f.4.1750268457663; Wed, 18 Jun 2025 10:40:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxU0kwdlscA0a/TfkuoDPVpV0SY0h1I0z821bVOupD96O2QJDPBeoneLN1ts9zfh0zY6p91g== X-Received: by 2002:a05:6000:402a:b0:3a5:2208:41e3 with SMTP id ffacd0b85a97d-3a572398dcfmr14347224f8f.4.1750268457179; Wed, 18 Jun 2025 10:40:57 -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 ffacd0b85a97d-3a568b74313sm17643014f8f.96.2025.06.18.10.40.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:40:56 -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 15/29] mm/migration: remove PageMovable() Date: Wed, 18 Jun 2025 19:39:58 +0200 Message-ID: <20250618174014.1168640-16-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> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As __ClearPageMovable() is gone that would have only made PageMovable()==false but still __PageMovable()==true, now PageMovable() == __PageMovable(). So we can replace PageMovable() checks by __PageMovable(). In fact, __PageMovable() cannot change until a page is freed, so we can turn some PageMovable() into sanity checks for __PageMovable(). Signed-off-by: David Hildenbrand --- include/linux/migrate.h | 2 -- mm/compaction.c | 15 --------------- mm/migrate.c | 18 ++++++++++-------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index fb6e9612e9f0b..204e89eac998f 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -104,10 +104,8 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, #endif /* CONFIG_MIGRATION */ #ifdef CONFIG_COMPACTION -bool PageMovable(struct page *page); void __SetPageMovable(struct page *page, const struct movable_operations *ops); #else -static inline bool PageMovable(struct page *page) { return false; } static inline void __SetPageMovable(struct page *page, const struct movable_operations *ops) { diff --git a/mm/compaction.c b/mm/compaction.c index 889ec696ba96a..5c37373017014 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -114,21 +114,6 @@ static unsigned long release_free_list(struct list_head *freepages) } #ifdef CONFIG_COMPACTION -bool PageMovable(struct page *page) -{ - const struct movable_operations *mops; - - VM_BUG_ON_PAGE(!PageLocked(page), page); - if (!__PageMovable(page)) - return false; - - mops = page_movable_ops(page); - if (mops) - return true; - - return false; -} - void __SetPageMovable(struct page *page, const struct movable_operations *mops) { VM_BUG_ON_PAGE(!PageLocked(page), page); diff --git a/mm/migrate.c b/mm/migrate.c index db807f9bbf975..cf92075108f0c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -87,9 +87,12 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) goto out; /* - * Check movable flag before taking the page lock because + * Check for movable_ops pages before taking the page lock because * we use non-atomic bitops on newly allocated page flags so * unconditionally grabbing the lock ruins page's owner side. + * + * Note that once a page has movable_ops, it will stay that way + * until the page was freed. */ if (unlikely(!__PageMovable(page))) goto out_putfolio; @@ -108,7 +111,8 @@ bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode) if (unlikely(!folio_trylock(folio))) goto out_putfolio; - if (!PageMovable(page) || PageIsolated(page)) + VM_WARN_ON_ONCE_PAGE(!__PageMovable(page), page); + if (PageIsolated(page)) goto out_no_isolated; mops = page_movable_ops(page); @@ -149,11 +153,10 @@ static void putback_movable_ops_page(struct page *page) */ struct folio *folio = page_folio(page); + VM_WARN_ON_ONCE_PAGE(!__PageMovable(page), page); VM_WARN_ON_ONCE_PAGE(!PageIsolated(page), page); folio_lock(folio); - /* If the page was released by it's owner, there is nothing to do. */ - if (PageMovable(page)) - page_movable_ops(page)->putback_page(page); + page_movable_ops(page)->putback_page(page); ClearPageIsolated(page); folio_unlock(folio); folio_put(folio); @@ -189,10 +192,9 @@ static int migrate_movable_ops_page(struct page *dst, struct page *src, { int rc = MIGRATEPAGE_SUCCESS; + VM_WARN_ON_ONCE_PAGE(!__PageMovable(src), src); VM_WARN_ON_ONCE_PAGE(!PageIsolated(src), src); - /* If the page was released by it's owner, there is nothing to do. */ - if (PageMovable(src)) - rc = page_movable_ops(src)->migrate_page(dst, src, mode); + rc = page_movable_ops(src)->migrate_page(dst, src, mode); if (rc == MIGRATEPAGE_SUCCESS) ClearPageIsolated(src); return rc; -- 2.49.0