On 7/1/22 21:14, Lin Yang wrote:
> According to the result parsing from xml, add the argument of
> SGX EPC memory backend into QEMU command line.
>
> With NUMA config:
>
> #qemu-system-x86_64 \
> ...... \
> -object
> '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}'
> \
> -object
> '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}'
> \
> -machine
> sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1
>
> Without NUMA config:
>
> #qemu-system-x86_64 \
> ...... \
> -object
> '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}'
> \
> -object
> '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}'
> \
> -machine sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1
Except, ...
>
> Signed-off-by: Lin Yang <lin.a.y...@intel.com>
> Signed-off-by: Michal Privoznik <mpriv...@redhat.com>
> Signed-off-by: Haibin Huang <haibin.hu...@intel.com>
> ---
> src/qemu/qemu_alias.c | 3 +-
> src/qemu/qemu_command.c | 86 ++++++++++++++++++-
> src/qemu/qemu_monitor_json.c | 41 +++++++--
> .../sgx-epc-numa.x86_64-latest.args | 40 +++++++++
> .../sgx-epc.x86_64-6.2.0.args | 37 ++++++++
> tests/qemuxml2argvtest.c | 3 +
> 6 files changed, 198 insertions(+), 12 deletions(-)
> create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
> create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
>
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
> @@ -0,0 +1,40 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/tmp/lib/domain--1-QEMUGuest1 \
> +USER=test \
> +LOGNAME=test \
> +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
> +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
> +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
> +/usr/bin/qemu-system-x86_64 \
> +-name guest=QEMUGuest1,debug-threads=on \
> +-S \
> +-object
> '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
> \
> +-machine
> q35,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1
> \
> +-accel tcg \
> +-cpu qemu64 \
> +-m 214 \
> +-overcommit mem-lock=off \
> +-smp 2,sockets=2,cores=1,threads=1 \
> +-object
> '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
> +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
> +-object
> '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
> +-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-display none \
> +-no-user-config \
> +-nodefaults \
> +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
> +-mon chardev=charmonitor,id=monitor,mode=control \
> +-rtc base=utc \
> +-no-shutdown \
> +-no-acpi \
> +-boot strict=on \
> +-device
> '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
> \
> +-device
> '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
> \
> +-object
> '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}'
> \
> +-object
> '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}'
> \
... nor here ...
> +-audiodev '{"id":"audio1","driver":"none"}' \
> +-device
> '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.1","addr":"0x0"}' \
> +-sandbox
> on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
> +-msg timestamp=on
> diff --git a/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
> b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
> new file mode 100644
> index 0000000000..56c476b777
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
> @@ -0,0 +1,37 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/tmp/lib/domain--1-QEMUGuest1 \
> +USER=test \
> +LOGNAME=test \
> +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
> +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
> +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
> +/usr/bin/qemu-system-x86_64 \
> +-name guest=QEMUGuest1,debug-threads=on \
> +-S \
> +-object
> '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}'
> \
> +-machine
> pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1
> \
> +-accel tcg \
> +-cpu qemu64 \
> +-m 134 \
> +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":140509184}' \
> +-overcommit mem-lock=off \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-display none \
> +-no-user-config \
> +-nodefaults \
> +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
> +-mon chardev=charmonitor,id=monitor,mode=control \
> +-rtc base=utc \
> +-no-shutdown \
> +-no-acpi \
> +-boot strict=on \
> +-device
> pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1
> \
> +-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
> +-object
> '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}'
> \
> +-object
> '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}'
> \
... nor here is epc backend generated before -machine argument which
makes QEMU fail at startup:
qemu-system-x86_64: Invalid parameter type for 'memdev', expected:
memory-backend-epc
At least I think that's the root cause.
Michal
