From patchwork Thu Jun 9 15:05:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9167257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 97CFB60467 for ; Thu, 9 Jun 2016 15:07:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87CF628328 for ; Thu, 9 Jun 2016 15:07:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AE1A2835A; Thu, 9 Jun 2016 15:07:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82E5228328 for ; Thu, 9 Jun 2016 15:07:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 091B86EBFA; Thu, 9 Jun 2016 15:07:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f196.google.com (mail-yw0-f196.google.com [209.85.161.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id E92B36EBFA for ; Thu, 9 Jun 2016 15:07:41 +0000 (UTC) Received: by mail-yw0-f196.google.com with SMTP id y6so5080287ywe.0 for ; Thu, 09 Jun 2016 08:07:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=klw8mWzDZEOyOD686hkYOCtuA25e/GtFumxBomtjT/0=; b=e6t0Au97B8nuKTlpK24SdMgwCAkNAQfZu3fE6BwiWWhJWUizpOUFL4lcKxBE24MUuT RdTIFzeTc/coEG0kFby6+SroYyrQcfU0ilpdZ191IYUYbqpOF2vLOhWbEY3Aj2iDQkFH zmViQJmG79IZl57g6NAbcAjpJXWMM1f/+40d9zhG2A6cLPGLI4lQF4c8o5oYAWjCWzhm Gm9O6RN9YcqnIOPCpRvloOYAcagWaj9PjMLXIOsjm3RcsmZIfZp4gEM72TIokcxjzpM4 jdkQ+I+uP8vTTNhaPiEin0gwCUWzXkssYE8u+L1UlmyeCr1tNXtuFOUBktGdkn3e2YRJ huwQ== X-Gm-Message-State: ALyK8tKGHOrS+AiEn5Hk6GafaGP2Jh9VfmwGArHbHOtHLD6gZdWxvmEerRlvnD+o8O6Gwg== X-Received: by 10.37.115.20 with SMTP id o20mr5969780ybc.177.1465484860736; Thu, 09 Jun 2016 08:07:40 -0700 (PDT) Received: from jade.localdomain ([201.82.24.203]) by smtp.gmail.com with ESMTPSA id n10sm3465619ywd.7.2016.06.09.08.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jun 2016 08:07:39 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/3] dma-buf/sync_file: only enable fence signalling during wait Date: Thu, 9 Jun 2016 12:05:28 -0300 Message-Id: <1465484730-8128-1-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , linux-kernel@vger.kernel.org, laurent.pinchart@ideasonboard.com, Gustavo Padovan , John Harrison , m.chehab@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Signalling doesn't need to be enabled at sync_file creation, it is only required if userspace waiting the fence to signal through poll(). Thus we delay fence_add_callback() until poll is called. It only adds the callback the first time poll() is called. This avoid re-adding the same callback multiple times. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/sync_file.c | 36 +++++++++++++++++++++++------------- include/linux/fence.h | 12 ++++++++++++ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 00e9186..59f3445 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -91,9 +91,7 @@ struct sync_file *sync_file_create(struct fence *fence) sync_file->cbs[0].fence = fence; sync_file->cbs[0].sync_file = sync_file; - if (fence_add_callback(fence, &sync_file->cbs[0].cb, - fence_check_cb_func)) - atomic_dec(&sync_file->status); + INIT_LIST_HEAD(&sync_file->cbs[0].cb.node); sync_file_debug_add(sync_file); return sync_file; @@ -130,8 +128,7 @@ static void sync_file_add_pt(struct sync_file *sync_file, int *i, sync_file->cbs[*i].fence = fence; sync_file->cbs[*i].sync_file = sync_file; - if (!fence_add_callback(fence, &sync_file->cbs[*i].cb, - fence_check_cb_func)) { + if (!fence_is_signaled(fence)) { fence_get(fence); (*i)++; } @@ -212,11 +209,8 @@ static void sync_file_free(struct kref *kref) kref); int i; - for (i = 0; i < sync_file->num_fences; ++i) { - fence_remove_callback(sync_file->cbs[i].fence, - &sync_file->cbs[i].cb); + for (i = 0; i < sync_file->num_fences; ++i) fence_put(sync_file->cbs[i].fence); - } sync_file_debug_remove(sync_file); kfree(sync_file); @@ -233,17 +227,33 @@ static int sync_file_release(struct inode *inode, struct file *file) static unsigned int sync_file_poll(struct file *file, poll_table *wait) { struct sync_file *sync_file = file->private_data; - int status; + int status, i; poll_wait(file, &sync_file->wq, wait); + for (i = 0 ; i < sync_file->num_fences ; i++) { + if (fence_is_enabled(sync_file->cbs[i].fence)) + continue; + + if (fence_add_callback(sync_file->cbs[i].fence, + &sync_file->cbs[i].cb, + fence_check_cb_func)) + atomic_dec(&sync_file->status); + } + status = atomic_read(&sync_file->status); - if (!status) - return POLLIN; + if (status > 0) + return 0; + + for (i = 0 ; i < sync_file->num_fences ; i++) + fence_remove_callback(sync_file->cbs[i].fence, + &sync_file->cbs[i].cb); + if (status < 0) return POLLERR; - return 0; + + return POLLIN; } static long sync_file_ioctl_merge(struct sync_file *sync_file, diff --git a/include/linux/fence.h b/include/linux/fence.h index 523ea3f..95a70b2 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -283,6 +283,18 @@ fence_is_signaled(struct fence *fence) } /** + * fence_is_enabled - return an indication if signalling is enabled + * @fence: [in] the fence to check + * + * Returns true if signalling was already enabled, false if not. + */ +static inline bool +fence_is_enabled(struct fence *fence) +{ + return test_bit(FENCE_FLAG_ENABLE_SIGNAL_BIT, &fence->flags); +} + +/** * fence_is_later - return if f1 is chronologically later than f2 * @f1: [in] the first fence from the same context * @f2: [in] the second fence from the same context