| Message ID | 20210430062455.8117-32-yang.zhong@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Qemu SGX virtualization | expand |
On 4/30/21 1:24 AM, Yang Zhong wrote: > Since there is no fill_device_info() callback support, and when we > execute "info memory-devices" command in the monitor, the segfault > will be found. > > This patch will add this callback support and "info memory-devices" > will show sgx epc memory exposed to guest. The result as below: > > qemu) info memory-devices > Memory device [sgx-epc]: "epc1" > memaddr: 0x180000000 > size: 29360128 > memdev: /objects/mem1 > Memory device [sgx-epc]: "epc2" > memaddr: 0x181c00000 > size: 10485760 > memdev: /objects/mem2 > > Signed-off-by: Yang Zhong <yang.zhong@intel.com> > --- > +++ b/qapi/machine.json > @@ -1184,6 +1184,29 @@ > } > } > > +## > +# @SgxEPCDeviceInfo: > +# > +# Sgx EPC state information > +# > +# @id: device's ID > +# > +# @memaddr: physical address in memory, where device is mapped > +# > +# @size: size of memory that the device provides > +# > +# @memdev: memory backend linked with device > +# > +# Since: 5.1 6.1 > +## > +{ 'struct': 'SgxEPCDeviceInfo', > + 'data': { '*id': 'str', > + 'memaddr': 'size', > + 'size': 'size', > + 'memdev': 'str' > + } > +} > + > ## > # @MemoryDeviceInfo: > # > @@ -1198,7 +1221,8 @@ > 'data': { 'dimm': 'PCDIMMDeviceInfo', > 'nvdimm': 'PCDIMMDeviceInfo', > 'virtio-pmem': 'VirtioPMEMDeviceInfo', > - 'virtio-mem': 'VirtioMEMDeviceInfo' > + 'virtio-mem': 'VirtioMEMDeviceInfo', > + 'sgx-epc': 'SgxEPCDeviceInfo' > } > } > >
On Mon, May 03, 2021 at 01:01:22PM -0500, Eric Blake wrote: > On 4/30/21 1:24 AM, Yang Zhong wrote: > > Since there is no fill_device_info() callback support, and when we > > execute "info memory-devices" command in the monitor, the segfault > > will be found. > > > > This patch will add this callback support and "info memory-devices" > > will show sgx epc memory exposed to guest. The result as below: > > > > qemu) info memory-devices > > Memory device [sgx-epc]: "epc1" > > memaddr: 0x180000000 > > size: 29360128 > > memdev: /objects/mem1 > > Memory device [sgx-epc]: "epc2" > > memaddr: 0x181c00000 > > size: 10485760 > > memdev: /objects/mem2 > > > > Signed-off-by: Yang Zhong <yang.zhong@intel.com> > > --- > > > +++ b/qapi/machine.json > > @@ -1184,6 +1184,29 @@ > > } > > } > > > > +## > > +# @SgxEPCDeviceInfo: > > +# > > +# Sgx EPC state information > > +# > > +# @id: device's ID > > +# > > +# @memaddr: physical address in memory, where device is mapped > > +# > > +# @size: size of memory that the device provides > > +# > > +# @memdev: memory backend linked with device > > +# > > +# Since: 5.1 > > 6.1 Eric, thanks for your comments, i will change this in the next version, thanks! Yang > > > +## > > +{ 'struct': 'SgxEPCDeviceInfo', > > + 'data': { '*id': 'str', > > + 'memaddr': 'size', > > + 'size': 'size', > > + 'memdev': 'str' > > + } > > +} > > + > > ## > > # @MemoryDeviceInfo: > > # > > @@ -1198,7 +1221,8 @@ > > 'data': { 'dimm': 'PCDIMMDeviceInfo', > > 'nvdimm': 'PCDIMMDeviceInfo', > > 'virtio-pmem': 'VirtioPMEMDeviceInfo', > > - 'virtio-mem': 'VirtioMEMDeviceInfo' > > + 'virtio-mem': 'VirtioMEMDeviceInfo', > > + 'sgx-epc': 'SgxEPCDeviceInfo' > > } > > } > > > > > > -- > Eric Blake, Principal Software Engineer > Red Hat, Inc. +1-919-301-3226 > Virtualization: qemu.org | libvirt.org
diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c index 0995956f99..f9ebc8ab7f 100644 --- a/hw/i386/sgx-epc.c +++ b/hw/i386/sgx-epc.c @@ -208,7 +208,22 @@ static MemoryRegion *sgx_epc_md_get_memory_region(MemoryDeviceState *md, static void sgx_epc_md_fill_device_info(const MemoryDeviceState *md, MemoryDeviceInfo *info) { - /* TODO */ + SgxEPCDeviceInfo *se = g_new0(SgxEPCDeviceInfo, 1); + SGXEPCDevice *epc = SGX_EPC(md); + const DeviceState *dev = DEVICE(md); + + if (dev->id) { + se->has_id = true; + se->id = g_strdup(dev->id); + } + + se->memaddr = epc->addr; + se->size = object_property_get_uint(OBJECT(epc), SGX_EPC_SIZE_PROP, + NULL); + se->memdev = object_get_canonical_path(OBJECT(epc->hostmem)); + + info->u.sgx_epc.data = se; + info->type = MEMORY_DEVICE_INFO_KIND_SGX_EPC; } static void sgx_epc_class_init(ObjectClass *oc, void *data) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index bd539e0c1e..974892e73d 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1819,6 +1819,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) VirtioMEMDeviceInfo *vmi; MemoryDeviceInfo *value; PCDIMMDeviceInfo *di; + SgxEPCDeviceInfo *se; for (info = info_list; info; info = info->next) { value = info->value; @@ -1866,6 +1867,15 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) vmi->block_size); monitor_printf(mon, " memdev: %s\n", vmi->memdev); break; + case MEMORY_DEVICE_INFO_KIND_SGX_EPC: + se = value->u.sgx_epc.data; + monitor_printf(mon, "Memory device [%s]: \"%s\"\n", + MemoryDeviceInfoKind_str(value->type), + se->id ? se->id : ""); + monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", se->memaddr); + monitor_printf(mon, " size: %" PRIu64 "\n", se->size); + monitor_printf(mon, " memdev: %s\n", se->memdev); + break; default: g_assert_not_reached(); } diff --git a/qapi/machine.json b/qapi/machine.json index 6e90d463fc..3f2c2da92f 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1184,6 +1184,29 @@ } } +## +# @SgxEPCDeviceInfo: +# +# Sgx EPC state information +# +# @id: device's ID +# +# @memaddr: physical address in memory, where device is mapped +# +# @size: size of memory that the device provides +# +# @memdev: memory backend linked with device +# +# Since: 5.1 +## +{ 'struct': 'SgxEPCDeviceInfo', + 'data': { '*id': 'str', + 'memaddr': 'size', + 'size': 'size', + 'memdev': 'str' + } +} + ## # @MemoryDeviceInfo: # @@ -1198,7 +1221,8 @@ 'data': { 'dimm': 'PCDIMMDeviceInfo', 'nvdimm': 'PCDIMMDeviceInfo', 'virtio-pmem': 'VirtioPMEMDeviceInfo', - 'virtio-mem': 'VirtioMEMDeviceInfo' + 'virtio-mem': 'VirtioMEMDeviceInfo', + 'sgx-epc': 'SgxEPCDeviceInfo' } }
Since there is no fill_device_info() callback support, and when we execute "info memory-devices" command in the monitor, the segfault will be found. This patch will add this callback support and "info memory-devices" will show sgx epc memory exposed to guest. The result as below: qemu) info memory-devices Memory device [sgx-epc]: "epc1" memaddr: 0x180000000 size: 29360128 memdev: /objects/mem1 Memory device [sgx-epc]: "epc2" memaddr: 0x181c00000 size: 10485760 memdev: /objects/mem2 Signed-off-by: Yang Zhong <yang.zhong@intel.com> --- hw/i386/sgx-epc.c | 17 ++++++++++++++++- monitor/hmp-cmds.c | 10 ++++++++++ qapi/machine.json | 26 +++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 2 deletions(-)