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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 78B87CFA451 for ; Thu, 20 Nov 2025 23:08:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A74AF10E7DA; Thu, 20 Nov 2025 23:08:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Oq95YoWe"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD2DA10E7DB for ; Thu, 20 Nov 2025 23:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763680112; x=1795216112; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=St5MxBUCZJcinOju0ZzS80vPNdzerp0xVZDJj547ddw=; b=Oq95YoWenGPsM9CCD2qCzc4U8ub+jD7kWU/CLtFNnAQLgfsyfGaNKYmW D51y1YNCo0ZcsX2QmijIUYEDweXBmFRSZ0YR1jRgtJYn4qDpDdREizCD5 OQUrbVOE+yBmUKxbzhh8tmZ1XvEycA4q20e4MQ/3kGU/XyYtGC0zUv5FD CxamjsmhoVbnNpY7JUIyVyZVAjm8OX+14+Dlp8jNh/LrL4iUNStnkbQvQ u5DHxXCmY7Tiyc91VLvqX4AqLaHvpYqwgayuvfwg/0228Pj+n5WfT42JX O9xk+gCVoePeEpxbAdDevPhIyz4xnIGO9F/2w211386IjRVFRfwBvZd+0 g==; X-CSE-ConnectionGUID: wsci2ktLRXqxAgIIRJHs5A== X-CSE-MsgGUID: P6tVCyuKTdKh0GM7Ll/e0w== X-IronPort-AV: E=McAfee;i="6800,10657,11619"; a="65699780" X-IronPort-AV: E=Sophos;i="6.20,214,1758610800"; d="scan'208";a="65699780" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 15:08:31 -0800 X-CSE-ConnectionGUID: lG0PZyxFTOKLYOhE+/99iw== X-CSE-MsgGUID: MjqUGEr1ROq7Z6UP56tBDQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,214,1758610800"; d="scan'208";a="191364908" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 15:08:30 -0800 From: Matthew Brost To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Andrew Morton , David Hildenbrand , Zi Yan , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Oscar Salvador , Lorenzo Stoakes , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Ralph Campbell , =?UTF-8?q?Mika=20Penttil=C3=A4?= , Francois Dugast , Balbir Singh Subject: [PATCH v2 2/2] fixup: mm/migrate_device: add THP splitting during migration Date: Thu, 20 Nov 2025 15:08:25 -0800 Message-Id: <20251120230825.181072-2-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251120230825.181072-1-matthew.brost@intel.com> References: <20251120230825.181072-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix splitting a folio in PMD collection to collect a skip on folio split failure and continue the loop at the current position on success. This fixes an issue where migration entries that had already been collected could accidentally be left behind. Cc: Andrew Morton Cc: David Hildenbrand Cc: Zi Yan Cc: Joshua Hahn Cc: Rakie Kim Cc: Byungchul Park Cc: Gregory Price Cc: Ying Huang Cc: Alistair Popple Cc: Oscar Salvador Cc: Lorenzo Stoakes Cc: Baolin Wang Cc: "Liam R. Howlett" Cc: Nico Pache Cc: Ryan Roberts Cc: Dev Jain Cc: Barry Song Cc: Lyude Paul Cc: Danilo Krummrich Cc: David Airlie Cc: Simona Vetter Cc: Ralph Campbell Cc: Mika Penttilä Cc: Francois Dugast Cc: Balbir Singh Signed-off-by: Matthew Brost --- This fixup should be squashed into the patch "mm/migrate_device: add THP splitting during migration" in mm/mm-unstable --- mm/migrate_device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 4506e96dcd20..ab373fd38961 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -313,16 +313,18 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, if (folio_test_large(folio)) { int ret; + arch_leave_lazy_mmu_mode(); pte_unmap_unlock(ptep, ptl); ret = migrate_vma_split_folio(folio, migrate->fault_page); if (ret) { - ptep = pte_offset_map_lock(mm, pmdp, addr, &ptl); - goto next; + if (unmapped) + flush_tlb_range(walk->vma, start, end); + + return migrate_vma_collect_skip(addr, end, walk); } - addr = start; goto again; } -- 2.34.1