Commit 37771a13 authored by Ahmad Rehman's avatar Ahmad Rehman Committed by Liu Chuang
Browse files

drm/amdgpu: Init zone device and drm client after mode-1 reset on reload 

mainline inclusion
from mainline-v6.9-rc1
commit f679fd6057fbf5ab34aaee28d58b7f81af0cbf48
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9TM7F
CVE: CVE-2024-36022

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f679fd6057fbf5ab34aaee28d58b7f81af0cbf48



--------------------------------

In passthrough environment, when amdgpu is reloaded after unload, mode-1
is triggered after initializing the necessary IPs, That init does not
include KFD, and KFD init waits until the reset is completed. KFD init
is called in the reset handler, but in this case, the zone device and
drm client is not initialized, causing app to create kernel panic.

v2: Removing the init KFD condition from amdgpu_amdkfd_drm_client_create.
As the previous version has the potential of creating DRM client twice.

v3: v2 patch results in SDMA engine hung as DRM open causes VM clear to SDMA
before SDMA init. Adding the condition to in drm client creation, on top of v1,
to guard against drm client creation call multiple times.

Signed-off-by: default avatarAhmad Rehman <Ahmad.Rehman@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarLiu Chuang <liuchuang40@huawei.com>
parent e5cba164

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int amdgpu_amdkfd_drm_client_create(struct amdgpu_device *adev) 
{

	int ret;



	if (!adev->kfd.init_complete)

	if (!adev->kfd.init_complete || adev->kfd.client.dev)

		return 0;



	ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd",

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -2376,8 +2376,11 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work) 
	}

	for (i = 0; i < mgpu_info.num_dgpu; i++) {

		adev = mgpu_info.gpu_ins[i].adev;

		if (!adev->kfd.init_complete)

		if (!adev->kfd.init_complete) {

			kgd2kfd_init_zone_device(adev);

			amdgpu_amdkfd_device_init(adev);

			amdgpu_amdkfd_drm_client_create(adev);

		}

		amdgpu_ttm_set_buffer_funcs_status(adev, true);

	}

}