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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CAA9C433FE for ; Wed, 13 Apr 2022 10:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234754AbiDMKHX (ORCPT ); Wed, 13 Apr 2022 06:07:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbiDMKHU (ORCPT ); Wed, 13 Apr 2022 06:07:20 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 30BD513F37 for ; Wed, 13 Apr 2022 03:05:00 -0700 (PDT) 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 EE69613D5; Wed, 13 Apr 2022 03:04:59 -0700 (PDT) Received: from [10.57.41.233] (unknown [10.57.41.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6FAA53F73B; Wed, 13 Apr 2022 03:04:58 -0700 (PDT) Message-ID: Date: Wed, 13 Apr 2022 11:04:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v1] drm/scheduler: Don't kill jobs in interrupt context Content-Language: en-GB To: Dmitry Osipenko , David Airlie , Daniel Vetter , Tomeu Vizoso , Rob Herring , Alyssa Rosenzweig , Rob Clark , Andrey Grodzovsky Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Osipenko References: <20220411221536.283312-1-dmitry.osipenko@collabora.com> From: Steven Price In-Reply-To: <20220411221536.283312-1-dmitry.osipenko@collabora.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/04/2022 23:15, Dmitry Osipenko wrote: > Interrupt context can't sleep. Drivers like Panfrost and MSM are taking > mutex when job is released, and thus, that code can sleep. This results > into "BUG: scheduling while atomic" if locks are contented while job is > freed. There is no good reason for releasing scheduler's jobs in IRQ > context, hence use normal context to fix the trouble. > > Cc: stable@vger.kernel.org > Fixes: 542cff7893a3 ("drm/sched: Avoid lockdep spalt on killing a processes") > Signed-off-by: Dmitry Osipenko Reviewed-by: Steven Price > --- > drivers/gpu/drm/scheduler/sched_entity.c | 6 +++--- > include/drm/gpu_scheduler.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c > index 191c56064f19..6b25b2f4f5a3 100644 > --- a/drivers/gpu/drm/scheduler/sched_entity.c > +++ b/drivers/gpu/drm/scheduler/sched_entity.c > @@ -190,7 +190,7 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout) > } > EXPORT_SYMBOL(drm_sched_entity_flush); > > -static void drm_sched_entity_kill_jobs_irq_work(struct irq_work *wrk) > +static void drm_sched_entity_kill_jobs_work(struct work_struct *wrk) > { > struct drm_sched_job *job = container_of(wrk, typeof(*job), work); > > @@ -207,8 +207,8 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f, > struct drm_sched_job *job = container_of(cb, struct drm_sched_job, > finish_cb); > > - init_irq_work(&job->work, drm_sched_entity_kill_jobs_irq_work); > - irq_work_queue(&job->work); > + INIT_WORK(&job->work, drm_sched_entity_kill_jobs_work); > + schedule_work(&job->work); > } > > static struct dma_fence * > diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h > index 0fca8f38bee4..addb135eeea6 100644 > --- a/include/drm/gpu_scheduler.h > +++ b/include/drm/gpu_scheduler.h > @@ -28,7 +28,7 @@ > #include > #include > #include > -#include > +#include > > #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000) > > @@ -295,7 +295,7 @@ struct drm_sched_job { > */ > union { > struct dma_fence_cb finish_cb; > - struct irq_work work; > + struct work_struct work; > }; > > uint64_t id;