Message ID | 20181107153019.26401-9-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <intel-gfx-bounces@lists.freedesktop.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70FA6109C for <patchwork-intel-gfx@patchwork.kernel.org>; Wed, 7 Nov 2018 15:30:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 606D42C699 for <patchwork-intel-gfx@patchwork.kernel.org>; Wed, 7 Nov 2018 15:30:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E8812C6B0; Wed, 7 Nov 2018 15:30:41 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 45D802C62F for <patchwork-intel-gfx@patchwork.kernel.org>; Wed, 7 Nov 2018 15:30:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C3F96E1B6; Wed, 7 Nov 2018 15:30:39 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81C2C6E1B5 for <intel-gfx@lists.freedesktop.org>; Wed, 7 Nov 2018 15:30:38 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id b34-v6so1507753ede.13 for <intel-gfx@lists.freedesktop.org>; Wed, 07 Nov 2018 07:30:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HeZyi+pUwpeLs9Jmvlj3k+X5NVcF1gTKmQR3rzR90ZE=; b=Y67Ie/3LWV17Mt+VVWOTLpm3mXuvhVGOY+yKgwqTtUgF8zdIx2O4jQEUOsNNWVuQDF Nr0P5h8qWrrRAMW7VICdfdE0gNwg2mjWPdw6cKBouEB9taUnS9Sh0M+jR8u19oLEIWrU ZH/ZXJ6c7nWZrh72G2EaeTVtzV2Xbnunrc9ANZlxtmUl/BmOxu4xXWywUP8FIGjRzzbT 9IgbU6CA+tXQM1ohZJDb7bGbOVczGDKgJLwyintezdLy4iEUfbVSdlTPwxajkEdZLWf5 NAmXMXiZjN2y574wFgWAN6U7trIC/LgFDmJJtUquQocaiZMt4/8Ske6L+AsLQdG2UaVM 1VQg== X-Gm-Message-State: AGRZ1gKxp8rgM4wu8/uLf266EszEWvKw0zC4tThmtmcUWSGwYN7uTHCd NXfFJNrcWLcchi2EDuG9cMfq+H7ss0w= X-Google-Smtp-Source: AJdET5eO7cPqPdvbJZG72+s/qtjMe6bv00QlaBwHCML7iyW9fhiTnllDCoaDlXyR3VhTdmSpMqg/CA== X-Received: by 2002:a50:a938:: with SMTP id l53-v6mr587028edc.30.1541604636741; Wed, 07 Nov 2018 07:30:36 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id b48-v6sm322425edb.27.2018.11.07.07.30.35 for <intel-gfx@lists.freedesktop.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 07:30:35 -0800 (PST) From: Daniel Vetter <daniel.vetter@ffwll.ch> To: Intel Graphics Development <intel-gfx@lists.freedesktop.org> Date: Wed, 7 Nov 2018 16:30:15 +0100 Message-Id: <20181107153019.26401-9-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181107153019.26401-1-daniel.vetter@ffwll.ch> References: <20181107153019.26401-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 09/13] reservation: Annotate dma_fence waits X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development <intel-gfx.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/intel-gfx> List-Post: <mailto:intel-gfx@lists.freedesktop.org> List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[01/13] locking/lockdep: restore cross-release checks
|
expand
|
diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c index c1618335ca99..599b88c75cd5 100644 --- a/drivers/dma-buf/reservation.c +++ b/drivers/dma-buf/reservation.c @@ -429,6 +429,8 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, long ret = timeout ? timeout : 1; int i; + dma_fence_might_wait(); + retry: shared_count = 0; seq = read_seqcount_begin(&obj->seq);
reservations have an optimized fastpath that bypasses dma_fence_wait(), make sure we still catch all dependencies in lockdep. To avoid lockdep complaining about recursion on the fake dma_fence_wait lock we use the dma_fence_might_sleep annotation. Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/dma-buf/reservation.c | 2 ++ 1 file changed, 2 insertions(+)