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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2ADF2C47083 for ; Wed, 2 Jun 2021 12:55:52 +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 DE8D7613F1 for ; Wed, 2 Jun 2021 12:55:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE8D7613F1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 513026EC97; Wed, 2 Jun 2021 12:55:51 +0000 (UTC) Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39E306EC97 for ; Wed, 2 Jun 2021 12:55:50 +0000 (UTC) Received: by mail-ej1-x631.google.com with SMTP id k7so3640021ejv.12 for ; Wed, 02 Jun 2021 05:55:50 -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=BGdK0GWrR19hcLHpsh70m2uOhBDdCatcfYfJEqWg4U4=; b=ZyqbgI68xEGrQJ1uwtzsQmnYkWdzGNMkxvvoSllXVDJg4V1DjhBjwQZtqvXP6OiOGw WIjVtZRodEgu2DNw3SA2f5op69VaWkIhYhbzv3TMOpXEHoEFzVLBKvkjWUAz4uVIdwj3 iIiEyjkMETOZcHR52XmpeP4FclzhZIAQ9NplQ= 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=BGdK0GWrR19hcLHpsh70m2uOhBDdCatcfYfJEqWg4U4=; b=GqbZMJ/R0675mA8qbVxZeZC1fIrtI6N28qQ8Q4PMM6FZLlkhSgtPktgJCIIJX5uaNV waNyRdmV5l/fWnn66rYXkjCaWXTFiXPTZgeF/c9z3orZh39Sw9/CpfHle21TK3EvX4Kr NJ6HkoTcQgO3p0WJsaYMG0LrbZY2v98o14Xuly6Y3u5bC4DxVG2DsyX4Iy+OYpSiZ9wJ rpGhSKfpUs7Gzqytupbf8x1pVdfSLhGs7pYP2wWE1pEY0uux0ZF94KZsSzxsKuvxm42q kWjCYtDzAfyKtdtM8rdGgXNhnTjWIslyx2+ohRf5UgsqAxCzSxjPGmmRcc9Iz9o4jguZ lgVg== X-Gm-Message-State: AOAM532HslUH8qiZ+9NBFlMLLyU7hXbS5mOplxxmLaSCWoRkdBp1HIwn X5StOti5cc1D7mrnwTENkJjrjA== X-Google-Smtp-Source: ABdhPJx3nvxv/Fl3Hs8KaAEUXkrY9ZxdccRAjzSysS772lwvYR4lgyouO4yoAGlDRctOg3YRljDF4g== X-Received: by 2002:a17:906:c1ca:: with SMTP id bw10mr34843655ejb.512.1622638548874; Wed, 02 Jun 2021 05:55:48 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id bq1sm4194210ejb.66.2021.06.02.05.55.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 05:55:48 -0700 (PDT) Date: Wed, 2 Jun 2021 14:55:46 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [PATCH 2/7] dma-buf: add SPDX header and fix style in dma-resv.c Message-ID: References: <20210602111714.212426-1-christian.koenig@amd.com> <20210602111714.212426-2-christian.koenig@amd.com> <9f0d39d3-400e-8744-e80f-6e1b45eeabff@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <9f0d39d3-400e-8744-e80f-6e1b45eeabff@gmail.com> X-Operating-System: Linux phenom 5.10.32scarlett+ 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: , Cc: dri-devel@lists.freedesktop.org, jason@jlekstrand.net Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jun 02, 2021 at 02:47:25PM +0200, Christian König wrote: > > > Am 02.06.21 um 14:34 schrieb Daniel Vetter: > > On Wed, Jun 02, 2021 at 01:17:09PM +0200, Christian König wrote: > > > No functional change. > > > > > > Signed-off-by: Christian König > > Acked-by: Daniel Vetter > > > > Maybe add the checkpatch warnings you're fixing here to the commit > > message. I didn't know that initcalls should be at the bottom ... > > Well dma_resv_lockdep() had some tab/space mixup and moving it around was > the easiest way to fix that in the editor :) > > Moving it to the end seemed logical to me. Ah whack that into the commit message then, I was confused for a bit :-) -Daniel > > Christian. > > > -Daniel > > > > > > > --- > > > drivers/dma-buf/dma-resv.c | 128 +++++++++++++++++++------------------ > > > 1 file changed, 65 insertions(+), 63 deletions(-) > > > > > > diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c > > > index 6ddbeb5dfbf6..87f5d82d992a 100644 > > > --- a/drivers/dma-buf/dma-resv.c > > > +++ b/drivers/dma-buf/dma-resv.c > > > @@ -1,3 +1,4 @@ > > > +// SPDX-License-Identifier: MIT > > > /* > > > * Copyright (C) 2012-2014 Canonical Ltd (Maarten Lankhorst) > > > * > > > @@ -92,49 +93,6 @@ static void dma_resv_list_free(struct dma_resv_list *list) > > > kfree_rcu(list, rcu); > > > } > > > -#if IS_ENABLED(CONFIG_LOCKDEP) > > > -static int __init dma_resv_lockdep(void) > > > -{ > > > - struct mm_struct *mm = mm_alloc(); > > > - struct ww_acquire_ctx ctx; > > > - struct dma_resv obj; > > > - struct address_space mapping; > > > - int ret; > > > - > > > - if (!mm) > > > - return -ENOMEM; > > > - > > > - dma_resv_init(&obj); > > > - address_space_init_once(&mapping); > > > - > > > - mmap_read_lock(mm); > > > - ww_acquire_init(&ctx, &reservation_ww_class); > > > - ret = dma_resv_lock(&obj, &ctx); > > > - if (ret == -EDEADLK) > > > - dma_resv_lock_slow(&obj, &ctx); > > > - fs_reclaim_acquire(GFP_KERNEL); > > > - /* for unmap_mapping_range on trylocked buffer objects in shrinkers */ > > > - i_mmap_lock_write(&mapping); > > > - i_mmap_unlock_write(&mapping); > > > -#ifdef CONFIG_MMU_NOTIFIER > > > - lock_map_acquire(&__mmu_notifier_invalidate_range_start_map); > > > - __dma_fence_might_wait(); > > > - lock_map_release(&__mmu_notifier_invalidate_range_start_map); > > > -#else > > > - __dma_fence_might_wait(); > > > -#endif > > > - fs_reclaim_release(GFP_KERNEL); > > > - ww_mutex_unlock(&obj.lock); > > > - ww_acquire_fini(&ctx); > > > - mmap_read_unlock(mm); > > > - > > > - mmput(mm); > > > - > > > - return 0; > > > -} > > > -subsys_initcall(dma_resv_lockdep); > > > -#endif > > > - > > > /** > > > * dma_resv_init - initialize a reservation object > > > * @obj: the reservation object > > > @@ -196,9 +154,7 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences) > > > if (old && old->shared_max) { > > > if ((old->shared_count + num_fences) <= old->shared_max) > > > return 0; > > > - else > > > - max = max(old->shared_count + num_fences, > > > - old->shared_max * 2); > > > + max = max(old->shared_count + num_fences, old->shared_max * 2); > > > } else { > > > max = max(4ul, roundup_pow_of_two(num_fences)); > > > } > > > @@ -337,17 +293,17 @@ void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence) > > > EXPORT_SYMBOL(dma_resv_add_excl_fence); > > > /** > > > -* dma_resv_copy_fences - Copy all fences from src to dst. > > > -* @dst: the destination reservation object > > > -* @src: the source reservation object > > > -* > > > -* Copy all fences from src to dst. dst-lock must be held. > > > -*/ > > > + * dma_resv_copy_fences - Copy all fences from src to dst. > > > + * @dst: the destination reservation object > > > + * @src: the source reservation object > > > + * > > > + * Copy all fences from src to dst. dst-lock must be held. > > > + */ > > > int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) > > > { > > > struct dma_resv_list *src_list, *dst_list; > > > struct dma_fence *old, *new; > > > - unsigned i; > > > + unsigned int i; > > > dma_resv_assert_held(dst); > > > @@ -356,7 +312,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) > > > retry: > > > if (src_list) { > > > - unsigned shared_count = src_list->shared_count; > > > + unsigned int shared_count = src_list->shared_count; > > > rcu_read_unlock(); > > > @@ -373,6 +329,7 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) > > > dst_list->shared_count = 0; > > > for (i = 0; i < src_list->shared_count; ++i) { > > > + struct dma_fence __rcu **dst; > > > struct dma_fence *fence; > > > fence = rcu_dereference(src_list->shared[i]); > > > @@ -391,7 +348,8 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src) > > > continue; > > > } > > > - rcu_assign_pointer(dst_list->shared[dst_list->shared_count++], fence); > > > + dst = &dst_list->shared[dst_list->shared_count++]; > > > + rcu_assign_pointer(*dst, fence); > > > } > > > } else { > > > dst_list = NULL; > > > @@ -431,7 +389,7 @@ EXPORT_SYMBOL(dma_resv_copy_fences); > > > */ > > > int dma_resv_get_fences_rcu(struct dma_resv *obj, > > > struct dma_fence **pfence_excl, > > > - unsigned *pshared_count, > > > + unsigned int *pshared_count, > > > struct dma_fence ***pshared) > > > { > > > struct dma_fence **shared = NULL; > > > @@ -533,9 +491,9 @@ long dma_resv_wait_timeout_rcu(struct dma_resv *obj, > > > bool wait_all, bool intr, > > > unsigned long timeout) > > > { > > > - struct dma_fence *fence; > > > - unsigned seq, shared_count; > > > long ret = timeout ? timeout : 1; > > > + unsigned int seq, shared_count; > > > + struct dma_fence *fence; > > > int i; > > > retry: > > > @@ -565,8 +523,9 @@ long dma_resv_wait_timeout_rcu(struct dma_resv *obj, > > > shared_count = fobj->shared_count; > > > for (i = 0; !fence && i < shared_count; ++i) { > > > - struct dma_fence *lfence = rcu_dereference(fobj->shared[i]); > > > + struct dma_fence *lfence; > > > + lfence = rcu_dereference(fobj->shared[i]); > > > if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, > > > &lfence->flags)) > > > continue; > > > @@ -633,7 +592,7 @@ static inline int dma_resv_test_signaled_single(struct dma_fence *passed_fence) > > > */ > > > bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all) > > > { > > > - unsigned seq, shared_count; > > > + unsigned int seq, shared_count; > > > int ret; > > > rcu_read_lock(); > > > @@ -643,16 +602,16 @@ bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all) > > > seq = read_seqcount_begin(&obj->seq); > > > if (test_all) { > > > - unsigned i; > > > - > > > struct dma_resv_list *fobj = rcu_dereference(obj->fence); > > > + unsigned int i; > > > if (fobj) > > > shared_count = fobj->shared_count; > > > for (i = 0; i < shared_count; ++i) { > > > - struct dma_fence *fence = rcu_dereference(fobj->shared[i]); > > > + struct dma_fence *fence; > > > + fence = rcu_dereference(fobj->shared[i]); > > > ret = dma_resv_test_signaled_single(fence); > > > if (ret < 0) > > > goto retry; > > > @@ -681,3 +640,46 @@ bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all) > > > return ret; > > > } > > > EXPORT_SYMBOL_GPL(dma_resv_test_signaled_rcu); > > > + > > > +#if IS_ENABLED(CONFIG_LOCKDEP) > > > +static int __init dma_resv_lockdep(void) > > > +{ > > > + struct mm_struct *mm = mm_alloc(); > > > + struct ww_acquire_ctx ctx; > > > + struct dma_resv obj; > > > + struct address_space mapping; > > > + int ret; > > > + > > > + if (!mm) > > > + return -ENOMEM; > > > + > > > + dma_resv_init(&obj); > > > + address_space_init_once(&mapping); > > > + > > > + mmap_read_lock(mm); > > > + ww_acquire_init(&ctx, &reservation_ww_class); > > > + ret = dma_resv_lock(&obj, &ctx); > > > + if (ret == -EDEADLK) > > > + dma_resv_lock_slow(&obj, &ctx); > > > + fs_reclaim_acquire(GFP_KERNEL); > > > + /* for unmap_mapping_range on trylocked buffer objects in shrinkers */ > > > + i_mmap_lock_write(&mapping); > > > + i_mmap_unlock_write(&mapping); > > > +#ifdef CONFIG_MMU_NOTIFIER > > > + lock_map_acquire(&__mmu_notifier_invalidate_range_start_map); > > > + __dma_fence_might_wait(); > > > + lock_map_release(&__mmu_notifier_invalidate_range_start_map); > > > +#else > > > + __dma_fence_might_wait(); > > > +#endif > > > + fs_reclaim_release(GFP_KERNEL); > > > + ww_mutex_unlock(&obj.lock); > > > + ww_acquire_fini(&ctx); > > > + mmap_read_unlock(mm); > > > + > > > + mmput(mm); > > > + > > > + return 0; > > > +} > > > +subsys_initcall(dma_resv_lockdep); > > > +#endif > > > -- > > > 2.25.1 > > > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch