diff options
author | Andrey Grodzovsky <andrey.grodzovsky@amd.com> | 2018-08-22 10:07:35 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-08-27 12:09:40 -0400 |
commit | a3d9103ebfa03824d255060fc2c11ac94e3ef441 (patch) | |
tree | da7379cc25769190a26e793603b1aded8393ec9b /drivers/gpu/drm/amd/amdgpu | |
parent | 4f0ecd36f276941453f6ea7f76308a2f14540987 (diff) |
drm/amdgpu: Fix page fault and kasan warning on pci device remove.
Problem:
When executing echo 1 > /sys/class/drm/card0/device/remove kasan warning
as bellow and page fault happen because adev->gart.pages already freed by the
time amdgpu_gart_unbind is called.
BUG: KASAN: user-memory-access in amdgpu_gart_unbind+0x98/0x180 [amdgpu]
Write of size 8 at addr 0000000000003648 by task bash/1828
CPU: 2 PID: 1828 Comm: bash Tainted: G W O 4.18.0-rc1-dev+ #29
Hardware name: Gigabyte Technology Co., Ltd. AX370-Gaming/AX370-Gaming-CF, BIOS F3 06/19/2017
Call Trace:
dump_stack+0x71/0xab
kasan_report+0x109/0x390
amdgpu_gart_unbind+0x98/0x180 [amdgpu]
ttm_tt_unbind+0x43/0x60 [ttm]
ttm_bo_move_ttm+0x83/0x1c0 [ttm]
ttm_bo_handle_move_mem+0xb97/0xd00 [ttm]
ttm_bo_evict+0x273/0x530 [ttm]
ttm_mem_evict_first+0x29c/0x360 [ttm]
ttm_bo_force_list_clean+0xfc/0x210 [ttm]
ttm_bo_clean_mm+0xe7/0x160 [ttm]
amdgpu_ttm_fini+0xda/0x1d0 [amdgpu]
amdgpu_bo_fini+0xf/0x60 [amdgpu]
gmc_v8_0_sw_fini+0x36/0x70 [amdgpu]
amdgpu_device_fini+0x2d0/0x7d0 [amdgpu]
amdgpu_driver_unload_kms+0x6a/0xd0 [amdgpu]
drm_dev_unregister+0x79/0x180 [drm]
amdgpu_pci_remove+0x2a/0x60 [amdgpu]
pci_device_remove+0x5b/0x100
device_release_driver_internal+0x236/0x360
pci_stop_bus_device+0xbf/0xf0
pci_stop_and_remove_bus_device_locked+0x16/0x30
remove_store+0xda/0xf0
kernfs_fop_write+0x186/0x220
__vfs_write+0xcc/0x330
vfs_write+0xe6/0x250
ksys_write+0xb1/0x140
do_syscall_64+0x77/0x1e0
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x7f66ebbb32c0
Fix:
Split gmc_v{6,7,8,9}_0_gart_fini to postpone amdgpu_gart_fini to after
memory managers are shut down since gart unbind happens
as part of this procedure
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 16 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 16 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 16 |
4 files changed, 8 insertions, 49 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c index 75317f283c69..ad151fefa41f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | |||
@@ -632,12 +632,6 @@ static void gmc_v6_0_gart_disable(struct amdgpu_device *adev) | |||
632 | amdgpu_gart_table_vram_unpin(adev); | 632 | amdgpu_gart_table_vram_unpin(adev); |
633 | } | 633 | } |
634 | 634 | ||
635 | static void gmc_v6_0_gart_fini(struct amdgpu_device *adev) | ||
636 | { | ||
637 | amdgpu_gart_table_vram_free(adev); | ||
638 | amdgpu_gart_fini(adev); | ||
639 | } | ||
640 | |||
641 | static void gmc_v6_0_vm_decode_fault(struct amdgpu_device *adev, | 635 | static void gmc_v6_0_vm_decode_fault(struct amdgpu_device *adev, |
642 | u32 status, u32 addr, u32 mc_client) | 636 | u32 status, u32 addr, u32 mc_client) |
643 | { | 637 | { |
@@ -935,8 +929,9 @@ static int gmc_v6_0_sw_fini(void *handle) | |||
935 | 929 | ||
936 | amdgpu_gem_force_release(adev); | 930 | amdgpu_gem_force_release(adev); |
937 | amdgpu_vm_manager_fini(adev); | 931 | amdgpu_vm_manager_fini(adev); |
938 | gmc_v6_0_gart_fini(adev); | 932 | amdgpu_gart_table_vram_free(adev); |
939 | amdgpu_bo_fini(adev); | 933 | amdgpu_bo_fini(adev); |
934 | amdgpu_gart_fini(adev); | ||
940 | release_firmware(adev->gmc.fw); | 935 | release_firmware(adev->gmc.fw); |
941 | adev->gmc.fw = NULL; | 936 | adev->gmc.fw = NULL; |
942 | 937 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index 36dc367c4b45..f8d8a3a73e42 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | |||
@@ -747,19 +747,6 @@ static void gmc_v7_0_gart_disable(struct amdgpu_device *adev) | |||
747 | } | 747 | } |
748 | 748 | ||
749 | /** | 749 | /** |
750 | * gmc_v7_0_gart_fini - vm fini callback | ||
751 | * | ||
752 | * @adev: amdgpu_device pointer | ||
753 | * | ||
754 | * Tears down the driver GART/VM setup (CIK). | ||
755 | */ | ||
756 | static void gmc_v7_0_gart_fini(struct amdgpu_device *adev) | ||
757 | { | ||
758 | amdgpu_gart_table_vram_free(adev); | ||
759 | amdgpu_gart_fini(adev); | ||
760 | } | ||
761 | |||
762 | /** | ||
763 | * gmc_v7_0_vm_decode_fault - print human readable fault info | 750 | * gmc_v7_0_vm_decode_fault - print human readable fault info |
764 | * | 751 | * |
765 | * @adev: amdgpu_device pointer | 752 | * @adev: amdgpu_device pointer |
@@ -1095,8 +1082,9 @@ static int gmc_v7_0_sw_fini(void *handle) | |||
1095 | amdgpu_gem_force_release(adev); | 1082 | amdgpu_gem_force_release(adev); |
1096 | amdgpu_vm_manager_fini(adev); | 1083 | amdgpu_vm_manager_fini(adev); |
1097 | kfree(adev->gmc.vm_fault_info); | 1084 | kfree(adev->gmc.vm_fault_info); |
1098 | gmc_v7_0_gart_fini(adev); | 1085 | amdgpu_gart_table_vram_free(adev); |
1099 | amdgpu_bo_fini(adev); | 1086 | amdgpu_bo_fini(adev); |
1087 | amdgpu_gart_fini(adev); | ||
1100 | release_firmware(adev->gmc.fw); | 1088 | release_firmware(adev->gmc.fw); |
1101 | adev->gmc.fw = NULL; | 1089 | adev->gmc.fw = NULL; |
1102 | 1090 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 70fc97b59b4f..9333109b210d 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | |||
@@ -969,19 +969,6 @@ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev) | |||
969 | } | 969 | } |
970 | 970 | ||
971 | /** | 971 | /** |
972 | * gmc_v8_0_gart_fini - vm fini callback | ||
973 | * | ||
974 | * @adev: amdgpu_device pointer | ||
975 | * | ||
976 | * Tears down the driver GART/VM setup (CIK). | ||
977 | */ | ||
978 | static void gmc_v8_0_gart_fini(struct amdgpu_device *adev) | ||
979 | { | ||
980 | amdgpu_gart_table_vram_free(adev); | ||
981 | amdgpu_gart_fini(adev); | ||
982 | } | ||
983 | |||
984 | /** | ||
985 | * gmc_v8_0_vm_decode_fault - print human readable fault info | 972 | * gmc_v8_0_vm_decode_fault - print human readable fault info |
986 | * | 973 | * |
987 | * @adev: amdgpu_device pointer | 974 | * @adev: amdgpu_device pointer |
@@ -1199,8 +1186,9 @@ static int gmc_v8_0_sw_fini(void *handle) | |||
1199 | amdgpu_gem_force_release(adev); | 1186 | amdgpu_gem_force_release(adev); |
1200 | amdgpu_vm_manager_fini(adev); | 1187 | amdgpu_vm_manager_fini(adev); |
1201 | kfree(adev->gmc.vm_fault_info); | 1188 | kfree(adev->gmc.vm_fault_info); |
1202 | gmc_v8_0_gart_fini(adev); | 1189 | amdgpu_gart_table_vram_free(adev); |
1203 | amdgpu_bo_fini(adev); | 1190 | amdgpu_bo_fini(adev); |
1191 | amdgpu_gart_fini(adev); | ||
1204 | release_firmware(adev->gmc.fw); | 1192 | release_firmware(adev->gmc.fw); |
1205 | adev->gmc.fw = NULL; | 1193 | adev->gmc.fw = NULL; |
1206 | 1194 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 399a5db27649..72f8018fa2a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | |||
@@ -942,26 +942,12 @@ static int gmc_v9_0_sw_init(void *handle) | |||
942 | return 0; | 942 | return 0; |
943 | } | 943 | } |
944 | 944 | ||
945 | /** | ||
946 | * gmc_v9_0_gart_fini - vm fini callback | ||
947 | * | ||
948 | * @adev: amdgpu_device pointer | ||
949 | * | ||
950 | * Tears down the driver GART/VM setup (CIK). | ||
951 | */ | ||
952 | static void gmc_v9_0_gart_fini(struct amdgpu_device *adev) | ||
953 | { | ||
954 | amdgpu_gart_table_vram_free(adev); | ||
955 | amdgpu_gart_fini(adev); | ||
956 | } | ||
957 | |||
958 | static int gmc_v9_0_sw_fini(void *handle) | 945 | static int gmc_v9_0_sw_fini(void *handle) |
959 | { | 946 | { |
960 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | 947 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
961 | 948 | ||
962 | amdgpu_gem_force_release(adev); | 949 | amdgpu_gem_force_release(adev); |
963 | amdgpu_vm_manager_fini(adev); | 950 | amdgpu_vm_manager_fini(adev); |
964 | gmc_v9_0_gart_fini(adev); | ||
965 | 951 | ||
966 | /* | 952 | /* |
967 | * TODO: | 953 | * TODO: |
@@ -974,7 +960,9 @@ static int gmc_v9_0_sw_fini(void *handle) | |||
974 | */ | 960 | */ |
975 | amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL); | 961 | amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL); |
976 | 962 | ||
963 | amdgpu_gart_table_vram_free(adev); | ||
977 | amdgpu_bo_fini(adev); | 964 | amdgpu_bo_fini(adev); |
965 | amdgpu_gart_fini(adev); | ||
978 | 966 | ||
979 | return 0; | 967 | return 0; |
980 | } | 968 | } |