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 0B8A82FE39D for ; Wed, 18 Jun 2025 17:40:46 +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=1750268452; cv=none; b=YDTMhPjRVnnm4ZQ8SQHcPwIt6ULf3dYUoxG7o6jEX+gKwqEicoxkqON2OWbemZzEbtJxdGwY12OuC0ICssv6j0x1cKPszP7D1hx2I3H4cXyLT3JoWArM3Zsjp6sOv/wkz0of0RK7tCZHPnil/wTQ/HeO9YCheGbQrsml95HLKU4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750268452; c=relaxed/simple; bh=aEP6DnjEOauJOFrkxr2zR+ZZpgBJ0tgUTK1LoPRl2/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oS4HuEyGMNKwXlkSyOjtyOPSpZwlc+E8SW9N/pUN7dVHbMyg+qoAbZJdxwoqUOLTqzmTWkXI9VHR6UNqDEjmmS8MQTG7KjdXhFN0nVAfX/BvzxSuAWgfe740OsqpK6FqQtHAYcYFpaVeznuapjuznZpviEQH/IZsn9BbHYwuaP0= 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=SKXjlzv3; 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="SKXjlzv3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268444; 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=j8LuODrccx/EBs9A7vTNySqHbhe9k9tI08r8Ga0Xgcs=; b=SKXjlzv3cry7VNKq6L/ear0UzV1W5ZjHdUzddKR16vBcaC4YzyZD6ybLxLIu+o11cgJOYU A+Vz6OaHgzHay1l4h+Fyi/eQDPUtqkJM6NVgntFzHaIsZTdbEQ7N8D0X2WjaRQd4wlMfqG VZeIfiuc8jxTr5DDgXqw6++hIgnphes= 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-251-OBnChjEOMaiLJVOxsT_hyQ-1; Wed, 18 Jun 2025 13:40:43 -0400 X-MC-Unique: OBnChjEOMaiLJVOxsT_hyQ-1 X-Mimecast-MFC-AGG-ID: OBnChjEOMaiLJVOxsT_hyQ_1750268442 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4530c186394so32130695e9.0 for ; Wed, 18 Jun 2025 10:40:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268441; x=1750873241; 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=j8LuODrccx/EBs9A7vTNySqHbhe9k9tI08r8Ga0Xgcs=; b=hsbBZ+CIYj6f6d2GUGHJVdh5hLD/tQCPlKrrzcSUCs5Q7fj9NP1kVPNV2OG85rViF5 a3W6NVX43d69AO8l8qJhsgT+3F6OA9eevss0SS6TS51zYcAtSpYHQxZ6sdaYY9ODUCaq XHbp/I/9NaND1iW1Kw5bQyXxTt8bSeQYwwUFIr84lGswb5kWjJdX22KP/STRciiTicwa QlnSq/LHJ72sWQbTkKoq96qq2JM3yeXK09KV5YOqE1sySfIyuiFaWgn6iXbsOc5dk+Zh ogW3ULVH02Kz8MEg308obDsYKotTfBHd2EoAPnFWTm2MbU478tBiL5uB6MYReXg1oVYw RSig== X-Forwarded-Encrypted: i=1; AJvYcCXrw4Isr0j/pSzQqVfuiqFBBMJBMbOm5f5Kuf8SfPxWE8o66wRtRsCAf9XVIRkaVEHTeCEXI8OTW9/gV6oo@vger.kernel.org X-Gm-Message-State: AOJu0YyfTQEcCwVNkMuj0LGO6bgOT4bZGXa8Xeugv1GMlQ86UHo/tLj6 C/5fu1p7w0Wei32FElSrfwOQPGg3SmmdQZCf4MxuIbQR9TkHeDRfqv30Bk8BkQ+jWLrteIyO2M/ nLlykV9cq5K8B0BpAfVvy9HJjKoky6zzKXZmEYC8McYn8YnMPkzC16pGv2gv0obKYXZ4= X-Gm-Gg: ASbGncu0ZYktAlOBVKi4yQWvNbXE5DRbIATHEHvZ41yiriS+jPi5TeLxIkbIHDBwRDo GeXSNc7UxlOSglIY11ISg5GIZLksKQLv8IixIStuZM7/jIfLcfAq1jA8SLdfeDiOGtElwTZRi2B keQP3T1gN29YwX1cmZyN2yDlHzwZb2LqKQAQ6ib0s3txfuuDzltgfvS9Op5Ftx4lrdJvToGpz7Y P0SmRi1CS8cH4G37eao694i8eSobwHd9NiFLLepD4f9n/BWAlUpTbk619tmnmlJn8IxnLaBJWG6 M2764zAJsatZtMMijyCwXd0X8oY0FBaPK3EQuTfFqbx+lAbuUXVXU3ZJGytlIvJMNb7MQTPqcHA uvhecew== X-Received: by 2002:a05:600c:1ca1:b0:440:54ef:dfdc with SMTP id 5b1f17b1804b1-4533cae6605mr166407455e9.8.1750268441171; Wed, 18 Jun 2025 10:40:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHc4TaNXORzdooVLODlvwGNYZ3WZPNGmS5C2sKfTSdPVLBbA2Ps3b4UKdLfdRWvy1N8seVTmg== X-Received: by 2002:a05:600c:1ca1:b0:440:54ef:dfdc with SMTP id 5b1f17b1804b1-4533cae6605mr166407185e9.8.1750268440690; Wed, 18 Jun 2025 10:40:40 -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-4535e97ab95sm3814165e9.7.2025.06.18.10.40.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:40:40 -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 09/29] mm/migrate: factor out movable_ops page handling into migrate_movable_ops_page() Date: Wed, 18 Jun 2025 19:39:52 +0200 Message-ID: <20250618174014.1168640-10-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 Let's factor it out, simplifying the calling code. The assumption is that flush_dcache_page() is not required for movable_ops pages: as documented for flush_dcache_folio(), it really only applies when the kernel wrote to pagecache pages / pages in highmem. movable_ops callbacks should be handling flushing caches if ever required. Note that we can now change folio_mapping_flags() to folio_test_anon() to make it clearer, because movable_ops pages will never take that path. Signed-off-by: David Hildenbrand --- mm/migrate.c | 82 ++++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 32e77898f7d6c..456e41dad83a2 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -159,6 +159,45 @@ static void putback_movable_ops_page(struct page *page) folio_put(folio); } +/** + * migrate_movable_ops_page - migrate an isolated movable_ops page + * @page: The isolated page. + * + * Migrate an isolated movable_ops page. + * + * If the src page was already released by its owner, the src page is + * un-isolated (putback) and migration succeeds; the migration core will be the + * owner of both pages. + * + * If the src page was not released by its owner and the migration was + * successful, the owner of the src page and the dst page are swapped and + * the src page is un-isolated. + * + * If migration fails, the ownership stays unmodified and the src page + * remains isolated: migration may be retried later or the page can be putback. + * + * TODO: migration core will treat both pages as folios and lock them before + * this call to unlock them after this call. Further, the folio refcounts on + * src and dst are also released by migration core. These pages will not be + * folios in the future, so that must be reworked. + * + * Returns MIGRATEPAGE_SUCCESS on success, otherwise a negative error + * code. + */ +static int migrate_movable_ops_page(struct page *dst, struct page *src, + enum migrate_mode mode) +{ + int rc = MIGRATEPAGE_SUCCESS; + + 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); + if (rc == MIGRATEPAGE_SUCCESS) + ClearPageIsolated(src); + return rc; +} + /* * Put previously isolated pages back onto the appropriate lists * from where they were once taken off for compaction/migration. @@ -1023,51 +1062,20 @@ static int move_to_new_folio(struct folio *dst, struct folio *src, mode); else rc = fallback_migrate_folio(mapping, dst, src, mode); - } else { - const struct movable_operations *mops; - /* - * In case of non-lru page, it could be released after - * isolation step. In that case, we shouldn't try migration. - */ - VM_BUG_ON_FOLIO(!folio_test_isolated(src), src); - if (!folio_test_movable(src)) { - rc = MIGRATEPAGE_SUCCESS; - folio_clear_isolated(src); + if (rc != MIGRATEPAGE_SUCCESS) goto out; - } - - mops = folio_movable_ops(src); - rc = mops->migrate_page(&dst->page, &src->page, mode); - WARN_ON_ONCE(rc == MIGRATEPAGE_SUCCESS && - !folio_test_isolated(src)); - } - - /* - * When successful, old pagecache src->mapping must be cleared before - * src is freed; but stats require that PageAnon be left as PageAnon. - */ - if (rc == MIGRATEPAGE_SUCCESS) { - if (__folio_test_movable(src)) { - VM_BUG_ON_FOLIO(!folio_test_isolated(src), src); - - /* - * We clear PG_movable under page_lock so any compactor - * cannot try to migrate this page. - */ - folio_clear_isolated(src); - } - /* - * Anonymous and movable src->mapping will be cleared by - * free_pages_prepare so don't reset it here for keeping - * the type to work PageAnon, for example. + * For pagecache folios, src->mapping must be cleared before src + * is freed. Anonymous folios must stay anonymous until freed. */ - if (!folio_mapping_flags(src)) + if (!folio_test_anon(src)) src->mapping = NULL; if (likely(!folio_is_zone_device(dst))) flush_dcache_folio(dst); + } else { + rc = migrate_movable_ops_page(&dst->page, &src->page, mode); } out: return rc; -- 2.49.0