search for: nouveau_channel_del

.../drm/nouveau/nouveau_chan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index 1363578..174300b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -76,6 +76,8 @@ nouveau_channel_del(struct nouveau_channel **pchan) nouveau_object_del(client, NVDRM_DEVICE, chan->push.handle); nouveau_bo_vma_del(chan->push.buffer, &chan->push.vma); nouveau_bo_unmap(chan->push.buffer); + if (chan->push.buffer && chan->push.buffer->pin_refcnt) + nouveau_...

...nsertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c > index e648ecd0c1a0..3dfbc374478e 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_chan.c > +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c > @@ -90,6 +90,7 @@ nouveau_channel_del(struct nouveau_channel **pchan) > if (cli) > nouveau_svmm_part(chan->vmm->svmm, chan->inst); > > + nvif_object_dtor(&chan->blit); > nvif_object_dtor(&chan->nvsw); > nvif_ob...

...+++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index e648ecd0c1a0..3dfbc374478e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -90,6 +90,7 @@ nouveau_channel_del(struct nouveau_channel **pchan) if (cli) nouveau_svmm_part(chan->vmm->svmm, chan->inst); + nvif_object_dtor(&chan->blit); nvif_object_dtor(&chan->nvsw); nvif_object_dtor(&chan->gart); nvif_object_dtor(&chan->vram); diff --git a/drivers/gpu/drm...

...4ebf1..a7a47b325 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -533,6 +533,7 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nvif_device *device, if (ret) { NV_PRINTK(err, cli, "channel failed to initialise, %d\n", ret); nouveau_channel_del(pchan); + goto done; } ret = nouveau_svmm_join((*pchan)->vmm->svmm, (*pchan)->inst); -- Frantisek Hrbata

...t; +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c > > @@ -533,6 +533,7 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nvif_device *device, > > if (ret) { > > NV_PRINTK(err, cli, "channel failed to initialise, %d\n", ret); > > nouveau_channel_del(pchan); > > + goto done; > > } > > > > ret = nouveau_svmm_join((*pchan)->vmm->svmm, (*pchan)->inst); > > -- > > Frantisek Hrbata > > Is this still planned to be applied? AFAICS this is the fix for > CVE-2020-25639. >...

