Skip to content

Commit 16eb51a

Browse files
committed
drm/msm: Fix vmap madv warning
Commit d6ae7d1 ("drm/msm/gem: Simplify vmap vs LRU tracking") introduced a splat in the pin_pages_locked() path for buffers that had been MADV_DONTNEED. ------------[ cut here ]------------ msm_obj->madv != 0 WARNING: CPU: 1 PID: 144 at drivers/gpu/drm/msm/msm_gem.c:230 msm_gem_pin_pages_locked+0x9c/0xd4 Modules linked in: lzo_rle cros_ec_lid_angle cros_ec_sensors cros_ec_sensors_core venus_dec venus_enc videobuf2_dma_contig cdc_ether usbnet mii uvcvideo videobuf2_vmalloc hci_uart btqca qcom_spmi_adc5 uvc qcom_spmi_temp_alarm qcom_vadc_common cros_ec_sensorhub videobuf2_memops cros_ec_typec sx9324 sx_common typec joydev bluetooth industrialio_triggered_buffer ecdh_generic kfifo_buf ecc venus_core qcom_stats v4l2_mem2mem videobuf2_v4l2 videobuf2_common ath11k_ahb ath11k mac80211 cfg80211 fuse zram zsmalloc CPU: 1 PID: 144 Comm: ring0 Tainted: G W 6.3.0-rc2-debug+ torvalds#622 Hardware name: Google Villager (rev1+) with LTE (DT) pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : msm_gem_pin_pages_locked+0x9c/0xd4 lr : msm_gem_pin_pages_locked+0x9c/0xd4 sp : ffffffc009ffbab0 x29: ffffffc009ffbab0 x28: ffffffee8da75008 x27: ffffff80a10274d0 x26: ffffff8087fe3bf8 x25: ffffff8087fe3c08 x24: 0000000000000001 x23: ffffff80891d5800 x22: ffffff809d0de480 x21: ffffff8081e5a080 x20: 0000000000000002 x19: ffffff80a3564c00 x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 00000000000a9620 x14: 0000000000000000 x13: 2d2d2d2d2d2d2d2d x12: 2d2d2d2d5d206572 x11: 656820747563205b x10: 2d2d2d2d2d2d2d2d x9 : ffffffee8c705dfc x8 : ffffffee8da75000 x7 : ffffffee8d34e6d0 x6 : 0000000000000000 x5 : 00000000000affa8 x4 : 000000000000000d x3 : ffffffee8da75008 x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff8088048040 Call trace: msm_gem_pin_pages_locked+0x9c/0xd4 get_vaddr+0xb0/0x150 msm_gem_get_vaddr_active+0x1c/0x28 snapshot_buf+0x90/0x10c msm_rd_dump_submit+0x30c/0x380 msm_gpu_submit+0x88/0x174 msm_job_run+0x68/0x118 drm_sched_main+0x2b8/0x3a0 kthread+0xf0/0x100 ret_from_fork+0x10/0x20 irq event stamp: 3358 hardirqs last enabled at (3357): [<ffffffee8c7051f4>] __up_console_sem+0x7c/0x80 hardirqs last disabled at (3358): [<ffffffee8d3480b0>] el1_dbg+0x24/0x80 softirqs last enabled at (3330): [<ffffffee8c610420>] __do_softirq+0x21c/0x4bc softirqs last disabled at (3325): [<ffffffee8c616708>] ____do_softirq+0x18/0x24 ---[ end trace 0000000000000000 ]--- But, as with msm_gem_get_vaddr_active(), this is a special case because we know that the buffer won't be purged evicted until it's fence is signaled. We just forgot to propagate the logic get_vaddr() to pin_pages_locked(). Fixes: d6ae7d1 ("drm/msm/gem: Simplify vmap vs LRU tracking") Signed-off-by: Rob Clark <robdclark@chromium.org> Patchwork: https://patchwork.freedesktop.org/patch/532616/ Link: https://lore.kernel.org/r/20230417225504.494934-1-robdclark@gmail.com
1 parent ce90233 commit 16eb51a

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

drivers/gpu/drm/msm/msm_gem.c

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,18 @@ static void put_pages(struct drm_gem_object *obj)
219219
}
220220
}
221221

222-
static struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj)
222+
static struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj,
223+
unsigned madv)
223224
{
224225
struct msm_drm_private *priv = obj->dev->dev_private;
225226
struct msm_gem_object *msm_obj = to_msm_bo(obj);
226227
struct page **p;
227228

228229
msm_gem_assert_locked(obj);
229230

230-
if (GEM_WARN_ON(msm_obj->madv != MSM_MADV_WILLNEED)) {
231+
if (GEM_WARN_ON(msm_obj->madv > madv)) {
232+
DRM_DEV_ERROR(obj->dev->dev, "Invalid madv state: %u vs %u\n",
233+
msm_obj->madv, madv);
231234
return ERR_PTR(-EBUSY);
232235
}
233236

@@ -248,7 +251,7 @@ struct page **msm_gem_pin_pages(struct drm_gem_object *obj)
248251
struct page **p;
249252

250253
msm_gem_lock(obj);
251-
p = msm_gem_pin_pages_locked(obj);
254+
p = msm_gem_pin_pages_locked(obj, MSM_MADV_WILLNEED);
252255
msm_gem_unlock(obj);
253256

254257
return p;
@@ -473,10 +476,7 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma)
473476

474477
msm_gem_assert_locked(obj);
475478

476-
if (GEM_WARN_ON(msm_obj->madv != MSM_MADV_WILLNEED))
477-
return -EBUSY;
478-
479-
pages = msm_gem_pin_pages_locked(obj);
479+
pages = msm_gem_pin_pages_locked(obj, MSM_MADV_WILLNEED);
480480
if (IS_ERR(pages))
481481
return PTR_ERR(pages);
482482

@@ -699,13 +699,7 @@ static void *get_vaddr(struct drm_gem_object *obj, unsigned madv)
699699
if (obj->import_attach)
700700
return ERR_PTR(-ENODEV);
701701

702-
if (GEM_WARN_ON(msm_obj->madv > madv)) {
703-
DRM_DEV_ERROR(obj->dev->dev, "Invalid madv state: %u vs %u\n",
704-
msm_obj->madv, madv);
705-
return ERR_PTR(-EBUSY);
706-
}
707-
708-
pages = msm_gem_pin_pages_locked(obj);
702+
pages = msm_gem_pin_pages_locked(obj, madv);
709703
if (IS_ERR(pages))
710704
return ERR_CAST(pages);
711705

0 commit comments

Comments
 (0)