From 2d4a57802077b14a32f4d6b3c14a7541e9efa875 Mon Sep 17 00:00:00 2001 From: Shweta Khatri Date: Thu, 9 Jan 2025 22:33:12 -0500 Subject: [PATCH] Revert "Revert "hsakmt: Only set exec flag when requested"" This reverts commit 80da7d5ee40ed36a04186f6d97e8e07d13c937d7. Reason for revert: This will put back the change ID - Id1154f08f6ba21c633905fd46b06053994d6f3cc to ROCR repo, which will prevent memory allocations from being automatically granted the 'executable' flag, addressing previously - incorrect and unsafe behavior in ROCm driver. Change-Id: I3d45c45859929a80f7791681b411251e099a1901 --- libhsakmt/src/fmm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libhsakmt/src/fmm.c b/libhsakmt/src/fmm.c index 65ce5b5be9..162babd9be 100644 --- a/libhsakmt/src/fmm.c +++ b/libhsakmt/src/fmm.c @@ -1401,11 +1401,8 @@ static uint32_t fmm_translate_hsa_to_ioc_flags(HsaMemFlags flags) KFD_IOC_ALLOC_MEM_FLAGS_UNCACHED); if (!flags.ui32.ReadOnly) ioc_flags |= KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE; - /* TODO: Since, ROCr interfaces doesn't allow caller to set page - * permissions, mark all user allocations with exec permission. - * Check for flags.ui32.ExecuteAccess once ROCr is ready. - */ - ioc_flags |= KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE; + if (flags.ui32.ExecuteAccess) + ioc_flags |= KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE; return ioc_flags; }