Skip to contentSkip to conversation

drm/nouveau: Fix bug in buffer relocs for Nouveau

PATCH In review Tanmay Bhushan 3 participants 3 messages Jan 19, 2023 – Mar 27, 2023

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

PATCH 1/1 drm/nouveau: Fix bug in buffer relocs for Nouveau

dma_resv_wait_timeout returns greater than zero on success as opposed to ttm_bo_wait_ctx. As a result of that relocs will fail and give failure even when it was a success.

---
 drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_gem.c +1 -2
index f77e44958037..0e3690459144 100644
@@ -706,9 +706,8 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
 		ret = dma_resv_wait_timeout(nvbo->bo.base.resv,
 					    DMA_RESV_USAGE_BOOKKEEP,
 					    false, 15 * HZ);
-		if (ret == 0)
+		if (ret <= 0) {
 			ret = -EBUSY;
-		if (ret) {
 			NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
 				  ret);
 			break;
Signature · 1 line
2.34.1
#1 lore raw
Quoted 3 lines · Tanmay Bhushan

dma_resv_wait_timeout returns greater than zero on success as opposed to ttm_bo_wait_ctx. As a result of that relocs will fail and give failure even when it was a success.

Today I switched my workstation from 6.2 to 6.3-rc3 and started seeing lots of new kernel messages:

[  642.138313][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc wait_idle failed: 1500
[  642.138389][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc apply: 1500
[  646.123490][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc wait_idle failed: 1500
[  646.123573][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc apply: 1500

The graphics seemed to go slower or hang a bit when these messages would appear. I then found your patch! However, I have some comments about it.

First, it should include a fixes tag:

Fixes 41d351f29528 ("drm/nouveau: stop using ttm_bo_wait")
Quoted 10 lines
---
 drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_gem.c +0 -0
index f77e44958037..0e3690459144 100644

drivers/gpu/drm/nouveau/nouveau_gem.c nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, · line 710

Quoted 6 lines
drivers/gpu/drm/nouveau/nouveau_gem.c +1 -1
@@ -706,9 +706,8 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
 		ret = dma_resv_wait_timeout(nvbo->bo.base.resv,
 					    DMA_RESV_USAGE_BOOKKEEP,
 					    false, 15 * HZ);
-		if (ret == 0)
+		if (ret <= 0) {
 			ret = -EBUSY;

This is incorrect for 2 reasons:

* it treats restarts as timeouts

* this function now returns >0 on success

drivers/gpu/drm/nouveau/nouveau_gem.c nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, · line 713

Quoted 4 lines
drivers/gpu/drm/nouveau/nouveau_gem.c +0 -1
-		if (ret) {
 			NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
 				  ret);
 			break;

I rearranged things to basically correctly translate the return code of dma_resv_wait_timeout() to match the previous ttm_bo_wait():

		ret = dma_resv_wait_timeout(nvbo->bo.base.resv,
					    DMA_RESV_USAGE_BOOKKEEP,
					    false, 15 * HZ);
		if (ret == 0)
			ret = -EBUSY;
		if (ret > 0)
			ret = 0;
		if (ret) {
			NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
				  ret);
			break;
		}

So the patch just becomes:

@@ -708,6 +708,8 @@ nouveau_gem_pushbuf_reloc_apply(struct n
false, 15 * HZ);
if (ret == 0)
ret = -EBUSY;
+ if (ret > 0)
+ ret = 0;
if (ret) {
NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
ret);

With this variant, everything runs correctly on my workstation again.

It probably deserves a comment about why @ret is being translated. Or perhaps a new variable should be introduced to separate the return value of dma_resv_wait_timeout() from the return value of this function.

Either way, this is an important fix for 6.3-rc!

John Ogness

#2 lore raw

Am 27.03.23 um 10:42 schrieb John Ogness:

Quoted 73 lines · Tanmay Bhushan
Quoted 3 lines

dma_resv_wait_timeout returns greater than zero on success as opposed to ttm_bo_wait_ctx. As a result of that relocs will fail and give failure even when it was a success.

Today I switched my workstation from 6.2 to 6.3-rc3 and started seeing lots of new kernel messages:

[  642.138313][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc wait_idle failed: 1500
[  642.138389][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc apply: 1500
[  646.123490][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc wait_idle failed: 1500
[  646.123573][ T1751] nouveau 0000:f0:10.0: X[1751]: reloc apply: 1500

The graphics seemed to go slower or hang a bit when these messages would appear. I then found your patch! However, I have some comments about it.

First, it should include a fixes tag:

Fixes 41d351f29528 ("drm/nouveau: stop using ttm_bo_wait")
Quoted 10 lines
---
  drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_gem.c +0 -0
index f77e44958037..0e3690459144 100644

drivers/gpu/drm/nouveau/nouveau_gem.c nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, · line 710

Quoted 6 lines
drivers/gpu/drm/nouveau/nouveau_gem.c +1 -1
@@ -706,9 +706,8 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
  		ret = dma_resv_wait_timeout(nvbo->bo.base.resv,
  					    DMA_RESV_USAGE_BOOKKEEP,
  					    false, 15 * HZ);
-		if (ret == 0)
+		if (ret <= 0) {
  			ret = -EBUSY;

This is incorrect for 2 reasons:

* it treats restarts as timeouts

* this function now returns >0 on success

drivers/gpu/drm/nouveau/nouveau_gem.c nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, · line 713

Quoted 4 lines
drivers/gpu/drm/nouveau/nouveau_gem.c +0 -1
-		if (ret) {
  			NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
  				  ret);
  			break;

I rearranged things to basically correctly translate the return code of dma_resv_wait_timeout() to match the previous ttm_bo_wait():

		ret = dma_resv_wait_timeout(nvbo->bo.base.resv,
					    DMA_RESV_USAGE_BOOKKEEP,
					    false, 15 * HZ);
		if (ret == 0)
			ret = -EBUSY;
		if (ret > 0)
			ret = 0;
		if (ret) {
			NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
				  ret);
			break;
		}

So the patch just becomes:

drivers/gpu/drm/nouveau/nouveau_gem.c +2 -0
@@ -708,6 +708,8 @@ nouveau_gem_pushbuf_reloc_apply(struct n
  					    false, 15 * HZ);
  		if (ret == 0)
  			ret = -EBUSY;
+		if (ret > 0)
+			ret = 0;
  		if (ret) {
  			NV_PRINTK(err, cli, "reloc wait_idle failed: %ld\n",
  				  ret);
Quoted 5 lines

With this variant, everything runs correctly on my workstation again.

It probably deserves a comment about why @ret is being translated. Or perhaps a new variable should be introduced to separate the return value of dma_resv_wait_timeout() from the return value of this function.

I'm going to take a look tomorrow, but your code already looks pretty correct to me.

And sorry for the noise, missed the different in the conversion.

Thanks,
Christian.

Quoted 4 lines

Either way, this is an important fix for 6.3-rc!

John Ogness