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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 686D7C432BE for ; Fri, 27 Aug 2021 20:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D45B60FE6 for ; Fri, 27 Aug 2021 20:23:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231656AbhH0UYX (ORCPT ); Fri, 27 Aug 2021 16:24:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231646AbhH0UYX (ORCPT ); Fri, 27 Aug 2021 16:24:23 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25567C0613D9 for ; Fri, 27 Aug 2021 13:23:33 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id q14so12206694wrp.3 for ; Fri, 27 Aug 2021 13:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=SH4smeHuT0xsWwZuM3q5Wjxs+0gdoVgjvGEw6S+uOoo=; b=WLBhfHVkDrF3VFCwexlhpWcwuv/mrfu+/ekY9lmus2oitDKeSoxbqBB9w/MecXp2Zt p/ixUDwyfgKEtgom7LaAhv6fPinlm1+awxG88V3jTfQORo/D6gvlDtrbW9lpf81x3DPa poup178NdlUdrpODAeRUsqbjhD51sVbVcvYDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=SH4smeHuT0xsWwZuM3q5Wjxs+0gdoVgjvGEw6S+uOoo=; b=EfMqE6uQ8B2f2RebVMbYC+IBGqcTQcEBc2m9P4vBt8ymOqqhofDISLevBfb88E0wGb pb+fPC9fyyyZN82qEB+PvnZIQgeXZjr7umJ10jUYxa7tvVZjaQDPAo96D1BMzK5oX7kt Y2/TzXxb2G4Gn4Pu0eQ757PWqhTlMGiWOCI9DoI5x01np0i2sLTWPa/lZ6XbYs3Kn8c6 2DUebCXJz0yqyTb2yG0+VjRj1MvopaYttmXZGKg92bBKiWsu+dcx257aIsrm3X/mRLS8 Mw8Ol/NNnzG7vC8euxaDh9NLMUmrHkjbpJ8PxIsq1mfXS46nMSk8cnHxHAJC1HNvfZMk 2GGg== X-Gm-Message-State: AOAM532fO7qL06xb35ywtLQEUyMNBJEMCtvNx7H/i5hP+VlpEEVk6/Ti lFLj5vGL1LszylA5bEU6aO4zow== X-Google-Smtp-Source: ABdhPJyXAVHKOTbeXJZ2GxqnjCZWlcj6hPfzvGK6QNK07JKxU+X8EPp3T/6Sq9RXo9QaoPCgmp0C0w== X-Received: by 2002:adf:9f0c:: with SMTP id l12mr12861983wrf.146.1630095811632; Fri, 27 Aug 2021 13:23:31 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id a133sm12097302wme.5.2021.08.27.13.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 13:23:31 -0700 (PDT) Date: Fri, 27 Aug 2021 22:23:29 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: Daniel Vetter , 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 Subject: Re: [PATCH 1/2] dma-buf: nuke DMA_FENCE_TRACE macros v2 Message-ID: References: <20210818105443.1578-1-christian.koenig@amd.com> <015fd5ed-9255-9c28-44f3-3c8dde90ebad@gmail.com> <0c150724-032f-b566-4f61-b4771bafe7a8@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0c150724-032f-b566-4f61-b4771bafe7a8@gmail.com> X-Operating-System: Linux phenom 5.10.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Fri, Aug 27, 2021 at 11:07:58AM +0200, Christian König wrote: > 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? CI watches dmesg too ... it just doesn't force a reboot (which hurts run rate really badly). > > > 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? Hm I thought it was just down to sw_sync igt testcase, and everything else is moved to vgem. Do we have more, or has more landed since I looked a while ago? -Daniel > > 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 */ > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch