From 22b8e328a18b2466aaac7f8397f06918ba4779df Mon Sep 17 00:00:00 2001 From: lucas <1358497393@qq.com> Date: Fri, 21 Nov 2025 15:24:46 +0800 Subject: [PATCH] fix: remove ub drain operation --- doc/api_docs_reference.md | 1 - src/ham.c | 5 ----- src/ham.h | 1 - src/ham_comm.h | 1 - test/cases/test_ham.cpp | 6 ------ 5 files changed, 14 deletions(-) diff --git a/doc/api_docs_reference.md b/doc/api_docs_reference.md index 6cdd20e..ec7a5dc 100644 --- a/doc/api_docs_reference.md +++ b/doc/api_docs_reference.md @@ -119,7 +119,6 @@ int32_t ubturbo_ham_migrate(HamRamPages *ramList, size_t ramNum, int32_t step); | ERR_MIGRATE_PAGES | 页面迁移失败 | | ERR_MODIFY_PAGETABLE | 修改页表属性失败 | | ERR_CLEAR_CACHE | 刷cache失败 | -| ERR_DRAIN_UB | 执行UB排空失败 | ## 约束 CONSTRAINTS diff --git a/src/ham.c b/src/ham.c index 2a88616..80be2a7 100644 --- a/src/ham.c +++ b/src/ham.c @@ -154,11 +154,6 @@ int32_t ubturbo_ham_migrate(HamRamPages *ramList, size_t ramNum, int32_t step) HAM_LOGERROR("Failed to cache clear, errno: %d.\n", errno); return -ERR_CLEAR_CACHE; } - ret = HandleIoctl(g_fd, HAM_UB_DRAIN, (uintptr_t) &g_scna); - if (ret) { - HAM_LOGERROR("Failed to drain ub, errno: %d.\n", errno); - return -ERR_DRAIN_UB; - } } return SUCCESS; diff --git a/src/ham.h b/src/ham.h index c65df1c..e1f428a 100644 --- a/src/ham.h +++ b/src/ham.h @@ -31,7 +31,6 @@ enum HamErrCode { ERR_MIGRATE_PAGES = 0x4000, ERR_MODIFY_PAGETABLE = 0x4001, ERR_CLEAR_CACHE = 0x4002, - ERR_DRAIN_UB = 0x4003, ERR_ROLLBACK_PAGES = 0x5000, }; diff --git a/src/ham_comm.h b/src/ham_comm.h index 2ca17e2..7e387ba 100644 --- a/src/ham_comm.h +++ b/src/ham_comm.h @@ -31,7 +31,6 @@ extern "C" { #define HAM_STOP_MIGRATION _IOW('N', 3, unsigned long) #define HAM_MODIFY_PAGETABLE _IOW('N', 4, unsigned long) #define HAM_CACHE_CLEAR _IOW('N', 5, unsigned long) -#define HAM_UB_DRAIN _IOW('N', 6, unsigned long) typedef enum { HAM_LOG_DEBUG = 0, diff --git a/test/cases/test_ham.cpp b/test/cases/test_ham.cpp index 48a3109..af09f11 100644 --- a/test/cases/test_ham.cpp +++ b/test/cases/test_ham.cpp @@ -134,12 +134,6 @@ TEST_F(TestHam, migratePagesTask) ret = ubturbo_ham_migrate(nullptr, 0, HAM_MIGRATE_COMPLETION); EXPECT_EQ(ret, -ERR_CLEAR_CACHE); - /* drain ub failed */ - MOCKER(HandleIoctl).stubs().with(eq(g_fd), eq(HAM_UB_DRAIN), any()).will(returnValue(-1)) - .then(returnValue(0)); - ret = ubturbo_ham_migrate(nullptr, 0, HAM_MIGRATE_COMPLETION); - EXPECT_EQ(ret, -ERR_DRAIN_UB); - /* all success */ ret = ubturbo_ham_migrate(nullptr, 0, HAM_MIGRATE_COMPLETION); EXPECT_EQ(ret, SUCCESS); -- Gitee