Skip to contentSkip to conversation

nouveau-fix-migrate_to_ram-for-faulting-page.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Oct 21, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: nouveau: fix migrate_to_ram() for faulting page
has been removed from the -mm tree. Its filename was
nouveau-fix-migrate_to_ram-for-faulting-page.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Alistair Popple <[email protected]>
Subject: nouveau: fix migrate_to_ram() for faulting page
Date: Wed, 19 Oct 2022 23:29:34 +1100

Commit 16ce101db85d ("mm/memory.c: fix race when faulting a device private page") changed the migrate_to_ram() callback to take a reference on the device page to ensure it can't be freed while handling the fault. Unfortunately the corresponding update to Nouveau to accommodate this change was inadvertently dropped from that patch causing GPU to CPU migration to fail so add it here.

Fixes 16ce101db85d ("mm/memory.c: fix race when faulting a device private page")
Cc John Hubbard <[email protected]>
Cc Ralph Campbell <[email protected]>
Cc Lyude Paul <[email protected]>
Cc Ben Skeggs <[email protected]>

---

 drivers/gpu/drm/nouveau/nouveau_dmem.c |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/nouveau_dmem.c renamed from drivers/gpu/drm/nouveau/nouveau_dmem.c~nouveau-fix-migrate_to_ram-for-faulting-page +1 -0
@@ -176,6 +176,7 @@ static vm_fault_t nouveau_dmem_migrate_t
 		.src		= &src,
 		.dst		= &dst,
 		.pgmap_owner	= drm->dev,
+		.fault_page	= vmf->page,
 		.flags		= MIGRATE_VMA_SELECT_DEVICE_PRIVATE,
 	};
 

_

Patches currently in -mm which might be from [email protected] are