From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC875C4320E for ; Fri, 27 Aug 2021 09:08:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75C6260FE6 for ; Fri, 27 Aug 2021 09:08:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 75C6260FE6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD7C66E903; Fri, 27 Aug 2021 09:08:03 +0000 (UTC) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 893FD6E903 for ; Fri, 27 Aug 2021 09:08:02 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id n5so9254774wro.12 for ; Fri, 27 Aug 2021 02:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=3oh1QpE0WrFfn3uQpDReWIUFo/u8YO7Ue3ewWkgWFFI=; b=e4AzkdnWBESEnlsx67SUEm+CzQYDw7R7w35P9Olv0rntHSyJ1TEDlh3Iw58OLhP3UG hWJGU8FUWdNIqDQ6mv4kZvkKiNGbepD4fdU7qfWVcTOKt0dWMqGCb3EpYRxpJzB4TXqQ 82X/s3lW4bTDKtl9xU42bFoVnRCYs2PIL94Pfh6xSmn5DYIx/nGufPHVaWspjSicm0uk 3bW0W0AHU6//qmgzZsf8tP7CCYyZXhtpsqqzuHTC6FqenqLsBEPI0ABRmHHUoZLk9m4S V7ouyHtW+DrzOhMlUEugXiR52t7xcOSSI1ZMeuioB0y+XBaqawY2V65vlFXZj6JK2sHH vKQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=3oh1QpE0WrFfn3uQpDReWIUFo/u8YO7Ue3ewWkgWFFI=; b=uBMYa14ipoXFYo9dIb3DAJpYI9Gv6xFNPN46YBYTcC2Qsl/9MLjQPFE5aY30VBAOIg eFEUV1+8Ez0A069u9LAdHK+sHMWo41sDb2SERWCTlHjWZq/3ELTe9Lhcegn4JbiBRuGP 8w8kQjZH6HBcKHAKmBbYDtvHvG/TXwbwr1VPzm/2TbO0Z/lpnnAK+MTDaMQYxmPruedZ nlDyJ/fP2rS4ncrDWhby5Znd7bCFnYa+OsCSnELGt/kkkJ1olSvu84tX+nmT4NMufx/T 5eg5fd9HZ7++Y/RW/iFpdKhiE6gCupuGiKryCNVpe/CJyPgzxJWehscDg259+YLeG/1m 1Cyg== X-Gm-Message-State: AOAM530hAoxHgZX2JODwpiWTT45bqBHUYVyITbIKjmb9nHdofeEM2F5Z oNKkrUqpDAV5g7OmgQAfWkWMvf+j6NEIzjgU X-Google-Smtp-Source: ABdhPJyQU+kDRvvbKupvLtP6M9g/82QVH4Ecli/dOu3tgnvEgdAsF0HzB9Ep+2BQEDNazBnWxOToog== X-Received: by 2002:adf:816f:: with SMTP id 102mr8887416wrm.368.1630055281098; Fri, 27 Aug 2021 02:08:01 -0700 (PDT) Received: from [192.168.178.21] (p5b0ea1b5.dip0.t-ipconnect.de. [91.14.161.181]) by smtp.gmail.com with ESMTPSA id p9sm10840196wmq.40.2021.08.27.02.07.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Aug 2021 02:08:00 -0700 (PDT) Subject: Re: [PATCH 1/2] dma-buf: nuke DMA_FENCE_TRACE macros v2 To: Daniel Vetter Cc: hridya@google.com, john.stultz@linaro.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, gustavo@padovan.org, linux-media@vger.kernel.org, adelva@google.com, sspatil@google.com References: <20210818105443.1578-1-christian.koenig@amd.com> <015fd5ed-9255-9c28-44f3-3c8dde90ebad@gmail.com> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <0c150724-032f-b566-4f61-b4771bafe7a8@gmail.com> Date: Fri, 27 Aug 2021 11:07:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Am 26.08.21 um 10:55 schrieb Daniel Vetter: > On Tue, Aug 24, 2021 at 10:12:24AM +0200, Christian König wrote: >> Just a gentle ping. Daniel any more comments on this? > Still haven't seen a patch set to nuke the sw_sync igt tests. Otherwise > this is just going to cause fails and reboots in our ci (we reboot on > taints). *sigh* can I at least print a warning without breaking the igt tests? > >> I'm not sure if the second patch will cause trouble with any unit test, but >> I'm willing to try it. We can always trivial revert it. > See above, remove the igts and we should be fine I think. I don't think > there's any selftests or kselftests, but checking that should be a quick > grep at most. Yeah, we don't have any selftests as far as I can see but this stuff is so interweaved with igt that it will be hard to remove I think. A good bunch of the igt code seems to have been moved to using VGEM instead, but as far as I can see there is still plenty left relying on this. Alternatively could we make the config option depend on CONFIG_DEBUG? Christian. > -Daniel > >> Thanks, >> Christian. >> >> Am 18.08.21 um 12:54 schrieb Christian König: >>> Only the DRM GPU scheduler, radeon and amdgpu where using them and they depend >>> on a non existing config option to actually emit some code. >>> >>> v2: keep the signal path as is for now >>> >>> Signed-off-by: Christian König >>> --- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 10 +--------- >>> drivers/gpu/drm/radeon/radeon_fence.c | 24 ++++------------------- >>> drivers/gpu/drm/scheduler/sched_fence.c | 18 ++--------------- >>> include/linux/dma-fence.h | 22 --------------------- >>> 4 files changed, 7 insertions(+), 67 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c >>> index 0b1c48590c43..c65994e382bd 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c >>> @@ -246,7 +246,6 @@ bool amdgpu_fence_process(struct amdgpu_ring *ring) >>> struct amdgpu_fence_driver *drv = &ring->fence_drv; >>> struct amdgpu_device *adev = ring->adev; >>> uint32_t seq, last_seq; >>> - int r; >>> do { >>> last_seq = atomic_read(&ring->fence_drv.last_seq); >>> @@ -278,12 +277,7 @@ bool amdgpu_fence_process(struct amdgpu_ring *ring) >>> if (!fence) >>> continue; >>> - r = dma_fence_signal(fence); >>> - if (!r) >>> - DMA_FENCE_TRACE(fence, "signaled from irq context\n"); >>> - else >>> - BUG(); >>> - >>> + dma_fence_signal(fence); >>> dma_fence_put(fence); >>> pm_runtime_mark_last_busy(adev_to_drm(adev)->dev); >>> pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); >>> @@ -639,8 +633,6 @@ static bool amdgpu_fence_enable_signaling(struct dma_fence *f) >>> if (!timer_pending(&ring->fence_drv.fallback_timer)) >>> amdgpu_fence_schedule_fallback(ring); >>> - DMA_FENCE_TRACE(&fence->base, "armed on ring %i!\n", ring->idx); >>> - >>> return true; >>> } >>> diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c >>> index 18f2c2e0dfb3..3f351d222cbb 100644 >>> --- a/drivers/gpu/drm/radeon/radeon_fence.c >>> +++ b/drivers/gpu/drm/radeon/radeon_fence.c >>> @@ -176,18 +176,11 @@ static int radeon_fence_check_signaled(wait_queue_entry_t *wait, unsigned mode, >>> */ >>> seq = atomic64_read(&fence->rdev->fence_drv[fence->ring].last_seq); >>> if (seq >= fence->seq) { >>> - int ret = dma_fence_signal_locked(&fence->base); >>> - >>> - if (!ret) >>> - DMA_FENCE_TRACE(&fence->base, "signaled from irq context\n"); >>> - else >>> - DMA_FENCE_TRACE(&fence->base, "was already signaled\n"); >>> - >>> + dma_fence_signal_locked(&fence->base); >>> radeon_irq_kms_sw_irq_put(fence->rdev, fence->ring); >>> __remove_wait_queue(&fence->rdev->fence_queue, &fence->fence_wake); >>> dma_fence_put(&fence->base); >>> - } else >>> - DMA_FENCE_TRACE(&fence->base, "pending\n"); >>> + } >>> return 0; >>> } >>> @@ -422,8 +415,6 @@ static bool radeon_fence_enable_signaling(struct dma_fence *f) >>> fence->fence_wake.func = radeon_fence_check_signaled; >>> __add_wait_queue(&rdev->fence_queue, &fence->fence_wake); >>> dma_fence_get(f); >>> - >>> - DMA_FENCE_TRACE(&fence->base, "armed on ring %i!\n", fence->ring); >>> return true; >>> } >>> @@ -441,11 +432,7 @@ bool radeon_fence_signaled(struct radeon_fence *fence) >>> return true; >>> if (radeon_fence_seq_signaled(fence->rdev, fence->seq, fence->ring)) { >>> - int ret; >>> - >>> - ret = dma_fence_signal(&fence->base); >>> - if (!ret) >>> - DMA_FENCE_TRACE(&fence->base, "signaled from radeon_fence_signaled\n"); >>> + dma_fence_signal(&fence->base); >>> return true; >>> } >>> return false; >>> @@ -550,7 +537,6 @@ long radeon_fence_wait_timeout(struct radeon_fence *fence, bool intr, long timeo >>> { >>> uint64_t seq[RADEON_NUM_RINGS] = {}; >>> long r; >>> - int r_sig; >>> /* >>> * This function should not be called on !radeon fences. >>> @@ -567,9 +553,7 @@ long radeon_fence_wait_timeout(struct radeon_fence *fence, bool intr, long timeo >>> return r; >>> } >>> - r_sig = dma_fence_signal(&fence->base); >>> - if (!r_sig) >>> - DMA_FENCE_TRACE(&fence->base, "signaled from fence_wait\n"); >>> + dma_fence_signal(&fence->base); >>> return r; >>> } >>> diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c >>> index 69de2c76731f..3736746c47bd 100644 >>> --- a/drivers/gpu/drm/scheduler/sched_fence.c >>> +++ b/drivers/gpu/drm/scheduler/sched_fence.c >>> @@ -50,26 +50,12 @@ static void __exit drm_sched_fence_slab_fini(void) >>> void drm_sched_fence_scheduled(struct drm_sched_fence *fence) >>> { >>> - int ret = dma_fence_signal(&fence->scheduled); >>> - >>> - if (!ret) >>> - DMA_FENCE_TRACE(&fence->scheduled, >>> - "signaled from irq context\n"); >>> - else >>> - DMA_FENCE_TRACE(&fence->scheduled, >>> - "was already signaled\n"); >>> + dma_fence_signal(&fence->scheduled); >>> } >>> void drm_sched_fence_finished(struct drm_sched_fence *fence) >>> { >>> - int ret = dma_fence_signal(&fence->finished); >>> - >>> - if (!ret) >>> - DMA_FENCE_TRACE(&fence->finished, >>> - "signaled from irq context\n"); >>> - else >>> - DMA_FENCE_TRACE(&fence->finished, >>> - "was already signaled\n"); >>> + dma_fence_signal(&fence->finished); >>> } >>> static const char *drm_sched_fence_get_driver_name(struct dma_fence *fence) >>> diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h >>> index 6ffb4b2c6371..4cc119ab272f 100644 >>> --- a/include/linux/dma-fence.h >>> +++ b/include/linux/dma-fence.h >>> @@ -590,26 +590,4 @@ struct dma_fence *dma_fence_get_stub(void); >>> struct dma_fence *dma_fence_allocate_private_stub(void); >>> u64 dma_fence_context_alloc(unsigned num); >>> -#define DMA_FENCE_TRACE(f, fmt, args...) \ >>> - do { \ >>> - struct dma_fence *__ff = (f); \ >>> - if (IS_ENABLED(CONFIG_DMA_FENCE_TRACE)) \ >>> - pr_info("f %llu#%llu: " fmt, \ >>> - __ff->context, __ff->seqno, ##args); \ >>> - } while (0) >>> - >>> -#define DMA_FENCE_WARN(f, fmt, args...) \ >>> - do { \ >>> - struct dma_fence *__ff = (f); \ >>> - pr_warn("f %llu#%llu: " fmt, __ff->context, __ff->seqno,\ >>> - ##args); \ >>> - } while (0) >>> - >>> -#define DMA_FENCE_ERR(f, fmt, args...) \ >>> - do { \ >>> - struct dma_fence *__ff = (f); \ >>> - pr_err("f %llu#%llu: " fmt, __ff->context, __ff->seqno, \ >>> - ##args); \ >>> - } while (0) >>> - >>> #endif /* __LINUX_DMA_FENCE_H */