linux-kernel - Re: [PATCH] drm/v3d: centralize error handling when init scheduler fails

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 1 Mar 2022 22:41:47 -0100
From:   Melissa Wen <melissa.srw@...il.com>
To:     Andrey Grodzovsky <andrey.grodzovsky@....com>
Cc:     Melissa Wen <mwen@...lia.com>, Emma Anholt <emma@...olt.net>,
        David Airlie <airlied@...ux.ie>,
        Daniel Vetter <daniel@...ll.ch>, Jiawei.Gu@....com,
        Christian Konig <christian.koenig@....com>,
        DRI Development <dri-devel@...ts.freedesktop.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] drm/v3d: centralize error handling when init scheduler fails

On Mon, Feb 28, 2022 at 8:21 PM Andrey Grodzovsky
<andrey.grodzovsky@....com> wrote:
>
> Acked-by: Andrey Grodzovsky <andrey.grodzovsky@....com>
>
> Andrey
Thanks. Applied to drm-misc-next.

Melissa
>
> On 2022-02-28 13:16, Melissa Wen wrote:
> > Remove redundant error message (since now it is very similar to what
> > we do in drm_sched_init) and centralize all error handling in a
> > unique place, as we follow the same steps in any case of failure.
> >
> > Signed-off-by: Melissa Wen <mwen@...lia.com>
> > ---
> >   drivers/gpu/drm/v3d/v3d_sched.c | 40 +++++++++++----------------------
> >   1 file changed, 13 insertions(+), 27 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
> > index 39459ae96f30..06238e6d7f5c 100644
> > --- a/drivers/gpu/drm/v3d/v3d_sched.c
> > +++ b/drivers/gpu/drm/v3d/v3d_sched.c
> > @@ -392,34 +392,24 @@ v3d_sched_init(struct v3d_dev *v3d)
> >                            hw_jobs_limit, job_hang_limit,
> >                            msecs_to_jiffies(hang_limit_ms), NULL,
> >                            NULL, "v3d_bin", v3d->drm.dev);
> > -     if (ret) {
> > -             dev_err(v3d->drm.dev, "Failed to create bin scheduler: %d.", ret);
> > +     if (ret)
> >               return ret;
> > -     }
> >
> >       ret = drm_sched_init(&v3d->queue[V3D_RENDER].sched,
> >                            &v3d_render_sched_ops,
> >                            hw_jobs_limit, job_hang_limit,
> >                            msecs_to_jiffies(hang_limit_ms), NULL,
> >                            NULL, "v3d_render", v3d->drm.dev);
> > -     if (ret) {
> > -             dev_err(v3d->drm.dev, "Failed to create render scheduler: %d.",
> > -                     ret);
> > -             v3d_sched_fini(v3d);
> > -             return ret;
> > -     }
> > +     if (ret)
> > +             goto fail;
> >
> >       ret = drm_sched_init(&v3d->queue[V3D_TFU].sched,
> >                            &v3d_tfu_sched_ops,
> >                            hw_jobs_limit, job_hang_limit,
> >                            msecs_to_jiffies(hang_limit_ms), NULL,
> >                            NULL, "v3d_tfu", v3d->drm.dev);
> > -     if (ret) {
> > -             dev_err(v3d->drm.dev, "Failed to create TFU scheduler: %d.",
> > -                     ret);
> > -             v3d_sched_fini(v3d);
> > -             return ret;
> > -     }
> > +     if (ret)
> > +             goto fail;
> >
> >       if (v3d_has_csd(v3d)) {
> >               ret = drm_sched_init(&v3d->queue[V3D_CSD].sched,
> > @@ -427,27 +417,23 @@ v3d_sched_init(struct v3d_dev *v3d)
> >                                    hw_jobs_limit, job_hang_limit,
> >                                    msecs_to_jiffies(hang_limit_ms), NULL,
> >                                    NULL, "v3d_csd", v3d->drm.dev);
> > -             if (ret) {
> > -                     dev_err(v3d->drm.dev, "Failed to create CSD scheduler: %d.",
> > -                             ret);
> > -                     v3d_sched_fini(v3d);
> > -                     return ret;
> > -             }
> > +             if (ret)
> > +                     goto fail;
> >
> >               ret = drm_sched_init(&v3d->queue[V3D_CACHE_CLEAN].sched,
> >                                    &v3d_cache_clean_sched_ops,
> >                                    hw_jobs_limit, job_hang_limit,
> >                                    msecs_to_jiffies(hang_limit_ms), NULL,
> >                                    NULL, "v3d_cache_clean", v3d->drm.dev);
> > -             if (ret) {
> > -                     dev_err(v3d->drm.dev, "Failed to create CACHE_CLEAN scheduler: %d.",
> > -                             ret);
> > -                     v3d_sched_fini(v3d);
> > -                     return ret;
> > -             }
> > +             if (ret)
> > +                     goto fail;
> >       }
> >
> >       return 0;
> > +
> > +fail:
> > +     v3d_sched_fini(v3d);
> > +     return ret;
> >   }
> >
> >   void