Support multifd compression test for guestperf
cover Support multifd compression test for guestperf
From: Hyman Huang <[email protected]>
The first patch just nitpick the inconsistent parameters for multifd test.
The second patch support multifd compression test.
Please review, thanks,
Yong
Hyman Huang (2):
tests/migration: Nitpick the inconsistent parameters tests/migration: Introduce multifd compression into guestperf
tests/migration/guestperf/comparison.py | 15 ++++++++++++++- tests/migration/guestperf/engine.py | 12 ++++++++++++ tests/migration/guestperf/scenario.py | 7 +++++-- tests/migration/guestperf/shell.py | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/2 tests/migration: Nitpick the inconsistent parameters
From: Hyman Huang <[email protected]>
--- tests/migration/guestperf/comparison.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/migration/guestperf/comparison.py +1 -1
@@ -127,7 +127,7 @@ def __init__(self, name, scenarios): # varying numbers of channels Comparison("compr-multifd", scenarios = [ Scenario("compr-multifd-channels-4", - multifd=True, multifd_channels=2), + multifd=True, multifd_channels=4), Scenario("compr-multifd-channels-8", multifd=True, multifd_channels=8), Scenario("compr-multifd-channels-32",
Signature · 1 line
2.27.0
Re: [PATCH 1/2] tests/migration: Nitpick the inconsistent parameters
Quoted 12 lines · [email protected] writes:
From: Hyman Huang <[email protected]>
Signed-off-by Hyman Huang <[email protected]>--- tests/migration/guestperf/comparison.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/migration/guestperf/comparison.py +0
-0
tests/migration/guestperf/comparison.py def __init__(self, name, scenarios): · line 133
Quoted 8 lines
tests/migration/guestperf/comparison.py +1
-1@@ -127,7 +127,7 @@ def __init__(self, name, scenarios): # varying numbers of channels Comparison("compr-multifd", scenarios = [ Scenario("compr-multifd-channels-4", - multifd=True, multifd_channels=2), + multifd=True, multifd_channels=4), Scenario("compr-multifd-channels-8", multifd=True, multifd_channels=8), Scenario("compr-multifd-channels-32",
PATCH 2/2 tests/migration: Introduce multifd compression into guestperf
In reply to [email protected]From: Hyman Huang <[email protected]>
Guestperf tool does not cover the multifd compression option currently, it is worth supporting so that developers can analysis the migration performance with different compression algorithms.
Multifd support 4 compression algorithms currently:
zlib, zstd, qpl, uadk
To request that multifd with the specified compression algorithm such as zlib:
$ ./tests/migration/guestperf.py \
--multifd --multifd-channels 4 --multifd-compression zlib \
--output output.jsonTo run the entire standardized set of multifd compression comparisons, with unix migration:
$ ./tests/migration/guestperf-batch.py \
--dst-host localhost --transport unix \
--filter compr-multifd-compression* --output outputdir--- tests/migration/guestperf/comparison.py | 13 +++++++++++++ tests/migration/guestperf/engine.py | 12 ++++++++++++ tests/migration/guestperf/scenario.py | 7 +++++-- tests/migration/guestperf/shell.py | 3 +++ 4 files changed, 33 insertions(+), 2 deletions(-)
tests/migration/guestperf/comparison.py +13 -0
@@ -158,4 +158,17 @@ def __init__(self, name, scenarios): Scenario("compr-dirty-limit-50MB", dirty_limit=True, vcpu_dirty_limit=50), ]), + + # Looking at effect of multifd with + # different compression algorithm + Comparison("compr-multifd-compression", scenarios = [ + Scenario("compr-multifd-compression-zlib", + multifd=True, multifd_channels=4, multifd_compression="zlib"), + Scenario("compr-multifd-compression-zstd", + multifd=True, multifd_channels=4, multifd_compression="zstd"), + Scenario("compr-multifd-compression-qpl", + multifd=True, multifd_channels=4, multifd_compression="qpl"), + Scenario("compr-multifd-compression-uadk", + multifd=True, multifd_channels=4, multifd_compression="uadk"), + ]), ]
tests/migration/guestperf/engine.py +12 -0
@@ -31,6 +31,8 @@ '..', '..', '..', 'python')) from qemu.machine import QEMUMachine +# multifd supported compressoin algorithms +MULTIFD_CMP_ALGS = ("zlib", "zstd", "qpl", "uadk") class Engine(object):
@@ -205,6 +207,16 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri): resp = dst.cmd("migrate-set-parameters", multifd_channels=scenario._multifd_channels) + if scenario._multifd_compression: + if scenario._multifd_compression not in MULTIFD_CMP_ALGS: + raise Exception("unsupported multifd compression " + "algorithm: %s" % + scenario._multifd_compression) + resp = src.command("migrate-set-parameters", + multifd_compression=scenario._multifd_compression) + resp = dst.command("migrate-set-parameters", + multifd_compression=scenario._multifd_compression) + if scenario._dirty_limit: if not hardware._dirty_ring_size: raise Exception("dirty ring size must be configured when "
tests/migration/guestperf/scenario.py +5 -2
@@ -30,7 +30,7 @@ def __init__(self, name, auto_converge=False, auto_converge_step=10, compression_mt=False, compression_mt_threads=1, compression_xbzrle=False, compression_xbzrle_cache=10, - multifd=False, multifd_channels=2, + multifd=False, multifd_channels=2, multifd_compression="", dirty_limit=False, x_vcpu_dirty_limit_period=500, vcpu_dirty_limit=1):
@@ -61,6 +61,7 @@ def __init__(self, name, self._multifd = multifd self._multifd_channels = multifd_channels + self._multifd_compression = multifd_compression self._dirty_limit = dirty_limit self._x_vcpu_dirty_limit_period = x_vcpu_dirty_limit_period
@@ -85,6 +86,7 @@ def serialize(self): "compression_xbzrle_cache": self._compression_xbzrle_cache, "multifd": self._multifd, "multifd_channels": self._multifd_channels, + "multifd_compression": self._multifd_compression, "dirty_limit": self._dirty_limit, "x_vcpu_dirty_limit_period": self._x_vcpu_dirty_limit_period, "vcpu_dirty_limit": self._vcpu_dirty_limit,
@@ -109,4 +111,5 @@ def deserialize(cls, data): data["compression_xbzrle"], data["compression_xbzrle_cache"], data["multifd"], - data["multifd_channels"]) + data["multifd_channels"], + data["multifd_compression"])
tests/migration/guestperf/shell.py +3 -0
@@ -130,6 +130,8 @@ def __init__(self): action="store_true") parser.add_argument("--multifd-channels", dest="multifd_channels", default=2, type=int) + parser.add_argument("--multifd-compression", dest="multifd_compression", + default="") parser.add_argument("--dirty-limit", dest="dirty_limit", default=False, action="store_true")
@@ -166,6 +168,7 @@ def get_scenario(self, args): multifd=args.multifd, multifd_channels=args.multifd_channels, + multifd_compression=args.multifd_compression, dirty_limit=args.dirty_limit, x_vcpu_dirty_limit_period=\
Signature · 1 line
2.27.0
Re: [PATCH 2/2] tests/migration: Introduce multifd compression into guestperf
Quoted 7 lines · [email protected] writes:
From: Hyman Huang <[email protected]>
Guestperf tool does not cover the multifd compression option currently, it is worth supporting so that developers can analysis the migration performance with different compression algorithms.
Quoted 8 lines
Multifd support 4 compression algorithms currently:
zlib, zstd, qpl, uadkTo request that multifd with the specified compression algorithm such as zlib:
$ ./tests/migration/guestperf.py \ --multifd --multifd-channels 4 --multifd-compression zlib \ --output output.json
Aren't you hitting this bug?
/init (00001): INFO: 1722970659523ms copied 1 GB in 00382ms /init (00001): INFO: 1722970659896ms copied 1 GB in 00372ms /init (00001): INFO: 1722970660279ms copied 1 GB in 00382ms
qemu-system-x86_64: multifd_send_pages: channel 0 has already quit!
qemu-system-x86_64: Unable to write to socket: Broken pipe
qemu-system-x86_64: check_section_footer: Read section footer failed: -5
qemu-system-x86_64: load of migration failed: Invalid argument
Quoted 7 lines
To run the entire standardized set of multifd compression comparisons, with unix migration:
$ ./tests/migration/guestperf-batch.py \ --dst-host localhost --transport unix \ --filter compr-multifd-compression* --output outputdir
Quoted 6 lines
Signed-off-by Hyman Huang <[email protected]>--- tests/migration/guestperf/comparison.py | 13 +++++++++++++ tests/migration/guestperf/engine.py | 12 ++++++++++++ tests/migration/guestperf/scenario.py | 7 +++++-- tests/migration/guestperf/shell.py | 3 +++
While here, if you'd like to move the whole guestperf into scripts/migration and make initrd-stress.img built by default I'd appreciate it.
tests/migration/guestperf/comparison.py def __init__(self, name, scenarios): · line 163
Quoted 13 lines
4 files changed, 33 insertions(+), 2 deletions(-)tests/migration/guestperf/comparison.py +3
-0@@ -158,4 +158,17 @@ def __init__(self, name, scenarios): Scenario("compr-dirty-limit-50MB", dirty_limit=True, vcpu_dirty_limit=50), ]), + + # Looking at effect of multifd with + # different compression algorithm
s/algorithm/algorithms/
Quoted 16 lines
tests/migration/guestperf/comparison.py +10
-0+ Comparison("compr-multifd-compression", scenarios = [ + Scenario("compr-multifd-compression-zlib", + multifd=True, multifd_channels=4, multifd_compression="zlib"), + Scenario("compr-multifd-compression-zstd", + multifd=True, multifd_channels=4, multifd_compression="zstd"), + Scenario("compr-multifd-compression-qpl", + multifd=True, multifd_channels=4, multifd_compression="qpl"), + Scenario("compr-multifd-compression-uadk", + multifd=True, multifd_channels=4, multifd_compression="uadk"), + ]), ]tests/migration/guestperf/engine.py +0
-0
tests/migration/guestperf/engine.py line 34
Quoted 4 lines
tests/migration/guestperf/engine.py +1
-0@@ -31,6 +31,8 @@ '..', '..', '..', 'python')) from qemu.machine import QEMUMachine +# multifd supported compressoin algorithms
compression
Quoted 7 lines
tests/migration/guestperf/engine.py +1
-0+MULTIFD_CMP_ALGS = ("zlib", "zstd", "qpl", "uadk") class Engine(object):@@ -205,6 +207,16 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri): resp = dst.cmd("migrate-set-parameters", multifd_channels=scenario._multifd_channels)
tests/migration/guestperf/engine.py def _migrate(self, hardware, scenario, src, dst, connect_uri): · line 218
Quoted 10 lines
tests/migration/guestperf/engine.py +9
-0+ if scenario._multifd_compression: + if scenario._multifd_compression not in MULTIFD_CMP_ALGS: + raise Exception("unsupported multifd compression " + "algorithm: %s" % + scenario._multifd_compression) + resp = src.command("migrate-set-parameters", + multifd_compression=scenario._multifd_compression) + resp = dst.command("migrate-set-parameters", + multifd_compression=scenario._multifd_compression)
Should these be src.cmd() and dst.cmd()?
Quoted 61 lines
tests/migration/guestperf/engine.py +1
-0+ if scenario._dirty_limit: if not hardware._dirty_ring_size: raise Exception("dirty ring size must be configured when "tests/migration/guestperf/scenario.py +5
-2@@ -30,7 +30,7 @@ def __init__(self, name, auto_converge=False, auto_converge_step=10, compression_mt=False, compression_mt_threads=1, compression_xbzrle=False, compression_xbzrle_cache=10, - multifd=False, multifd_channels=2, + multifd=False, multifd_channels=2, multifd_compression="", dirty_limit=False, x_vcpu_dirty_limit_period=500, vcpu_dirty_limit=1):@@ -61,6 +61,7 @@ def __init__(self, name, self._multifd = multifd self._multifd_channels = multifd_channels + self._multifd_compression = multifd_compression self._dirty_limit = dirty_limit self._x_vcpu_dirty_limit_period = x_vcpu_dirty_limit_period@@ -85,6 +86,7 @@ def serialize(self): "compression_xbzrle_cache": self._compression_xbzrle_cache, "multifd": self._multifd, "multifd_channels": self._multifd_channels, + "multifd_compression": self._multifd_compression, "dirty_limit": self._dirty_limit, "x_vcpu_dirty_limit_period": self._x_vcpu_dirty_limit_period, "vcpu_dirty_limit": self._vcpu_dirty_limit,@@ -109,4 +111,5 @@ def deserialize(cls, data): data["compression_xbzrle"], data["compression_xbzrle_cache"], data["multifd"], - data["multifd_channels"]) + data["multifd_channels"], + data["multifd_compression"])tests/migration/guestperf/shell.py +3
-0@@ -130,6 +130,8 @@ def __init__(self): action="store_true") parser.add_argument("--multifd-channels", dest="multifd_channels", default=2, type=int) + parser.add_argument("--multifd-compression", dest="multifd_compression", + default="") parser.add_argument("--dirty-limit", dest="dirty_limit", default=False, action="store_true")@@ -166,6 +168,7 @@ def get_scenario(self, args): multifd=args.multifd, multifd_channels=args.multifd_channels, + multifd_compression=args.multifd_compression, dirty_limit=args.dirty_limit, x_vcpu_dirty_limit_period=\
Re: [PATCH 2/2] tests/migration: Introduce multifd compression into guestperf
Quoted 32 lines · Fabiano Rosas
Quoted 7 lines · [email protected] writes:
From: Hyman Huang <[email protected]>
Guestperf tool does not cover the multifd compression option currently, it is worth supporting so that developers can analysis the migration performance with different compression algorithms.
Quoted 8 lines
Multifd support 4 compression algorithms currently:
zlib, zstd, qpl, uadkTo request that multifd with the specified compression algorithm such as zlib:
$ ./tests/migration/guestperf.py \ --multifd --multifd-channels 4 --multifd-compression zlib \ --output output.jsonAren't you hitting this bug?
/init (00001): INFO: 1722970659523ms copied 1 GB in 00382ms
/init (00001): INFO: 1722970659896ms copied 1 GB in 00372ms
/init (00001): INFO: 1722970660279ms copied 1 GB in 00382ms
qemu-system-x86_64:
multifd_send_pages: channel 0 has already quit!
Quoted 8 lines
qemu-system-x86_64: Unable to write to socket: Broken pipe
qemu-system-x86_64:
check_section_footer: Read section footer failed: -5qemu-system-x86_64: load of migration failed: Invalid argument
No, I use the older qemu (6.2.0) to do the test since the guestperf script updates infrequently. I'll use the latest version to do the regression testing.
Quoted 15 lines
Quoted 8 lines
To run the entire standardized set of multifd compression comparisons, with unix migration:
$ ./tests/migration/guestperf-batch.py \ --dst-host localhost --transport unix \ --filter compr-multifd-compression* --output outputdirQuoted 6 lines
Signed-off-by Hyman Huang <[email protected]>--- tests/migration/guestperf/comparison.py | 13 +++++++++++++ tests/migration/guestperf/engine.py | 12 ++++++++++++ tests/migration/guestperf/scenario.py | 7 +++++-- tests/migration/guestperf/shell.py | 3 +++
Quoted 4 lines
While here, if you'd like to move the whole guestperf into
scripts/migrationand make initrd-stress.img built by default I'd appreciate it.
Of course, I'm glad to.
Quoted 66 lines
Review
Quoted 4 lines
4 files changed, 33 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/tests/migration/guestperf/comparison.pytests/migration/guestperf/comparison.py def __init__(self, name, scenarios): · line 163
Quoted 10 lines
index
40e9d2eb1d..71208e8540100644tests/migration/guestperf/comparison.py +3
-0@@ -158,4 +158,17 @@ def __init__(self, name, scenarios): Scenario("compr-dirty-limit-50MB", dirty_limit=True, vcpu_dirty_limit=50), ]), + + # Looking at effect of multifd with + # different compression algorithms/algorithm/algorithms/
tests/migration/guestperf/comparison.py def __init__(self, name, scenarios):
Quoted 3 lines
tests/migration/guestperf/comparison.py +3
-0+ Comparison("compr-multifd-compression", scenarios = [ + Scenario("compr-multifd-compression-zlib", + multifd=True, multifd_channels=4,multifd_compression="zlib"),
tests/migration/guestperf/comparison.py def __init__(self, name, scenarios): · line 168
Quoted 2 lines
tests/migration/guestperf/comparison.py +2
-0+ Scenario("compr-multifd-compression-zstd", + multifd=True, multifd_channels=4,multifd_compression="zstd"),
tests/migration/guestperf/comparison.py def __init__(self, name, scenarios): · line 170
Quoted 2 lines
tests/migration/guestperf/comparison.py +2
-0+ Scenario("compr-multifd-compression-qpl", + multifd=True, multifd_channels=4,multifd_compression="qpl"),
tests/migration/guestperf/comparison.py def __init__(self, name, scenarios): · line 172
Quoted 2 lines
tests/migration/guestperf/comparison.py +2
-0+ Scenario("compr-multifd-compression-uadk", + multifd=True, multifd_channels=4,multifd_compression="uadk"),
Review
Quoted 3 lines
tests/migration/guestperf/comparison.py +1
-0+ ]), ](quoted diff) +0
-0
b/tests/migration/guestperf/engine.pytests/migration/guestperf/engine.py line 34
Quoted 8 lines
index
608d7270f6..883a7b8ab6100644tests/migration/guestperf/engine.py +1
-0@@ -31,6 +31,8 @@ '..', '..', '..', 'python')) from qemu.machine import QEMUMachine +# multifd supported compressoin algorithmscompression
tests/migration/guestperf/engine.py def _migrate(self, hardware, scenario, src, dst,
Quoted 5 lines
tests/migration/guestperf/engine.py +1
-0+MULTIFD_CMP_ALGS = ("zlib", "zstd", "qpl", "uadk") class Engine(object):@@ -205,6 +207,16 @@ def _migrate(self, hardware, scenario, src, dst,
connect_uri):tests/migration/guestperf/engine.py def _migrate(self, hardware, scenario, src, dst, connect_uri):
Quoted 5 lines
tests/migration/guestperf/engine.py +2
-0resp = dst.cmd("migrate-set-parameters", multifd_channels=scenario._multifd_channels) + if scenario._multifd_compression: + if scenario._multifd_compression not in
MULTIFD_CMP_ALGS:tests/migration/guestperf/engine.py def _migrate(self, hardware, scenario, src, dst, connect_uri): · line 218
Quoted 7 lines
tests/migration/guestperf/engine.py +7
-0+ raise Exception("unsupported multifd compression " + "algorithm: %s" % + scenario._multifd_compression) + resp = src.command("migrate-set-parameters", + multifd_compression=scenario._multifd_compression) + resp = dst.command("migrate-set-parameters", + multifd_compression=scenario._multifd_compression)
Quoted 2 lines
Should these be
src.cmd()anddst.cmd()?
Yes, I'll fix it in the next version.
Thanks for pointing out the low-level mistake I made. :(
Quoted 64 lines
tests/migration/guestperf/engine.py def _migrate(self, hardware, scenario, src, dst, connect_uri):
Quoted 5 lines
tests/migration/guestperf/engine.py +1
-0+ if scenario._dirty_limit: if not hardware._dirty_ring_size: raise Exception("dirty ring size must be configuredwhen "
Review
Quoted 1 line
(quoted diff) +0
-0
b/tests/migration/guestperf/scenario.pytests/migration/guestperf/scenario.py def __init__(self, name, · line 33
Quoted 9 lines
index
154c4f5d5f..4be7fafebf100644tests/migration/guestperf/scenario.py +1
-1@@ -30,7 +30,7 @@ def __init__(self, name, auto_converge=False, auto_converge_step=10, compression_mt=False, compression_mt_threads=1, compression_xbzrle=False, compression_xbzrle_cache=10, - multifd=False, multifd_channels=2, + multifd=False, multifd_channels=2,multifd_compression="",
Quoted 12 lines
tests/migration/guestperf/scenario.py +1
-0dirty_limit=False, x_vcpu_dirty_limit_period=500, vcpu_dirty_limit=1):@@ -61,6 +61,7 @@ def __init__(self, name, self._multifd = multifd self._multifd_channels = multifd_channels + self._multifd_compression = multifd_compression self._dirty_limit = dirty_limit self._x_vcpu_dirty_limit_period = x_vcpu_dirty_limit_periodtests/migration/guestperf/scenario.py def serialize(self): · line 91
Quoted 6 lines
tests/migration/guestperf/scenario.py +1
-0@@ -85,6 +86,7 @@ def serialize(self): "compression_xbzrle_cache": self._compression_xbzrle_cache, "multifd": self._multifd, "multifd_channels": self._multifd_channels, + "multifd_compression": self._multifd_compression, "dirty_limit": self._dirty_limit, "x_vcpu_dirty_limit_period":self._x_vcpu_dirty_limit_period,
Review
Quoted 9 lines
tests/migration/guestperf/scenario.py +2
-1"vcpu_dirty_limit": self._vcpu_dirty_limit,@@ -109,4 +111,5 @@ def deserialize(cls, data): data["compression_xbzrle"], data["compression_xbzrle_cache"], data["multifd"], - data["multifd_channels"]) + data["multifd_channels"], + data["multifd_compression"])(quoted diff) +0
-0
b/tests/migration/guestperf/shell.pytests/migration/guestperf/shell.py def __init__(self): · line 131
Quoted 6 lines
index
c85d89efec..1452eb8a33100644tests/migration/guestperf/shell.py +0
-0@@ -130,6 +130,8 @@ def __init__(self): action="store_true") parser.add_argument("--multifd-channels",dest="multifd_channels",
tests/migration/guestperf/shell.py def __init__(self): · line 133
Quoted 2 lines
tests/migration/guestperf/shell.py +1
-0default=2, type=int) + parser.add_argument("--multifd-compression",dest="multifd_compression",
tests/migration/guestperf/shell.py def __init__(self):
Quoted 3 lines
tests/migration/guestperf/shell.py +1
-0+ default="") parser.add_argument("--dirty-limit", dest="dirty_limit",default=False,
Quoted 3 lines
tests/migration/guestperf/shell.py +0
-0action="store_true")@@ -166,6 +168,7 @@ def get_scenario(self, args):
Quoted 7 lines
tests/migration/guestperf/shell.py def get_scenario(self, args): · line 174
Quoted 6 lines
tests/migration/guestperf/shell.py +1
-0multifd=args.multifd, multifd_channels=args.multifd_channels, + multifd_compression=args.multifd_compression, dirty_limit=args.dirty_limit, x_vcpu_dirty_limit_period=\
Yong
Signature · 1 line
Best regards