From patchwork Sat Feb 25 15:43:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 9591757 X-Patchwork-Delegate: agross@codeaurora.org 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 7C06960471 for ; Sat, 25 Feb 2017 15:43:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D1D92852D for ; Sat, 25 Feb 2017 15:43:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61F5B28538; Sat, 25 Feb 2017 15:43:54 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02D072852D for ; Sat, 25 Feb 2017 15:43:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751356AbdBYPnw (ORCPT ); Sat, 25 Feb 2017 10:43:52 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:34909 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324AbdBYPnw (ORCPT ); Sat, 25 Feb 2017 10:43:52 -0500 Received: by mail-qk0-f194.google.com with SMTP id n127so7407710qkf.2 for ; Sat, 25 Feb 2017 07:43:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Xe6w4wUJPbJ5oWeD4CaO45VAimJ16HLsPDir1rh0LGE=; b=OtBslSY7QGYUCCbhEteeW3k5iEPxyLZgrqy+kdr6cMrJ8LbMTExLDu81o++gUgA1Wp EtoifnlqTLidaj5HOwrEYa00O4r5puAGgQ1KxzgyC27IZB02c9dnfNhzxilwkgePk1mJ SM/UzL5DnVIcLwve7t+6ba95PcAvekPq0nL6/ugpHku8AvCKAuPrsk/pMTPDzoTXEx/K wMPndoo488BgLLBF2Xk30C/P0NQpAdkfukKH0CPsE1PUv3AkNcHcQnIADrSo5pcx5PSR 2TEpsv9LmQc/ZPxUz6h/YhAQb6FgCNTDdaEfSTGyxlk/wDTA3+SD3M6CbM6SImMF9/ZN /6kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Xe6w4wUJPbJ5oWeD4CaO45VAimJ16HLsPDir1rh0LGE=; b=RZAPORt3PeVibsZO5g49M2eWs+B9vMV+hPGMgaWxyUh3zkxity+euigbN5rhH2478m 2RwYe7MV8dko8y4a0ryR+zXR4Q6WkiEyfsHTYdUmRNai4WIiBAdYXSz1GX1OgoXFMuj1 /R9ScJ7Pj33cPMh/pxBFHLuhN/dk4aS3DF5DUn4zYh6fUxsa8xz4eyafqaqIyXr4jFqx 7t87t8ihW+Arb37CufQxKcFe8IkUCLlhQxIt/28ZRXQRp/Mj02RLdlp6aVc7KpFcAQwp CBP9j9UQWSQJHoYV+Cr+gZmf3pcJGS1Ear0YxLapuxePsCgZt7JR7qwVg3K+BuEq/iH3 ZIXA== X-Gm-Message-State: AMke39lJWxDsDsddLzpefeCdi0osGwFSyObLZkE4x7I+B1zk65JqAOHg+yJYYVI3oZSAfA== X-Received: by 10.55.91.129 with SMTP id p123mr8799374qkb.64.1488037426641; Sat, 25 Feb 2017 07:43:46 -0800 (PST) Received: from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a]) by smtp.gmail.com with ESMTPSA id j4sm6986994qkc.40.2017.02.25.07.43.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 25 Feb 2017 07:43:45 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Rob Clark Subject: [PATCH] drm/msm: move submit fence wait out of struct_mutex Date: Sat, 25 Feb 2017 10:43:30 -0500 Message-Id: <20170225154330.28247-1-robdclark@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Probably a symptom of needing finer grained locking, but if we wait on the incoming fence-fd (which could come from a different context) while holding struct_mutex, that blocks retire_worker so gpu fences cannot get scheduled. This causes a problem if userspace manages to get more than a frame ahead, leaving the atomic-commit worker blocked waiting on fences that cannot be signaled because submit is blocked waiting for a fence signalled from vblank (after the atomic commit which is blocked). If we start having multiple fence ctxs for the gpu, submit_fence_sync() would probably need to move outside of struct_mutex as well. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem_submit.c | 39 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 1172fe7..1c545eb 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -404,6 +404,24 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, if (MSM_PIPE_FLAGS(args->flags) & ~MSM_SUBMIT_FLAGS) return -EINVAL; + if (args->flags & MSM_SUBMIT_FENCE_FD_IN) { + in_fence = sync_file_get_fence(args->fence_fd); + + if (!in_fence) + return -EINVAL; + + /* TODO if we get an array-fence due to userspace merging multiple + * fences, we need a way to determine if all the backing fences + * are from our own context.. + */ + + if (in_fence->context != gpu->fctx->context) { + ret = dma_fence_wait(in_fence, true); + if (ret) + return ret; + } + } + ret = mutex_lock_interruptible(&dev->struct_mutex); if (ret) return ret; @@ -431,27 +449,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, if (ret) goto out; - if (args->flags & MSM_SUBMIT_FENCE_FD_IN) { - in_fence = sync_file_get_fence(args->fence_fd); - - if (!in_fence) { - ret = -EINVAL; - goto out; - } - - /* TODO if we get an array-fence due to userspace merging multiple - * fences, we need a way to determine if all the backing fences - * are from our own context.. - */ - - if (in_fence->context != gpu->fctx->context) { - ret = dma_fence_wait(in_fence, true); - if (ret) - goto out; - } - - } - if (!(args->fence & MSM_SUBMIT_NO_IMPLICIT)) { ret = submit_fence_sync(submit); if (ret)