From patchwork Tue Dec 15 01:29:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 7850631 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 43164BEEE1 for ; Tue, 15 Dec 2015 01:30:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B89A20374 for ; Tue, 15 Dec 2015 01:30:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56FF320320 for ; Tue, 15 Dec 2015 01:30:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932959AbbLOBaB (ORCPT ); Mon, 14 Dec 2015 20:30:01 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33494 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932996AbbLOB36 (ORCPT ); Mon, 14 Dec 2015 20:29:58 -0500 Received: by pabur14 with SMTP id ur14so113595139pab.0 for ; Mon, 14 Dec 2015 17:29:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=omr46PqL0/NzXvHBUgQDNc1VX14uZY7uI3HbyM+Ej4I=; b=cPQX85HuIl9v89yPvn0fZFf0g5ojSo+Zn9flm7tp7zhf3WwlKBtIyD4lGw95KMyGaB IaiOYB8NkJWTTn5HJs4nNvhDTSXXD2QgdSBwxo/NLHwQRcDVNmjQryGaaLN3ryvogdd6 ZLp5zN/2BQUIZSk9d65aUOKk5PFctr4/ewG59tW+TrpVxx/hzUC0rxBEbwz2m0WPM3HG IQVINhuxAiv5l+0YaMY1p77pMUBXlAmS1xI4dfx+rqrSgR87b8grsh7AujF/pczZdNKr adxXJqqc6Vl8ks0vYMHWFIt1cG+/WXIpBWbIZ09YW+IgihShBbfq7F6xoetWjq7m3BCQ MX9w== X-Gm-Message-State: ALoCoQmUj88CKwSWZ4M9fUzBka2QevpE6+WAGCmvHtoh4PEt09rtFVYjWiohoOxKnTxVU0YxnzPa6YzK6NU6Ngyk3aaJpiUf7Q== X-Received: by 10.66.90.166 with SMTP id bx6mr42240933pab.75.1450142998060; Mon, 14 Dec 2015 17:29:58 -0800 (PST) Received: from dtor-ws ([2620:0:1000:1301:1dc6:d5f5:521b:1126]) by smtp.gmail.com with ESMTPSA id w20sm44871247pfi.55.2015.12.14.17.29.56 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 14 Dec 2015 17:29:57 -0800 (PST) Date: Mon, 14 Dec 2015 17:29:55 -0800 From: Dmitry Torokhov To: Greg Kroah-Hartman Cc: Sumit Semwal , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Andrew Bresticker , Maarten Lankhorst , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH] android: fix warning when releasing active sync point Message-ID: <20151215012955.GA28277@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Userspace can close the sync device while there are still active fence points, in which case kernel produces the following warning: [ 43.853176] ------------[ cut here ]------------ [ 43.857834] WARNING: CPU: 0 PID: 892 at /mnt/host/source/src/third_party/kernel/v3.18/drivers/staging/android/sync.c:439 android_fence_release+0x88/0x104() [ 43.871741] CPU: 0 PID: 892 Comm: Binder_5 Tainted: G U 3.18.0-07661-g0550ce9 #1 [ 43.880176] Hardware name: Google Tegra210 Smaug Rev 1+ (DT) [ 43.885834] Call trace: [ 43.888294] [] dump_backtrace+0x0/0x10c [ 43.893697] [] show_stack+0x10/0x1c [ 43.898756] [] dump_stack+0x74/0xb8 [ 43.903814] [] warn_slowpath_common+0x84/0xb0 [ 43.909736] [] warn_slowpath_null+0x14/0x20 [ 43.915482] [] android_fence_release+0x84/0x104 [ 43.921582] [] fence_release+0x104/0x134 [ 43.927066] [] sync_fence_free+0x74/0x9c [ 43.932552] [] sync_fence_release+0x34/0x48 [ 43.938304] [] __fput+0x100/0x1b8 [ 43.943185] [] ____fput+0x8/0x14 [ 43.947982] [] task_work_run+0xb0/0xe4 [ 43.953297] [] do_notify_resume+0x44/0x5c [ 43.958867] ---[ end trace 5a2aa4027cc5d171 ]--- Let's fix it by introducing a new optional callback (disable_signaling) to fence operations so that drivers can do proper clean ups when we remove last callback for given fence. Reviewed-by: Andrew Bresticker Signed-off-by: Dmitry Torokhov --- drivers/dma-buf/fence.c | 6 +++++- drivers/staging/android/sync.c | 8 ++++++++ include/linux/fence.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 7b05dbe..0ed73ad 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -304,8 +304,12 @@ fence_remove_callback(struct fence *fence, struct fence_cb *cb) spin_lock_irqsave(fence->lock, flags); ret = !list_empty(&cb->node); - if (ret) + if (ret) { list_del_init(&cb->node); + if (list_empty(&fence->cb_list)) + if (fence->ops->disable_signaling) + fence->ops->disable_signaling(fence); + } spin_unlock_irqrestore(fence->lock, flags); diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index e0c1acb..f8566c1 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -465,6 +465,13 @@ static bool android_fence_enable_signaling(struct fence *fence) return true; } +static void android_fence_disable_signaling(struct fence *fence) +{ + struct sync_pt *pt = container_of(fence, struct sync_pt, base); + + list_del_init(&pt->active_list); +} + static int android_fence_fill_driver_data(struct fence *fence, void *data, int size) { @@ -508,6 +515,7 @@ static const struct fence_ops android_fence_ops = { .get_driver_name = android_fence_get_driver_name, .get_timeline_name = android_fence_get_timeline_name, .enable_signaling = android_fence_enable_signaling, + .disable_signaling = android_fence_disable_signaling, .signaled = android_fence_signaled, .wait = fence_default_wait, .release = android_fence_release, diff --git a/include/linux/fence.h b/include/linux/fence.h index bb52201..ce44348 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -107,6 +107,7 @@ struct fence_cb { * @get_driver_name: returns the driver name. * @get_timeline_name: return the name of the context this fence belongs to. * @enable_signaling: enable software signaling of fence. + * @disable_signaling: disable software signaling of fence (optional). * @signaled: [optional] peek whether the fence is signaled, can be null. * @wait: custom wait implementation, or fence_default_wait. * @release: [optional] called on destruction of fence, can be null @@ -166,6 +167,7 @@ struct fence_ops { const char * (*get_driver_name)(struct fence *fence); const char * (*get_timeline_name)(struct fence *fence); bool (*enable_signaling)(struct fence *fence); + void (*disable_signaling)(struct fence *fence); bool (*signaled)(struct fence *fence); signed long (*wait)(struct fence *fence, bool intr, signed long timeout); void (*release)(struct fence *fence);