提交 09716d7d 编写于 作者: T Tang Yizhou 提交者: Yang Yingliang

share_pool: Fix error message printing

ascend inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4EUVI
CVE: NA

-------------------------------------------------
1. Addresses can't be printed for security issue.
2. Some small printing fixes.
Signed-off-by: NTang Yizhou <tangyizhou@huawei.com>
Reviewed-by: NDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 855fa098
...@@ -635,7 +635,7 @@ int sp_group_add_task(int pid, int spg_id) ...@@ -635,7 +635,7 @@ int sp_group_add_task(int pid, int spg_id)
if (printk_ratelimit()) { if (printk_ratelimit()) {
pr_warn("share pool: task add group failed when mm populate " pr_warn("share pool: task add group failed when mm populate "
"failed (potential no enough memory): %d " "failed (potential no enough memory): %d "
"spa flag is %d\n", ret, spa->type); "spa type is %d\n", ret, spa->type);
} }
sp_munmap_task_areas(mm, spa->link.next); sp_munmap_task_areas(mm, spa->link.next);
spin_lock(&sp_area_lock); spin_lock(&sp_area_lock);
...@@ -1516,8 +1516,10 @@ static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa, ...@@ -1516,8 +1516,10 @@ static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa,
unsigned long addr, buf, offset; unsigned long addr, buf, offset;
if (spg_valid(spa->spg)) { if (spg_valid(spa->spg)) {
/* k2u to group */
file = spa_file(spa); file = spa_file(spa);
} else { } else {
/* k2u to task */
if (spa->is_hugepage) { if (spa->is_hugepage) {
file = hugetlb_file_setup(HUGETLB_ANON_FILE, spa_size(spa), VM_NORESERVE, file = hugetlb_file_setup(HUGETLB_ANON_FILE, spa_size(spa), VM_NORESERVE,
&user, HUGETLB_ANONHUGE_INODE, hsize_log); &user, HUGETLB_ANONHUGE_INODE, hsize_log);
...@@ -1550,7 +1552,7 @@ static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa, ...@@ -1550,7 +1552,7 @@ static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa,
if (ret) { if (ret) {
do_munmap(mm, ret_addr, spa_size(spa), NULL); do_munmap(mm, ret_addr, spa_size(spa), NULL);
pr_err("share pool: remap vmalloc hugepage failed, " pr_err("share pool: remap vmalloc hugepage failed, "
"ret %d, kva is %lx\n", ret, kva); "ret %d, kva is %pK\n", ret, (void *)kva);
ret_addr = ret; ret_addr = ret;
goto put_mm; goto put_mm;
} }
...@@ -1721,7 +1723,7 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size, ...@@ -1721,7 +1723,7 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size,
} else if (ret == 0) { } else if (ret == 0) {
/* do nothing */ /* do nothing */
} else { } else {
pr_err("it is not vmalloc address\n"); pr_err("share pool: k2u kva not vmalloc address\n");
return ERR_PTR(ret); return ERR_PTR(ret);
} }
/* aligned down kva is convenient for caller to start with any valid kva */ /* aligned down kva is convenient for caller to start with any valid kva */
...@@ -1749,7 +1751,7 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size, ...@@ -1749,7 +1751,7 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size,
} }
if (!vmalloc_area_set_flag(spa, kva_aligned, VM_SHAREPOOL)) { if (!vmalloc_area_set_flag(spa, kva_aligned, VM_SHAREPOOL)) {
pr_err("%s: the kva %ld is not valid\n", __func__, kva_aligned); pr_err("share pool: %s: the kva %pK is not valid\n", __func__, (void *)kva_aligned);
goto out; goto out;
} }
...@@ -1778,7 +1780,7 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size, ...@@ -1778,7 +1780,7 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size,
} }
if (!vmalloc_area_set_flag(spa, kva_aligned, VM_SHAREPOOL)) { if (!vmalloc_area_set_flag(spa, kva_aligned, VM_SHAREPOOL)) {
pr_err("%s: the kva %ld is not valid\n", __func__, kva_aligned); pr_err("share pool: %s: the kva %pK is not valid\n", __func__, (void *)kva_aligned);
goto out; goto out;
} }
...@@ -1797,8 +1799,8 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size, ...@@ -1797,8 +1799,8 @@ void *sp_make_share_k2u(unsigned long kva, unsigned long size,
} else { } else {
/* associate vma and spa */ /* associate vma and spa */
if (!vmalloc_area_clr_flag(spa, kva_aligned, VM_SHAREPOOL)) if (!vmalloc_area_clr_flag(spa, kva_aligned, VM_SHAREPOOL))
pr_warn("share pool: %s: the kva %ld is not valid \n", pr_warn("share pool: %s: the kva %pK is not valid\n",
__func__, kva_aligned); __func__, (void *)kva_aligned);
} }
out: out:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册