Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Alistair Popple <apopple@nvidia.com>
To:     Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org
Cc:     Alistair Popple <apopple@nvidia.com>, linux-kernel@vger.kernel.org,
        amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, Lyude Paul <lyude@redhat.com>,
        Ben Skeggs <bskeggs@redhat.com>,
        Ralph Campbell <rcampbell@nvidia.com>,
        John Hubbard <jhubbard@nvidia.com>
Subject: [PATCH v2 6/8] nouveau/dmem: Refactor nouveau_dmem_fault_copy_one()
Date:   Wed, 28 Sep 2022 22:01:20 +1000
Message-Id: <20573d7b4e641a78fde9935f948e64e71c9e709e.1664366292.git-series.apopple@nvidia.com>
In-Reply-To: <cover.60659b549d8509ddecafad4f498ee7f03bb23c69.1664366292.git-series.apopple@nvidia.com>
References: <cover.60659b549d8509ddecafad4f498ee7f03bb23c69.1664366292.git-series.apopple@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ta2S8itL0Vnv7S5z+fDZiGHVH4FSdQrkSb2UffuLLHHVtekrRPS6pvPcUcpu?=
 =?us-ascii?Q?Z3cDJj5Gx26pRvyFewYABvU/ua/Iz0t6IlHQmQo5XOTr/G4XqSizZHBmSGLC?=
 =?us-ascii?Q?xGf8sA4vRDMTluJUPi0IwjEBdhPWknp4ONspOcuzvmyd0g64gLHzdbLHusmY?=
 =?us-ascii?Q?XATr924h3qhD6wu/imZv3+RoBZm4iZdjYAtWUxazQ4mU8j/CmC+Zu3lMlCKt?=
 =?us-ascii?Q?01oXlTty0PUzYKuP7utbwpp2qf4h8v9nbYWODeQg5MuocXtgzpD2CFaXJRFf?=
 =?us-ascii?Q?A0HDWTzGWkw9mJNETbIsc/I9B36NyV7G+TGH4wWzVFyKzcQwrGJ9yBD0FD6A?=
 =?us-ascii?Q?R0W9Zidic59Hocu75uDJGbqHZnU7Mx/JZ9jxkLSxkMz8Bfm88g8a7XhSEEYD?=
 =?us-ascii?Q?PTYadaRuY2/3g0C38tvN4Gfz5ABf94u+yLe64c/4gMcKeTM9uwbUTmvYd8xP?=
 =?us-ascii?Q?XkTOk/DZXzinGvJbus37o04J5Da8p4UCDSYVSilgXmW1YGmhsm/EHfIqNUgZ?=
 =?us-ascii?Q?PJ6SkuSSra0ka9kTm8RtvjCApZUfm05+VTwL2io0FqdRtdJHqwfAZZRqtIHz?=
 =?us-ascii?Q?742ofY0aBhcg9H6S/Z0qaRt50B/OmUZI/T+AkqeEfmKy5qwnihvq4Ve5h/FV?=
 =?us-ascii?Q?Qzlr4EXjVCQfsiINdqNWKZTBJPSl7GFNOIyywVdkNN/nfC6baZqKYzYeyffy?=
 =?us-ascii?Q?a9Ana6VAoBXP2XMqu9wnAGPpUolY3ZGY8dz7vD3EMZcaeFoU/snCvHCa47RT?=
 =?us-ascii?Q?c5q34xpBriidRYaNRn+mgOIRI05pDjElbYzwCfhse3I6FJMRxAJ+zPs2CHM/?=
 =?us-ascii?Q?PKeD3DFGEOtDnKsGS4YrEjXfuyQVsmONBobANwp4TG8kPgOCrC2Q2Kl2ZKB6?=
 =?us-ascii?Q?V8OOo5o5ylcnMSPwRGT66ovjyd2J+K7ky7V0UIXRTGHybvUU3G91FczL7z07?=
 =?us-ascii?Q?L2R+YeqFxiJuzJtWYpHDABqzAuKsykrIMZrgfnFOEsYi+JJrOxoMZ7DWSKY6?=
 =?us-ascii?Q?XUbkRCP6nntXmHVMvCmiqDA0Gp0srr8kqbJbFoqye8l4EI8OcyRG1gMkOlRY?=
 =?us-ascii?Q?bNScNLlXO4i5qshxTAZ4+HRZIJoh/dIimHa/9yPQ448LodpzPDPcM0uNBpLg?=
 =?us-ascii?Q?oGUjz7gGDv/5QPXo9lLzwjFDZHTWpjdvDULjqLQ/Nub9dGFudYuaLqP7UqlU?=
 =?us-ascii?Q?3r8Ue2nMzwys4kIPbMWZj7cejHSbh1Eik6A8ML798XakKbDcFfH+IELVQ/0W?=
 =?us-ascii?Q?MDX2vHztrQnJEWTfpH7LfkoaT7deKzHmJrWTjeHkmemgVWPYrEFWtZxphjFb?=
 =?us-ascii?Q?dZOCMWz2wSdN8GKZjafppqP1tFn2Xub4Y0GmzhL5KpRyf7VsMVuSw9XTloAX?=
 =?us-ascii?Q?jIhA5dQzJSXHRidwLR+YLBOziESQyhPJR7QFc05rGuQfpO7AAGC74yHxLeoS?=
 =?us-ascii?Q?rub5jreBvg1tEWsvnUWVHpChLnLuH6RjYtmD0z72913kgkI8t/BgYJO0Dfth?=
 =?us-ascii?Q?0hIPQzjrAWS38iytwf/IpPJ6I74LfyuwdI1VuSsNKEdND4pg/MqXYT0L1ZI1?=
 =?us-ascii?Q?D9ycS7uMy676Fqsa5JKGqeTRPeAqnZjYhL2HDTyZ?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2446eecf-8cf9-4b7c-50eb-08daa1494a35
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 12:02:18.1195
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YwDhX8jr2X3hxge2ZwOXynFsTA56G2ZgYPHBRIzQ6V2Xo9v5dtmsZ+MJe97bNvnZG3ZVuD46EnrR/XS3oXDuAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7604
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

