On Thu, Aug 18, 2022 at 3:20 PM Christian König <christian.koenig@xxxxxxx> wrote: > > Hi Bas, > > I've just pushed the branch drm-exec to my fdo repository: > https://gitlab.freedesktop.org/ckoenig/linux-drm.git > > This branch contains all the gang submit patches as well as the latest > drm-exec stuff. VCN3/4 video decoding has some issues on it, but that > probably shouldn't bother your work. Hi Christian, The drm-exec branch doesn't seem to be capable of running Forza Horizon 5. First bad commit seems to be commit 8bb3e919ce0109512f6631422f3fe52169836261 Author: Christian König <christian.koenig@xxxxxxx> Date: Thu Jul 14 10:23:38 2022 +0200 drm/amdgpu: revert "partial revert "remove ctx->lock" v2" This reverts commit 94f4c4965e5513ba624488f4b601d6b385635aec. We found that the bo_list is missing a protection for its list entries. Since that is fixed now this workaround can be removed again. Signed-off-by: Christian König <christian.koenig@xxxxxxx> and https://patchwork.freedesktop.org/patch/497679/ ("drm/amdgpu: Fix use-after-free on amdgpu_bo_list mutex") seems to fix things at that patch, but I'm not seeing the obvious rebase over "drm/amdgpu: cleanup and reorder amdgpu_cs.c" yet (and/or whether further issues were introduced). Error logs: [ 124.821691] ------------[ cut here ]------------ [ 124.821696] WARNING: CPU: 3 PID: 2485 at drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:667 amdgpu_ttm_tt_get_user_pages+0x15c/0x190 [amdgpu] [ 124.821955] Modules linked in: uinput snd_seq_dummy snd_hrtimer snd_seq snd_seq_device ccm algif_aead cbc des_generic libdes ecb md4 cmac algif_hash algif_skcipher af_alg bnep intel_rapl_msr intel_rapl_common snd_soc_acp5x_mach snd_acp5x_i2s snd_acp5x_pcm_dma edac_mce_amd kvm_amd kvm rtw88_8822ce rtw88_8822c rtw88_pci irqbypass rapl rtw88_core pcspkr joydev mac80211 btusb s nd_hda_codec_hdmi btrtl libarc4 snd_hda_intel btbcm btintel snd_intel_dspcfg btmtk snd_pci_acp5x i2c_piix4 snd_soc_nau8821 snd_intel_sdw_acpi snd_rn_pci_acp3x cfg80211 bluetooth snd_soc_core snd_hda_codec snd_acp_config snd_soc_acpi snd_pci_acp3x ecdh_generic snd_hda_core cdc_acm mousedev snd_compress ecc rfkill snd_hwdep ac97_bus snd_pcm_dmaengine ina2xx_adc snd_pcm kfifo_buf spi_amd snd_timer opt3001 ina2xx snd industrialio soundcore mac_hid acpi_cpufreq fuse ip_tables x_tables overlay ext4 crc16 mbcache jbd2 mmc_block vfat fat usbhid amdgpu drm_ttm_helper ttm agpgart drm_exec gpu_sched i2c_algo_bit [ 124.822016] drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw atkbd crct10dif_pclmul libps2 crc32_pclmul vivaldi_fmap sdhci_pci ghash_clmulni_intel i8042 ccp cqhci sdhci aesni_intel hid_multitouch xhci_pci crypto_simd cryptd wdat_wdt mmc_core cec sp5100_tco rng_core xhci_pci_renesas serio video i2c_hid_acpi 8250_dw i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user [ 124.822051] CPU: 3 PID: 2485 Comm: ForzaHorizon5.e Not tainted 5.18.0-1-neptune-00172-g067e00b76d9c #23 [ 124.822054] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022 [ 124.822055] RIP: 0010:amdgpu_ttm_tt_get_user_pages+0x15c/0x190 [amdgpu] [ 124.822262] Code: e1 ef c0 48 c7 c7 10 4a 0c c1 e8 5f f7 3e dd eb 9c 48 c7 c6 85 0a f6 c0 bf 02 00 00 00 e8 8c 74 e2 ff 41 be f2 ff ff ff eb 8b <0f> 0b eb f4 41 be fd ff ff ff e9 7c ff ff ff 48 83 b8 a0 00 00 00 [ 124.822264] RSP: 0018:ffffa257827afb98 EFLAGS: 00010282 [ 124.822267] RAX: ffff8b82240e6000 RBX: ffff8b8200a31100 RCX: 0000000000000001 [ 124.822268] RDX: 0000000000000dc0 RSI: ffff8b82240e6000 RDI: ffff8b82a4c7e800 [ 124.822269] RBP: ffff8b82ee809320 R08: 0000000000001000 R09: ffff8b82240e6000 [ 124.822270] R10: 0000000000000006 R11: 0000000000000000 R12: ffff8b82ee6dc9c0 [ 124.822272] R13: 0000000031880000 R14: 0000000000000001 R15: ffff8b823face440 [ 124.822273] FS: 000000002773f640(0000) GS:ffff8b852fec0000(0000) knlGS:000000001aba0000 [ 124.822275] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 124.822276] CR2: 0000000003ff4000 CR3: 00000001f1c2e000 CR4: 0000000000350ee0 [ 124.822278] Call Trace: [ 124.822281] <TASK> [ 124.822285] amdgpu_cs_ioctl+0x9cc/0x2070 [amdgpu] [ 124.822496] ? amdgpu_cs_find_mapping+0x110/0x110 [amdgpu] [ 124.822701] drm_ioctl_kernel+0xc5/0x170 [drm] [ 124.822728] ? futex_wait+0x18f/0x260 [ 124.822733] drm_ioctl+0x229/0x400 [drm] [ 124.822757] ? amdgpu_cs_find_mapping+0x110/0x110 [amdgpu] [ 124.822963] amdgpu_drm_ioctl+0x4a/0x80 [amdgpu] [ 124.823165] __x64_sys_ioctl+0x8c/0xc0 [ 124.823169] do_syscall_64+0x3a/0x80 [ 124.823174] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 124.823177] RIP: 0033:0x7f5525e1059b [ 124.823180] Code: ff ff ff 85 c0 79 9b 49 c7 c4 ff ff ff ff 5b 5d 4c 89 e0 41 5c c3 66 0f 1f 84 00 00 00 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a5 a8 0c 00 f7 d8 64 89 01 48 [ 124.823182] RSP: 002b:000000002773d548 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 124.823185] RAX: ffffffffffffffda RBX: 000000002773d5d0 RCX: 00007f5525e1059b [ 124.823186] RDX: 000000002773d5d0 RSI: 00000000c0186444 RDI: 0000000000000021 [ 124.823187] RBP: 00000000c0186444 R08: 00007f54a4043c80 R09: 000000002773d590 [ 124.823188] R10: 0000000000000000 R11: 0000000000000246 R12: 00007f54a4043d50 [ 124.823190] R13: 0000000000000021 R14: 00007f54a4043cb0 R15: 00007f54a4043d20 [ 124.823192] </TASK> [ 124.823193] ---[ end trace 0000000000000000 ]--- [ 124.823197] [drm:amdgpu_cs_ioctl [amdgpu]] *ERROR* Failed to process the buffer list -14! [ 124.823410] ------------[ cut here ]------------ [ 124.823411] refcount_t: underflow; use-after-free. [ 124.823418] WARNING: CPU: 3 PID: 2485 at lib/refcount.c:28 refcount_warn_saturate+0xa6/0xf0 [ 124.823424] Modules linked in: uinput snd_seq_dummy snd_hrtimer snd_seq snd_seq_device ccm algif_aead cbc des_generic libdes ecb md4 cmac algif_hash algif_skcipher af_alg bnep intel_rapl_msr intel_rapl_common snd_soc_acp5x_mach snd_acp5x_i2s snd_acp5x_pcm_dma edac_mce_amd kvm_amd kvm rtw88_8822ce rtw88_8822c rtw88_pci irqbypass rapl rtw88_core pcspkr joydev mac80211 btusb s nd_hda_codec_hdmi btrtl libarc4 snd_hda_intel btbcm btintel snd_intel_dspcfg btmtk snd_pci_acp5x i2c_piix4 snd_soc_nau8821 snd_intel_sdw_acpi snd_rn_pci_acp3x cfg80211 bluetooth snd_soc_core snd_hda_codec snd_acp_config snd_soc_acpi snd_pci_acp3x ecdh_generic snd_hda_core cdc_acm mousedev snd_compress ecc rfkill snd_hwdep ac97_bus snd_pcm_dmaengine ina2xx_adc snd_pcm kfifo_buf spi_amd snd_timer opt3001 ina2xx snd industrialio soundcore mac_hid acpi_cpufreq fuse ip_tables x_tables overlay ext4 crc16 mbcache jbd2 mmc_block vfat fat usbhid amdgpu drm_ttm_helper ttm agpgart drm_exec gpu_sched i2c_algo_bit [ 124.823485] drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw atkbd crct10dif_pclmul libps2 crc32_pclmul vivaldi_fmap sdhci_pci ghash_clmulni_intel i8042 ccp cqhci sdhci aesni_intel hid_multitouch xhci_pci crypto_simd cryptd wdat_wdt mmc_core cec sp5100_tco rng_core xhci_pci_renesas serio video i2c_hid_acpi 8250_dw i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user [ 124.823516] CPU: 3 PID: 2485 Comm: ForzaHorizon5.e Tainted: G W 5.18.0-1-neptune-00172-g067e00b76d9c #23 [ 124.823519] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022 [ 124.823520] RIP: 0010:refcount_warn_saturate+0xa6/0xf0 [ 124.823523] Code: 05 2d c4 6d 01 01 e8 90 68 58 00 0f 0b c3 80 3d 1d c4 6d 01 00 75 95 48 c7 c7 b8 db ba 9e c6 05 0d c4 6d 01 01 e8 71 68 58 00 <0f> 0b c3 80 3d fc c3 6d 01 00 0f 85 72 ff ff ff 48 c7 c7 10 dc ba [ 124.823524] RSP: 0018:ffffa257827afba8 EFLAGS: 00010286 [ 124.823526] RAX: 0000000000000000 RBX: ffffa257827afc58 RCX: 0000000000000027 [ 124.823527] RDX: ffff8b852fee0768 RSI: 0000000000000001 RDI: ffff8b852fee0760 [ 124.823528] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffa257827af9b8 [ 124.823529] R10: 0000000000000003 R11: ffffffff9f2c5168 R12: 00000000ffffffff [ 124.823530] R13: 0000000000000018 R14: 0000000000000001 R15: ffff8b823face440 [ 124.823531] FS: 000000002773f640(0000) GS:ffff8b852fec0000(0000) knlGS:000000001aba0000 [ 124.823533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 124.823534] CR2: 0000000003ff4000 CR3: 00000001f1c2e000 CR4: 0000000000350ee0 [ 124.823535] Call Trace: [ 124.823537] <TASK> [ 124.823537] amdgpu_cs_parser_fini+0x11e/0x160 [amdgpu] [ 124.823745] amdgpu_cs_ioctl+0x40a/0x2070 [amdgpu] [ 124.823954] ? amdgpu_cs_find_mapping+0x110/0x110 [amdgpu] [ 124.824159] drm_ioctl_kernel+0xc5/0x170 [drm] [ 124.824185] ? futex_wait+0x18f/0x260 [ 124.824189] drm_ioctl+0x229/0x400 [drm] [ 124.824213] ? amdgpu_cs_find_mapping+0x110/0x110 [amdgpu] [ 124.824444] amdgpu_drm_ioctl+0x4a/0x80 [amdgpu] [ 124.824651] __x64_sys_ioctl+0x8c/0xc0 [ 124.824655] do_syscall_64+0x3a/0x80 [ 124.824660] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 124.824663] RIP: 0033:0x7f5525e1059b [ 124.824665] Code: ff ff ff 85 c0 79 9b 49 c7 c4 ff ff ff ff 5b 5d 4c 89 e0 41 5c c3 66 0f 1f 84 00 00 00 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a5 a8 0c 00 f7 d8 64 89 01 48 [ 124.824667] RSP: 002b:000000002773d548 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 124.824670] RAX: ffffffffffffffda RBX: 000000002773d5d0 RCX: 00007f5525e1059b [ 124.824671] RDX: 000000002773d5d0 RSI: 00000000c0186444 RDI: 0000000000000021 [ 124.824673] RBP: 00000000c0186444 R08: 00007f54a4043c80 R09: 000000002773d590 [ 124.824674] R10: 0000000000000000 R11: 0000000000000246 R12: 00007f54a4043d50 [ 124.824675] R13: 0000000000000021 R14: 00007f54a4043cb0 R15: 00007f54a4043d20 [ 124.824677] </TASK> [ 124.824678] ---[ end trace 0000000000000000 ]--- > > Please rebase this work on top. It should at least make the TTM changes > unnecessary. > > Going to take a closer look into the VM sync changes now. > > Regards, > Christian. > > Am 13.08.22 um 03:27 schrieb Bas Nieuwenhuizen: > > This adds a context option to use DMA_RESV_USAGE_BOOKKEEP for userspace submissions, > > based on Christians TTM work. > > > > Disabling implicit sync is something we've wanted in radv for a while for resolving > > some corner cases. A more immediate thing that would be solved here is avoiding a > > bunch of implicit sync on GPU map/unmap operations as well, which helps with stutter > > around sparse maps/unmaps. > > > > This has seen a significant improvement in stutter in Forza Horizon 5 and Forza > > Horizon 4. (As games that had significant issues in sparse binding related stutter). > > I've been able to pass a full vulkan-cts run on navi21 with this. > > > > Userspace code for this is available at > > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18032 and a branch > > for the kernel code is available at > > https://github.com/BNieuwenhuizen/linux/tree/no-implicit-sync-5.19 > > > > This is a follow-up on RFC series https://patchwork.freedesktop.org/series/104578/ . > > > > The main changes were: > > > > 1) Instead of replacing num_shared with usage, I'm just adding usage, since > > num_shared was actually needed. > > 2) We now agree that DMA_RESV_USAGE_BOOKKEEP is reasonable for this purpose. > > > > Please let me know if I missed anything, especially with the change to VM updates, > > as we went back and forth a ton of times on that. > > > > > > Bas Nieuwenhuizen (6): > > drm/ttm: Add usage to ttm_validate_buffer. > > drm/amdgpu: Add separate mode for syncing DMA_RESV_USAGE_BOOKKEEP. > > drm/amdgpu: Allow explicit sync for VM ops. > > drm/amdgpu: Refactor amdgpu_vm_get_pd_bo. > > drm/amdgpu: Add option to disable implicit sync for a context. > > drm/amdgpu: Bump amdgpu driver version. > > > > .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +++++++--- > > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 +++++++++--- > > drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 32 +++++++++++++++++-- > > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 ++++--- > > drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 11 ++++--- > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 11 +++++-- > > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 4 +-- > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 ++- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 3 +- > > drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 1 + > > drivers/gpu/drm/qxl/qxl_release.c | 1 + > > drivers/gpu/drm/radeon/radeon_cs.c | 2 ++ > > drivers/gpu/drm/radeon/radeon_gem.c | 1 + > > drivers/gpu/drm/radeon/radeon_vm.c | 2 ++ > > drivers/gpu/drm/ttm/ttm_execbuf_util.c | 3 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 7 +++- > > drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 1 + > > include/drm/ttm/ttm_execbuf_util.h | 2 ++ > > include/uapi/drm/amdgpu_drm.h | 3 ++ > > 28 files changed, 122 insertions(+), 37 deletions(-) > > >
