Skip to contentSkip to conversation

gpu/drm/nouveau: fix return type in nouveau_dmem_migrate_to_ram()

PATCH In review Balbir Singh 2 participants 4 messages Nov 14, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpu/drm/nouveau: fix return type in nouveau_dmem_migrate_to_ram()

ret of type vm_fault_t is reused to capture the return value of nouveau_dmem_copy_folio(), which returns an int. Use a new variable err to fix the issue. The issue is not new, prior to this the function called was called nouveau_dmem_copy_one() and ret was used to capture it's value.

The bug does not cause a real issue at runtime, the value is used as a boolean to check if nouveau_dmem_copy_folio() succeeded or failed. The different types should not impact the execution of the code at runtime.

Cc Andrew Morton <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Zi Yan <[email protected]>
Cc Joshua Hahn <[email protected]>
Cc Rakie Kim <[email protected]>
Cc Byungchul Park <[email protected]>
Cc Gregory Price <[email protected]>
Cc Ying Huang <[email protected]>
Cc Alistair Popple <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Baolin Wang <[email protected]>
Cc "Liam R. Howlett" <[email protected]>
Cc Nico Pache <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Dev Jain <[email protected]>
Cc Barry Song <[email protected]>
Cc Lyude Paul <[email protected]>
Cc Danilo Krummrich <[email protected]>
Cc David Airlie <[email protected]>
Cc Simona Vetter <[email protected]>
Cc Ralph Campbell <[email protected]>
Cc Mika Penttilä <[email protected]>
Cc Matthew Brost <[email protected]>
Cc Francois Dugast <[email protected]>
---
 drivers/gpu/drm/nouveau/nouveau_dmem.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dmem.c +3 -2
index 244812e7dd69..58071652679d 100644
@@ -188,6 +188,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
 	struct nouveau_svmm *svmm;
 	struct page *dpage;
 	vm_fault_t ret = 0;
+	int err;
 	struct migrate_vma args = {
 		.vma		= vmf->vma,
 		.pgmap_owner	= drm->dev,
@@ -256,9 +257,9 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf)
 	svmm = folio_zone_device_data(sfolio);
 	mutex_lock(&svmm->mutex);
 	nouveau_svmm_invalidate(svmm, args.start, args.end);
-	ret = nouveau_dmem_copy_folio(drm, sfolio, dfolio, &dma_info);
+	err = nouveau_dmem_copy_folio(drm, sfolio, dfolio, &dma_info);
 	mutex_unlock(&svmm->mutex);
-	if (ret) {
+	if (err) {
 		ret = VM_FAULT_SIGBUS;
 		goto done;
 	}
Signature · 1 line
2.51.1
#1 lore raw
Quoted 10 lines · Balbir Singh

ret of type vm_fault_t is reused to capture the return value of nouveau_dmem_copy_folio(), which returns an int. Use a new variable err to fix the issue. The issue is not new, prior to this the function called was called nouveau_dmem_copy_one() and ret was used to capture it's value.

The bug does not cause a real issue at runtime, the value is used as a boolean to check if nouveau_dmem_copy_folio() succeeded or failed. The different types should not impact the execution of the code at runtime.

Again, spell out that it is a sparse warning one way or the other and ideally paste the relevant part here,

Also, take a look at the definition of "bug", like at wikipedia

"In engineering, a bug is a design defect in an engineered system—such as software, computer hardware, electronics, circuitry or machinery—that causes an undesired result."

Talking about a bug when nothing is broken can be really misleading to people that watch out for CVEs etc.

Signature · 3 lines
Cheers

David
#2 lore raw
In reply to Balbir Singh
Quoted 11 lines · Balbir Singh

ret of type vm_fault_t is reused to capture the return value of nouveau_dmem_copy_folio(), which returns an int. Use a new variable err to fix the issue. The issue is not new, prior to this the function called was called nouveau_dmem_copy_one() and ret was used to capture it's value.

The bug does not cause a real issue at runtime, the value is used as a boolean to check if nouveau_dmem_copy_folio() succeeded or failed. The different types should not impact the execution of the code at runtime.

Also, as commented previously, the prefix in the subject does not match existing norms. Take a look at

	git log --oneline drivers/gpu/drm/nouveau/nouveau_dmem.c

and note how it's commonly something along the lines of "drm/nouveau" or better "drm/nouveau/dmem".

The only patch that uses "gpu/drm/nouveau" is from you recently. In fact, there is no other patch in the codebase that uses that prefix.

Signature · 3 lines
Cheers

David
#3 lore raw
Quoted 13 lines · David Hildenbrand (Red Hat)
Quoted 11 lines · Balbir Singh

ret of type vm_fault_t is reused to capture the return value of nouveau_dmem_copy_folio(), which returns an int. Use a new variable err to fix the issue. The issue is not new, prior to this the function called was called nouveau_dmem_copy_one() and ret was used to capture it's value.

The bug does not cause a real issue at runtime, the value is used as a boolean to check if nouveau_dmem_copy_folio() succeeded or failed. The different types should not impact the execution of the code at runtime.

Quoted 8 lines

Also, as commented previously, the prefix in the subject does not match existing norms. Take a look at

    git log --oneline drivers/gpu/drm/nouveau/nouveau_dmem.c

and note how it's commonly something along the lines of "drm/nouveau" or better "drm/nouveau/dmem".

The only patch that uses "gpu/drm/nouveau" is from you recently. In fact, there is no other patch in the codebase that uses that prefix.

I'll fix the subject prefix

Thanks for the review,
Balbir