From patchwork Fri Mar 1 00:43:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 15176 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C32AE23E1A for ; Fri, 1 Mar 2013 00:44:13 +0000 (UTC) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by fiordland.canonical.com (Postfix) with ESMTP id 7B5A1A1935F for ; Fri, 1 Mar 2013 00:44:13 +0000 (UTC) Received: by mail-ve0-f181.google.com with SMTP id d10so2405971vea.40 for ; Thu, 28 Feb 2013 16:44:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=B9MQqd2xPSxmF0PuISFwbCzwCVuoA4p8+vX8mcnc/qc=; b=cJt9xFSz6c0MISZ2DN5iKQfrQ8XJbXsPbPToyE02EghGAUxUloCNminQEs6bsJpxm8 g7HVhBM/x0GqGgZCcsRE2wpa1jTN0GYiZHRnKjSjfF916tFdOOs7g3zBP4R4BwlAQj7L mdzEUib2+uymbparvH+jSaLD4TyuRA228IMheprIiT+zyforybyxWzG0cBQCRnu8MbRe 8H1gZ62vBeRSxuKzUl2CLfP47oGNZO8irhto8J2+fWNunh4B53omeAkyG3oGafb0XcDu fOSE9etph1XfzY4ixVX7NpHppvU7Va2ZPrcgcTRfqV9s77zdvmEhsSI9JndcjoiLafBL d7zA== X-Received: by 10.52.93.235 with SMTP id cx11mr2825136vdb.51.1362098653040; Thu, 28 Feb 2013 16:44:13 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp662veb; Thu, 28 Feb 2013 16:44:12 -0800 (PST) X-Received: by 10.68.238.103 with SMTP id vj7mr11795235pbc.181.1362098652091; Thu, 28 Feb 2013 16:44:12 -0800 (PST) Received: from mail-da0-f46.google.com (mail-da0-f46.google.com [209.85.210.46]) by mx.google.com with ESMTPS id b7si10611140paz.245.2013.02.28.16.44.11 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Feb 2013 16:44:12 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.46 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.210.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.46 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: by mail-da0-f46.google.com with SMTP id z8so1113873dad.19 for ; Thu, 28 Feb 2013 16:44:11 -0800 (PST) X-Received: by 10.66.166.43 with SMTP id zd11mr15961958pab.5.1362098651675; Thu, 28 Feb 2013 16:44:11 -0800 (PST) Received: from localhost.localdomain (c-24-21-54-107.hsd1.or.comcast.net. [24.21.54.107]) by mx.google.com with ESMTPS id dx17sm10914892pac.17.2013.02.28.16.44.10 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Feb 2013 16:44:11 -0800 (PST) From: John Stultz To: lkml Cc: Erik Gilling , Maarten Lankhorst , Daniel Vetter , Rob Clark , Sumit Semwal , Greg KH , dri-devel@lists.freedesktop.org, Android Kernel Team , John Stultz Subject: [PATCH 20/30] staging: sync: Improve timeout dump messages Date: Thu, 28 Feb 2013 16:43:16 -0800 Message-Id: <1362098606-26469-21-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362098606-26469-1-git-send-email-john.stultz@linaro.org> References: <1362098606-26469-1-git-send-email-john.stultz@linaro.org> X-Gm-Message-State: ALoCoQkXgh7nBAp/539LcX0jivf04MdLgC7Ivr5SfS9RI3wdqjcjOnR6Txpv5uoplZkfYjrEpMcN From: Erik Gilling Improve the output of the timeout dumps, including the fence pointer. Cc: Maarten Lankhorst Cc: Erik Gilling Cc: Daniel Vetter Cc: Rob Clark Cc: Sumit Semwal Cc: Greg KH Cc: dri-devel@lists.freedesktop.org Cc: Android Kernel Team Signed-off-by: Erik Gilling [jstultz: Added commit message] Signed-off-by: John Stultz --- drivers/staging/android/sync.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index d54fa8d..92cdfe8 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -576,6 +576,8 @@ int sync_fence_wait(struct sync_fence *fence, long timeout) return fence->status; if (fence->status == 0) { + pr_info("fence timeout on [%p] after %dms\n", fence, + jiffies_to_msecs(timeout)); sync_dump(); return -ETIME; } @@ -849,7 +851,8 @@ static void sync_print_fence(struct seq_file *s, struct sync_fence *fence) struct list_head *pos; unsigned long flags; - seq_printf(s, "%s: %s\n", fence->name, sync_status_str(fence->status)); + seq_printf(s, "[%p] %s: %s\n", fence, fence->name, + sync_status_str(fence->status)); list_for_each(pos, &fence->pt_list_head) { struct sync_pt *pt =