From 5e66e7ac1c7d9f5a76fadd52a7507d7992f89951 Mon Sep 17 00:00:00 2001 From: panhengchang Date: Sat, 15 Nov 2025 19:15:04 +0800 Subject: [PATCH] modify mb_nums compute --- tmm_driver/src/tmm_driver.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tmm_driver/src/tmm_driver.c b/tmm_driver/src/tmm_driver.c index b0864ac..fc2e195 100644 --- a/tmm_driver/src/tmm_driver.c +++ b/tmm_driver/src/tmm_driver.c @@ -30,7 +30,7 @@ MODULE_DESCRIPTION("Get tmm base memory info module"); #define _4K_PER_GB (_2M_PER_GB * _4K_PER_2M) #define REGULAR_SPLIT_GB 2 #define _2M_UEFI 511 -#define _4K_UEFI (130 * 256) +#define _4K_UEFI (130 * 512) #define ORDER_NINE 9 #define MB_SHIFT 20 #define DECIMAL 10 @@ -473,10 +473,10 @@ static int mig_src_meta_data_check(tmm_memory_info_s *memory_info, uint64_t *mig return -EINVAL; } + _2mb_nums = (total_memory - (gb_nums * MBS_PER_GB)) / 2 + _2M_UEFI; if (gb_nums >= 1) gb_nums--; gb_nums = (gb_nums < REGULAR_SPLIT_GB) ? gb_nums : REGULAR_SPLIT_GB; - _2mb_nums = (total_memory - (gb_nums * MBS_PER_GB)) / 2 + _2M_UEFI; meta_data_need = _2mb_nums * (_4K_PER_2M - 1) + gb_nums * (_4K_PER_GB - 1); if (meta_data_need > VIRTCCA_MAX_ENTRY_NUM - ttt_meta_data_used) { @@ -503,7 +503,6 @@ static int mig_dst_mem_check(tmm_memory_info_s *memory_info, uint64_t *mig_mem) } mem_node_free = cal_numa_node_mem_info(memory_info, numa_index, &cvm_used, &meta_data_used); - pr_info("tmm_driver: mem_node_free = %llu MB\n", mem_node_free >> MB_SHIFT); if ((mem_node_free >> MB_SHIFT) < mig_mem[numa_index]) { pr_err("tmm_driver: Attention! Dst NUMA %d memory is not enough, excepted %llu MB, but only %llu MB\n", numa_index, mig_mem[numa_index], mem_node_free >> MB_SHIFT); @@ -611,7 +610,6 @@ static int get_mig_info(const char *buf, tmm_memory_info_s *memory_info, uint64_ char *input_base = NULL; char *input = NULL; char *token = NULL; - int numa_index = 0; int i = 0; int ret = 0; @@ -651,10 +649,6 @@ static int get_mig_info(const char *buf, tmm_memory_info_s *memory_info, uint64_ goto out; } - for (numa_index = 0; numa_index < TMM_MAX_NODE_NUM; numa_index++) { - pr_info("%d: mig_mem = %llu\n", numa_index, mig_mem[numa_index]); - } - ret = get_tmm_memory_info(memory_info); if (ret) pr_err("tmm_driver: unable to get memory_info\n"); -- Gitee