nouveau_dmem_fault_copy_one() is used during handling of CPU faults via
the migrate_to_ram() callback and is used to copy data from GPU to CPU
memory. It is currently specific to fault handling, however a future
patch implementing eviction of data during teardown needs similar
functionality.

Refactor out the core functionality so that it is not specific to fault
handling.

Signed-off-by: Alistair Popple <apopple@nvidia.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
---
 drivers/gpu/drm/nouveau/nouveau_dmem.c | 58 +++++++++++++--------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index b092988..65f51fb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -139,44 +139,24 @@ static void nouveau_dmem_fence_done(struct nouveau_fence **fence)
 	}
 }
 
-static vm_fault_t nouveau_dmem_fault_copy_one(struct nouveau_drm *drm,
-		struct vm_fault *vmf, struct migrate_vma *args,
-		dma_addr_t *dma_addr)
+static int nouveau_dmem_copy_one(struct nouveau_drm *drm, struct page *spage,
+				struct page *dpage, dma_addr_t *dma_addr)
 {
 	struct device *dev = drm->dev->dev;
-	struct page *dpage, *spage;
-	struct nouveau_svmm *svmm;
-
-	spage = migrate_pfn_to_page(args->src[0]);
-	if (!spage || !(args->src[0] & MIGRATE_PFN_MIGRATE))
-		return 0;
 
-	dpage = alloc_page_vma(GFP_HIGHUSER, vmf->vma, vmf->address);
-	if (!dpage)
-		return VM_FAULT_SIGBUS;
 	lock_page(dpage);
 
 	*dma_addr = dma_map_page(dev, dpage, 0, PAGE_SIZE, DMA_BIDIRECTIONAL);
 	if (dma_mapping_error(dev, *dma_addr))
-		goto error_free_page;
+		return -EIO;
 
-	svmm = spage->zone_device_data;
-	mutex_lock(&svmm->mutex);
-	nouveau_svmm_invalidate(svmm, args->start, args->end);
 	if (drm->dmem->migrate.copy_func(drm, 1, NOUVEAU_APER_HOST, *dma_addr,
-			NOUVEAU_APER_VRAM, nouveau_dmem_page_addr(spage)))
-		goto error_dma_unmap;
-	mutex_unlock(&svmm->mutex);
+					 NOUVEAU_APER_VRAM, nouveau_dmem_page_addr(spage))) {
+		dma_unmap_page(dev, *dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
+		return -EIO;
+	}
 
-	args->dst[0] = migrate_pfn(page_to_pfn(dpage));
 	return 0;
-
-error_dma_unmap:
-	mutex_unlock(&svmm->mutex);
-	dma_unmap_page(dev, *dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
-error_free_page:
-	__free_page(dpage);
-	return VM_FAULT_SIGBUS;
 }
 
 static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
@@ -184,9 +164,11 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
 	struct nouveau_drm *drm = page_to_drm(vmf->page);
 	struct nouveau_dmem *dmem = drm->dmem;
 	struct nouveau_fence *fence;
+	struct nouveau_svmm *svmm;
+	struct page *spage, *dpage;
 	unsigned long src = 0, dst = 0;
 	dma_addr_t dma_addr = 0;
-	vm_fault_t ret;
+	vm_fault_t ret = 0;
 	struct migrate_vma args = {
 		.vma		= vmf->vma,
 		.start		= vmf->address,
@@ -207,9 +189,25 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
 	if (!args.cpages)
 		return 0;
 
-	ret = nouveau_dmem_fault_copy_one(drm, vmf, &args, &dma_addr);
-	if (ret || dst == 0)
+	spage = migrate_pfn_to_page(src);
+	if (!spage || !(src & MIGRATE_PFN_MIGRATE))
+		goto done;
+
+	dpage = alloc_page_vma(GFP_HIGHUSER, vmf->vma, vmf->address);
+	if (!dpage)
+		goto done;
+
+	dst = migrate_pfn(page_to_pfn(dpage));
+
+	svmm = spage->zone_device_data;
+	mutex_lock(&svmm->mutex);
+	nouveau_svmm_invalidate(svmm, args.start, args.end);
+	ret = nouveau_dmem_copy_one(drm, spage, dpage, &dma_addr);
+	mutex_unlock(&svmm->mutex);
+	if (ret) {
+		ret = VM_FAULT_SIGBUS;
 		goto done;
+	}
 
 	nouveau_fence_new(dmem->migrate.chan, false, &fence);
 	migrate_vma_pages(&args);
-- 
git-series 0.9.1