...chan_fini(struct nouveau_abi16 *abi16, /* destroy channel object, all children will be killed too */ if (chan->chan) { - abi16->handles &= ~(1 << (chan->chan->handle & 0xffff)); + abi16->handles &= ~(1ULL << (chan->chan->handle & 0xffff)); nouveau_channel_del(&chan->chan); } @@ -280,7 +280,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) INIT_LIST_HEAD(&chan->notifiers); list_add(&chan->head, &abi16->channels); - abi16->handles |= (1 << init->channel); + abi16->handles |= (1ULL << init-&...

...+++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index e648ecd0c1a0..3dfbc374478e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -90,6 +90,7 @@ nouveau_channel_del(struct nouveau_channel **pchan) if (cli) nouveau_svmm_part(chan->vmm->svmm, chan->inst); + nvif_object_dtor(&chan->blit); nvif_object_dtor(&chan->nvsw); nvif_object_dtor(&chan->gart); nvif_object_dtor(&chan->vram); diff --git a/drivers/gpu/drm...

...ist_update+0x19e/0x1c0 [10380.560403] gk104_fifo_gpfifo_fini+0x7d/0xa0 [10380.560404] nvkm_fifo_chan_fini+0x19/0x20 [10380.560406] nvkm_object_fini+0xbc/0x150 [10380.560408] nvkm_ioctl_del+0x2f/0x50 [10380.560409] nvkm_ioctl+0xdf/0x177 [10380.560410] nvif_object_fini+0x49/0x60 [10380.560412] nouveau_channel_del+0x89/0x110 [10380.560413] nouveau_abi16_chan_fini.isra.0+0xa0/0x110 [10380.560414] nouveau_abi16_fini+0x2d/0x60 [10380.560416] nouveau_drm_postclose+0x4c/0xe0 [10380.560418] drm_file_free.part.0+0x1e0/0x290 [10380.560420] drm_release+0xa7/0xe0 [10380.591300] __fput+0xc7/0x250 [10380.592291]...

...[nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nvkm_ioctl_del+0x7e/0xa0 [nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nvkm_ioctl+0x10a/0x240 [nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nvif_object_fini+0x49/0x60 [nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nouveau_channel_del+0x6e/0x110 [nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nouveau_abi16_chan_fini.isra.0+0xa1/0xe0 [nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nouveau_abi16_fini+0x2d/0x70 [nouveau] Apr 14 02:19:08 bicoid.molgen.mpg.de kernel: nouveau_drm_postclose+0x4b/0xd0 [nouveau] Apr 14 0...

...-- a/drivers/gpu/drm/nouveau/nouveau_chan.c > +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c > @@ -533,6 +533,7 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nvif_device *device, > if (ret) { > NV_PRINTK(err, cli, "channel failed to initialise, %d\n", ret); > nouveau_channel_del(pchan); > + goto done; > } > > ret = nouveau_svmm_join((*pchan)->vmm->svmm, (*pchan)->inst); > -- > Frantisek Hrbata Is this still planned to be applied? AFAICS this is the fix for CVE-2020-25639. Regards, Salvatore

...module_param_named(vram_pushbuf, nouveau_vram_pushbuf, int, 0400); int diff --git a/drm/nouveau_chan.h b/drm/nouveau_chan.h index 2016370..8309c24 100644 --- a/drm/nouveau_chan.h +++ b/drm/nouveau_chan.h @@ -47,4 +47,6 @@ int nouveau_channel_new(struct nouveau_drm *, struct nvif_device *, void nouveau_channel_del(struct nouveau_channel **); int nouveau_channel_idle(struct nouveau_channel *); +extern int nouveau_vram_pushbuf; + #endif diff --git a/drm/nouveau_connector.c b/drm/nouveau_connector.c index 1ec44c8..c8ac948 100644 --- a/drm/nouveau_connector.c +++ b/drm/nouveau_connector.c @@ -45,15 +45,15 @...

5.2.0-rc4-next-20190613 dmesg nouveau 0000:01:00.0: DRM: GPU lockup - switching to software fbcon nouveau 0000:01:00.0: fifo: SCHED_ERROR 0a [CTXSW_TIMEOUT] nouveau 0000:01:00.0: fifo: runlist 0: scheduled for recovery nouveau 0000:01:00.0: fifo: channel 5: killed nouveau 0000:01:00.0: fifo: engine 6: scheduled for recovery nouveau 0000:01:00.0: fifo: engine 0: scheduled for recovery

The ffsll function is a lot slower than the __ffs64 built-in which compiles to a single instruction on 64-bit. It's also nice to avoid custom versions of standard functions. Note that __ffs == ffs - 1. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- I wrote a user-space program to test these out and make sure that the functions behaved as expected. The logic in abi16 had to be

Reduces object size ~4kb Joe Perches (2): drm/nouveau: Add new logging function nv_cli_printk drm/nouveau: Convert NV_PRINTK macros and uses to new nv_cli_<level> macros drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- drivers/gpu/drm/nouveau/nouveau_chan.c | 12 +++---- drivers/gpu/drm/nouveau/nouveau_drm.c | 21 +++++++++++ drivers/gpu/drm/nouveau/nouveau_drv.h | 44

Hi there, Resending these now that they've had some more polish and testing, and I heard that Ben's vacation is over :-) These patches work as a starting point for more explicit error mechanisms and better robustness. At the moment, when a job hangs or faults, it seems that nouveau doesn't quite know how to handle the situation and often results in a hang. Some of these situations

https://bugs.freedesktop.org/show_bug.cgi?id=85495 Bug ID: 85495 Summary: nouveau: xft fonts not rendered on Dell M4800 (QHD+) Product: xorg Version: unspecified Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Driver/nouveau

...ni+0x2b/0x80 [nouveau] [ 1052.699069] nvkm_object_fini+0xb8/0x210 [nouveau] [ 1052.699082] nvkm_object_fini+0x73/0x210 [nouveau] [ 1052.699093] nvkm_ioctl_del+0x7e/0xa0 [nouveau] [ 1052.699105] nvkm_ioctl+0x10a/0x240 [nouveau] [ 1052.699116] nvif_object_fini+0x59/0x80 [nouveau] [ 1052.699135] nouveau_channel_del+0x87/0x120 [nouveau] [ 1052.699152] ? nouveau_channel_idle+0x84/0xc0 [nouveau] [ 1052.699169] nouveau_abi16_chan_fini.isra.3+0x9c/0xe0 [nouveau] [ 1052.699186] nouveau_abi16_fini+0x2d/0x70 [nouveau] [ 1052.699203] nouveau_drm_postclose+0x4b/0xe0 [nouveau] [ 1052.699212] drm_release+0x264/0x380...

...0x20 [nouveau] [ 6050.787665] [<ffffffffa02ffb92>] nvkm_client_ioctl+0x12/0x20 [nouveau] [ 6050.787679] [<ffffffffa0268042>] nvif_object_ioctl+0x42/0x50 [nouveau] [ 6050.787695] [<ffffffffa026860a>] nvif_object_fini+0x5a/0x80 [nouveau] [ 6050.787721] [<ffffffffa0315c11>] nouveau_channel_del+0x61/0x100 [nouveau] [ 6050.787747] [<ffffffffa0314d05>] nouveau_abi16_chan_fini.isra.1+0x125/0x1d0 [nouveau] [ 6050.787771] [<ffffffffa0314ca9>] ? nouveau_abi16_chan_fini.isra.1+0xc9/0x1d0 [nouveau] [ 6050.787796] [<ffffffffa03154c7>] nouveau_abi16_ioctl_channel_free+0x77/0x90...