Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
cbff63e8
T
tp-qemu
项目概览
openeuler
/
tp-qemu
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tp-qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
cbff63e8
编写于
10月 25, 2018
作者:
Q
Qianqian Zhu
提交者:
GitHub
10月 25, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1367 from huangyum/numa_1574834
numa_memdev_options: add case to test two nodes with different backend
上级
823a958e
5ae927d7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
5 deletion
+21
-5
qemu/tests/cfg/numa_memdev_options.cfg
qemu/tests/cfg/numa_memdev_options.cfg
+17
-4
qemu/tests/numa_memdev_options.py
qemu/tests/numa_memdev_options.py
+4
-1
未找到文件。
qemu/tests/cfg/numa_memdev_options.cfg
浏览文件 @
cbff63e8
- numa_memdev_options:
- numa_memdev_options:
type = numa_memdev_options
type = numa_memdev_options
kill_vm_on_error = yes
kill_vm_on_error = yes
mem_fixed =
153
6
mem_fixed =
409
6
mem_devs = "mem0 mem1"
mem_devs = "mem0 mem1"
backend_mem = memory-backend-ram
backend_mem = memory-backend-ram
use_mem = no
use_mem = no
host-nodes_mem0 = 0
host-nodes_mem0 = 0
host-nodes_mem1 = 1
host-nodes_mem1 = 1
size_mem0 =
512
M
size_mem0 =
1024
M
size_mem1 =
1024
M
size_mem1 =
3072
M
guest_numa_nodes = "node0 node1"
guest_numa_nodes = "node0 node1"
numa_memdev_node0 = mem-mem0
numa_memdev_node0 = mem-mem0
numa_memdev_node1 = mem-mem1
numa_memdev_node1 = mem-mem1
...
@@ -40,4 +40,17 @@
...
@@ -40,4 +40,17 @@
backend_mem = memory-backend-file
backend_mem = memory-backend-file
setup_hugepages = yes
setup_hugepages = yes
mem-path = /mnt/kvm_hugepage
mem-path = /mnt/kvm_hugepage
target_hugepages = 1500
target_nodes = 0 1
# Please update following numbers according to actual hugepage size,
# It intends for 2M hugepage by default.
target_num_node0 = 522
target_num_node1 = 1546
- numa_ram_hugepage:
backend_mem_mem0 = memory-backend-file
backend_mem_mem1 = memory-backend-ram
setup_hugepages = yes
mem-path_mem0 = /mnt/kvm_hugepage
target_nodes = 0
# Please update following numbers according to actual hugepage size,
# It intends for 2M hugepage by default.
target_num_node0 = 522
qemu/tests/numa_memdev_options.py
浏览文件 @
cbff63e8
...
@@ -5,6 +5,7 @@ from avocado.utils import process
...
@@ -5,6 +5,7 @@ from avocado.utils import process
from
virttest
import
error_context
from
virttest
import
error_context
from
virttest
import
utils_misc
from
virttest
import
utils_misc
from
virttest.staging
import
utils_memory
from
virttest.staging
import
utils_memory
from
virttest.compat_52lts
import
decode_to_text
def
check_host_numa_node_amount
(
test
):
def
check_host_numa_node_amount
(
test
):
...
@@ -66,19 +67,21 @@ def check_memory_in_procfs(test, params, vm):
...
@@ -66,19 +67,21 @@ def check_memory_in_procfs(test, params, vm):
policy
=
params
[
'policy_mem'
]
policy
=
params
[
'policy_mem'
]
if
policy
==
'preferred'
:
if
policy
==
'preferred'
:
policy
=
'prefer'
policy
=
'prefer'
mem_path
=
params
.
get
(
"mem-path"
,
None
)
for
mem_dev
in
params
[
'mem_devs'
].
split
():
for
mem_dev
in
params
[
'mem_devs'
].
split
():
memdev_params
=
params
.
object_params
(
mem_dev
)
memdev_params
=
params
.
object_params
(
mem_dev
)
mem_size
=
memdev_params
[
'size'
]
mem_size
=
memdev_params
[
'size'
]
mem_size
=
int
(
float
(
utils_misc
.
normalize_data_size
(
mem_size
,
"K"
)))
mem_size
=
int
(
float
(
utils_misc
.
normalize_data_size
(
mem_size
,
"K"
)))
smaps
=
process
.
system_output
(
"grep -1 %d /proc/%d/smaps"
smaps
=
process
.
system_output
(
"grep -1 %d /proc/%d/smaps"
%
(
mem_size
,
qemu_pid
))
%
(
mem_size
,
qemu_pid
))
smaps
=
decode_to_text
(
smaps
).
strip
()
mem_path
=
memdev_params
.
get
(
"mem-path"
)
if
mem_path
and
(
mem_path
not
in
smaps
):
if
mem_path
and
(
mem_path
not
in
smaps
):
test
.
fail
(
"memdev = %s: mem-path '%s' is not in smaps '%s'!"
test
.
fail
(
"memdev = %s: mem-path '%s' is not in smaps '%s'!"
%
(
mem_dev
,
mem_path
,
smaps
))
%
(
mem_dev
,
mem_path
,
smaps
))
mem_start
=
smaps
.
split
(
'-'
)[
0
]
mem_start
=
smaps
.
split
(
'-'
)[
0
]
numa_maps
=
process
.
system_output
(
"grep %s /proc/%d/numa_maps"
numa_maps
=
process
.
system_output
(
"grep %s /proc/%d/numa_maps"
%
(
mem_start
,
qemu_pid
))
%
(
mem_start
,
qemu_pid
))
numa_maps
=
decode_to_text
(
numa_maps
).
strip
()
if
mem_path
and
(
mem_path
not
in
numa_maps
):
if
mem_path
and
(
mem_path
not
in
numa_maps
):
test
.
fail
(
"memdev = %s: mem-path '%s' is not in numa_maps '%s'!"
test
.
fail
(
"memdev = %s: mem-path '%s' is not in numa_maps '%s'!"
%
(
mem_dev
,
mem_path
,
numa_maps
))
%
(
mem_dev
,
mem_path
,
numa_maps
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录