reformat memory and fmm functions according to kernel coding style
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Этот коммит содержится в:
Oded Gabbay
+78
-64
@@ -37,13 +37,14 @@
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtSetMemoryPolicy(
|
||||
HSAuint32 Node,
|
||||
HSAuint32 DefaultPolicy,
|
||||
HSAuint32 AlternatePolicy,
|
||||
void* MemoryAddressAlternate,
|
||||
HSAuint64 MemorySizeInBytes
|
||||
)
|
||||
HSAuint32 Node,
|
||||
HSAuint32 DefaultPolicy,
|
||||
HSAuint32 AlternatePolicy,
|
||||
void *MemoryAddressAlternate,
|
||||
HSAuint64 MemorySizeInBytes
|
||||
)
|
||||
{
|
||||
struct kfd_ioctl_set_memory_policy_args args;
|
||||
HSAKMT_STATUS result;
|
||||
uint32_t gpu_id;
|
||||
|
||||
@@ -53,23 +54,31 @@ hsaKmtSetMemoryPolicy(
|
||||
if (result != HSAKMT_STATUS_SUCCESS)
|
||||
return result;
|
||||
|
||||
// We accept any legal policy and alternate address location. You get CC everywhere anyway.
|
||||
if ((DefaultPolicy != HSA_CACHING_CACHED && DefaultPolicy != HSA_CACHING_NONCACHED)
|
||||
|| (AlternatePolicy != HSA_CACHING_CACHED && AlternatePolicy != HSA_CACHING_NONCACHED))
|
||||
{
|
||||
/*
|
||||
* We accept any legal policy and alternate address location.
|
||||
* You get CC everywhere anyway.
|
||||
*/
|
||||
if ((DefaultPolicy != HSA_CACHING_CACHED &&
|
||||
DefaultPolicy != HSA_CACHING_NONCACHED) ||
|
||||
(AlternatePolicy != HSA_CACHING_CACHED &&
|
||||
AlternatePolicy != HSA_CACHING_NONCACHED))
|
||||
return HSAKMT_STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
CHECK_PAGE_MULTIPLE(MemoryAddressAlternate);
|
||||
CHECK_PAGE_MULTIPLE(MemorySizeInBytes);
|
||||
|
||||
struct kfd_ioctl_set_memory_policy_args args;
|
||||
memset(&args, 0, sizeof(args));
|
||||
|
||||
args.gpu_id = gpu_id;
|
||||
args.default_policy = (DefaultPolicy == HSA_CACHING_CACHED) ? KFD_IOC_CACHE_POLICY_COHERENT : KFD_IOC_CACHE_POLICY_NONCOHERENT;
|
||||
args.alternate_policy = (AlternatePolicy == HSA_CACHING_CACHED) ? KFD_IOC_CACHE_POLICY_COHERENT : KFD_IOC_CACHE_POLICY_NONCOHERENT;
|
||||
args.alternate_aperture_base = (uintptr_t)MemoryAddressAlternate;
|
||||
args.default_policy = (DefaultPolicy == HSA_CACHING_CACHED) ?
|
||||
KFD_IOC_CACHE_POLICY_COHERENT :
|
||||
KFD_IOC_CACHE_POLICY_NONCOHERENT;
|
||||
|
||||
args.alternate_policy = (AlternatePolicy == HSA_CACHING_CACHED) ?
|
||||
KFD_IOC_CACHE_POLICY_COHERENT :
|
||||
KFD_IOC_CACHE_POLICY_NONCOHERENT;
|
||||
|
||||
args.alternate_aperture_base = (uintptr_t) MemoryAddressAlternate;
|
||||
args.alternate_aperture_size = MemorySizeInBytes;
|
||||
|
||||
int err = kmtIoctl(kfd_fd, AMDKFD_IOC_SET_MEMORY_POLICY, &args);
|
||||
@@ -79,46 +88,51 @@ hsaKmtSetMemoryPolicy(
|
||||
|
||||
static HSAuint32 PageSizeFromFlags(unsigned int pageSizeFlags)
|
||||
{
|
||||
switch (pageSizeFlags)
|
||||
{
|
||||
switch (pageSizeFlags) {
|
||||
case HSA_PAGE_SIZE_4KB: return 4*1024;
|
||||
case HSA_PAGE_SIZE_64KB: return 64*1024;
|
||||
case HSA_PAGE_SIZE_2MB: return 2*1024*1024;
|
||||
case HSA_PAGE_SIZE_1GB: return 1024*1024*1024;
|
||||
default: assert(false); return 4*1024;
|
||||
default:
|
||||
assert(false);
|
||||
return 4*1024;
|
||||
}
|
||||
}
|
||||
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtAllocMemory(
|
||||
HSAuint32 PreferredNode, //IN
|
||||
HSAuint64 SizeInBytes, //IN (multiple of page size)
|
||||
HsaMemFlags MemFlags, //IN
|
||||
void** MemoryAddress //OUT (page-aligned)
|
||||
)
|
||||
HSAuint32 PreferredNode, /* IN */
|
||||
HSAuint64 SizeInBytes, /* IN (multiple of page size) */
|
||||
HsaMemFlags MemFlags, /* IN */
|
||||
void **MemoryAddress /* OUT (page-aligned) */
|
||||
)
|
||||
{
|
||||
CHECK_KFD_OPEN();
|
||||
HSAKMT_STATUS result;
|
||||
HSAuint64 page_size;
|
||||
uint32_t gpu_id;
|
||||
int err;
|
||||
|
||||
CHECK_KFD_OPEN();
|
||||
|
||||
result = validate_nodeid(PreferredNode, &gpu_id);
|
||||
if (result != HSAKMT_STATUS_SUCCESS)
|
||||
return result;
|
||||
|
||||
// The required size should be page aligned (GDS?)
|
||||
HSAuint64 page_size = PageSizeFromFlags(MemFlags.ui32.PageSize);
|
||||
if ((SizeInBytes & (page_size-1)) && !MemFlags.ui32.GDSMemory){
|
||||
/* The required size should be page aligned (GDS?) */
|
||||
page_size = PageSizeFromFlags(MemFlags.ui32.PageSize);
|
||||
if ((SizeInBytes & (page_size-1)) && !MemFlags.ui32.GDSMemory)
|
||||
return HSAKMT_STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
if (MemFlags.ui32.HostAccess && !MemFlags.ui32.NonPaged) {
|
||||
err = posix_memalign(MemoryAddress, page_size, SizeInBytes);
|
||||
if (err != 0)
|
||||
return HSAKMT_STATUS_NO_MEMORY;
|
||||
|
||||
if (MemFlags.ui32.ExecuteAccess) {
|
||||
err = mprotect(*MemoryAddress, SizeInBytes, PROT_READ | PROT_WRITE | PROT_EXEC);
|
||||
err = mprotect(*MemoryAddress, SizeInBytes,
|
||||
PROT_READ | PROT_WRITE | PROT_EXEC);
|
||||
|
||||
if (err != 0) {
|
||||
free(*MemoryAddress);
|
||||
return err;
|
||||
@@ -127,10 +141,12 @@ hsaKmtAllocMemory(
|
||||
return HSAKMT_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
if(!MemFlags.ui32.HostAccess && MemFlags.ui32.NonPaged){
|
||||
*MemoryAddress = fmm_allocate_device(gpu_id, SizeInBytes);
|
||||
if (!MemFlags.ui32.HostAccess && MemFlags.ui32.NonPaged) {
|
||||
*MemoryAddress = fmm_allocate_device(gpu_id, SizeInBytes);
|
||||
|
||||
if (*MemoryAddress == NULL)
|
||||
return HSAKMT_STATUS_NO_MEMORY;
|
||||
|
||||
return HSAKMT_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -140,22 +156,22 @@ hsaKmtAllocMemory(
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtFreeMemory(
|
||||
void* MemoryAddress, //IN (page-aligned)
|
||||
HSAuint64 SizeInBytes //IN
|
||||
)
|
||||
void *MemoryAddress, /* IN (page-aligned) */
|
||||
HSAuint64 SizeInBytes /* IN */
|
||||
)
|
||||
{
|
||||
CHECK_KFD_OPEN();
|
||||
|
||||
fmm_release( MemoryAddress, SizeInBytes);
|
||||
fmm_release(MemoryAddress, SizeInBytes);
|
||||
return HSAKMT_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtRegisterMemory(
|
||||
void* MemoryAddress, //IN (page-aligned)
|
||||
HSAuint64 MemorySizeInBytes //IN (page-aligned)
|
||||
)
|
||||
void *MemoryAddress, /* IN (page-aligned) */
|
||||
HSAuint64 MemorySizeInBytes /* IN (page-aligned) */
|
||||
)
|
||||
{
|
||||
CHECK_KFD_OPEN();
|
||||
|
||||
@@ -165,8 +181,8 @@ hsaKmtRegisterMemory(
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtDeregisterMemory(
|
||||
void* MemoryAddress //IN
|
||||
)
|
||||
void *MemoryAddress /* IN */
|
||||
)
|
||||
{
|
||||
CHECK_KFD_OPEN();
|
||||
|
||||
@@ -176,50 +192,47 @@ hsaKmtDeregisterMemory(
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtMapMemoryToGPU(
|
||||
void* MemoryAddress, //IN (page-aligned)
|
||||
HSAuint64 MemorySizeInBytes, //IN (page-aligned)
|
||||
HSAuint64* AlternateVAGPU //OUT (page-aligned)
|
||||
)
|
||||
void *MemoryAddress, /* IN (page-aligned) */
|
||||
HSAuint64 MemorySizeInBytes, /* IN (page-aligned) */
|
||||
HSAuint64 *AlternateVAGPU /* OUT (page-aligned) */
|
||||
)
|
||||
{
|
||||
CHECK_KFD_OPEN();
|
||||
|
||||
if (AlternateVAGPU)
|
||||
*AlternateVAGPU = 0;
|
||||
|
||||
if (fmm_map_to_gpu(MemoryAddress, MemorySizeInBytes, AlternateVAGPU)){
|
||||
if (!fmm_map_to_gpu(MemoryAddress, MemorySizeInBytes, AlternateVAGPU))
|
||||
return HSAKMT_STATUS_SUCCESS;
|
||||
}
|
||||
else {
|
||||
else
|
||||
return HSAKMT_STATUS_ERROR;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtUnmapMemoryToGPU(
|
||||
void* MemoryAddress //IN (page-aligned)
|
||||
)
|
||||
void *MemoryAddress /* IN (page-aligned) */
|
||||
)
|
||||
{
|
||||
CHECK_KFD_OPEN();
|
||||
if (fmm_unmap_from_gpu(MemoryAddress))
|
||||
if (!fmm_unmap_from_gpu(MemoryAddress))
|
||||
return HSAKMT_STATUS_SUCCESS;
|
||||
else
|
||||
return HSAKMT_STATUS_ERROR;
|
||||
|
||||
}
|
||||
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtMapGraphicHandle(
|
||||
HSAuint32 NodeId, //IN
|
||||
HSAuint64 GraphicDeviceHandle, //IN
|
||||
HSAuint64 GraphicResourceHandle, //IN
|
||||
HSAuint64 GraphicResourceOffset, //IN
|
||||
HSAuint64 GraphicResourceSize, //IN
|
||||
HSAuint64* FlatMemoryAddress //OUT
|
||||
)
|
||||
HSAuint32 NodeId, /* IN */
|
||||
HSAuint64 GraphicDeviceHandle, /* IN */
|
||||
HSAuint64 GraphicResourceHandle, /* IN */
|
||||
HSAuint64 GraphicResourceOffset, /* IN */
|
||||
HSAuint64 GraphicResourceSize, /* IN */
|
||||
HSAuint64 *FlatMemoryAddress /* OUT */
|
||||
)
|
||||
{
|
||||
|
||||
CHECK_KFD_OPEN();
|
||||
HSAKMT_STATUS result;
|
||||
uint32_t gpu_id;
|
||||
@@ -248,10 +261,11 @@ hsaKmtMapGraphicHandle(
|
||||
HSAKMT_STATUS
|
||||
HSAKMTAPI
|
||||
hsaKmtUnmapGraphicHandle(
|
||||
HSAuint32 NodeId, //IN
|
||||
HSAuint64 FlatMemoryAddress, //IN
|
||||
HSAuint64 SizeInBytes //IN
|
||||
)
|
||||
HSAuint32 NodeId, /* IN */
|
||||
HSAuint64 FlatMemoryAddress, /* IN */
|
||||
HSAuint64 SizeInBytes /* IN */
|
||||
)
|
||||
{
|
||||
|
||||
return hsaKmtUnmapMemoryToGPU(PORT_UINT64_TO_VPTR(FlatMemoryAddress));
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user