mirror of https://github.com/xemu-project/xemu.git
82565fb6b3
Currently, if an array of pointers contains a NULL pointer, that
pointer will be encoded as '0' in the stream. Since the JSON writer
doesn't define a "pointer" type, that '0' will now be an uint8, which
is different from the original type being pointed to, e.g. struct.
(we're further calling uint8 "nullptr", but that's irrelevant to the
issue)
That mixed-type array shouldn't be compressed, otherwise data is lost
as the code currently makes the whole array have the type of the first
element:
css = {NULL, NULL, ..., 0x5555568a7940, NULL};
{"name": "s390_css", "instance_id": 0, "vmsd_name": "s390_css",
"version": 1, "fields": [
...,
{"name": "css", "array_len": 256, "type": "nullptr", "size": 1},
...,
]}
In the above, the valid pointer at position 254 got lost among the
compressed array of nullptr.
While we could disable the array compression when a NULL pointer is
found, the JSON part of the stream still makes part of downtime, so we
should avoid writing unecessary bytes to it.
Keep the array compression in place, but if NULL and non-NULL pointers
are mixed break the array into several type-contiguous pieces :
css = {NULL, NULL, ..., 0x5555568a7940, NULL};
{"name": "s390_css", "instance_id": 0, "vmsd_name": "s390_css",
"version": 1, "fields": [
...,
{"name": "css", "array_len": 254, "type": "nullptr", "size": 1},
{"name": "css", "type": "struct", "struct": {"vmsd_name": "s390_css_img", ... }, "size": 768},
{"name": "css", "type": "nullptr", "size": 1},
...,
]}
Now each type-discontiguous region will become a new JSON entry. The
reader should interpret this as a concatenation of values, all part of
the same field.
Parsing the JSON with analyze-script.py now shows the proper data
being pointed to at the places where the pointer is valid and
"nullptr" where there's NULL:
"s390_css (14)": {
...
"css": [
"nullptr",
"nullptr",
...
"nullptr",
{
"chpids": [
{
"in_use": "0x00",
"type": "0x00",
"is_virtual": "0x00"
},
...
]
},
"nullptr",
}
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20250109185249.23952-7-farosas@suse.de>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
(cherry picked from commit 35049eb0d2fc72bb8c563196ec75b4d6c13fce02)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|---|---|---|
| .. | ||
| ci | ||
| coccinelle | ||
| codeconverter | ||
| coverage | ||
| coverity-scan | ||
| kvm | ||
| modules | ||
| oss-fuzz | ||
| performance | ||
| qapi | ||
| qemu-guest-agent | ||
| qemugdb | ||
| qmp | ||
| rust | ||
| simplebench | ||
| tracetool | ||
| analyse-9p-simpletrace.py | ||
| analyse-locks-simpletrace.py | ||
| analyze-inclusions | ||
| analyze-migration.py | ||
| archive-source.sh | ||
| block-coroutine-wrapper.py | ||
| check_sparse.py | ||
| checkpatch.pl | ||
| clean-header-guards.pl | ||
| clean-includes | ||
| cleanup-trace-events.pl | ||
| cocci-macro-file.h | ||
| compare-machine-types.py | ||
| cpu-x86-uarch-abi.py | ||
| decodetree.py | ||
| device-crash-test | ||
| disas-objdump.pl | ||
| dump-guest-memory.py | ||
| entitlement.sh | ||
| extract-vsssdk-headers | ||
| feature_to_c.py | ||
| fix-multiline-comments.sh | ||
| get_maintainer.pl | ||
| git-submodule.sh | ||
| git.orderfile | ||
| hxtool | ||
| kernel-doc | ||
| make-config-poison.sh | ||
| make-release | ||
| meson-buildoptions.py | ||
| meson-buildoptions.sh | ||
| meson.build | ||
| minikconf.py | ||
| modinfo-collect.py | ||
| modinfo-generate.py | ||
| mtest2make.py | ||
| nsis.py | ||
| probe-gdb-support.py | ||
| python_qmp_updater.py | ||
| qapi-gen.py | ||
| qemu-binfmt-conf.sh | ||
| qemu-gdb.py | ||
| qemu-plugin-symbols.py | ||
| qemu-stamp.py | ||
| qemu-trace-stap | ||
| qemu-version.sh | ||
| qom-cast-macro-clean-cocci-gen.py | ||
| refresh-pxe-roms.sh | ||
| render_block_graph.py | ||
| replay-dump.py | ||
| shaderinclude.py | ||
| signrom.py | ||
| simpletrace.py | ||
| symlink-install-tree.py | ||
| tracetool.py | ||
| u2f-setup-gen.py | ||
| undefsym.py | ||
| update-linux-headers.sh | ||
| update-mips-syscall-args.sh | ||
| update-syscalltbl.sh | ||
| userfaultfd-wrlat.py | ||
| vmstate-static-checker.py | ||
| xen-detect.c | ||
| xml-preprocess-test.py | ||
| xml-preprocess.py | ||