Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220704134532.103876-1-andrealmeid@igalia.com> <db6ab6f5-e3b1-f068-37ac-807e1ff074a8@amd.com>
In-Reply-To: <db6ab6f5-e3b1-f068-37ac-807e1ff074a8@amd.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Tue, 5 Jul 2022 11:10:07 -0400
Message-ID: <CADnq5_O3i2ciutAFS-uzX8bedOXxeOJUNWGRfsuOqpmL-tW64w@mail.gmail.com>
Subject: Re: [PATCH] drm/amdpgu/debugfs: Simplify some exit paths
To:     =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
Cc:     =?UTF-8?Q?Andr=C3=A9_Almeida?= <andrealmeid@igalia.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        Pan Xinhui <Xinhui.Pan@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Hawking Zhang <Hawking.Zhang@amd.com>,
        Tao Zhou <tao.zhou1@amd.com>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        Jack Xiao <Jack.Xiao@amd.com>,
        amd-gfx list <amd-gfx@lists.freedesktop.org>,
        Maling list - DRI developers 
        <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>, kernel-dev@igalia.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!

On Mon, Jul 4, 2022 at 12:23 PM Christian K=C3=B6nig
<christian.koenig@amd.com> wrote:
>
> Am 04.07.22 um 15:45 schrieb Andr=C3=A9 Almeida:
> > To avoid code repetition, unify the function exit path when possible. N=
o
> > functional changes.
> >
> > Signed-off-by: Andr=C3=A9 Almeida <andrealmeid@igalia.com>
>
> Acked-by: Christian K=C3=B6nig <christian.koenig@amd.com>
>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 107 ++++++++-----------=
-
> >   1 file changed, 42 insertions(+), 65 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/=
drm/amd/amdgpu/amdgpu_debugfs.c
> > index f3ac7912c29c..f3b3c688e4e7 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
> > @@ -383,12 +383,8 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struc=
t file *f, char __user *buf,
> >
> >               value =3D RREG32_PCIE(*pos);
> >               r =3D put_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     amdgpu_virt_disable_access_debugfs(adev);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               result +=3D 4;
> >               buf +=3D 4;
> > @@ -396,11 +392,12 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(stru=
ct file *f, char __user *buf,
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> > -
> >       amdgpu_virt_disable_access_debugfs(adev);
> > -     return result;
> > +     return r;
> >   }
> >
> >   /**
> > @@ -441,12 +438,8 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(stru=
ct file *f, const char __user
> >               uint32_t value;
> >
> >               r =3D get_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     amdgpu_virt_disable_access_debugfs(adev);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               WREG32_PCIE(*pos, value);
> >
> > @@ -456,11 +449,12 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(str=
uct file *f, const char __user
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> > -
> >       amdgpu_virt_disable_access_debugfs(adev);
> > -     return result;
> > +     return r;
> >   }
> >
> >   /**
> > @@ -502,12 +496,8 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struc=
t file *f, char __user *buf,
> >
> >               value =3D RREG32_DIDT(*pos >> 2);
> >               r =3D put_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     amdgpu_virt_disable_access_debugfs(adev);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               result +=3D 4;
> >               buf +=3D 4;
> > @@ -515,11 +505,12 @@ static ssize_t amdgpu_debugfs_regs_didt_read(stru=
ct file *f, char __user *buf,
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> > -
> >       amdgpu_virt_disable_access_debugfs(adev);
> > -     return result;
> > +     return r;
> >   }
> >
> >   /**
> > @@ -560,12 +551,8 @@ static ssize_t amdgpu_debugfs_regs_didt_write(stru=
ct file *f, const char __user
> >               uint32_t value;
> >
> >               r =3D get_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     amdgpu_virt_disable_access_debugfs(adev);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               WREG32_DIDT(*pos >> 2, value);
> >
> > @@ -575,11 +562,12 @@ static ssize_t amdgpu_debugfs_regs_didt_write(str=
uct file *f, const char __user
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> > -
> >       amdgpu_virt_disable_access_debugfs(adev);
> > -     return result;
> > +     return r;
> >   }
> >
> >   /**
> > @@ -621,12 +609,8 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct=
 file *f, char __user *buf,
> >
> >               value =3D RREG32_SMC(*pos);
> >               r =3D put_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     amdgpu_virt_disable_access_debugfs(adev);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               result +=3D 4;
> >               buf +=3D 4;
> > @@ -634,11 +618,12 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struc=
t file *f, char __user *buf,
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> > -
> >       amdgpu_virt_disable_access_debugfs(adev);
> > -     return result;
> > +     return r;
> >   }
> >
> >   /**
> > @@ -679,12 +664,8 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struc=
t file *f, const char __user *
> >               uint32_t value;
> >
> >               r =3D get_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     amdgpu_virt_disable_access_debugfs(adev);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               WREG32_SMC(*pos, value);
> >
> > @@ -694,11 +675,12 @@ static ssize_t amdgpu_debugfs_regs_smc_write(stru=
ct file *f, const char __user *
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> > -
> >       amdgpu_virt_disable_access_debugfs(adev);
> > -     return result;
> > +     return r;
> >   }
> >
> >   /**
> > @@ -1090,11 +1072,8 @@ static ssize_t amdgpu_debugfs_gfxoff_write(struc=
t file *f, const char __user *bu
> >               uint32_t value;
> >
> >               r =3D get_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               amdgpu_gfx_off_ctrl(adev, value ? true : false);
> >
> > @@ -1104,10 +1083,12 @@ static ssize_t amdgpu_debugfs_gfxoff_write(stru=
ct file *f, const char __user *bu
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> >
> > -     return result;
> > +     return r;
> >   }
> >
> >
> > @@ -1139,18 +1120,12 @@ static ssize_t amdgpu_debugfs_gfxoff_read(struc=
t file *f, char __user *buf,
> >               uint32_t value;
> >
> >               r =3D amdgpu_get_gfx_off_status(adev, &value);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               r =3D put_user(value, (uint32_t *)buf);
> > -             if (r) {
> > -                     pm_runtime_mark_last_busy(adev_to_drm(adev)->dev)=
;
> > -                     pm_runtime_put_autosuspend(adev_to_drm(adev)->dev=
);
> > -                     return r;
> > -             }
> > +             if (r)
> > +                     goto out;
> >
> >               result +=3D 4;
> >               buf +=3D 4;
> > @@ -1158,10 +1133,12 @@ static ssize_t amdgpu_debugfs_gfxoff_read(struc=
t file *f, char __user *buf,
> >               size -=3D 4;
> >       }
> >
> > +     r =3D result;
> > +out:
> >       pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
> >       pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
> >
> > -     return result;
> > +     return r;
> >   }
> >
> >   static const struct file_operations amdgpu_debugfs_regs2_fops =3D {
>