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.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 5BB09C47083 for ; Wed, 2 Jun 2021 14:08:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4168A613D8 for ; Wed, 2 Jun 2021 14:08:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231562AbhFBOKi (ORCPT ); Wed, 2 Jun 2021 10:10:38 -0400 Received: from foss.arm.com ([217.140.110.172]:45640 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231558AbhFBOIg (ORCPT ); Wed, 2 Jun 2021 10:08:36 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 44A161042; Wed, 2 Jun 2021 07:06:53 -0700 (PDT) Received: from [192.168.1.179] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 47D133F73D; Wed, 2 Jun 2021 07:06:51 -0700 (PDT) Subject: Re: [PATCH 03/11] drm/panfrost: Use xarray and helpers for depedency tracking To: Daniel Vetter , DRI Development Cc: Intel Graphics Development , =?UTF-8?Q?Christian_K=c3=b6nig?= , Luben Tuikov , Alex Deucher , Lee Jones , Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , Sumit Semwal , linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Daniel Vetter References: <20210521090959.1663703-1-daniel.vetter@ffwll.ch> <20210521090959.1663703-3-daniel.vetter@ffwll.ch> From: Steven Price Message-ID: <2054fee7-dcd2-a4fa-5d50-7fe6f1b474be@arm.com> Date: Wed, 2 Jun 2021 15:06:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210521090959.1663703-3-daniel.vetter@ffwll.ch> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 21/05/2021 10:09, Daniel Vetter wrote: > More consistency and prep work for the next patch. > > Aside: I wonder whether we shouldn't just move this entire xarray > business into the scheduler so that not everyone has to reinvent the > same wheels. Cc'ing some scheduler people for this too. > > Cc: "Christian König" > Cc: Luben Tuikov > Cc: Alex Deucher > Cc: Lee Jones > Cc: Steven Price > Cc: Rob Herring > Cc: Tomeu Vizoso > Cc: Alyssa Rosenzweig > Cc: Sumit Semwal > Cc: linux-media@vger.kernel.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Daniel Vetter Two comments below, but otherwise looks like a nice cleanup. > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 41 ++++++++--------- > drivers/gpu/drm/panfrost/panfrost_job.c | 61 ++++++++++--------------- > drivers/gpu/drm/panfrost/panfrost_job.h | 8 ++-- > 3 files changed, 46 insertions(+), 64 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > index ca07098a6141..7977b4752b5c 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -137,12 +137,6 @@ panfrost_lookup_bos(struct drm_device *dev, > if (!job->bo_count) > return 0; > > - job->implicit_fences = kvmalloc_array(job->bo_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->implicit_fences) > - return -ENOMEM; > - > ret = drm_gem_objects_lookup(file_priv, > (void __user *)(uintptr_t)args->bo_handles, > job->bo_count, &job->bos); > @@ -173,7 +167,7 @@ panfrost_lookup_bos(struct drm_device *dev, > } > > /** > - * panfrost_copy_in_sync() - Sets up job->in_fences[] with the sync objects > + * panfrost_copy_in_sync() - Sets up job->deps with the sync objects > * referenced by the job. > * @dev: DRM device > * @file_priv: DRM file for this fd > @@ -193,22 +187,14 @@ panfrost_copy_in_sync(struct drm_device *dev, > { > u32 *handles; > int ret = 0; > - int i; > + int i, in_fence_count; > > - job->in_fence_count = args->in_sync_count; > + in_fence_count = args->in_sync_count; > > - if (!job->in_fence_count) > + if (!in_fence_count) > return 0; > > - job->in_fences = kvmalloc_array(job->in_fence_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->in_fences) { > - DRM_DEBUG("Failed to allocate job in fences\n"); > - return -ENOMEM; > - } > - > - handles = kvmalloc_array(job->in_fence_count, sizeof(u32), GFP_KERNEL); > + handles = kvmalloc_array(in_fence_count, sizeof(u32), GFP_KERNEL); > if (!handles) { > ret = -ENOMEM; > DRM_DEBUG("Failed to allocate incoming syncobj handles\n"); > @@ -217,16 +203,23 @@ panfrost_copy_in_sync(struct drm_device *dev, > > if (copy_from_user(handles, > (void __user *)(uintptr_t)args->in_syncs, > - job->in_fence_count * sizeof(u32))) { > + in_fence_count * sizeof(u32))) { > ret = -EFAULT; > DRM_DEBUG("Failed to copy in syncobj handles\n"); > goto fail; > } > > - for (i = 0; i < job->in_fence_count; i++) { > + for (i = 0; i < in_fence_count; i++) { > + struct dma_fence *fence; > + > ret = drm_syncobj_find_fence(file_priv, handles[i], 0, 0, > - &job->in_fences[i]); > - if (ret == -EINVAL) > + &fence); > + if (ret) > + goto fail; > + > + ret = drm_gem_fence_array_add(&job->deps, fence); > + > + if (ret) > goto fail; > } > > @@ -264,6 +257,8 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, > > kref_init(&job->refcount); > > + xa_init_flags(&job->deps, XA_FLAGS_ALLOC); > + > job->pfdev = pfdev; > job->jc = args->jc; > job->requirements = args->requirements; > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c > index f5d39ee14ab5..707d912ff64a 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > @@ -196,14 +196,21 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) > job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); > } > > -static void panfrost_acquire_object_fences(struct drm_gem_object **bos, > - int bo_count, > - struct dma_fence **implicit_fences) > +static int panfrost_acquire_object_fences(struct drm_gem_object **bos, > + int bo_count, > + struct xarray *deps) > { > - int i; > + int i, ret; > > - for (i = 0; i < bo_count; i++) > - implicit_fences[i] = dma_resv_get_excl_rcu(bos[i]->resv); > + for (i = 0; i < bo_count; i++) { > + struct dma_fence *fence = dma_resv_get_excl_rcu(bos[i]->resv); > + > + ret = drm_gem_fence_array_add(deps, fence); > + if (ret) > + return ret; > + } > + > + return 0; > } > > static void panfrost_attach_object_fences(struct drm_gem_object **bos, > @@ -236,8 +243,10 @@ int panfrost_job_push(struct panfrost_job *job) > > kref_get(&job->refcount); /* put by scheduler job completion */ > > - panfrost_acquire_object_fences(job->bos, job->bo_count, > - job->implicit_fences); > + ret = panfrost_acquire_object_fences(job->bos, job->bo_count, > + &job->deps); > + if (ret) > + goto unlock; I think this needs to move above the kref_get() otherwise we'll leak the job on failure. > > drm_sched_entity_push_job(&job->base, entity); > > @@ -254,18 +263,15 @@ static void panfrost_job_cleanup(struct kref *ref) > { > struct panfrost_job *job = container_of(ref, struct panfrost_job, > refcount); > + struct dma_fence *fence; > + unsigned long index; > unsigned int i; > > - if (job->in_fences) { > - for (i = 0; i < job->in_fence_count; i++) > - dma_fence_put(job->in_fences[i]); > - kvfree(job->in_fences); > - } > - if (job->implicit_fences) { > - for (i = 0; i < job->bo_count; i++) > - dma_fence_put(job->implicit_fences[i]); > - kvfree(job->implicit_fences); > + xa_for_each(&job->deps, index, fence) { > + dma_fence_put(fence); > } > + xa_destroy(&job->deps); > + > dma_fence_put(job->done_fence); > dma_fence_put(job->render_done_fence); > > @@ -308,26 +314,9 @@ static struct dma_fence *panfrost_job_dependency(struct drm_sched_job *sched_job > struct drm_sched_entity *s_entity) > { > struct panfrost_job *job = to_panfrost_job(sched_job); > - struct dma_fence *fence; > - unsigned int i; > > - /* Explicit fences */ > - for (i = 0; i < job->in_fence_count; i++) { > - if (job->in_fences[i]) { > - fence = job->in_fences[i]; > - job->in_fences[i] = NULL; > - return fence; > - } > - } > - > - /* Implicit fences, max. one per BO */ > - for (i = 0; i < job->bo_count; i++) { > - if (job->implicit_fences[i]) { > - fence = job->implicit_fences[i]; > - job->implicit_fences[i] = NULL; > - return fence; > - } > - } > + if (!xa_empty(&job->deps)) > + return xa_erase(&job->deps, job->last_dep++); Rather than tracking last_dep separately this could be written using xa_find(): if (xa_find(&job->deps, &i, ULONG_MAX, XA_PRESENT)) return xa_erase(&job->deps, &i); Steve > > return NULL; > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panfrost/panfrost_job.h > index bbd3ba97ff67..82306a03b57e 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.h > +++ b/drivers/gpu/drm/panfrost/panfrost_job.h > @@ -19,9 +19,9 @@ struct panfrost_job { > struct panfrost_device *pfdev; > struct panfrost_file_priv *file_priv; > > - /* Optional fences userspace can pass in for the job to depend on. */ > - struct dma_fence **in_fences; > - u32 in_fence_count; > + /* Contains both explicit and implicit fences */ > + struct xarray deps; > + unsigned long last_dep; > > /* Fence to be signaled by IRQ handler when the job is complete. */ > struct dma_fence *done_fence; > @@ -30,8 +30,6 @@ struct panfrost_job { > __u32 requirements; > __u32 flush_id; > > - /* Exclusive fences we have taken from the BOs to wait for */ > - struct dma_fence **implicit_fences; > struct panfrost_gem_mapping **mappings; > struct drm_gem_object **bos; > u32 bo_count; > 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.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 88D46C47083 for ; Wed, 2 Jun 2021 14:06:59 +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 584C160FE3 for ; Wed, 2 Jun 2021 14:06:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 584C160FE3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com 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 792546ECA4; Wed, 2 Jun 2021 14:06:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id EEB156ECA4; Wed, 2 Jun 2021 14:06:54 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 44A161042; Wed, 2 Jun 2021 07:06:53 -0700 (PDT) Received: from [192.168.1.179] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 47D133F73D; Wed, 2 Jun 2021 07:06:51 -0700 (PDT) Subject: Re: [PATCH 03/11] drm/panfrost: Use xarray and helpers for depedency tracking To: Daniel Vetter , DRI Development References: <20210521090959.1663703-1-daniel.vetter@ffwll.ch> <20210521090959.1663703-3-daniel.vetter@ffwll.ch> From: Steven Price Message-ID: <2054fee7-dcd2-a4fa-5d50-7fe6f1b474be@arm.com> Date: Wed, 2 Jun 2021 15:06:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210521090959.1663703-3-daniel.vetter@ffwll.ch> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit 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: Tomeu Vizoso , Intel Graphics Development , linaro-mm-sig@lists.linaro.org, Luben Tuikov , Alyssa Rosenzweig , Alex Deucher , Daniel Vetter , Lee Jones , =?UTF-8?Q?Christian_K=c3=b6nig?= , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 21/05/2021 10:09, Daniel Vetter wrote: > More consistency and prep work for the next patch. > > Aside: I wonder whether we shouldn't just move this entire xarray > business into the scheduler so that not everyone has to reinvent the > same wheels. Cc'ing some scheduler people for this too. > > Cc: "Christian König" > Cc: Luben Tuikov > Cc: Alex Deucher > Cc: Lee Jones > Cc: Steven Price > Cc: Rob Herring > Cc: Tomeu Vizoso > Cc: Alyssa Rosenzweig > Cc: Sumit Semwal > Cc: linux-media@vger.kernel.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Daniel Vetter Two comments below, but otherwise looks like a nice cleanup. > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 41 ++++++++--------- > drivers/gpu/drm/panfrost/panfrost_job.c | 61 ++++++++++--------------- > drivers/gpu/drm/panfrost/panfrost_job.h | 8 ++-- > 3 files changed, 46 insertions(+), 64 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > index ca07098a6141..7977b4752b5c 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -137,12 +137,6 @@ panfrost_lookup_bos(struct drm_device *dev, > if (!job->bo_count) > return 0; > > - job->implicit_fences = kvmalloc_array(job->bo_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->implicit_fences) > - return -ENOMEM; > - > ret = drm_gem_objects_lookup(file_priv, > (void __user *)(uintptr_t)args->bo_handles, > job->bo_count, &job->bos); > @@ -173,7 +167,7 @@ panfrost_lookup_bos(struct drm_device *dev, > } > > /** > - * panfrost_copy_in_sync() - Sets up job->in_fences[] with the sync objects > + * panfrost_copy_in_sync() - Sets up job->deps with the sync objects > * referenced by the job. > * @dev: DRM device > * @file_priv: DRM file for this fd > @@ -193,22 +187,14 @@ panfrost_copy_in_sync(struct drm_device *dev, > { > u32 *handles; > int ret = 0; > - int i; > + int i, in_fence_count; > > - job->in_fence_count = args->in_sync_count; > + in_fence_count = args->in_sync_count; > > - if (!job->in_fence_count) > + if (!in_fence_count) > return 0; > > - job->in_fences = kvmalloc_array(job->in_fence_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->in_fences) { > - DRM_DEBUG("Failed to allocate job in fences\n"); > - return -ENOMEM; > - } > - > - handles = kvmalloc_array(job->in_fence_count, sizeof(u32), GFP_KERNEL); > + handles = kvmalloc_array(in_fence_count, sizeof(u32), GFP_KERNEL); > if (!handles) { > ret = -ENOMEM; > DRM_DEBUG("Failed to allocate incoming syncobj handles\n"); > @@ -217,16 +203,23 @@ panfrost_copy_in_sync(struct drm_device *dev, > > if (copy_from_user(handles, > (void __user *)(uintptr_t)args->in_syncs, > - job->in_fence_count * sizeof(u32))) { > + in_fence_count * sizeof(u32))) { > ret = -EFAULT; > DRM_DEBUG("Failed to copy in syncobj handles\n"); > goto fail; > } > > - for (i = 0; i < job->in_fence_count; i++) { > + for (i = 0; i < in_fence_count; i++) { > + struct dma_fence *fence; > + > ret = drm_syncobj_find_fence(file_priv, handles[i], 0, 0, > - &job->in_fences[i]); > - if (ret == -EINVAL) > + &fence); > + if (ret) > + goto fail; > + > + ret = drm_gem_fence_array_add(&job->deps, fence); > + > + if (ret) > goto fail; > } > > @@ -264,6 +257,8 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, > > kref_init(&job->refcount); > > + xa_init_flags(&job->deps, XA_FLAGS_ALLOC); > + > job->pfdev = pfdev; > job->jc = args->jc; > job->requirements = args->requirements; > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c > index f5d39ee14ab5..707d912ff64a 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > @@ -196,14 +196,21 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) > job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); > } > > -static void panfrost_acquire_object_fences(struct drm_gem_object **bos, > - int bo_count, > - struct dma_fence **implicit_fences) > +static int panfrost_acquire_object_fences(struct drm_gem_object **bos, > + int bo_count, > + struct xarray *deps) > { > - int i; > + int i, ret; > > - for (i = 0; i < bo_count; i++) > - implicit_fences[i] = dma_resv_get_excl_rcu(bos[i]->resv); > + for (i = 0; i < bo_count; i++) { > + struct dma_fence *fence = dma_resv_get_excl_rcu(bos[i]->resv); > + > + ret = drm_gem_fence_array_add(deps, fence); > + if (ret) > + return ret; > + } > + > + return 0; > } > > static void panfrost_attach_object_fences(struct drm_gem_object **bos, > @@ -236,8 +243,10 @@ int panfrost_job_push(struct panfrost_job *job) > > kref_get(&job->refcount); /* put by scheduler job completion */ > > - panfrost_acquire_object_fences(job->bos, job->bo_count, > - job->implicit_fences); > + ret = panfrost_acquire_object_fences(job->bos, job->bo_count, > + &job->deps); > + if (ret) > + goto unlock; I think this needs to move above the kref_get() otherwise we'll leak the job on failure. > > drm_sched_entity_push_job(&job->base, entity); > > @@ -254,18 +263,15 @@ static void panfrost_job_cleanup(struct kref *ref) > { > struct panfrost_job *job = container_of(ref, struct panfrost_job, > refcount); > + struct dma_fence *fence; > + unsigned long index; > unsigned int i; > > - if (job->in_fences) { > - for (i = 0; i < job->in_fence_count; i++) > - dma_fence_put(job->in_fences[i]); > - kvfree(job->in_fences); > - } > - if (job->implicit_fences) { > - for (i = 0; i < job->bo_count; i++) > - dma_fence_put(job->implicit_fences[i]); > - kvfree(job->implicit_fences); > + xa_for_each(&job->deps, index, fence) { > + dma_fence_put(fence); > } > + xa_destroy(&job->deps); > + > dma_fence_put(job->done_fence); > dma_fence_put(job->render_done_fence); > > @@ -308,26 +314,9 @@ static struct dma_fence *panfrost_job_dependency(struct drm_sched_job *sched_job > struct drm_sched_entity *s_entity) > { > struct panfrost_job *job = to_panfrost_job(sched_job); > - struct dma_fence *fence; > - unsigned int i; > > - /* Explicit fences */ > - for (i = 0; i < job->in_fence_count; i++) { > - if (job->in_fences[i]) { > - fence = job->in_fences[i]; > - job->in_fences[i] = NULL; > - return fence; > - } > - } > - > - /* Implicit fences, max. one per BO */ > - for (i = 0; i < job->bo_count; i++) { > - if (job->implicit_fences[i]) { > - fence = job->implicit_fences[i]; > - job->implicit_fences[i] = NULL; > - return fence; > - } > - } > + if (!xa_empty(&job->deps)) > + return xa_erase(&job->deps, job->last_dep++); Rather than tracking last_dep separately this could be written using xa_find(): if (xa_find(&job->deps, &i, ULONG_MAX, XA_PRESENT)) return xa_erase(&job->deps, &i); Steve > > return NULL; > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panfrost/panfrost_job.h > index bbd3ba97ff67..82306a03b57e 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.h > +++ b/drivers/gpu/drm/panfrost/panfrost_job.h > @@ -19,9 +19,9 @@ struct panfrost_job { > struct panfrost_device *pfdev; > struct panfrost_file_priv *file_priv; > > - /* Optional fences userspace can pass in for the job to depend on. */ > - struct dma_fence **in_fences; > - u32 in_fence_count; > + /* Contains both explicit and implicit fences */ > + struct xarray deps; > + unsigned long last_dep; > > /* Fence to be signaled by IRQ handler when the job is complete. */ > struct dma_fence *done_fence; > @@ -30,8 +30,6 @@ struct panfrost_job { > __u32 requirements; > __u32 flush_id; > > - /* Exclusive fences we have taken from the BOs to wait for */ > - struct dma_fence **implicit_fences; > struct panfrost_gem_mapping **mappings; > struct drm_gem_object **bos; > u32 bo_count; > 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.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 66673C4708F for ; Wed, 2 Jun 2021 14:06:57 +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 28F3660FE4 for ; Wed, 2 Jun 2021 14:06:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28F3660FE4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8698D6ECA5; Wed, 2 Jun 2021 14:06:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id EEB156ECA4; Wed, 2 Jun 2021 14:06:54 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 44A161042; Wed, 2 Jun 2021 07:06:53 -0700 (PDT) Received: from [192.168.1.179] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 47D133F73D; Wed, 2 Jun 2021 07:06:51 -0700 (PDT) To: Daniel Vetter , DRI Development References: <20210521090959.1663703-1-daniel.vetter@ffwll.ch> <20210521090959.1663703-3-daniel.vetter@ffwll.ch> From: Steven Price Message-ID: <2054fee7-dcd2-a4fa-5d50-7fe6f1b474be@arm.com> Date: Wed, 2 Jun 2021 15:06:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210521090959.1663703-3-daniel.vetter@ffwll.ch> Content-Language: en-GB Subject: Re: [Intel-gfx] [PATCH 03/11] drm/panfrost: Use xarray and helpers for depedency tracking X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Tomeu Vizoso , Intel Graphics Development , Sumit Semwal , linaro-mm-sig@lists.linaro.org, Luben Tuikov , Alyssa Rosenzweig , Alex Deucher , Daniel Vetter , Lee Jones , =?UTF-8?Q?Christian_K=c3=b6nig?= , linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" T24gMjEvMDUvMjAyMSAxMDowOSwgRGFuaWVsIFZldHRlciB3cm90ZToKPiBNb3JlIGNvbnNpc3Rl bmN5IGFuZCBwcmVwIHdvcmsgZm9yIHRoZSBuZXh0IHBhdGNoLgo+IAo+IEFzaWRlOiBJIHdvbmRl ciB3aGV0aGVyIHdlIHNob3VsZG4ndCBqdXN0IG1vdmUgdGhpcyBlbnRpcmUgeGFycmF5Cj4gYnVz aW5lc3MgaW50byB0aGUgc2NoZWR1bGVyIHNvIHRoYXQgbm90IGV2ZXJ5b25lIGhhcyB0byByZWlu dmVudCB0aGUKPiBzYW1lIHdoZWVscy4gQ2MnaW5nIHNvbWUgc2NoZWR1bGVyIHBlb3BsZSBmb3Ig dGhpcyB0b28uCj4gCj4gQ2M6ICJDaHJpc3RpYW4gS8O2bmlnIiA8Y2hyaXN0aWFuLmtvZW5pZ0Bh bWQuY29tPgo+IENjOiBMdWJlbiBUdWlrb3YgPGx1YmVuLnR1aWtvdkBhbWQuY29tPgo+IENjOiBB bGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Cj4gQ2M6IExlZSBKb25lcyA8 bGVlLmpvbmVzQGxpbmFyby5vcmc+Cj4gQ2M6IFN0ZXZlbiBQcmljZSA8c3RldmVuLnByaWNlQGFy bS5jb20+Cj4gQ2M6IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5lbC5vcmc+Cj4gQ2M6IFRvbWV1IFZp em9zbyA8dG9tZXUudml6b3NvQGNvbGxhYm9yYS5jb20+Cj4gQ2M6IEFseXNzYSBSb3Nlbnp3ZWln IDxhbHlzc2Eucm9zZW56d2VpZ0Bjb2xsYWJvcmEuY29tPgo+IENjOiBTdW1pdCBTZW13YWwgPHN1 bWl0LnNlbXdhbEBsaW5hcm8ub3JnPgo+IENjOiBsaW51eC1tZWRpYUB2Z2VyLmtlcm5lbC5vcmcK PiBDYzogbGluYXJvLW1tLXNpZ0BsaXN0cy5saW5hcm8ub3JnCj4gU2lnbmVkLW9mZi1ieTogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CgpUd28gY29tbWVudHMgYmVsb3cs IGJ1dCBvdGhlcndpc2UgbG9va3MgbGlrZSBhIG5pY2UgY2xlYW51cC4KCj4gLS0tCj4gIGRyaXZl cnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9kcnYuYyB8IDQxICsrKysrKysrLS0tLS0tLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuYyB8IDYxICsrKysrKysr KystLS0tLS0tLS0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2pv Yi5oIHwgIDggKystLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDY0IGRl bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFu ZnJvc3RfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMKPiBp bmRleCBjYTA3MDk4YTYxNDEuLjc5NzdiNDc1MmI1YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFu ZnJvc3QvcGFuZnJvc3RfZHJ2LmMKPiBAQCAtMTM3LDEyICsxMzcsNiBAQCBwYW5mcm9zdF9sb29r dXBfYm9zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAlpZiAoIWpvYi0+Ym9fY291bnQpCj4g IAkJcmV0dXJuIDA7Cj4gIAo+IC0Jam9iLT5pbXBsaWNpdF9mZW5jZXMgPSBrdm1hbGxvY19hcnJh eShqb2ItPmJvX2NvdW50LAo+IC0JCQkJICBzaXplb2Yoc3RydWN0IGRtYV9mZW5jZSAqKSwKPiAt CQkJCSAgR0ZQX0tFUk5FTCB8IF9fR0ZQX1pFUk8pOwo+IC0JaWYgKCFqb2ItPmltcGxpY2l0X2Zl bmNlcykKPiAtCQlyZXR1cm4gLUVOT01FTTsKPiAtCj4gIAlyZXQgPSBkcm1fZ2VtX29iamVjdHNf bG9va3VwKGZpbGVfcHJpdiwKPiAgCQkJCSAgICAgKHZvaWQgX191c2VyICopKHVpbnRwdHJfdClh cmdzLT5ib19oYW5kbGVzLAo+ICAJCQkJICAgICBqb2ItPmJvX2NvdW50LCAmam9iLT5ib3MpOwo+ IEBAIC0xNzMsNyArMTY3LDcgQEAgcGFuZnJvc3RfbG9va3VwX2JvcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAo+ICB9Cj4gIAo+ICAvKioKPiAtICogcGFuZnJvc3RfY29weV9pbl9zeW5jKCkgLSBT ZXRzIHVwIGpvYi0+aW5fZmVuY2VzW10gd2l0aCB0aGUgc3luYyBvYmplY3RzCj4gKyAqIHBhbmZy b3N0X2NvcHlfaW5fc3luYygpIC0gU2V0cyB1cCBqb2ItPmRlcHMgd2l0aCB0aGUgc3luYyBvYmpl Y3RzCj4gICAqIHJlZmVyZW5jZWQgYnkgdGhlIGpvYi4KPiAgICogQGRldjogRFJNIGRldmljZQo+ ICAgKiBAZmlsZV9wcml2OiBEUk0gZmlsZSBmb3IgdGhpcyBmZAo+IEBAIC0xOTMsMjIgKzE4Nywx NCBAQCBwYW5mcm9zdF9jb3B5X2luX3N5bmMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgewo+ ICAJdTMyICpoYW5kbGVzOwo+ICAJaW50IHJldCA9IDA7Cj4gLQlpbnQgaTsKPiArCWludCBpLCBp bl9mZW5jZV9jb3VudDsKPiAgCj4gLQlqb2ItPmluX2ZlbmNlX2NvdW50ID0gYXJncy0+aW5fc3lu Y19jb3VudDsKPiArCWluX2ZlbmNlX2NvdW50ID0gYXJncy0+aW5fc3luY19jb3VudDsKPiAgCj4g LQlpZiAoIWpvYi0+aW5fZmVuY2VfY291bnQpCj4gKwlpZiAoIWluX2ZlbmNlX2NvdW50KQo+ICAJ CXJldHVybiAwOwo+ICAKPiAtCWpvYi0+aW5fZmVuY2VzID0ga3ZtYWxsb2NfYXJyYXkoam9iLT5p bl9mZW5jZV9jb3VudCwKPiAtCQkJCQlzaXplb2Yoc3RydWN0IGRtYV9mZW5jZSAqKSwKPiAtCQkJ CQlHRlBfS0VSTkVMIHwgX19HRlBfWkVSTyk7Cj4gLQlpZiAoIWpvYi0+aW5fZmVuY2VzKSB7Cj4g LQkJRFJNX0RFQlVHKCJGYWlsZWQgdG8gYWxsb2NhdGUgam9iIGluIGZlbmNlc1xuIik7Cj4gLQkJ cmV0dXJuIC1FTk9NRU07Cj4gLQl9Cj4gLQo+IC0JaGFuZGxlcyA9IGt2bWFsbG9jX2FycmF5KGpv Yi0+aW5fZmVuY2VfY291bnQsIHNpemVvZih1MzIpLCBHRlBfS0VSTkVMKTsKPiArCWhhbmRsZXMg PSBrdm1hbGxvY19hcnJheShpbl9mZW5jZV9jb3VudCwgc2l6ZW9mKHUzMiksIEdGUF9LRVJORUwp Owo+ICAJaWYgKCFoYW5kbGVzKSB7Cj4gIAkJcmV0ID0gLUVOT01FTTsKPiAgCQlEUk1fREVCVUco IkZhaWxlZCB0byBhbGxvY2F0ZSBpbmNvbWluZyBzeW5jb2JqIGhhbmRsZXNcbiIpOwo+IEBAIC0y MTcsMTYgKzIwMywyMyBAQCBwYW5mcm9zdF9jb3B5X2luX3N5bmMoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKPiAgCj4gIAlpZiAoY29weV9mcm9tX3VzZXIoaGFuZGxlcywKPiAgCQkJICAgKHZvaWQg X191c2VyICopKHVpbnRwdHJfdClhcmdzLT5pbl9zeW5jcywKPiAtCQkJICAgam9iLT5pbl9mZW5j ZV9jb3VudCAqIHNpemVvZih1MzIpKSkgewo+ICsJCQkgICBpbl9mZW5jZV9jb3VudCAqIHNpemVv Zih1MzIpKSkgewo+ICAJCXJldCA9IC1FRkFVTFQ7Cj4gIAkJRFJNX0RFQlVHKCJGYWlsZWQgdG8g Y29weSBpbiBzeW5jb2JqIGhhbmRsZXNcbiIpOwo+ICAJCWdvdG8gZmFpbDsKPiAgCX0KPiAgCj4g LQlmb3IgKGkgPSAwOyBpIDwgam9iLT5pbl9mZW5jZV9jb3VudDsgaSsrKSB7Cj4gKwlmb3IgKGkg PSAwOyBpIDwgaW5fZmVuY2VfY291bnQ7IGkrKykgewo+ICsJCXN0cnVjdCBkbWFfZmVuY2UgKmZl bmNlOwo+ICsKPiAgCQlyZXQgPSBkcm1fc3luY29ial9maW5kX2ZlbmNlKGZpbGVfcHJpdiwgaGFu ZGxlc1tpXSwgMCwgMCwKPiAtCQkJCQkgICAgICZqb2ItPmluX2ZlbmNlc1tpXSk7Cj4gLQkJaWYg KHJldCA9PSAtRUlOVkFMKQo+ICsJCQkJCSAgICAgJmZlbmNlKTsKPiArCQlpZiAocmV0KQo+ICsJ CQlnb3RvIGZhaWw7Cj4gKwo+ICsJCXJldCA9IGRybV9nZW1fZmVuY2VfYXJyYXlfYWRkKCZqb2It PmRlcHMsIGZlbmNlKTsKPiArCj4gKwkJaWYgKHJldCkKPiAgCQkJZ290byBmYWlsOwo+ICAJfQo+ ICAKPiBAQCAtMjY0LDYgKzI1Nyw4IEBAIHN0YXRpYyBpbnQgcGFuZnJvc3RfaW9jdGxfc3VibWl0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gIAo+ICAJa3JlZl9pbml0KCZq b2ItPnJlZmNvdW50KTsKPiAgCj4gKwl4YV9pbml0X2ZsYWdzKCZqb2ItPmRlcHMsIFhBX0ZMQUdT X0FMTE9DKTsKPiArCj4gIAlqb2ItPnBmZGV2ID0gcGZkZXY7Cj4gIAlqb2ItPmpjID0gYXJncy0+ amM7Cj4gIAlqb2ItPnJlcXVpcmVtZW50cyA9IGFyZ3MtPnJlcXVpcmVtZW50czsKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2pvYi5jIGIvZHJpdmVycy9n cHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2pvYi5jCj4gaW5kZXggZjVkMzllZTE0YWI1Li43MDdk OTEyZmY2NGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0 X2pvYi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2pvYi5jCj4g QEAgLTE5NiwxNCArMTk2LDIxIEBAIHN0YXRpYyB2b2lkIHBhbmZyb3N0X2pvYl9od19zdWJtaXQo c3RydWN0IHBhbmZyb3N0X2pvYiAqam9iLCBpbnQganMpCj4gIAlqb2Jfd3JpdGUocGZkZXYsIEpT X0NPTU1BTkRfTkVYVChqcyksIEpTX0NPTU1BTkRfU1RBUlQpOwo+ICB9Cj4gIAo+IC1zdGF0aWMg dm9pZCBwYW5mcm9zdF9hY3F1aXJlX29iamVjdF9mZW5jZXMoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICoqYm9zLAo+IC0JCQkJCSAgIGludCBib19jb3VudCwKPiAtCQkJCQkgICBzdHJ1Y3QgZG1hX2Zl bmNlICoqaW1wbGljaXRfZmVuY2VzKQo+ICtzdGF0aWMgaW50IHBhbmZyb3N0X2FjcXVpcmVfb2Jq ZWN0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKipib3MsCj4gKwkJCQkJICBpbnQgYm9f Y291bnQsCj4gKwkJCQkJICBzdHJ1Y3QgeGFycmF5ICpkZXBzKQo+ICB7Cj4gLQlpbnQgaTsKPiAr CWludCBpLCByZXQ7Cj4gIAo+IC0JZm9yIChpID0gMDsgaSA8IGJvX2NvdW50OyBpKyspCj4gLQkJ aW1wbGljaXRfZmVuY2VzW2ldID0gZG1hX3Jlc3ZfZ2V0X2V4Y2xfcmN1KGJvc1tpXS0+cmVzdik7 Cj4gKwlmb3IgKGkgPSAwOyBpIDwgYm9fY291bnQ7IGkrKykgewo+ICsJCXN0cnVjdCBkbWFfZmVu Y2UgKmZlbmNlID0gZG1hX3Jlc3ZfZ2V0X2V4Y2xfcmN1KGJvc1tpXS0+cmVzdik7Cj4gKwo+ICsJ CXJldCA9IGRybV9nZW1fZmVuY2VfYXJyYXlfYWRkKGRlcHMsIGZlbmNlKTsKPiArCQlpZiAocmV0 KQo+ICsJCQlyZXR1cm4gcmV0Owo+ICsJfQo+ICsKPiArCXJldHVybiAwOwo+ICB9Cj4gIAo+ICBz dGF0aWMgdm9pZCBwYW5mcm9zdF9hdHRhY2hfb2JqZWN0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKipib3MsCj4gQEAgLTIzNiw4ICsyNDMsMTAgQEAgaW50IHBhbmZyb3N0X2pvYl9wdXNo KHN0cnVjdCBwYW5mcm9zdF9qb2IgKmpvYikKPiAgCj4gIAlrcmVmX2dldCgmam9iLT5yZWZjb3Vu dCk7IC8qIHB1dCBieSBzY2hlZHVsZXIgam9iIGNvbXBsZXRpb24gKi8KPiAgCj4gLQlwYW5mcm9z dF9hY3F1aXJlX29iamVjdF9mZW5jZXMoam9iLT5ib3MsIGpvYi0+Ym9fY291bnQsCj4gLQkJCQkg ICAgICAgam9iLT5pbXBsaWNpdF9mZW5jZXMpOwo+ICsJcmV0ID0gcGFuZnJvc3RfYWNxdWlyZV9v YmplY3RfZmVuY2VzKGpvYi0+Ym9zLCBqb2ItPmJvX2NvdW50LAo+ICsJCQkJCSAgICAgJmpvYi0+ ZGVwcyk7Cj4gKwlpZiAocmV0KQo+ICsJCWdvdG8gdW5sb2NrOwoKSSB0aGluayB0aGlzIG5lZWRz IHRvIG1vdmUgYWJvdmUgdGhlIGtyZWZfZ2V0KCkgb3RoZXJ3aXNlIHdlJ2xsIGxlYWsgdGhlCmpv YiBvbiBmYWlsdXJlLgoKPiAgCj4gIAlkcm1fc2NoZWRfZW50aXR5X3B1c2hfam9iKCZqb2ItPmJh c2UsIGVudGl0eSk7Cj4gIAo+IEBAIC0yNTQsMTggKzI2MywxNSBAQCBzdGF0aWMgdm9pZCBwYW5m cm9zdF9qb2JfY2xlYW51cChzdHJ1Y3Qga3JlZiAqcmVmKQo+ICB7Cj4gIAlzdHJ1Y3QgcGFuZnJv c3Rfam9iICpqb2IgPSBjb250YWluZXJfb2YocmVmLCBzdHJ1Y3QgcGFuZnJvc3Rfam9iLAo+ICAJ CQkJCQlyZWZjb3VudCk7Cj4gKwlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKPiArCXVuc2lnbmVk IGxvbmcgaW5kZXg7Cj4gIAl1bnNpZ25lZCBpbnQgaTsKPiAgCj4gLQlpZiAoam9iLT5pbl9mZW5j ZXMpIHsKPiAtCQlmb3IgKGkgPSAwOyBpIDwgam9iLT5pbl9mZW5jZV9jb3VudDsgaSsrKQo+IC0J CQlkbWFfZmVuY2VfcHV0KGpvYi0+aW5fZmVuY2VzW2ldKTsKPiAtCQlrdmZyZWUoam9iLT5pbl9m ZW5jZXMpOwo+IC0JfQo+IC0JaWYgKGpvYi0+aW1wbGljaXRfZmVuY2VzKSB7Cj4gLQkJZm9yIChp ID0gMDsgaSA8IGpvYi0+Ym9fY291bnQ7IGkrKykKPiAtCQkJZG1hX2ZlbmNlX3B1dChqb2ItPmlt cGxpY2l0X2ZlbmNlc1tpXSk7Cj4gLQkJa3ZmcmVlKGpvYi0+aW1wbGljaXRfZmVuY2VzKTsKPiAr CXhhX2Zvcl9lYWNoKCZqb2ItPmRlcHMsIGluZGV4LCBmZW5jZSkgewo+ICsJCWRtYV9mZW5jZV9w dXQoZmVuY2UpOwo+ICAJfQo+ICsJeGFfZGVzdHJveSgmam9iLT5kZXBzKTsKPiArCj4gIAlkbWFf ZmVuY2VfcHV0KGpvYi0+ZG9uZV9mZW5jZSk7Cj4gIAlkbWFfZmVuY2VfcHV0KGpvYi0+cmVuZGVy X2RvbmVfZmVuY2UpOwo+ICAKPiBAQCAtMzA4LDI2ICszMTQsOSBAQCBzdGF0aWMgc3RydWN0IGRt YV9mZW5jZSAqcGFuZnJvc3Rfam9iX2RlcGVuZGVuY3koc3RydWN0IGRybV9zY2hlZF9qb2IgKnNj aGVkX2pvYgo+ICAJCQkJCQkgc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKnNfZW50aXR5KQo+ICB7 Cj4gIAlzdHJ1Y3QgcGFuZnJvc3Rfam9iICpqb2IgPSB0b19wYW5mcm9zdF9qb2Ioc2NoZWRfam9i KTsKPiAtCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlOwo+IC0JdW5zaWduZWQgaW50IGk7Cj4gIAo+ IC0JLyogRXhwbGljaXQgZmVuY2VzICovCj4gLQlmb3IgKGkgPSAwOyBpIDwgam9iLT5pbl9mZW5j ZV9jb3VudDsgaSsrKSB7Cj4gLQkJaWYgKGpvYi0+aW5fZmVuY2VzW2ldKSB7Cj4gLQkJCWZlbmNl ID0gam9iLT5pbl9mZW5jZXNbaV07Cj4gLQkJCWpvYi0+aW5fZmVuY2VzW2ldID0gTlVMTDsKPiAt CQkJcmV0dXJuIGZlbmNlOwo+IC0JCX0KPiAtCX0KPiAtCj4gLQkvKiBJbXBsaWNpdCBmZW5jZXMs IG1heC4gb25lIHBlciBCTyAqLwo+IC0JZm9yIChpID0gMDsgaSA8IGpvYi0+Ym9fY291bnQ7IGkr Kykgewo+IC0JCWlmIChqb2ItPmltcGxpY2l0X2ZlbmNlc1tpXSkgewo+IC0JCQlmZW5jZSA9IGpv Yi0+aW1wbGljaXRfZmVuY2VzW2ldOwo+IC0JCQlqb2ItPmltcGxpY2l0X2ZlbmNlc1tpXSA9IE5V TEw7Cj4gLQkJCXJldHVybiBmZW5jZTsKPiAtCQl9Cj4gLQl9Cj4gKwlpZiAoIXhhX2VtcHR5KCZq b2ItPmRlcHMpKQo+ICsJCXJldHVybiB4YV9lcmFzZSgmam9iLT5kZXBzLCBqb2ItPmxhc3RfZGVw KyspOwoKUmF0aGVyIHRoYW4gdHJhY2tpbmcgbGFzdF9kZXAgc2VwYXJhdGVseSB0aGlzIGNvdWxk IGJlIHdyaXR0ZW4gdXNpbmcKeGFfZmluZCgpOgoKICAgIGlmICh4YV9maW5kKCZqb2ItPmRlcHMs ICZpLCBVTE9OR19NQVgsIFhBX1BSRVNFTlQpKQoJcmV0dXJuIHhhX2VyYXNlKCZqb2ItPmRlcHMs ICZpKTsKClN0ZXZlCgo+ICAKPiAgCXJldHVybiBOVUxMOwo+ICB9Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuaCBiL2RyaXZlcnMvZ3B1L2RybS9w YW5mcm9zdC9wYW5mcm9zdF9qb2IuaAo+IGluZGV4IGJiZDNiYTk3ZmY2Ny4uODIzMDZhMDNiNTdl IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuaAo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuaAo+IEBAIC0xOSw5 ICsxOSw5IEBAIHN0cnVjdCBwYW5mcm9zdF9qb2Igewo+ICAJc3RydWN0IHBhbmZyb3N0X2Rldmlj ZSAqcGZkZXY7Cj4gIAlzdHJ1Y3QgcGFuZnJvc3RfZmlsZV9wcml2ICpmaWxlX3ByaXY7Cj4gIAo+ IC0JLyogT3B0aW9uYWwgZmVuY2VzIHVzZXJzcGFjZSBjYW4gcGFzcyBpbiBmb3IgdGhlIGpvYiB0 byBkZXBlbmQgb24uICovCj4gLQlzdHJ1Y3QgZG1hX2ZlbmNlICoqaW5fZmVuY2VzOwo+IC0JdTMy IGluX2ZlbmNlX2NvdW50Owo+ICsJLyogQ29udGFpbnMgYm90aCBleHBsaWNpdCBhbmQgaW1wbGlj aXQgZmVuY2VzICovCj4gKwlzdHJ1Y3QgeGFycmF5IGRlcHM7Cj4gKwl1bnNpZ25lZCBsb25nIGxh c3RfZGVwOwo+ICAKPiAgCS8qIEZlbmNlIHRvIGJlIHNpZ25hbGVkIGJ5IElSUSBoYW5kbGVyIHdo ZW4gdGhlIGpvYiBpcyBjb21wbGV0ZS4gKi8KPiAgCXN0cnVjdCBkbWFfZmVuY2UgKmRvbmVfZmVu Y2U7Cj4gQEAgLTMwLDggKzMwLDYgQEAgc3RydWN0IHBhbmZyb3N0X2pvYiB7Cj4gIAlfX3UzMiBy ZXF1aXJlbWVudHM7Cj4gIAlfX3UzMiBmbHVzaF9pZDsKPiAgCj4gLQkvKiBFeGNsdXNpdmUgZmVu Y2VzIHdlIGhhdmUgdGFrZW4gZnJvbSB0aGUgQk9zIHRvIHdhaXQgZm9yICovCj4gLQlzdHJ1Y3Qg ZG1hX2ZlbmNlICoqaW1wbGljaXRfZmVuY2VzOwo+ICAJc3RydWN0IHBhbmZyb3N0X2dlbV9tYXBw aW5nICoqbWFwcGluZ3M7Cj4gIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKipib3M7Cj4gIAl1MzIg Ym9fY291bnQ7Cj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK