1. 17 Nov, 2023 26 commits
  2. 15 Nov, 2023 3 commits
  3. 14 Nov, 2023 3 commits
    • Dave Airlie's avatar
      nouveau: use an rwlock for the event lock. · a2e36cd5
      Dave Airlie authored
      This allows it to break the following circular locking dependency.
      
      Aug 10 07:01:29 dg1test kernel: ======================================================
      Aug 10 07:01:29 dg1test kernel: WARNING: possible circular locking dependency detected
      Aug 10 07:01:29 dg1test kernel: 6.4.0-rc7+ #10 Not tainted
      Aug 10 07:01:29 dg1test kernel: ------------------------------------------------------
      Aug 10 07:01:29 dg1test kernel: wireplumber/2236 is trying to acquire lock:
      Aug 10 07:01:29 dg1test kernel: ffff8fca5320da18 (&fctx->lock){-...}-{2:2}, at: nouveau_fence_wait_uevent_handler+0x2b/0x100 [nouveau]
      Aug 10 07:01:29 dg1test kernel:
                                      but task is already holding lock:
      Aug 10 07:01:29 dg1test kernel: ffff8fca41208610 (&event->list_lock#2){-...}-{2:2}, at: nvkm_event_ntfy+0x50/0xf0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:
                                      which lock already depends on the new lock.
      Aug 10 07:01:29 dg1test kernel:
                                      the existing dependency chain (in reverse order) is:
      Aug 10 07:01:29 dg1test kernel:
                                      -> #3 (&event->list_lock#2){-...}-{2:2}:
      Aug 10 07:01:29 dg1test kernel:        _raw_spin_lock_irqsave+0x4b/0x70
      Aug 10 07:01:29 dg1test kernel:        nvkm_event_ntfy+0x50/0xf0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        ga100_fifo_nonstall_intr+0x24/0x30 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_intr+0x12c/0x240 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        __handle_irq_event_percpu+0x88/0x240
      Aug 10 07:01:29 dg1test kernel:        handle_irq_event+0x38/0x80
      Aug 10 07:01:29 dg1test kernel:        handle_edge_irq+0xa3/0x240
      Aug 10 07:01:29 dg1test kernel:        __common_interrupt+0x72/0x160
      Aug 10 07:01:29 dg1test kernel:        common_interrupt+0x60/0xe0
      Aug 10 07:01:29 dg1test kernel:        asm_common_interrupt+0x26/0x40
      Aug 10 07:01:29 dg1test kernel:
                                      -> #2 (&device->intr.lock){-...}-{2:2}:
      Aug 10 07:01:29 dg1test kernel:        _raw_spin_lock_irqsave+0x4b/0x70
      Aug 10 07:01:29 dg1test kernel:        nvkm_inth_allow+0x2c/0x80 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_event_ntfy_state+0x181/0x250 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_event_ntfy_allow+0x63/0xd0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_uevent_mthd+0x4d/0x70 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_ioctl+0x10b/0x250 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvif_object_mthd+0xa8/0x1f0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvif_event_allow+0x2a/0xa0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nouveau_fence_enable_signaling+0x78/0x80 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        __dma_fence_enable_signaling+0x5e/0x100
      Aug 10 07:01:29 dg1test kernel:        dma_fence_add_callback+0x4b/0xd0
      Aug 10 07:01:29 dg1test kernel:        nouveau_cli_work_queue+0xae/0x110 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nouveau_gem_object_close+0x1d1/0x2a0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        drm_gem_handle_delete+0x70/0xe0 [drm]
      Aug 10 07:01:29 dg1test kernel:        drm_ioctl_kernel+0xa5/0x150 [drm]
      Aug 10 07:01:29 dg1test kernel:        drm_ioctl+0x256/0x490 [drm]
      Aug 10 07:01:29 dg1test kernel:        nouveau_drm_ioctl+0x5a/0xb0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        __x64_sys_ioctl+0x91/0xd0
      Aug 10 07:01:29 dg1test kernel:        do_syscall_64+0x3c/0x90
      Aug 10 07:01:29 dg1test kernel:        entry_SYSCALL_64_after_hwframe+0x72/0xdc
      Aug 10 07:01:29 dg1test kernel:
                                      -> #1 (&event->refs_lock#4){....}-{2:2}:
      Aug 10 07:01:29 dg1test kernel:        _raw_spin_lock_irqsave+0x4b/0x70
      Aug 10 07:01:29 dg1test kernel:        nvkm_event_ntfy_state+0x37/0x250 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_event_ntfy_allow+0x63/0xd0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_uevent_mthd+0x4d/0x70 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_ioctl+0x10b/0x250 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvif_object_mthd+0xa8/0x1f0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvif_event_allow+0x2a/0xa0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nouveau_fence_enable_signaling+0x78/0x80 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        __dma_fence_enable_signaling+0x5e/0x100
      Aug 10 07:01:29 dg1test kernel:        dma_fence_add_callback+0x4b/0xd0
      Aug 10 07:01:29 dg1test kernel:        nouveau_cli_work_queue+0xae/0x110 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nouveau_gem_object_close+0x1d1/0x2a0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        drm_gem_handle_delete+0x70/0xe0 [drm]
      Aug 10 07:01:29 dg1test kernel:        drm_ioctl_kernel+0xa5/0x150 [drm]
      Aug 10 07:01:29 dg1test kernel:        drm_ioctl+0x256/0x490 [drm]
      Aug 10 07:01:29 dg1test kernel:        nouveau_drm_ioctl+0x5a/0xb0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        __x64_sys_ioctl+0x91/0xd0
      Aug 10 07:01:29 dg1test kernel:        do_syscall_64+0x3c/0x90
      Aug 10 07:01:29 dg1test kernel:        entry_SYSCALL_64_after_hwframe+0x72/0xdc
      Aug 10 07:01:29 dg1test kernel:
                                      -> #0 (&fctx->lock){-...}-{2:2}:
      Aug 10 07:01:29 dg1test kernel:        __lock_acquire+0x14e3/0x2240
      Aug 10 07:01:29 dg1test kernel:        lock_acquire+0xc8/0x2a0
      Aug 10 07:01:29 dg1test kernel:        _raw_spin_lock_irqsave+0x4b/0x70
      Aug 10 07:01:29 dg1test kernel:        nouveau_fence_wait_uevent_handler+0x2b/0x100 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_client_event+0xf/0x20 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_event_ntfy+0x9b/0xf0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        ga100_fifo_nonstall_intr+0x24/0x30 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        nvkm_intr+0x12c/0x240 [nouveau]
      Aug 10 07:01:29 dg1test kernel:        __handle_irq_event_percpu+0x88/0x240
      Aug 10 07:01:29 dg1test kernel:        handle_irq_event+0x38/0x80
      Aug 10 07:01:29 dg1test kernel:        handle_edge_irq+0xa3/0x240
      Aug 10 07:01:29 dg1test kernel:        __common_interrupt+0x72/0x160
      Aug 10 07:01:29 dg1test kernel:        common_interrupt+0x60/0xe0
      Aug 10 07:01:29 dg1test kernel:        asm_common_interrupt+0x26/0x40
      Aug 10 07:01:29 dg1test kernel:
                                      other info that might help us debug this:
      Aug 10 07:01:29 dg1test kernel: Chain exists of:
                                        &fctx->lock --> &device->intr.lock --> &event->list_lock#2
      Aug 10 07:01:29 dg1test kernel:  Possible unsafe locking scenario:
      Aug 10 07:01:29 dg1test kernel:        CPU0                    CPU1
      Aug 10 07:01:29 dg1test kernel:        ----                    ----
      Aug 10 07:01:29 dg1test kernel:   lock(&event->list_lock#2);
      Aug 10 07:01:29 dg1test kernel:                                lock(&device->intr.lock);
      Aug 10 07:01:29 dg1test kernel:                                lock(&event->list_lock#2);
      Aug 10 07:01:29 dg1test kernel:   lock(&fctx->lock);
      Aug 10 07:01:29 dg1test kernel:
                                       *** DEADLOCK ***
      Aug 10 07:01:29 dg1test kernel: 2 locks held by wireplumber/2236:
      Aug 10 07:01:29 dg1test kernel:  #0: ffff8fca53177bf8 (&device->intr.lock){-...}-{2:2}, at: nvkm_intr+0x29/0x240 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  #1: ffff8fca41208610 (&event->list_lock#2){-...}-{2:2}, at: nvkm_event_ntfy+0x50/0xf0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:
                                      stack backtrace:
      Aug 10 07:01:29 dg1test kernel: CPU: 6 PID: 2236 Comm: wireplumber Not tainted 6.4.0-rc7+ #10
      Aug 10 07:01:29 dg1test kernel: Hardware name: Gigabyte Technology Co., Ltd. Z390 I AORUS PRO WIFI/Z390 I AORUS PRO WIFI-CF, BIOS F8 11/05/2021
      Aug 10 07:01:29 dg1test kernel: Call Trace:
      Aug 10 07:01:29 dg1test kernel:  <TASK>
      Aug 10 07:01:29 dg1test kernel:  dump_stack_lvl+0x5b/0x90
      Aug 10 07:01:29 dg1test kernel:  check_noncircular+0xe2/0x110
      Aug 10 07:01:29 dg1test kernel:  __lock_acquire+0x14e3/0x2240
      Aug 10 07:01:29 dg1test kernel:  lock_acquire+0xc8/0x2a0
      Aug 10 07:01:29 dg1test kernel:  ? nouveau_fence_wait_uevent_handler+0x2b/0x100 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  ? lock_acquire+0xc8/0x2a0
      Aug 10 07:01:29 dg1test kernel:  _raw_spin_lock_irqsave+0x4b/0x70
      Aug 10 07:01:29 dg1test kernel:  ? nouveau_fence_wait_uevent_handler+0x2b/0x100 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  nouveau_fence_wait_uevent_handler+0x2b/0x100 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  nvkm_client_event+0xf/0x20 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  nvkm_event_ntfy+0x9b/0xf0 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  ga100_fifo_nonstall_intr+0x24/0x30 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  nvkm_intr+0x12c/0x240 [nouveau]
      Aug 10 07:01:29 dg1test kernel:  __handle_irq_event_percpu+0x88/0x240
      Aug 10 07:01:29 dg1test kernel:  handle_irq_event+0x38/0x80
      Aug 10 07:01:29 dg1test kernel:  handle_edge_irq+0xa3/0x240
      Aug 10 07:01:29 dg1test kernel:  __common_interrupt+0x72/0x160
      Aug 10 07:01:29 dg1test kernel:  common_interrupt+0x60/0xe0
      Aug 10 07:01:29 dg1test kernel:  asm_common_interrupt+0x26/0x40
      Aug 10 07:01:29 dg1test kernel: RIP: 0033:0x7fb66174d700
      Aug 10 07:01:29 dg1test kernel: Code: c1 e2 05 29 ca 8d 0c 10 0f be 07 84 c0 75 eb 89 c8 c3 0f 1f 84 00 00 00 00 00 f3 0f 1e fa e9 d7 0f fc ff 0f 1f 80 00 00 00 00 <f3> 0f 1e fa e9 c7 0f fc>
      Aug 10 07:01:29 dg1test kernel: RSP: 002b:00007ffdd3c48438 EFLAGS: 00000206
      Aug 10 07:01:29 dg1test kernel: RAX: 000055bb758763c0 RBX: 000055bb758752c0 RCX: 00000000000028b0
      Aug 10 07:01:29 dg1test kernel: RDX: 000055bb758752c0 RSI: 000055bb75887490 RDI: 000055bb75862950
      Aug 10 07:01:29 dg1test kernel: RBP: 00007ffdd3c48490 R08: 000055bb75873b10 R09: 0000000000000001
      Aug 10 07:01:29 dg1test kernel: R10: 0000000000000004 R11: 000055bb7587f000 R12: 000055bb75887490
      Aug 10 07:01:29 dg1test kernel: R13: 000055bb757f6280 R14: 000055bb758875c0 R15: 000055bb757f6280
      Aug 10 07:01:29 dg1test kernel:  </TASK>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      Tested-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Reviewed-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20231107053255.2257079-1-airlied@gmail.com
      a2e36cd5
    • Dan Carpenter's avatar
      nouveau/gsp/r535: Fix a NULL vs error pointer bug · 42bd415b
      Dan Carpenter authored
      The r535_gsp_cmdq_get() function returns error pointers but this code
      checks for NULL.  Also we need to propagate the error pointer back to
      the callers in r535_gsp_rpc_get().  Returning NULL will lead to a NULL
      pointer dereference.
      
      Fixes: 176fdcbd ("drm/nouveau/gsp/r535: add support for booting GSP-RM")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
      Reviewed-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/f71996d9-d1cb-45ea-a4b2-2dfc21312d8c@kili.mountain
      42bd415b
    • Dan Carpenter's avatar
      nouveau/gsp/r535: uninitialized variable in r535_gsp_acpi_mux_id() · 09f12bf9
      Dan Carpenter authored
      The if we hit the "continue" statement on the first iteration through
      the loop then "handle_mux" needs to be set to NULL so we continue
      looping.
      
      Fixes: 176fdcbd ("drm/nouveau/gsp/r535: add support for booting GSP-RM")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
      Reviewed-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/1d864f6e-43e9-43d8-9d90-30e76c9c843b@moroto.mountain
      09f12bf9
  4. 13 Nov, 2023 1 commit
  5. 12 Nov, 2023 5 commits
  6. 11 Nov, 2023 1 commit
    • Linus Torvalds's avatar
      Merge tag 'probes-fixes-v6.7-rc1' of... · 3ca112b7
      Linus Torvalds authored
      Merge tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
      
      Pull probes fixes from Masami Hiramatsu:
      
       - Documentation update: Add a note about argument and return value
         fetching is the best effort because it depends on the type.
      
       - objpool: Fix to make internal global variables static in
         test_objpool.c.
      
       - kprobes: Unify kprobes_exceptions_nofify() prototypes. There are the
         same prototypes in asm/kprobes.h for some architectures, but some of
         them are missing the prototype and it causes a warning. So move the
         prototype into linux/kprobes.h.
      
       - tracing: Fix to check the tracepoint event and return event at
         parsing stage. The tracepoint event doesn't support %return but if
         $retval exists, it will be converted to %return silently. This finds
         that case and rejects it.
      
       - tracing: Fix the order of the descriptions about the parameters of
         __kprobe_event_gen_cmd_start() to be consistent with the argument
         list of the function.
      
      * tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
        tracing/kprobes: Fix the order of argument descriptions
        tracing: fprobe-event: Fix to check tracepoint event and return
        kprobes: unify kprobes_exceptions_nofify() prototypes
        lib: test_objpool: make global variables static
        Documentation: tracing: Add a note about argument and retval access
      3ca112b7
  7. 10 Nov, 2023 1 commit
    • Linus Torvalds's avatar
      Merge tag 'fbdev-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev · 18553507
      Linus Torvalds authored
      Pull fbdev fixes and cleanups from Helge Deller:
      
       - fix double free and resource leaks in imsttfb
      
       - lots of remove callback cleanups and section mismatch fixes in
         omapfb, amifb and atmel_lcdfb
      
       - error code fix and memparse simplification in omapfb
      
      * tag 'fbdev-for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (31 commits)
        fbdev: fsl-diu-fb: mark wr_reg_wa() static
        fbdev: amifb: Convert to platform remove callback returning void
        fbdev: amifb: Mark driver struct with __refdata to prevent section mismatch warning
        fbdev: hyperv_fb: fix uninitialized local variable use
        fbdev: omapfb/tpd12s015: Convert to platform remove callback returning void
        fbdev: omapfb/tfp410: Convert to platform remove callback returning void
        fbdev: omapfb/sharp-ls037v7dw01: Convert to platform remove callback returning void
        fbdev: omapfb/opa362: Convert to platform remove callback returning void
        fbdev: omapfb/hdmi: Convert to platform remove callback returning void
        fbdev: omapfb/dvi: Convert to platform remove callback returning void
        fbdev: omapfb/dsi-cm: Convert to platform remove callback returning void
        fbdev: omapfb/dpi: Convert to platform remove callback returning void
        fbdev: omapfb/analog-tv: Convert to platform remove callback returning void
        fbdev: atmel_lcdfb: Convert to platform remove callback returning void
        fbdev: omapfb/tpd12s015: Don't put .remove() in .exit.text and drop suppress_bind_attrs
        fbdev: omapfb/tfp410: Don't put .remove() in .exit.text and drop suppress_bind_attrs
        fbdev: omapfb/sharp-ls037v7dw01: Don't put .remove() in .exit.text and drop suppress_bind_attrs
        fbdev: omapfb/opa362: Don't put .remove() in .exit.text and drop suppress_bind_attrs
        fbdev: omapfb/hdmi: Don't put .remove() in .exit.text and drop suppress_bind_attrs
        fbdev: omapfb/dvi: Don't put .remove() in .exit.text and drop suppress_bind_attrs
        ...
      18553507