]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: fix the idr allocation flags
authorPrike Liang <Prike.Liang@amd.com>
Mon, 23 Mar 2026 08:07:02 +0000 (16:07 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 30 Mar 2026 18:32:19 +0000 (14:32 -0400)
Fix the IDR allocation flags by using atomic GFP
flags in non‑sleepable contexts to avoid the __might_sleep()
complaint.

  268.290239] [drm] Initialized amdgpu 3.64.0 for 0000:03:00.0 on minor 0
[  268.294900] BUG: sleeping function called from invalid context at ./include/linux/sched/mm.h:323
[  268.295355] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1744, name: modprobe
[  268.295705] preempt_count: 1, expected: 0
[  268.295886] RCU nest depth: 0, expected: 0
[  268.296072] 2 locks held by modprobe/1744:
[  268.296077]  #0: ffff8c3a44abd1b8 (&dev->mutex){....}-{4:4}, at: __driver_attach+0xe4/0x210
[  268.296100]  #1: ffffffffc1a6ea78 (amdgpu_pasid_idr_lock){+.+.}-{3:3}, at: amdgpu_pasid_alloc+0x26/0xe0 [amdgpu]
[  268.296494] CPU: 12 UID: 0 PID: 1744 Comm: modprobe Tainted: G     U     OE       6.19.0-custom #16 PREEMPT(voluntary)
[  268.296498] Tainted: [U]=USER, [O]=OOT_MODULE, [E]=UNSIGNED_MODULE
[  268.296499] Hardware name: AMD Majolica-RN/Majolica-RN, BIOS RMJ1009A 06/13/2021
[  268.296501] Call Trace:

Fixes: 8f1de51f49be ("drm/amdgpu: prevent immediate PASID reuse case")
Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c

index d88523568b625fae3d1bc77bc9120e5a650ec214..569c5a89ff10b661d7ae9ad4e6f949e064d9ce35 100644 (file)
@@ -68,8 +68,11 @@ int amdgpu_pasid_alloc(unsigned int bits)
                return -EINVAL;
 
        spin_lock(&amdgpu_pasid_idr_lock);
+       /* TODO: Need to replace the idr with an xarry, and then
+        * handle the internal locking with ATOMIC safe paths.
+        */
        pasid = idr_alloc_cyclic(&amdgpu_pasid_idr, NULL, 1,
-                                1U << bits, GFP_KERNEL);
+                                1U << bits, GFP_ATOMIC);
        spin_unlock(&amdgpu_pasid_idr_lock);
 
        if (pasid >= 0)