From patchwork Thu Mar 31 20:26:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 8716621 Return-Path: X-Original-To: patchwork-dri-devel@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 3AC5EC0553 for ; Thu, 31 Mar 2016 20:28:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72228202E5 for ; Thu, 31 Mar 2016 20:28:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6E66E2025B for ; Thu, 31 Mar 2016 20:28:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E47F06EADD; Thu, 31 Mar 2016 20:28:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x235.google.com (mail-qg0-x235.google.com [IPv6:2607:f8b0:400d:c04::235]) by gabe.freedesktop.org (Postfix) with ESMTPS id 761396EAD9 for ; Thu, 31 Mar 2016 20:26:58 +0000 (UTC) Received: by mail-qg0-x235.google.com with SMTP id n34so68739221qge.1 for ; Thu, 31 Mar 2016 13:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B8MdqnD9DLMZx+Hd97jmqhcBoBHGJiThEfIjkbrVbjs=; b=FF3G3KxWOFp7cX6szIClJzvXnmWbt6VSFRXk84HRZri8bg1xR342eLf1oVkFxu4yeV NW41zbPqSruzky00FBu/WPJbNKg4ddGm4wS57r/A0sn6cYE/SrWLuUh8hv6IQt4NJ2Nn SM+gKP40ZIGyMmpLGojywmjPBHxnlarr1mV1OIgCfltoifEy0TgKqpaI6m5jW81q5YgY z9X6nAlfO81ZmkXGW0t0nbZwDuOVJXFEloarphetEdRfbucLD1+DYPC9G42+1jmdBsug NYzjm9ZIZpshh14cijqhQh5JPMoM6XlQoLqMlNfu0n0UmEsv7kIOCGX2pWdPwyYjcXyh tKkw== 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:in-reply-to :references; bh=B8MdqnD9DLMZx+Hd97jmqhcBoBHGJiThEfIjkbrVbjs=; b=h1QI4FGFU+x5O6ljhbQbt2YhMjfpYUW4RxFvCpCz9ndlUDjzVFK/vckiOCkB0zRbSK vzvHobWaRbZadX+2p6tdkWrGvsgNNgLiurizQujg2RiUAXAD2PgRba60sJOjjESry0ml lPfWRXq/ugunarPFWEyPntsKz0hJ320hwRV0W/gBtCBWOoMuERGnP28R++gLP4+AlD0b CeF2Xu7TRAYD7cUX/yDIRK+bjmK9oCmJB0T1Jb702Yq53673Esf9k3IDB9l0GyBEkfoF 1AwA6QBdc22T1ykoDShaGCuC+kVDxaqQ4l9Zmy5bIsoN1zMj9hWANHFugFBohHqrANXo Iszw== X-Gm-Message-State: AD7BkJIntFY4QdQDknY6gTFvUBYjDS3s5fco3Fjz04yWc0+6OshvllszGJuaqxUMnPs+nQ== X-Received: by 10.140.43.197 with SMTP id e63mr19990866qga.31.1459456016746; Thu, 31 Mar 2016 13:26:56 -0700 (PDT) Received: from localhost (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id h9sm4615078qhh.29.2016.03.31.13.26.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Mar 2016 13:26:56 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/4] reservation: sprinkle some WARN_ON()s Date: Thu, 31 Mar 2016 16:26:49 -0400 Message-Id: <1459456012-16248-2-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459456012-16248-1-git-send-email-robdclark@gmail.com> References: <1459456012-16248-1-git-send-email-robdclark@gmail.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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 A bit overkill since, for example, the rcu_dereference_protected() in reservation_object_get_list() will WARN. But this is much less subtle for folks reading the code. Signed-off-by: Rob Clark Reviewed-by: Christian König for this one. --- drivers/dma-buf/reservation.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c index c0bd572..0de3ea6 100644 --- a/drivers/dma-buf/reservation.c +++ b/drivers/dma-buf/reservation.c @@ -52,6 +52,8 @@ int reservation_object_reserve_shared(struct reservation_object *obj) struct reservation_object_list *fobj, *old; u32 max; + WARN_ON(!ww_mutex_is_locked(&obj->lock)); + old = reservation_object_get_list(obj); if (old && old->shared_max) { @@ -189,6 +191,8 @@ void reservation_object_add_shared_fence(struct reservation_object *obj, { struct reservation_object_list *old, *fobj = obj->staged; + WARN_ON(!ww_mutex_is_locked(&obj->lock)); + old = reservation_object_get_list(obj); obj->staged = NULL; @@ -207,6 +211,8 @@ void reservation_object_add_excl_fence(struct reservation_object *obj, struct reservation_object_list *old; u32 i = 0; + WARN_ON(!ww_mutex_is_locked(&obj->lock)); + old = reservation_object_get_list(obj); if (old) i = old->shared_count;