From patchwork Wed Jan 19 13:43:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 80107 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1nABFg-00GJNO-2A; Wed, 19 Jan 2022 13:43:52 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354866AbiASNns (ORCPT + 1 other); Wed, 19 Jan 2022 08:43:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349633AbiASNno (ORCPT ); Wed, 19 Jan 2022 08:43:44 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 652C3C061574 for ; Wed, 19 Jan 2022 05:43:43 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id cx27so11921007edb.1 for ; Wed, 19 Jan 2022 05:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nkHC8QZFOIHT45+bm5mbkRLb4msTxzU2f5F+QSxdoAg=; b=kA3OW1OUw0qGIgFgEr0kKZ2UdSFvZdnvjoM0lTM/D9X+mBtKQeC7rRw78LXmBVALy4 oS4/NuhD6B5fWe2IrNEF47yE1nam6z2V4bp6bIOzsGlGZ716RbQdTK36ZNr+UOUmNKTb 4ELPG1rofWbczCwKL3Cjw01+z31KKByuJHCwaFxVHr2HTpjT07jE9xg1BxTIr7T8Id5L 0G0e64OTarRwhrL7Vt8ky183Y85WxlAoL0oHmNkVtLOitqgFzRc9xLgNP2gzKQoVsJoI 8GWd/dRRlM/TV4K/R8/RvmmiWH/dmi6rGQfytV/U7OHRAwzKgvOaj/Hz0TzNfRu0KCiY QMJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nkHC8QZFOIHT45+bm5mbkRLb4msTxzU2f5F+QSxdoAg=; b=DD8gO7isaU1e+6DI8Ica2xjYlsmgS1mMG6gM4kC3nKju3/NWLqFIr23f4hYKZnUYfo nDxcjU4mQEDR6IKphFcszuOE2MjLueQNfoqzK1bI/jcyMcHLtopseyL/B6iAWNkNZuse xEdo6yldkPYwI3jsV8DL/mc7lQLHf3xtBaVDTrVUfZJk7/w+r84zD8BrNpGdjQQYsv4d Vb2DhFI2aZjUChrAg8QwUtSQHJbh2yXTTa3j/rB0djv4vqX11xh2zw3ETCQREAcbJZ1l R3IeNdCY+p526AV9gqybSwqZ6OgN8CLxrKVog6n/v8q3LA6eoFXgaA6SmkWb7yyFMF9E InHw== X-Gm-Message-State: AOAM531rkNOZiR2poDPDP395KbSYNEoVe91zcQa8nHABE8Kin0iK+kWp iC4mqHW902q4mUAOa0i8ptBj77gmyKs= X-Google-Smtp-Source: ABdhPJysfjK85HqXAmx0IVGsIhpy+iuwL6GzcPwoaLzs0OSgqk7DiaxMXm6z6DRv3u7tB0iykp3olA== X-Received: by 2002:a5d:634e:: with SMTP id b14mr30171587wrw.105.1642599821614; Wed, 19 Jan 2022 05:43:41 -0800 (PST) Received: from abel.fritz.box (p57b0bff8.dip0.t-ipconnect.de. [87.176.191.248]) by smtp.gmail.com with ESMTPSA id g15sm19733583wrm.2.2022.01.19.05.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 05:43:40 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: sumit.semwal@linaro.org, gustavo@padovan.org, daniel.vetter@ffwll.ch Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 1/4] dma-buf: consolidate dma_fence subclass checking Date: Wed, 19 Jan 2022 14:43:36 +0100 Message-Id: <20220119134339.3102-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -7.5 (-------) X-LSpam-Report: No, score=-7.5 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_HI=-5 autolearn=ham autolearn_force=no Consolidate the wrapper functions to check for dma_fence subclasses in the dma_fence header. This makes it easier to document and also check the different requirements for fence containers in the subclasses. Signed-off-by: Christian König --- include/linux/dma-fence-array.h | 15 +------------ include/linux/dma-fence-chain.h | 3 +-- include/linux/dma-fence.h | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/include/linux/dma-fence-array.h b/include/linux/dma-fence-array.h index 303dd712220f..fec374f69e12 100644 --- a/include/linux/dma-fence-array.h +++ b/include/linux/dma-fence-array.h @@ -45,19 +45,6 @@ struct dma_fence_array { struct irq_work work; }; -extern const struct dma_fence_ops dma_fence_array_ops; - -/** - * dma_fence_is_array - check if a fence is from the array subsclass - * @fence: fence to test - * - * Return true if it is a dma_fence_array and false otherwise. - */ -static inline bool dma_fence_is_array(struct dma_fence *fence) -{ - return fence->ops == &dma_fence_array_ops; -} - /** * to_dma_fence_array - cast a fence to a dma_fence_array * @fence: fence to cast to a dma_fence_array @@ -68,7 +55,7 @@ static inline bool dma_fence_is_array(struct dma_fence *fence) static inline struct dma_fence_array * to_dma_fence_array(struct dma_fence *fence) { - if (fence->ops != &dma_fence_array_ops) + if (!fence || !dma_fence_is_array(fence)) return NULL; return container_of(fence, struct dma_fence_array, base); diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h index 54fe3443fd2c..ee906b659694 100644 --- a/include/linux/dma-fence-chain.h +++ b/include/linux/dma-fence-chain.h @@ -49,7 +49,6 @@ struct dma_fence_chain { spinlock_t lock; }; -extern const struct dma_fence_ops dma_fence_chain_ops; /** * to_dma_fence_chain - cast a fence to a dma_fence_chain @@ -61,7 +60,7 @@ extern const struct dma_fence_ops dma_fence_chain_ops; static inline struct dma_fence_chain * to_dma_fence_chain(struct dma_fence *fence) { - if (!fence || fence->ops != &dma_fence_chain_ops) + if (!fence || !dma_fence_is_chain(fence)) return NULL; return container_of(fence, struct dma_fence_chain, base); diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 1ea691753bd3..775cdc0b4f24 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -587,4 +587,42 @@ struct dma_fence *dma_fence_get_stub(void); struct dma_fence *dma_fence_allocate_private_stub(void); u64 dma_fence_context_alloc(unsigned num); +extern const struct dma_fence_ops dma_fence_array_ops; +extern const struct dma_fence_ops dma_fence_chain_ops; + +/** + * dma_fence_is_array - check if a fence is from the array subclass + * @fence: the fence to test + * + * Return true if it is a dma_fence_array and false otherwise. + */ +static inline bool dma_fence_is_array(struct dma_fence *fence) +{ + return fence->ops == &dma_fence_array_ops; +} + +/** + * dma_fence_is_chain - check if a fence is from the chain subclass + * @fence: the fence to test + * + * Return true if it is a dma_fence_chain and false otherwise. + */ +static inline bool dma_fence_is_chain(struct dma_fence *fence) +{ + return fence->ops == &dma_fence_chain_ops; +} + +/** + * dma_fence_is_container - check if a fence is a container for other fences + * @fence: the fence to test + * + * Return true if this fence is a container for other fences, false otherwise. + * This is important since we can't build up large fence structure or otherwise + * we run into recursion during operation on those fences. + */ +static inline bool dma_fence_is_container(struct dma_fence *fence) +{ + return dma_fence_is_array(fence) || dma_fence_is_chain(fence); +} + #endif /* __LINUX_DMA_FENCE_H */ From patchwork Wed Jan 19 13:43:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 80108 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1nABFh-00GJNO-6k; Wed, 19 Jan 2022 13:43:53 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354881AbiASNnu (ORCPT + 1 other); Wed, 19 Jan 2022 08:43:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245443AbiASNno (ORCPT ); Wed, 19 Jan 2022 08:43:44 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAEF9C06161C for ; Wed, 19 Jan 2022 05:43:43 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id c71so11849741edf.6 for ; Wed, 19 Jan 2022 05:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZBnr8W3NhjErF+08iBcJ135fidhwJh6suv4msEwXqUY=; b=Xm6IWY1PeF5288tssLFaZn1by7Vu5JTy0T4ztY6KDjbHZC0M47grNGiEe/yIkQ3hob XsAw9Ag+Yj7/z8JbC0TJQ6TmTebV/YyVTwM3TQ0SIINgm7ZkXYNCSsOlyi/ov5NxQmf1 HLDO27OQb7OG4PgEQIxvqkmB/JDPgw/FzbXH2rUDzTbhIsfxN/GY10slrnxNTamYdIJN 9N1DvBxsOMBQZl3pKCSgSeqiz+d2NbMAP/IIKOwTmAQ6/HC4ra4egPhweB1qwiNteR4I 8CNhz/L/qDyqK1lP2g9y0QeAkEjCZNQnOrF8ninP8l95Ghxx6ZRO52Aac4IaHrEBCU/6 YQWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZBnr8W3NhjErF+08iBcJ135fidhwJh6suv4msEwXqUY=; b=4XmCUAEke+p2OrsnYyCx9L4AnIT9ukqYUXy3EDwUEiN6abQzQA9WJYSa+oPHYUVTxI sF+kOIwu0dyJimqDe557WsF4dgdV+/o6DnZU0Cyr+sj4e7RWhoWTtACeuRSZuPN1TYBK wvT9hoZX++TFp6mM29uCYNxbAWzrTIaDgBq8J8ru+idXr49kHAAAQBMgsVghwQaSzzv0 sNqmRzjkRr1kLdxEM5LKWeeXJXDmiYiIN3j1wC8l+eoHxMRaaXbJXqygdfrbi2nk8ltW GDBgVUl2RHWf+DBa7c8Nv051IpJwe+kFW6S/PkjK9Z2/v2pgxUxwn5o4xSJDz2lFcins ytcA== X-Gm-Message-State: AOAM530idsSplZ7v4JfLRyygwuUnMrUyRXb3r/+jVBi/9HikFkLJ1Yrr mXKuzcF7dC3T4yUyInmFI7w= X-Google-Smtp-Source: ABdhPJwRKHZmp53LX3TFftfhKR37HscsIXg23NmT8Lxx/R9T/LsqBsK1KO902EToCEEBzlGRYFkCow== X-Received: by 2002:a5d:5745:: with SMTP id q5mr7199118wrw.160.1642599822463; Wed, 19 Jan 2022 05:43:42 -0800 (PST) Received: from abel.fritz.box (p57b0bff8.dip0.t-ipconnect.de. [87.176.191.248]) by smtp.gmail.com with ESMTPSA id g15sm19733583wrm.2.2022.01.19.05.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 05:43:42 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: sumit.semwal@linaro.org, gustavo@padovan.org, daniel.vetter@ffwll.ch Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 2/4] dma-buf: warn about dma_fence_array container rules Date: Wed, 19 Jan 2022 14:43:37 +0100 Message-Id: <20220119134339.3102-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220119134339.3102-1-christian.koenig@amd.com> References: <20220119134339.3102-1-christian.koenig@amd.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -7.5 (-------) X-LSpam-Report: No, score=-7.5 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_HI=-5 autolearn=ham autolearn_force=no It's not allowed to nest another dma_fence container into a dma_fence_array or otherwise we can run into recursion. Warn about that when we create a dma_fence_array. Signed-off-by: Christian König Reviewed-by: Daniel Vetter --- drivers/dma-buf/dma-fence-array.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c index 3e07f961e2f3..4bfbcb885bbc 100644 --- a/drivers/dma-buf/dma-fence-array.c +++ b/drivers/dma-buf/dma-fence-array.c @@ -176,6 +176,19 @@ struct dma_fence_array *dma_fence_array_create(int num_fences, array->base.error = PENDING_ERROR; + /* dma_fence_array objects should never contain any other fence + * containers or otherwise we run into recursion and potential kernel + * stack overflow on operations on the dma_fence_array. + * + * The correct way of handling this is to flatten out the array by the + * caller instead. + * + * Enforce this here by checking that we don't create a dma_fence_array + * with any container inside. + */ + while (seqno--) + WARN_ON(dma_fence_is_container(fences[seqno])); + return array; } EXPORT_SYMBOL(dma_fence_array_create); From patchwork Wed Jan 19 13:43:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 80109 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1nABFi-00GJNO-7Q; Wed, 19 Jan 2022 13:43:54 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245443AbiASNnv (ORCPT + 1 other); Wed, 19 Jan 2022 08:43:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349764AbiASNnp (ORCPT ); Wed, 19 Jan 2022 08:43:45 -0500 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6243C06173E for ; Wed, 19 Jan 2022 05:43:44 -0800 (PST) Received: by mail-ed1-x530.google.com with SMTP id m4so11703955edb.10 for ; Wed, 19 Jan 2022 05:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/sKthdsDAA9J7PKlzAOm6qYQuF+X5868CR5aPtjU9kw=; b=XtIEVlQhs8lCmBJhE0TkSAEKWXXHiFKAemZcdZlrk99rAYDkimPaqJUEpH/2Bk9MXb oQEDnlNveR24SS7bogutR+ZOlMG+a0rg0FDPw1AcBPWDuBDsl5ssKfnPMlolawXpaoZW nhLUSPy1lFNN7XQjXGmbTBTiwm+qMvVP0k9QWXqNIMo567U6nlnmZCcuHgDHdLBfOxpA hud/t/u2syPq9nl00mw/J7+KBayrcL2WN2upWms1cdrnu2LJNofFPSec7mgVLhHConb/ GKpTfXfKCWUQu4mQWrEsRvfd6cgEpPhHJ4IopWZP556QMVm/inGedLKBlFEWk2DNPtEg AGBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/sKthdsDAA9J7PKlzAOm6qYQuF+X5868CR5aPtjU9kw=; b=ChjNpksmIzMhY7gIOT3FCc2THSDXe+gVVyXqgCcrd0tZ0Dt+qkQ469imuepsUW0/Tv X1Y6ZqJHWe//Id2787ZdxhkDXTdQznMQiAHeQp496k2lHo2J+UlmpZJiMqbO3Qh0GVUw JuXDDFR9r7ZUq5E36Ld4h8y4L8kigDNEA2z4XHIxDqxcKmIrUGcIybXMYhP0EdzfODdj bbgUuNz2qjchNo2fJm4RBM3JqN9wMXBrrbmj31SDuXDr0HpEUw8DxPauKVZEB91pfAbf cEGAW3G0tSNbb/35wUwrK8vhn585OBSkxmZvZGjhcbUjf6vIV6U2zK2FW/GTn4NzAI/j md1A== X-Gm-Message-State: AOAM53038frsde4XjYA41PT8m9N2Aq+dXYZbe15PCyqylaOCWi3nQHKB 8ladNBwSEnDmEmUOuynN/CqR/okvai8= X-Google-Smtp-Source: ABdhPJxLWMBIZT9uDp2E3FK1c4oEa/VtCv9jlY4Il0pA960zoj9MMVqts0dH61KGyu5t40ib1yO/Ew== X-Received: by 2002:adf:dcc3:: with SMTP id x3mr3040459wrm.417.1642599823344; Wed, 19 Jan 2022 05:43:43 -0800 (PST) Received: from abel.fritz.box (p57b0bff8.dip0.t-ipconnect.de. [87.176.191.248]) by smtp.gmail.com with ESMTPSA id g15sm19733583wrm.2.2022.01.19.05.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 05:43:42 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: sumit.semwal@linaro.org, gustavo@padovan.org, daniel.vetter@ffwll.ch Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 3/4] dma-buf: Warn about dma_fence_chain container rules Date: Wed, 19 Jan 2022 14:43:38 +0100 Message-Id: <20220119134339.3102-3-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220119134339.3102-1-christian.koenig@amd.com> References: <20220119134339.3102-1-christian.koenig@amd.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -7.5 (-------) X-LSpam-Report: No, score=-7.5 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_HI=-5 autolearn=ham autolearn_force=no Chaining of dma_fence_chain objects is only allowed through the prev fence and not through the contained fence. Warn about that when we create a dma_fence_chain. Signed-off-by: Christian König Reviewed-by: Daniel Vetter --- drivers/dma-buf/dma-fence-chain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c index 1b4cb3e5cec9..fa33f6b7f77b 100644 --- a/drivers/dma-buf/dma-fence-chain.c +++ b/drivers/dma-buf/dma-fence-chain.c @@ -254,5 +254,13 @@ void dma_fence_chain_init(struct dma_fence_chain *chain, dma_fence_init(&chain->base, &dma_fence_chain_ops, &chain->lock, context, seqno); + + /* Chaining dma_fence_chain container together is only allowed through + * the prev fence and not through the contained fence. + * + * The correct way of handling this is to flatten out the fence + * structure into a dma_fence_array by the caller instead. + */ + WARN_ON(dma_fence_is_chain(fence)); } EXPORT_SYMBOL(dma_fence_chain_init); From patchwork Wed Jan 19 13:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 80110 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1nABFl-00GJNO-Bn; Wed, 19 Jan 2022 13:43:57 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354883AbiASNnx (ORCPT + 1 other); Wed, 19 Jan 2022 08:43:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354878AbiASNnq (ORCPT ); Wed, 19 Jan 2022 08:43:46 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDCADC06173F for ; Wed, 19 Jan 2022 05:43:45 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id a18so11790462edj.7 for ; Wed, 19 Jan 2022 05:43:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B/RyGnK1GOVV7mP2i6NUyL8dXTOp5mSU0ausD8jObPM=; b=pVinbeY9LHg95yEKahv8g20gbCh1BdN4nWVUNdHsg+Pi7vXMs7N2GB4+sLUsB4rsUg y/+M947KC1OlC3mGcqiIs8LRAHHVwr98JEqW6NRQw2F6Vy/1KJi07x/DFBPsb2QC+n/V V3FdSFUIqBfQNiY6aoimqXHksG39jj/AvaMF7Xt6hyubaqlKmNxlcVEvx3W2O6fT2q4X QT5eoUkU/xpo21Wveo2E3YK2AWcVVWrEdXeSDL62ggUKkKSB+tpmWyRDIbdpwptp8mhP NRrA0ef94fYDJRJgN5CHcL0SnLD/aNcyKCZFjdfLT2jkO146+Ty80EATuNp2RuHR81yF sQjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B/RyGnK1GOVV7mP2i6NUyL8dXTOp5mSU0ausD8jObPM=; b=25cFNe06A/t0sTeqW4R3FYvxRi39LkwXbMcdzjcOC7mE37KidIeH9TPZkjhI3hjGW2 ZelC9CPVg3NJyowMKcgalMJoiTRoKUNvqZ/ZLEr5q5o5In8+5qzYOFGpV1n2b/C8HpQt rU8Xp7nYuXX4d8NyISSEFSfKjSuLnS+wuUCuTNk/SZ6jzRk4T1f7+fuSOlC1avzfCMsv IvCasJNw51L3Er5XMmgZrXFKNlOjyUXVq/PQkanPSN5lPkRmVBGPjA9jAj+lqD0TRcoQ 44IlywkkY0XjlYDQFYlSgkemif2WL8ZSrKpiPV9GobLLs9rCqTxHgYXq9hkSOwGhFi4A 6nsw== X-Gm-Message-State: AOAM533rkV/pVk8JWMAogA+YIYx4O2uABA5TeMYGPeyPcZFXNFUn+Cpu 33X4kGDGU9YucjHNqQ2hm18= X-Google-Smtp-Source: ABdhPJyRkjh8/psx0CRmEPXxOUN/B1pOuBL36LxzwXxNBKNTIJUgRDrIKqquQcrZosFF3bO3uS8Y/A== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr17658023wrp.295.1642599824450; Wed, 19 Jan 2022 05:43:44 -0800 (PST) Received: from abel.fritz.box (p57b0bff8.dip0.t-ipconnect.de. [87.176.191.248]) by smtp.gmail.com with ESMTPSA id g15sm19733583wrm.2.2022.01.19.05.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 05:43:43 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: sumit.semwal@linaro.org, gustavo@padovan.org, daniel.vetter@ffwll.ch Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 4/4] dma-buf: warn about containers in dma_resv object Date: Wed, 19 Jan 2022 14:43:39 +0100 Message-Id: <20220119134339.3102-4-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220119134339.3102-1-christian.koenig@amd.com> References: <20220119134339.3102-1-christian.koenig@amd.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -7.5 (-------) X-LSpam-Report: No, score=-7.5 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_HI=-5 autolearn=ham autolearn_force=no Drivers should not add containers as shared fences to the dma_resv object, instead each fence should be added individually. Signed-off-by: Christian König Reviewed-by: Daniel Vetter --- drivers/dma-buf/dma-resv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 6dd9a40b55d4..e8a0c1d51da2 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -256,6 +256,11 @@ void dma_resv_add_shared_fence(struct dma_resv *obj, struct dma_fence *fence) dma_resv_assert_held(obj); + /* Drivers should not add containers here, instead add each fence + * individually. + */ + WARN_ON(dma_fence_is_container(fence)); + fobj = dma_resv_shared_list(obj); count = fobj->shared_count;