From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934025AbdJXNXR (ORCPT ); Tue, 24 Oct 2017 09:23:17 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:43624 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933777AbdJXNXM (ORCPT ); Tue, 24 Oct 2017 09:23:12 -0400 X-Google-Smtp-Source: ABhQp+RL4IHpSrGnz3M7T+var972LmPItwqy9q+EHyS8DJKOfUKxJt5XKBBb00Jan/TFrnM2PWzQ/A== From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Jordan Crouse , Rob Clark , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 1/6] drm/msm: show task cmdline in gpu recovery messages Date: Tue, 24 Oct 2017 09:22:48 -0400 Message-Id: <20171024132256.20286-2-robdclark@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171024132256.20286-1-robdclark@gmail.com> References: <20171024132256.20286-1-robdclark@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that freedreno gallium driver defaults to using submit_queue task (render reordering), just showing task->comm is not so useful (ie. it is always "flush_queue:0"), so also dump the cmdline. This should also be more useful for piglit/shader_runner. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gpu.c | 54 +++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index a05aa119f22b..d26a7282466e 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -235,6 +235,20 @@ static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, } } +static struct msm_gem_submit * +find_submit(struct msm_ringbuffer *ring, uint32_t fence) +{ + struct msm_gem_submit *submit; + + WARN_ON(!mutex_is_locked(&ring->gpu->dev->struct_mutex)); + + list_for_each_entry(submit, &ring->submits, node) + if (submit->seqno == fence) + return submit; + + return NULL; +} + static void retire_submits(struct msm_gpu *gpu); static void recover_worker(struct work_struct *work) @@ -268,19 +282,35 @@ static void recover_worker(struct work_struct *work) dev_err(dev->dev, "%s: hangcheck recover!\n", gpu->name); fence = cur_ring->memptrs->fence + 1; - list_for_each_entry(submit, &cur_ring->submits, node) { - if (submit->seqno == fence) { - struct task_struct *task; - - rcu_read_lock(); - task = pid_task(submit->pid, PIDTYPE_PID); - if (task) { - dev_err(dev->dev, "%s: offending task: %s\n", - gpu->name, task->comm); - } - rcu_read_unlock(); - break; + submit = find_submit(cur_ring, fence); + if (submit) { + struct task_struct *task; + + rcu_read_lock(); + task = pid_task(submit->pid, PIDTYPE_PID); + if (task) { + char buf[256]; + int len; + + /* + * so slightly annoying, in other paths like mmap'ing gem + * buffers, mmap_sem is acquired before struct_mutex, which + * means we can't hold struct_mutex across the call to + * get_cmdline(). But we don't need 'submit' any further + * so no issue if hypothetically it goes away when dropping + * struct_mutex. For good measure null out the submit ptr + * to make this obvious. + */ + submit = NULL; + mutex_unlock(&dev->struct_mutex); + len = get_cmdline(task, buf, sizeof(buf)); + mutex_lock(&dev->struct_mutex); + + dev_err(dev->dev, "%s: offending task: %s (%-*s)\n", + gpu->name, task->comm, len, buf); } + rcu_read_unlock(); + } if (msm_gpu_active(gpu)) { -- 2.13.6