search for: nouveau_abi16_ioctl_channel_alloc

...dex c3fd5dd39ed9..0c585dc5f5c3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -244,12 +244,6 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) return 0; } -int -nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS) -{ - return -EINVAL; -} - int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) { diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h b/drivers/gpu/drm/nouveau/nouveau_abi16.h index 36fde1ff3ad5..9275d529b947 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.h +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h @@ -6,7 +6,6 @@ struct drm_device *dev, void *dat...

...TPARAM, nouveau_abi16_ioctl_getparam, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), - DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc, DRM_AUTH|DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free, DRM_AUTH|DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc, DRM_AUTH|DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(NOUVEAU_NOTIFIEROBJ_ALLOC, nouveau_abi16_ioc...

nouveau_abi16_ioctl_channel_alloc() and nouveau_cli_init() simply call their corresponding *_fini() counterpart. This can lead to nouveau_sched_fini() being called without struct nouveau_sched ever being initialized in the first place. Instead of embedding struct nouveau_sched into struct nouveau_cli and struct nouveau_chan_abi16,...

...abi16_get+0x37/0x80 [<ffffffff8118dfc6>] ? trace_hardirqs_on_caller+0x16/0x280 [<ffffffff81309e36>] ? kasan_unpoison_shadow+0x36/0x50 [<ffffffff81309e36>] ? kasan_unpoison_shadow+0x36/0x50 [<ffffffff81306803>] ? kmem_cache_alloc_trace+0x123/0x290 [<ffffffff8201333c>] ? nouveau_abi16_ioctl_channel_alloc+0xec/0x4d0 [<ffffffff820133fe>] nouveau_abi16_ioctl_channel_alloc+0x1ae/0x4d0 [<ffffffff82013250>] ? nouveau_abi16_ioctl_setparam+0x10/0x10 [<ffffffff81a85ccb>] drm_ioctl+0x20b/0x6b0 [<ffffffff811bfc66>] ? debug_lockdep_rcu_enabled+0x26/0x40 [<ffffffff81a85ac0>] ? drm_...

..._abi16.c > +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c > @@ -244,12 +244,6 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) > return 0; > } > > -int > -nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS) > -{ > - return -EINVAL; > -} > - > int > nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) > { > diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h b/drivers/gpu/drm/nouveau/nouveau_abi16.h > index 36fde1ff3ad5..9275d529b947 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_abi16.h > +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h > @@ -6,7 +6,6 @@ >...

...[<ffffffff8118dfc6>] ? trace_hardirqs_on_caller+0x16/0x280 > [<ffffffff81309e36>] ? kasan_unpoison_shadow+0x36/0x50 > [<ffffffff81309e36>] ? kasan_unpoison_shadow+0x36/0x50 > [<ffffffff81306803>] ? kmem_cache_alloc_trace+0x123/0x290 > [<ffffffff8201333c>] ? nouveau_abi16_ioctl_channel_alloc+0xec/0x4d0 > [<ffffffff820133fe>] nouveau_abi16_ioctl_channel_alloc+0x1ae/0x4d0 > [<ffffffff82013250>] ? nouveau_abi16_ioctl_setparam+0x10/0x10 > [<ffffffff81a85ccb>] drm_ioctl+0x20b/0x6b0 > [<ffffffff811bfc66>] ? debug_lockdep_rcu_enabled+0x26/0x40 > [<fff...

...ative #ifdef __BIG_ENDIAN #define ioread16_native ioread16be diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index 900fae0..b701117 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -270,8 +270,8 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) return nouveau_abi16_put(abi16, -EINVAL); /* allocate "abi16 channel" data and make up a handle for it */ - init->channel = ffsll(~abi16->handles); - if (!init->channel--) + init->channel = __ffs64(~abi16->handles); + if (~abi16->handles == 0)...

...ram, DRM_AUTH|DRM_RENDER_ALLOW), > + DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), > - DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc, DRM_AUTH|DRM_RENDER_ALLOW), > - DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free, DRM_AUTH|DRM_RENDER_ALLOW), > - DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc, DRM_AUTH|DRM_RENDER_ALLOW), > - DRM_IOCTL_DEF_DRV(NOUVEAU_NOT...

On Fri, 2024-02-02 at 17:14 +0000, Timur Tabi wrote: > On Fri, 2024-02-02 at 01:05 +0100, Danilo Krummrich wrote: > > nouveau_abi16_ioctl_channel_alloc() and nouveau_cli_init() simply call > > their corresponding *_fini() counterpart. This can lead to > > nouveau_sched_fini() being called without struct nouveau_sched ever > > being initialized in the first place. > > Thanks, I've confirmed that these patches do fix the...

https://bugs.freedesktop.org/show_bug.cgi?id=60007 Priority: medium Bug ID: 60007 Assignee: nouveau at lists.freedesktop.org Summary: BUG: nouveau crashes in various ways in 32-bits Fedora 18 QA Contact: xorg-team at lists.x.org Severity: critical Classification: Unclassified OS: Linux (All)

...uveau] [252778.066136] [<ffffffffa0907067>] nouveau_channel_new+0x57/0x6d0 [nouveau] [252778.066642] [<ffffffffa0844a2d>] ? nvif_device_init+0x2d/0x30 [nouveau] [252778.067144] [<ffffffff811eb0cc>] ? kmem_cache_alloc_trace+0x19c/0x1b0 [252778.067672] [<ffffffffa0906174>] nouveau_abi16_ioctl_channel_alloc+0xe4/0x330 [nouveau] [252778.068185] [<ffffffffa044cb6b>] drm_ioctl+0x21b/0x4c0 [drm] [252778.068710] [<ffffffffa0906090>] ? nouveau_abi16_ioctl_setparam+0x10/0x10 [nouveau] [252778.069220] [<ffffffffa08eee14>] nouveau_drm_ioctl+0x74/0xc0 [nouveau] [252778.069723] [<fffffff...

...e(0x0000) - not-present page [ 71.099189] PGD 119590067 P4D 119590067 PUD 1054f5067 PMD 0 [ 71.104842] Oops: 0000 [#1] SMP NOPTI [ 71.108498] CPU: 2 PID: 1329 Comm: crashme Not tainted 5.8.0-rc6+ #2 [ 71.114993] Hardware name: AMD Pike/Pike, BIOS RPK1506A 09/03/2014 [ 71.121213] RIP: 0010:nouveau_abi16_ioctl_channel_alloc+0x108/0x380 [nouveau] [ 71.128339] Code: 48 89 9d f0 00 00 00 41 8b 4c 24 04 41 8b 14 24 45 31 c0 4c 8d 4b 10 48 89 ee 4c 89 f7 e8 10 11 00 00 85 c0 75 78 48 8b 43 10 <8b> 90 a0 00 00 00 41 89 54 24 08 80 7d 3d 05 0f 86 bb 01 00 00 41 [ 71.147074] RSP: 0018:ffffb4a1809cfd38 EFLAGS: 000102...

...fff8147d90d>] nvkm_client_ioctl+0xd/0x10 [<ffffffff813e38cc>] nvif_object_ioctl+0x3c/0x50 [<ffffffff813e3e7d>] nvif_object_init+0xbd/0x130 [<ffffffff81492866>] nouveau_channel_new+0xa6/0x630 [<ffffffff813e4198>] ? nvif_device_init+0x28/0x30 [<ffffffff81491a2a>] nouveau_abi16_ioctl_channel_alloc+0xda/0x2d0 [<ffffffff813be0ad>] ? drm_copy_field+0x3d/0x60 [<ffffffff813bdc9e>] drm_ioctl+0x13e/0x510 [<ffffffff81491950>] ? nouveau_abi16_ioctl_setparam+0x10/0x10 [<ffffffff8147b6c3>] nouveau_drm_ioctl+0x63/0xc0 [<ffffffff8118ff33>] do_vfs_ioctl+0x283/0x460 [&lt...

...89] PGD 119590067 P4D 119590067 PUD 1054f5067 PMD 0 > > [ 71.104842] Oops: 0000 [#1] SMP NOPTI > > [ 71.108498] CPU: 2 PID: 1329 Comm: crashme Not tainted 5.8.0-rc6+ #2 > > [ 71.114993] Hardware name: AMD Pike/Pike, BIOS RPK1506A 09/03/2014 > > [ 71.121213] RIP: 0010:nouveau_abi16_ioctl_channel_alloc+0x108/0x380 [nouveau] > > [ 71.128339] Code: 48 89 9d f0 00 00 00 41 8b 4c 24 04 41 8b 14 24 45 31 c0 4c 8d 4b 10 48 89 ee 4c 89 f7 e8 10 11 00 00 85 c0 75 78 48 8b 43 10 <8b> 90 a0 00 00 00 41 89 54 24 08 80 7d 3d 05 0f 86 bb 01 00 00 41 > > [ 71.147074] RSP: 0018:ffffb4a1809...

...;ffffffffa04fb708>] nouveau_channel_new+0x38/0x6b0 [nouveau] May 16 08:32:14 brouette kernel: [<ffffffff8106845d>] ? get_parent_ip+0xd/0x50 May 16 08:32:14 brouette kernel: [<ffffffff810ef793>] ? kmem_cache_alloc+0xd3/0xe0 May 16 08:32:14 brouette kernel: [<ffffffffa0503fb0>] ? nouveau_abi16_ioctl_channel_alloc+0xd0/0x380 [nouveau] May 16 08:32:14 brouette kernel: [<ffffffffa050401e>] nouveau_abi16_ioctl_channel_alloc+0x13e/0x380 [nouveau] May 16 08:32:14 brouette kernel: [<ffffffffa03628b8>] drm_ioctl+0x1d8/0x5d0 [drm] May 16 08:32:14 brouette kernel: [<ffffffffa0503ee0>] ? nouveau_abi1...

...t, 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->channel); /* create channel object and initialise dma and fence management...

...00 00 00 4c 73 9d c0 ....8.......Ls.. backtrace: [<c00ee72c>] kmem_cache_alloc+0xf4/0x174 [<c03edcc8>] nv84_fence_context_new+0x58/0x170 [<c03ee564>] nvc0_fence_context_new+0xc/0x34 [<c03e2d3c>] nouveau_channel_new+0x374/0x730 [<c03eb6d4>] nouveau_abi16_ioctl_channel_alloc+0x148/0x37c [<c0327620>] drm_ioctl+0x1d4/0x50c [<c03e0eac>] nouveau_drm_ioctl+0x58/0xa4 [<c0107498>] do_vfs_ioctl+0x3f0/0x614 [<c01076f0>] SyS_ioctl+0x34/0x5c [<c000e8e0>] ret_fast_syscall+0x0/0x30 [<ffffffff>] 0xffffffff That's...

...age > [ 71.099189] PGD 119590067 P4D 119590067 PUD 1054f5067 PMD 0 > [ 71.104842] Oops: 0000 [#1] SMP NOPTI > [ 71.108498] CPU: 2 PID: 1329 Comm: crashme Not tainted 5.8.0-rc6+ #2 > [ 71.114993] Hardware name: AMD Pike/Pike, BIOS RPK1506A 09/03/2014 > [ 71.121213] RIP: 0010:nouveau_abi16_ioctl_channel_alloc+0x108/0x380 [nouveau] > [ 71.128339] Code: 48 89 9d f0 00 00 00 41 8b 4c 24 04 41 8b 14 24 45 31 c0 4c 8d 4b 10 48 89 ee 4c 89 f7 e8 10 11 00 00 85 c0 75 78 48 8b 43 10 <8b> 90 a0 00 00 00 41 89 54 24 08 80 7d 3d 05 0f 86 bb 01 00 00 41 > [ 71.147074] RSP: 0018:ffffb4a1809cfd38 EFLA...

...[<ffffffffa01e34a9>] nouveau_channel_prep+0x1d9/0x2a0 [nouveau] [<ffffffffa01e35c7>] nouveau_channel_new+0x57/0x6e0 [nouveau] [<ffffffffa0133a2d>] ? nvif_device_init+0x2d/0x30 [nouveau] [<ffffffff8121ab52>] ? kmem_cache_alloc_trace+0x1c2/0x1d0 [<ffffffffa01e2736>] nouveau_abi16_ioctl_channel_alloc+0xd6/0x2c0 [nouveau] [<ffffffffa0050712>] drm_ioctl+0x152/0x540 [drm] [<ffffffffa01e2660>] ? nouveau_abi16_ioctl_setparam+0x10/0x10 [nouveau] [<ffffffffa01cb144>] nouveau_drm_ioctl+0x74/0xc0 [nouveau] [<ffffffff81256183>] do_vfs_ioctl+0xa3/0x5d0 [<ffffffff81256729&gt...

..._abi16 *abi16, if (chan->ntfy) { nouveau_vma_del(&chan->ntfy_vma); nouveau_bo_unpin(chan->ntfy); - drm_gem_object_put_unlocked(&chan->ntfy->gem); + drm_gem_object_put_unlocked(&chan->ntfy->bo.base); } if (chan->heap.block_size) @@ -345,7 +345,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) goto done; } - ret = drm_gem_handle_create(file_priv, &chan->ntfy->gem, + ret = drm_gem_handle_create(file_priv, &chan->ntfy->bo.base, &init->notifier_handle); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/...