From 590fd531c0f6ba181cd642dfbf8725685d6dfb0c Mon Sep 17 00:00:00 2001 From: Philip Yang Date: Tue, 20 Sep 2022 10:57:09 -0400 Subject: [PATCH] kfdtest: Correct mmap return value checking On error mmap returns value MAP_FAILED, which is (void *)-1, not NULL pointer. Change-Id: I81b187266c943fa0aa4fab21b529d4c2989b12ad Signed-off-by: Philip Yang --- tests/kfdtest/src/KFDSVMEvictTest.cpp | 2 +- tests/kfdtest/src/KFDSVMRangeTest.cpp | 8 ++++---- tests/kfdtest/src/KFDTestUtil.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/kfdtest/src/KFDSVMEvictTest.cpp b/tests/kfdtest/src/KFDSVMEvictTest.cpp index 319b054a64..22953d01ab 100644 --- a/tests/kfdtest/src/KFDSVMEvictTest.cpp +++ b/tests/kfdtest/src/KFDSVMEvictTest.cpp @@ -88,7 +88,7 @@ void KFDSVMEvictTest::AllocBuffers(HSAuint32 defaultGPUNode, HSAuint32 count, HS for (HSAuint32 i = 0; i < count; i++) { m_pBuf = mmap(0, vramBufSize, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - EXPECT_NOTNULL(m_pBuf); + ASSERT_NE(MAP_FAILED, m_pBuf); m_Flags = (HSA_SVM_FLAGS)0; retry: diff --git a/tests/kfdtest/src/KFDSVMRangeTest.cpp b/tests/kfdtest/src/KFDSVMRangeTest.cpp index 2f78263078..f020529441 100644 --- a/tests/kfdtest/src/KFDSVMRangeTest.cpp +++ b/tests/kfdtest/src/KFDSVMRangeTest.cpp @@ -1254,7 +1254,7 @@ TEST_F(KFDSVMRangeTest, MigrateFileBackedRangeTest) { ASSERT_EQ(size, write(fd, buf, size)); void *MmapedFile = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - ASSERT_NE(nullptr, MmapedFile); + ASSERT_NE(MAP_FAILED, MmapedFile); HsaSVMRange filebackedRange(MmapedFile, size, defaultGPUNode, defaultGPUNode); @@ -1531,7 +1531,7 @@ TEST_F(KFDSVMRangeTest, VramOvercommitTest) { for (i = 0; i < numBufs; i++) { pBuf[i] = mmap(0, BufSize, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - ASSERT_NOTNULL(pBuf[i]); + ASSERT_NE(MAP_FAILED, pBuf[i]); ret = RegisterSVMRange(defaultGPUNode, pBuf[i], BufSize, defaultGPUNode, 0); if (ret != HSAKMT_STATUS_SUCCESS) @@ -1587,7 +1587,7 @@ TEST_F(KFDSVMRangeTest, VramOvercommitGiantRangeTest) { void *pBuf; pBuf = mmap(0, BufSize, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - ASSERT_NOTNULL(pBuf); + ASSERT_NE(MAP_FAILED, pBuf); ret = RegisterSVMRange(defaultGPUNode, pBuf, BufSize, defaultGPUNode, 0); EXPECT_EQ (HSAKMT_STATUS_SUCCESS, ret); @@ -1623,7 +1623,7 @@ TEST_F(KFDSVMRangeTest, PrefaultPartialRangeTest) { char *pBuf; pBuf = (char *)mmap(0, BufSize, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - ASSERT_NOTNULL(pBuf); + ASSERT_NE(MAP_FAILED, pBuf); memset(pBuf + PAGE_SIZE, 0x2, PAGE_SIZE); memset(pBuf + 2 * PAGE_SIZE, 0x3, PAGE_SIZE); diff --git a/tests/kfdtest/src/KFDTestUtil.cpp b/tests/kfdtest/src/KFDTestUtil.cpp index fe647fb853..103b144b05 100644 --- a/tests/kfdtest/src/KFDTestUtil.cpp +++ b/tests/kfdtest/src/KFDTestUtil.cpp @@ -862,7 +862,7 @@ HsaSVMRange::HsaSVMRange(void *addr, HSAuint64 size, HSAuint32 GPUNode, HSAuint3 m_SelfAllocated(false) { if (!m_pUser) { m_pUser = mmap(0, m_Size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - EXPECT_NOTNULL(m_pUser); + EXPECT_NE(MAP_FAILED, m_pUser); m_SelfAllocated = true; }