tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amdkfd: Fix race in gfx10 context restore handler

Missing synchronization with VGPR restore leads to intermittent
VGPR trashing in the user shader.

Signed-off-by: Jay Cornwall <jay.cornwall@amd.com>
Reviewed-by: Yong Zhao <Yong.Zhao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Jay Cornwall and committed by
Alex Deucher c18cc2bb b2100ce1

+71 -69
+70 -69
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
··· 905 905 0x7a5d0000, 0x807c817c, 906 906 0x807aff7a, 0x00000080, 907 907 0xbf0a717c, 0xbf85fff8, 908 - 0xbf820141, 0xbef4037e, 908 + 0xbf820142, 0xbef4037e, 909 909 0x8775ff7f, 0x0000ffff, 910 910 0x8875ff75, 0x00040000, 911 911 0xbef60380, 0xbef703ff, ··· 967 967 0x725d0000, 0xe0304080, 968 968 0x725d0100, 0xe0304100, 969 969 0x725d0200, 0xe0304180, 970 - 0x725d0300, 0xbf820031, 970 + 0x725d0300, 0xbf820032, 971 971 0xbef603ff, 0x01000000, 972 972 0xbef20378, 0x8078ff78, 973 973 0x00000400, 0xbefc0384, ··· 992 992 0x725d0000, 0xe0304100, 993 993 0x725d0100, 0xe0304200, 994 994 0x725d0200, 0xe0304300, 995 - 0x725d0300, 0xb9782a05, 996 - 0x80788178, 0x907c9973, 997 - 0x877c817c, 0xbf06817c, 998 - 0xbf850002, 0x8f788978, 999 - 0xbf820001, 0x8f788a78, 1000 - 0xb9721e06, 0x8f728a72, 1001 - 0x80787278, 0x8078ff78, 1002 - 0x00000200, 0x80f8ff78, 1003 - 0x00000050, 0xbef603ff, 1004 - 0x01000000, 0xbefc03ff, 1005 - 0x0000006c, 0x80f89078, 1006 - 0xf429003a, 0xf0000000, 1007 - 0xbf8cc07f, 0x80fc847c, 1008 - 0xbf800000, 0xbe803100, 1009 - 0xbe823102, 0x80f8a078, 1010 - 0xf42d003a, 0xf0000000, 1011 - 0xbf8cc07f, 0x80fc887c, 1012 - 0xbf800000, 0xbe803100, 1013 - 0xbe823102, 0xbe843104, 1014 - 0xbe863106, 0x80f8c078, 1015 - 0xf431003a, 0xf0000000, 1016 - 0xbf8cc07f, 0x80fc907c, 1017 - 0xbf800000, 0xbe803100, 1018 - 0xbe823102, 0xbe843104, 1019 - 0xbe863106, 0xbe883108, 1020 - 0xbe8a310a, 0xbe8c310c, 1021 - 0xbe8e310e, 0xbf06807c, 1022 - 0xbf84fff0, 0xb9782a05, 1023 - 0x80788178, 0x907c9973, 1024 - 0x877c817c, 0xbf06817c, 1025 - 0xbf850002, 0x8f788978, 1026 - 0xbf820001, 0x8f788a78, 1027 - 0xb9721e06, 0x8f728a72, 1028 - 0x80787278, 0x8078ff78, 1029 - 0x00000200, 0xbef603ff, 1030 - 0x01000000, 0xf4211bfa, 995 + 0x725d0300, 0xbf8c3f70, 996 + 0xb9782a05, 0x80788178, 997 + 0x907c9973, 0x877c817c, 998 + 0xbf06817c, 0xbf850002, 999 + 0x8f788978, 0xbf820001, 1000 + 0x8f788a78, 0xb9721e06, 1001 + 0x8f728a72, 0x80787278, 1002 + 0x8078ff78, 0x00000200, 1003 + 0x80f8ff78, 0x00000050, 1004 + 0xbef603ff, 0x01000000, 1005 + 0xbefc03ff, 0x0000006c, 1006 + 0x80f89078, 0xf429003a, 1007 + 0xf0000000, 0xbf8cc07f, 1008 + 0x80fc847c, 0xbf800000, 1009 + 0xbe803100, 0xbe823102, 1010 + 0x80f8a078, 0xf42d003a, 1011 + 0xf0000000, 0xbf8cc07f, 1012 + 0x80fc887c, 0xbf800000, 1013 + 0xbe803100, 0xbe823102, 1014 + 0xbe843104, 0xbe863106, 1015 + 0x80f8c078, 0xf431003a, 1016 + 0xf0000000, 0xbf8cc07f, 1017 + 0x80fc907c, 0xbf800000, 1018 + 0xbe803100, 0xbe823102, 1019 + 0xbe843104, 0xbe863106, 1020 + 0xbe883108, 0xbe8a310a, 1021 + 0xbe8c310c, 0xbe8e310e, 1022 + 0xbf06807c, 0xbf84fff0, 1023 + 0xb9782a05, 0x80788178, 1024 + 0x907c9973, 0x877c817c, 1025 + 0xbf06817c, 0xbf850002, 1026 + 0x8f788978, 0xbf820001, 1027 + 0x8f788a78, 0xb9721e06, 1028 + 0x8f728a72, 0x80787278, 1029 + 0x8078ff78, 0x00000200, 1030 + 0xbef603ff, 0x01000000, 1031 + 0xf4211bfa, 0xf0000000, 1032 + 0x80788478, 0xf4211b3a, 1031 1033 0xf0000000, 0x80788478, 1032 - 0xf4211b3a, 0xf0000000, 1033 - 0x80788478, 0xf4211b7a, 1034 + 0xf4211b7a, 0xf0000000, 1035 + 0x80788478, 0xf4211eba, 1034 1036 0xf0000000, 0x80788478, 1035 - 0xf4211eba, 0xf0000000, 1036 - 0x80788478, 0xf4211efa, 1037 + 0xf4211efa, 0xf0000000, 1038 + 0x80788478, 0xf4211c3a, 1037 1039 0xf0000000, 0x80788478, 1038 - 0xf4211c3a, 0xf0000000, 1039 - 0x80788478, 0xf4211c7a, 1040 + 0xf4211c7a, 0xf0000000, 1041 + 0x80788478, 0xf4211e7a, 1040 1042 0xf0000000, 0x80788478, 1041 - 0xf4211e7a, 0xf0000000, 1042 - 0x80788478, 0xf4211cfa, 1043 + 0xf4211cfa, 0xf0000000, 1044 + 0x80788478, 0xf4211bba, 1043 1045 0xf0000000, 0x80788478, 1046 + 0xbf8cc07f, 0xb9eef814, 1044 1047 0xf4211bba, 0xf0000000, 1045 1048 0x80788478, 0xbf8cc07f, 1046 - 0xb9eef814, 0xf4211bba, 1047 - 0xf0000000, 0x80788478, 1048 - 0xbf8cc07f, 0xb9eef815, 1049 - 0xbef2036d, 0x876dff72, 1050 - 0x0000ffff, 0xbefc036f, 1051 - 0xbefe037a, 0xbeff037b, 1052 - 0x876f71ff, 0x000003ff, 1053 - 0xb9ef4803, 0xb9f9f816, 1054 - 0x876f71ff, 0xfffff800, 1055 - 0x906f8b6f, 0xb9efa2c3, 1056 - 0xb9f3f801, 0x876fff72, 1057 - 0xfc000000, 0x906f9a6f, 1058 - 0x8f6f906f, 0xbef30380, 1049 + 0xb9eef815, 0xbef2036d, 1050 + 0x876dff72, 0x0000ffff, 1051 + 0xbefc036f, 0xbefe037a, 1052 + 0xbeff037b, 0x876f71ff, 1053 + 0x000003ff, 0xb9ef4803, 1054 + 0xb9f9f816, 0x876f71ff, 1055 + 0xfffff800, 0x906f8b6f, 1056 + 0xb9efa2c3, 0xb9f3f801, 1057 + 0x876fff72, 0xfc000000, 1058 + 0x906f9a6f, 0x8f6f906f, 1059 + 0xbef30380, 0x88736f73, 1060 + 0x876fff72, 0x02000000, 1061 + 0x906f996f, 0x8f6f8f6f, 1059 1062 0x88736f73, 0x876fff72, 1060 - 0x02000000, 0x906f996f, 1061 - 0x8f6f8f6f, 0x88736f73, 1062 - 0x876fff72, 0x01000000, 1063 - 0x906f986f, 0x8f6f996f, 1064 - 0x88736f73, 0x876fff70, 1065 - 0x00800000, 0x906f976f, 1066 - 0xb9f3f807, 0x87fe7e7e, 1067 - 0x87ea6a6a, 0xb9f0f802, 1068 - 0xbf8a0000, 0xbe80226c, 1069 - 0xbf810000, 0xbf9f0000, 1063 + 0x01000000, 0x906f986f, 1064 + 0x8f6f996f, 0x88736f73, 1065 + 0x876fff70, 0x00800000, 1066 + 0x906f976f, 0xb9f3f807, 1067 + 0x87fe7e7e, 0x87ea6a6a, 1068 + 0xb9f0f802, 0xbf8a0000, 1069 + 0xbe80226c, 0xbf810000, 1070 1070 0xbf9f0000, 0xbf9f0000, 1071 1071 0xbf9f0000, 0xbf9f0000, 1072 + 0xbf9f0000, 0x00000000, 1072 1073 }; 1073 1074 static const uint32_t cwsr_trap_arcturus_hex[] = { 1074 1075 0xbf820001, 0xbf8202c4,
+1
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
··· 758 758 buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256 759 759 buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*2 760 760 buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*3 761 + s_waitcnt vmcnt(0) 761 762 762 763 /* restore SGPRs */ 763 764 //will be 2+8+16*6