Re: [PATCH 5.10 1/1] drm/amdgpu: Ensure the AMDGPU file descriptor is legitimate
On Mon, May 09, 2022 at 03:49:03PM +0100, Lee Jones wrote: > On Thu, 14 Apr 2022, Greg KH wrote: > > > On Tue, Apr 12, 2022 at 04:20:57PM +0100, Lee Jones wrote: > > > [ Upstream commit b40a6ab2cf9213923bf8e821ce7fa7f6a0a26990 ] > > > > > > This is a partial cherry-pick of the above upstream commit. > > > > > > It ensures the file descriptor passed in by userspace is a valid one. > > > > > > Cc: Felix Kuehling > > > Cc: Alex Deucher > > > Cc: "Christian König" > > > Cc: David Airlie > > > Cc: Daniel Vetter > > > Cc: amd-gfx@lists.freedesktop.org > > > Cc: dri-de...@lists.freedesktop.org > > > Signed-off-by: Lee Jones > > > --- > > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +++--- > > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > Now queued up, thanks. > > Could you also back-port this into v5.4 please? > > FYI, in the v5.10.y tree, it's now called: > > f0c31f192f38c drm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu > Now queued up, thanks. greg k-h
Re: [PATCH 5.10 1/1] drm/amdgpu: Ensure the AMDGPU file descriptor is legitimate
On Thu, 14 Apr 2022, Greg KH wrote: > On Tue, Apr 12, 2022 at 04:20:57PM +0100, Lee Jones wrote: > > [ Upstream commit b40a6ab2cf9213923bf8e821ce7fa7f6a0a26990 ] > > > > This is a partial cherry-pick of the above upstream commit. > > > > It ensures the file descriptor passed in by userspace is a valid one. > > > > Cc: Felix Kuehling > > Cc: Alex Deucher > > Cc: "Christian König" > > Cc: David Airlie > > Cc: Daniel Vetter > > Cc: amd-gfx@lists.freedesktop.org > > Cc: dri-de...@lists.freedesktop.org > > Signed-off-by: Lee Jones > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > Now queued up, thanks. Could you also back-port this into v5.4 please? FYI, in the v5.10.y tree, it's now called: f0c31f192f38c drm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu -- Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 5.10 1/1] drm/amdgpu: Ensure the AMDGPU file descriptor is legitimate
On Tue, Apr 12, 2022 at 04:20:57PM +0100, Lee Jones wrote: > [ Upstream commit b40a6ab2cf9213923bf8e821ce7fa7f6a0a26990 ] > > This is a partial cherry-pick of the above upstream commit. > > It ensures the file descriptor passed in by userspace is a valid one. > > Cc: Felix Kuehling > Cc: Alex Deucher > Cc: "Christian König" > Cc: David Airlie > Cc: Daniel Vetter > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-de...@lists.freedesktop.org > Signed-off-by: Lee Jones > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Now queued up, thanks. greg k-h
[PATCH 5.10 1/1] drm/amdgpu: Ensure the AMDGPU file descriptor is legitimate
[ Upstream commit b40a6ab2cf9213923bf8e821ce7fa7f6a0a26990 ] This is a partial cherry-pick of the above upstream commit. It ensures the file descriptor passed in by userspace is a valid one. Cc: Felix Kuehling Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-de...@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 26f8a21383774..1b4c7ced8b92c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1024,11 +1024,15 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd, struct dma_fence **ef) { struct amdgpu_device *adev = get_amdgpu_device(kgd); - struct drm_file *drm_priv = filp->private_data; - struct amdgpu_fpriv *drv_priv = drm_priv->driver_priv; - struct amdgpu_vm *avm = _priv->vm; + struct amdgpu_fpriv *drv_priv; + struct amdgpu_vm *avm; int ret; + ret = amdgpu_file_to_fpriv(filp, _priv); + if (ret) + return ret; + avm = _priv->vm; + /* Already a compute VM? */ if (avm->process_info) return -EINVAL; -- 2.35.1.1178.g4f1659d476-goog