From 80da7d5ee40ed36a04186f6d97e8e07d13c937d7 Mon Sep 17 00:00:00 2001 From: David Yat Sin Date: Wed, 16 Oct 2024 18:45:18 -0400 Subject: [PATCH] Revert "hsakmt: Only set exec flag when requested" This reverts commit 75143555fa068ac6afd2879b4398681c341a1215. Reason for revert: This is currently breaking some tools. Will put it back as soon as tools update their code. Change-Id: I05c82d443f3a274a618d05e6dc5a87943f5dc7a4 --- libhsakmt/src/fmm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libhsakmt/src/fmm.c b/libhsakmt/src/fmm.c index 406e4d687a..7f682e8999 100644 --- a/libhsakmt/src/fmm.c +++ b/libhsakmt/src/fmm.c @@ -1401,8 +1401,11 @@ 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; - if (flags.ui32.ExecuteAccess) - ioc_flags |= KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE; + /* 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; return ioc_flags; }