Add some new interfaces for ACRN hypervisor HSM driver:
- MMIO device passthrough
- virtual device creating/destroying
- platform information fetching from the hypervisor
---
ChangeLog:
v5:
- add comments where is the userspace code that uses the new api in commit log.
- specify the endian for some fields in struct acrn_vdev.
v4:
- remove "RFC" from Subject field.
v3:
- remove "platform information fetching from the hypervisor". What platform
information needs to be fetched has not been finally decided. Will send tis
patch out once that has been decided.
- add comments where is the userspace code that uses this new api:
- MMIO device passthrough
(a) assign a MMIO device to a User VM
https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c#L562
(b) de-assign a MMIO device from a User VM
https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c#L568
- virtual device creating/destroying
(a) create a virtual device for a User VM
https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c#L606
(b) destroy a virtual device of a User VM
https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c#L612
v2:
- remove "[email protected]" in the cc list since this patch set
doesn't fix any anything, it's not for Linux -stable releases.
Shuo Liu (2):
virt: acrn: Introduce interfaces for MMIO device passthrough
virt: acrn: Introduce interfaces for virtual device
creating/destroying
drivers/virt/acrn/hsm.c | 49 ++++++++++++++++++++++++
drivers/virt/acrn/hypercall.h | 52 ++++++++++++++++++++++++++
include/uapi/linux/acrn.h | 70 +++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+)
base-commit: 58e2cf5d794616b84f591d4d1276c8953278ce24
--
2.17.1
From: Shuo Liu <[email protected]>
MMIO device passthrough enables an OS in a virtual machine to directly
access a MMIO device in the host. It promises almost the native
performance, which is required in performance-critical scenarios of
ACRN.
HSM provides the following ioctls:
- Assign - ACRN_IOCTL_ASSIGN_MMIODEV
Pass data struct acrn_mmiodev from userspace to the hypervisor, and
inform the hypervisor to assign a MMIO device to a User VM.
- De-assign - ACRN_IOCTL_DEASSIGN_PCIDEV
Pass data struct acrn_mmiodev from userspace to the hypervisor, and
inform the hypervisor to de-assign a MMIO device from a User VM.
These new APIs will be used by user space code vm_assign_mmiodev and
vm_deassign_mmiodev in
https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
Signed-off-by: Shuo Liu <[email protected]>
Signed-off-by: Fei Li <[email protected]>
---
drivers/virt/acrn/hsm.c | 25 +++++++++++++++++++++++++
drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++++++
include/uapi/linux/acrn.h | 28 ++++++++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
index 130e12b8652a..f567ca59d7c2 100644
--- a/drivers/virt/acrn/hsm.c
+++ b/drivers/virt/acrn/hsm.c
@@ -114,6 +114,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
struct acrn_ptdev_irq *irq_info;
struct acrn_ioeventfd ioeventfd;
struct acrn_vm_memmap memmap;
+ struct acrn_mmiodev *mmiodev;
struct acrn_msi_entry *msi;
struct acrn_pcidev *pcidev;
struct acrn_irqfd irqfd;
@@ -217,6 +218,30 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
ret = acrn_vm_memseg_unmap(vm, &memmap);
break;
+ case ACRN_IOCTL_ASSIGN_MMIODEV:
+ mmiodev = memdup_user((void __user *)ioctl_param,
+ sizeof(struct acrn_mmiodev));
+ if (IS_ERR(mmiodev))
+ return PTR_ERR(mmiodev);
+
+ ret = hcall_assign_mmiodev(vm->vmid, virt_to_phys(mmiodev));
+ if (ret < 0)
+ dev_dbg(acrn_dev.this_device,
+ "Failed to assign MMIO device!\n");
+ kfree(mmiodev);
+ break;
+ case ACRN_IOCTL_DEASSIGN_MMIODEV:
+ mmiodev = memdup_user((void __user *)ioctl_param,
+ sizeof(struct acrn_mmiodev));
+ if (IS_ERR(mmiodev))
+ return PTR_ERR(mmiodev);
+
+ ret = hcall_deassign_mmiodev(vm->vmid, virt_to_phys(mmiodev));
+ if (ret < 0)
+ dev_dbg(acrn_dev.this_device,
+ "Failed to deassign MMIO device!\n");
+ kfree(mmiodev);
+ break;
case ACRN_IOCTL_ASSIGN_PCIDEV:
pcidev = memdup_user((void __user *)ioctl_param,
sizeof(struct acrn_pcidev));
diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
index 0cfad05bd1a9..f0c78e52cebb 100644
--- a/drivers/virt/acrn/hypercall.h
+++ b/drivers/virt/acrn/hypercall.h
@@ -41,6 +41,8 @@
#define HC_RESET_PTDEV_INTR _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x04)
#define HC_ASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x05)
#define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
+#define HC_ASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
+#define HC_DEASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
#define HC_ID_PM_BASE 0x80UL
#define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
@@ -194,6 +196,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
}
+/**
+ * hcall_assign_mmiodev() - Assign a MMIO device to a User VM
+ * @vmid: User VM ID
+ * @addr: Service VM GPA of the &struct acrn_mmiodev
+ *
+ * Return: 0 on success, <0 on failure
+ */
+static inline long hcall_assign_mmiodev(u64 vmid, u64 addr)
+{
+ return acrn_hypercall2(HC_ASSIGN_MMIODEV, vmid, addr);
+}
+
+/**
+ * hcall_deassign_mmiodev() - De-assign a PCI device from a User VM
+ * @vmid: User VM ID
+ * @addr: Service VM GPA of the &struct acrn_mmiodev
+ *
+ * Return: 0 on success, <0 on failure
+ */
+static inline long hcall_deassign_mmiodev(u64 vmid, u64 addr)
+{
+ return acrn_hypercall2(HC_DEASSIGN_MMIODEV, vmid, addr);
+}
+
/**
* hcall_assign_pcidev() - Assign a PCI device to a User VM
* @vmid: User VM ID
diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
index 353b2a2e4536..470036d6b1ac 100644
--- a/include/uapi/linux/acrn.h
+++ b/include/uapi/linux/acrn.h
@@ -396,6 +396,7 @@ struct acrn_ptdev_irq {
/* Type of PCI device assignment */
#define ACRN_PTDEV_QUIRK_ASSIGN (1U << 0)
+#define ACRN_MMIODEV_RES_NUM 3
#define ACRN_PCI_NUM_BARS 6
/**
* struct acrn_pcidev - Info for assigning or de-assigning a PCI device
@@ -417,6 +418,29 @@ struct acrn_pcidev {
__u32 bar[ACRN_PCI_NUM_BARS];
};
+/**
+ * struct acrn_mmiodev - Info for assigning or de-assigning a MMIO device
+ * @name: Name of the MMIO device.
+ * @res[].user_vm_pa: Physical address of User VM of the MMIO region
+ * for the MMIO device.
+ * @res[].service_vm_pa: Physical address of Service VM of the MMIO
+ * region for the MMIO device.
+ * @res[].size: Size of the MMIO region for the MMIO device.
+ * @res[].mem_type: Memory type of the MMIO region for the MMIO
+ * device.
+ *
+ * This structure will be passed to hypervisor directly.
+ */
+struct acrn_mmiodev {
+ __u8 name[8];
+ struct {
+ __u64 user_vm_pa;
+ __u64 service_vm_pa;
+ __u64 size;
+ __u64 mem_type;
+ } res[ACRN_MMIODEV_RES_NUM];
+};
+
/**
* struct acrn_msi_entry - Info for injecting a MSI interrupt to a VM
* @msi_addr: MSI addr[19:12] with dest vCPU ID
@@ -568,6 +592,10 @@ struct acrn_irqfd {
_IOW(ACRN_IOCTL_TYPE, 0x55, struct acrn_pcidev)
#define ACRN_IOCTL_DEASSIGN_PCIDEV \
_IOW(ACRN_IOCTL_TYPE, 0x56, struct acrn_pcidev)
+#define ACRN_IOCTL_ASSIGN_MMIODEV \
+ _IOW(ACRN_IOCTL_TYPE, 0x57, struct acrn_mmiodev)
+#define ACRN_IOCTL_DEASSIGN_MMIODEV \
+ _IOW(ACRN_IOCTL_TYPE, 0x58, struct acrn_mmiodev)
#define ACRN_IOCTL_PM_GET_CPU_STATE \
_IOWR(ACRN_IOCTL_TYPE, 0x60, __u64)
--
2.17.1
From: Shuo Liu <[email protected]>
The ACRN hypervisor can emulate a virtual device within hypervisor for a
Guest VM. The emulated virtual device can work without the ACRN
userspace after creation. The hypervisor do the emulation of that device.
To support the virtual device creating/destroying, HSM provides the
following ioctls:
- ACRN_IOCTL_CREATE_VDEV
Pass data struct acrn_vdev from userspace to the hypervisor, and inform
the hypervisor to create a virtual device for a User VM.
- ACRN_IOCTL_DESTROY_VDEV
Pass data struct acrn_vdev from userspace to the hypervisor, and inform
the hypervisor to destroy a virtual device of a User VM.
These new APIs will be used by user space code vm_add_hv_vdev and
vm_remove_hv_vdev in
https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
Signed-off-by: Shuo Liu <[email protected]>
Signed-off-by: Fei Li <[email protected]>
---
drivers/virt/acrn/hsm.c | 24 ++++++++++++++++++++
drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++
include/uapi/linux/acrn.h | 42 +++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
index f567ca59d7c2..5419794fccf1 100644
--- a/drivers/virt/acrn/hsm.c
+++ b/drivers/virt/acrn/hsm.c
@@ -118,6 +118,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
struct acrn_msi_entry *msi;
struct acrn_pcidev *pcidev;
struct acrn_irqfd irqfd;
+ struct acrn_vdev *vdev;
struct page *page;
u64 cstate_cmd;
int i, ret = 0;
@@ -266,6 +267,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
"Failed to deassign pci device!\n");
kfree(pcidev);
break;
+ case ACRN_IOCTL_CREATE_VDEV:
+ vdev = memdup_user((void __user *)ioctl_param,
+ sizeof(struct acrn_vdev));
+ if (IS_ERR(vdev))
+ return PTR_ERR(vdev);
+
+ ret = hcall_create_vdev(vm->vmid, virt_to_phys(vdev));
+ if (ret < 0)
+ dev_dbg(acrn_dev.this_device,
+ "Failed to create virtual device!\n");
+ kfree(vdev);
+ break;
+ case ACRN_IOCTL_DESTROY_VDEV:
+ vdev = memdup_user((void __user *)ioctl_param,
+ sizeof(struct acrn_vdev));
+ if (IS_ERR(vdev))
+ return PTR_ERR(vdev);
+ ret = hcall_destroy_vdev(vm->vmid, virt_to_phys(vdev));
+ if (ret < 0)
+ dev_dbg(acrn_dev.this_device,
+ "Failed to destroy virtual device!\n");
+ kfree(vdev);
+ break;
case ACRN_IOCTL_SET_PTDEV_INTR:
irq_info = memdup_user((void __user *)ioctl_param,
sizeof(struct acrn_ptdev_irq));
diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
index f0c78e52cebb..71d300821a18 100644
--- a/drivers/virt/acrn/hypercall.h
+++ b/drivers/virt/acrn/hypercall.h
@@ -43,6 +43,8 @@
#define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
#define HC_ASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
#define HC_DEASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
+#define HC_CREATE_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x09)
+#define HC_DESTROY_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x0A)
#define HC_ID_PM_BASE 0x80UL
#define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
@@ -196,6 +198,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
}
+/**
+ * hcall_create_vdev() - Create a virtual device for a User VM
+ * @vmid: User VM ID
+ * @addr: Service VM GPA of the &struct acrn_vdev
+ *
+ * Return: 0 on success, <0 on failure
+ */
+static inline long hcall_create_vdev(u64 vmid, u64 addr)
+{
+ return acrn_hypercall2(HC_CREATE_VDEV, vmid, addr);
+}
+
+/**
+ * hcall_destroy_vdev() - Destroy a virtual device of a User VM
+ * @vmid: User VM ID
+ * @addr: Service VM GPA of the &struct acrn_vdev
+ *
+ * Return: 0 on success, <0 on failure
+ */
+static inline long hcall_destroy_vdev(u64 vmid, u64 addr)
+{
+ return acrn_hypercall2(HC_DESTROY_VDEV, vmid, addr);
+}
+
/**
* hcall_assign_mmiodev() - Assign a MMIO device to a User VM
* @vmid: User VM ID
diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
index 470036d6b1ac..ccf47ed92500 100644
--- a/include/uapi/linux/acrn.h
+++ b/include/uapi/linux/acrn.h
@@ -441,6 +441,44 @@ struct acrn_mmiodev {
} res[ACRN_MMIODEV_RES_NUM];
};
+/**
+ * struct acrn_vdev - Info for creating or destroying a virtual device
+ * @id: Union of identifier of the virtual device
+ * @id.value: Raw data of the identifier
+ * @id.fields.vendor: Vendor id of the virtual PCI device
+ * @id.fields.device: Device id of the virtual PCI device
+ * @id.fields.legacy_id: ID of the virtual device if not a PCI device
+ * @slot: Virtual Bus/Device/Function of the virtual
+ * device
+ * @io_base: IO resource base address of the virtual device
+ * @io_size: IO resource size of the virtual device
+ * @args: Arguments for the virtual device creation
+ *
+ * The created virtual device can be a PCI device or a legacy device (e.g.
+ * a virtual UART controller) and it is emulated by the hypervisor. This
+ * structure will be passed to hypervisor directly.
+ */
+struct acrn_vdev {
+ /*
+ * the identifier of the device, the low 32 bits represent the vendor
+ * id and device id of PCI device and the high 32 bits represent the
+ * device number of the legacy device
+ */
+ union {
+ __u64 value;
+ struct {
+ __le16 vendor;
+ __le16 device;
+ __le32 legacy_id;
+ } fields;
+ } id;
+
+ __u64 slot;
+ __u32 io_addr[ACRN_PCI_NUM_BARS];
+ __u32 io_size[ACRN_PCI_NUM_BARS];
+ __u8 args[128];
+};
+
/**
* struct acrn_msi_entry - Info for injecting a MSI interrupt to a VM
* @msi_addr: MSI addr[19:12] with dest vCPU ID
@@ -596,6 +634,10 @@ struct acrn_irqfd {
_IOW(ACRN_IOCTL_TYPE, 0x57, struct acrn_mmiodev)
#define ACRN_IOCTL_DEASSIGN_MMIODEV \
_IOW(ACRN_IOCTL_TYPE, 0x58, struct acrn_mmiodev)
+#define ACRN_IOCTL_CREATE_VDEV \
+ _IOW(ACRN_IOCTL_TYPE, 0x59, struct acrn_vdev)
+#define ACRN_IOCTL_DESTROY_VDEV \
+ _IOW(ACRN_IOCTL_TYPE, 0x5A, struct acrn_vdev)
#define ACRN_IOCTL_PM_GET_CPU_STATE \
_IOWR(ACRN_IOCTL_TYPE, 0x60, __u64)
--
2.17.1
On Thu, Sep 23, 2021 at 04:41:28PM +0800, Fei Li wrote:
> From: Shuo Liu <[email protected]>
>
> The ACRN hypervisor can emulate a virtual device within hypervisor for a
> Guest VM. The emulated virtual device can work without the ACRN
> userspace after creation. The hypervisor do the emulation of that device.
>
> To support the virtual device creating/destroying, HSM provides the
> following ioctls:
> - ACRN_IOCTL_CREATE_VDEV
> Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> the hypervisor to create a virtual device for a User VM.
> - ACRN_IOCTL_DESTROY_VDEV
> Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> the hypervisor to destroy a virtual device of a User VM.
>
> These new APIs will be used by user space code vm_add_hv_vdev and
> vm_remove_hv_vdev in
> https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
>
> Signed-off-by: Shuo Liu <[email protected]>
> Signed-off-by: Fei Li <[email protected]>
> ---
> drivers/virt/acrn/hsm.c | 24 ++++++++++++++++++++
> drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++
> include/uapi/linux/acrn.h | 42 +++++++++++++++++++++++++++++++++++
> 3 files changed, 92 insertions(+)
>
> diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> index f567ca59d7c2..5419794fccf1 100644
> --- a/drivers/virt/acrn/hsm.c
> +++ b/drivers/virt/acrn/hsm.c
> @@ -118,6 +118,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> struct acrn_msi_entry *msi;
> struct acrn_pcidev *pcidev;
> struct acrn_irqfd irqfd;
> + struct acrn_vdev *vdev;
> struct page *page;
> u64 cstate_cmd;
> int i, ret = 0;
> @@ -266,6 +267,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> "Failed to deassign pci device!\n");
> kfree(pcidev);
> break;
> + case ACRN_IOCTL_CREATE_VDEV:
> + vdev = memdup_user((void __user *)ioctl_param,
> + sizeof(struct acrn_vdev));
> + if (IS_ERR(vdev))
> + return PTR_ERR(vdev);
> +
> + ret = hcall_create_vdev(vm->vmid, virt_to_phys(vdev));
> + if (ret < 0)
> + dev_dbg(acrn_dev.this_device,
> + "Failed to create virtual device!\n");
> + kfree(vdev);
> + break;
> + case ACRN_IOCTL_DESTROY_VDEV:
> + vdev = memdup_user((void __user *)ioctl_param,
> + sizeof(struct acrn_vdev));
> + if (IS_ERR(vdev))
> + return PTR_ERR(vdev);
> + ret = hcall_destroy_vdev(vm->vmid, virt_to_phys(vdev));
> + if (ret < 0)
> + dev_dbg(acrn_dev.this_device,
> + "Failed to destroy virtual device!\n");
> + kfree(vdev);
> + break;
> case ACRN_IOCTL_SET_PTDEV_INTR:
> irq_info = memdup_user((void __user *)ioctl_param,
> sizeof(struct acrn_ptdev_irq));
> diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
> index f0c78e52cebb..71d300821a18 100644
> --- a/drivers/virt/acrn/hypercall.h
> +++ b/drivers/virt/acrn/hypercall.h
> @@ -43,6 +43,8 @@
> #define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
> #define HC_ASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
> #define HC_DEASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
> +#define HC_CREATE_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x09)
> +#define HC_DESTROY_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x0A)
>
> #define HC_ID_PM_BASE 0x80UL
> #define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
> @@ -196,6 +198,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
> return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
> }
>
> +/**
> + * hcall_create_vdev() - Create a virtual device for a User VM
> + * @vmid: User VM ID
> + * @addr: Service VM GPA of the &struct acrn_vdev
> + *
> + * Return: 0 on success, <0 on failure
> + */
> +static inline long hcall_create_vdev(u64 vmid, u64 addr)
> +{
> + return acrn_hypercall2(HC_CREATE_VDEV, vmid, addr);
> +}
> +
> +/**
> + * hcall_destroy_vdev() - Destroy a virtual device of a User VM
> + * @vmid: User VM ID
> + * @addr: Service VM GPA of the &struct acrn_vdev
> + *
> + * Return: 0 on success, <0 on failure
> + */
> +static inline long hcall_destroy_vdev(u64 vmid, u64 addr)
> +{
> + return acrn_hypercall2(HC_DESTROY_VDEV, vmid, addr);
> +}
> +
> /**
> * hcall_assign_mmiodev() - Assign a MMIO device to a User VM
> * @vmid: User VM ID
> diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
> index 470036d6b1ac..ccf47ed92500 100644
> --- a/include/uapi/linux/acrn.h
> +++ b/include/uapi/linux/acrn.h
> @@ -441,6 +441,44 @@ struct acrn_mmiodev {
> } res[ACRN_MMIODEV_RES_NUM];
> };
>
> +/**
> + * struct acrn_vdev - Info for creating or destroying a virtual device
> + * @id: Union of identifier of the virtual device
> + * @id.value: Raw data of the identifier
> + * @id.fields.vendor: Vendor id of the virtual PCI device
> + * @id.fields.device: Device id of the virtual PCI device
> + * @id.fields.legacy_id: ID of the virtual device if not a PCI device
> + * @slot: Virtual Bus/Device/Function of the virtual
> + * device
> + * @io_base: IO resource base address of the virtual device
> + * @io_size: IO resource size of the virtual device
> + * @args: Arguments for the virtual device creation
> + *
> + * The created virtual device can be a PCI device or a legacy device (e.g.
> + * a virtual UART controller) and it is emulated by the hypervisor. This
> + * structure will be passed to hypervisor directly.
> + */
> +struct acrn_vdev {
> + /*
> + * the identifier of the device, the low 32 bits represent the vendor
> + * id and device id of PCI device and the high 32 bits represent the
> + * device number of the legacy device
> + */
> + union {
> + __u64 value;
> + struct {
> + __le16 vendor;
> + __le16 device;
> + __le32 legacy_id;
> + } fields;
> + } id;
> +
> + __u64 slot;
> + __u32 io_addr[ACRN_PCI_NUM_BARS];
Why is an io address only 32 bits?
And what endian is this?
> + __u32 io_size[ACRN_PCI_NUM_BARS];
Again, why only 32 bits?
> + __u8 args[128];
Where are args defined?
thanks,
greg k-h
On Thu, Sep 23, 2021 at 10:51:42AM +0200, Greg KH wrote:
> On Thu, Sep 23, 2021 at 04:41:28PM +0800, Fei Li wrote:
> > From: Shuo Liu <[email protected]>
> >
> > The ACRN hypervisor can emulate a virtual device within hypervisor for a
> > Guest VM. The emulated virtual device can work without the ACRN
> > userspace after creation. The hypervisor do the emulation of that device.
> >
> > To support the virtual device creating/destroying, HSM provides the
> > following ioctls:
> > - ACRN_IOCTL_CREATE_VDEV
> > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > the hypervisor to create a virtual device for a User VM.
> > - ACRN_IOCTL_DESTROY_VDEV
> > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > the hypervisor to destroy a virtual device of a User VM.
> >
> > These new APIs will be used by user space code vm_add_hv_vdev and
> > vm_remove_hv_vdev in
> > https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
> >
> > Signed-off-by: Shuo Liu <[email protected]>
> > Signed-off-by: Fei Li <[email protected]>
> > ---
> > drivers/virt/acrn/hsm.c | 24 ++++++++++++++++++++
> > drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++
> > include/uapi/linux/acrn.h | 42 +++++++++++++++++++++++++++++++++++
> > 3 files changed, 92 insertions(+)
> >
> > diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> > index f567ca59d7c2..5419794fccf1 100644
> > --- a/drivers/virt/acrn/hsm.c
> > +++ b/drivers/virt/acrn/hsm.c
> > @@ -118,6 +118,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > struct acrn_msi_entry *msi;
> > struct acrn_pcidev *pcidev;
> > struct acrn_irqfd irqfd;
> > + struct acrn_vdev *vdev;
> > struct page *page;
> > u64 cstate_cmd;
> > int i, ret = 0;
> > @@ -266,6 +267,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > "Failed to deassign pci device!\n");
> > kfree(pcidev);
> > break;
> > + case ACRN_IOCTL_CREATE_VDEV:
> > + vdev = memdup_user((void __user *)ioctl_param,
> > + sizeof(struct acrn_vdev));
> > + if (IS_ERR(vdev))
> > + return PTR_ERR(vdev);
> > +
> > + ret = hcall_create_vdev(vm->vmid, virt_to_phys(vdev));
> > + if (ret < 0)
> > + dev_dbg(acrn_dev.this_device,
> > + "Failed to create virtual device!\n");
> > + kfree(vdev);
> > + break;
> > + case ACRN_IOCTL_DESTROY_VDEV:
> > + vdev = memdup_user((void __user *)ioctl_param,
> > + sizeof(struct acrn_vdev));
> > + if (IS_ERR(vdev))
> > + return PTR_ERR(vdev);
> > + ret = hcall_destroy_vdev(vm->vmid, virt_to_phys(vdev));
> > + if (ret < 0)
> > + dev_dbg(acrn_dev.this_device,
> > + "Failed to destroy virtual device!\n");
> > + kfree(vdev);
> > + break;
> > case ACRN_IOCTL_SET_PTDEV_INTR:
> > irq_info = memdup_user((void __user *)ioctl_param,
> > sizeof(struct acrn_ptdev_irq));
> > diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
> > index f0c78e52cebb..71d300821a18 100644
> > --- a/drivers/virt/acrn/hypercall.h
> > +++ b/drivers/virt/acrn/hypercall.h
> > @@ -43,6 +43,8 @@
> > #define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
> > #define HC_ASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
> > #define HC_DEASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
> > +#define HC_CREATE_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x09)
> > +#define HC_DESTROY_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x0A)
> >
> > #define HC_ID_PM_BASE 0x80UL
> > #define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
> > @@ -196,6 +198,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
> > return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
> > }
> >
> > +/**
> > + * hcall_create_vdev() - Create a virtual device for a User VM
> > + * @vmid: User VM ID
> > + * @addr: Service VM GPA of the &struct acrn_vdev
> > + *
> > + * Return: 0 on success, <0 on failure
> > + */
> > +static inline long hcall_create_vdev(u64 vmid, u64 addr)
> > +{
> > + return acrn_hypercall2(HC_CREATE_VDEV, vmid, addr);
> > +}
> > +
> > +/**
> > + * hcall_destroy_vdev() - Destroy a virtual device of a User VM
> > + * @vmid: User VM ID
> > + * @addr: Service VM GPA of the &struct acrn_vdev
> > + *
> > + * Return: 0 on success, <0 on failure
> > + */
> > +static inline long hcall_destroy_vdev(u64 vmid, u64 addr)
> > +{
> > + return acrn_hypercall2(HC_DESTROY_VDEV, vmid, addr);
> > +}
> > +
> > /**
> > * hcall_assign_mmiodev() - Assign a MMIO device to a User VM
> > * @vmid: User VM ID
> > diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
> > index 470036d6b1ac..ccf47ed92500 100644
> > --- a/include/uapi/linux/acrn.h
> > +++ b/include/uapi/linux/acrn.h
> > @@ -441,6 +441,44 @@ struct acrn_mmiodev {
> > } res[ACRN_MMIODEV_RES_NUM];
> > };
> >
> > +/**
> > + * struct acrn_vdev - Info for creating or destroying a virtual device
> > + * @id: Union of identifier of the virtual device
> > + * @id.value: Raw data of the identifier
> > + * @id.fields.vendor: Vendor id of the virtual PCI device
> > + * @id.fields.device: Device id of the virtual PCI device
> > + * @id.fields.legacy_id: ID of the virtual device if not a PCI device
> > + * @slot: Virtual Bus/Device/Function of the virtual
> > + * device
> > + * @io_base: IO resource base address of the virtual device
> > + * @io_size: IO resource size of the virtual device
> > + * @args: Arguments for the virtual device creation
> > + *
> > + * The created virtual device can be a PCI device or a legacy device (e.g.
> > + * a virtual UART controller) and it is emulated by the hypervisor. This
> > + * structure will be passed to hypervisor directly.
> > + */
> > +struct acrn_vdev {
> > + /*
> > + * the identifier of the device, the low 32 bits represent the vendor
> > + * id and device id of PCI device and the high 32 bits represent the
> > + * device number of the legacy device
> > + */
> > + union {
> > + __u64 value;
> > + struct {
> > + __le16 vendor;
> > + __le16 device;
> > + __le32 legacy_id;
> > + } fields;
> > + } id;
> > +
> > + __u64 slot;
> > + __u32 io_addr[ACRN_PCI_NUM_BARS];
>
Hi Greg
> Why is an io address only 32 bits?
>
A PCI device could have six (ACRN_PCI_NUM_BARS) Base Address Registers,
Base Address registers that map into Memory Space can be 32 bits or 64
bits wide. Here doesn't mean this io address only is 32 bits.
Two io_addr could be a 64 bits io_addr which depends on the
Base Address Register Bits 3:0 Encoding.
> And what endian is this?
It's just an array which would be initialzied for index 0 to (ACRN_PCI_NUM_BARS - 1).
So I think what's the endian of it doesn't matter.
>
> > + __u32 io_size[ACRN_PCI_NUM_BARS];
>
> Again, why only 32 bits?
Here also doesn't mean the io_size is 32 bits. a 64 bits PCI BAR (Base Address Register)
could use two io_size element.
>
> > + __u8 args[128];
>
> Where are args defined?
For different kinds of vdevs, it represents differently.
For current usages, it may be:
a) a vdev's name of a virtual PCI device which used to communicate between VMs
b) an index of virtual Uart
c) a structure to represent a virtual Root Port.
thanks.
>
> thanks,
>
> greg k-h
On Thu, Sep 23, 2021 at 05:16:37PM +0800, Li Fei1 wrote:
> On Thu, Sep 23, 2021 at 10:51:42AM +0200, Greg KH wrote:
> > On Thu, Sep 23, 2021 at 04:41:28PM +0800, Fei Li wrote:
> > > From: Shuo Liu <[email protected]>
> > >
> > > The ACRN hypervisor can emulate a virtual device within hypervisor for a
> > > Guest VM. The emulated virtual device can work without the ACRN
> > > userspace after creation. The hypervisor do the emulation of that device.
> > >
> > > To support the virtual device creating/destroying, HSM provides the
> > > following ioctls:
> > > - ACRN_IOCTL_CREATE_VDEV
> > > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > > the hypervisor to create a virtual device for a User VM.
> > > - ACRN_IOCTL_DESTROY_VDEV
> > > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > > the hypervisor to destroy a virtual device of a User VM.
> > >
> > > These new APIs will be used by user space code vm_add_hv_vdev and
> > > vm_remove_hv_vdev in
> > > https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
> > >
> > > Signed-off-by: Shuo Liu <[email protected]>
> > > Signed-off-by: Fei Li <[email protected]>
> > > ---
> > > drivers/virt/acrn/hsm.c | 24 ++++++++++++++++++++
> > > drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++
> > > include/uapi/linux/acrn.h | 42 +++++++++++++++++++++++++++++++++++
> > > 3 files changed, 92 insertions(+)
> > >
> > > diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> > > index f567ca59d7c2..5419794fccf1 100644
> > > --- a/drivers/virt/acrn/hsm.c
> > > +++ b/drivers/virt/acrn/hsm.c
> > > @@ -118,6 +118,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > > struct acrn_msi_entry *msi;
> > > struct acrn_pcidev *pcidev;
> > > struct acrn_irqfd irqfd;
> > > + struct acrn_vdev *vdev;
> > > struct page *page;
> > > u64 cstate_cmd;
> > > int i, ret = 0;
> > > @@ -266,6 +267,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > > "Failed to deassign pci device!\n");
> > > kfree(pcidev);
> > > break;
> > > + case ACRN_IOCTL_CREATE_VDEV:
> > > + vdev = memdup_user((void __user *)ioctl_param,
> > > + sizeof(struct acrn_vdev));
> > > + if (IS_ERR(vdev))
> > > + return PTR_ERR(vdev);
> > > +
> > > + ret = hcall_create_vdev(vm->vmid, virt_to_phys(vdev));
> > > + if (ret < 0)
> > > + dev_dbg(acrn_dev.this_device,
> > > + "Failed to create virtual device!\n");
> > > + kfree(vdev);
> > > + break;
> > > + case ACRN_IOCTL_DESTROY_VDEV:
> > > + vdev = memdup_user((void __user *)ioctl_param,
> > > + sizeof(struct acrn_vdev));
> > > + if (IS_ERR(vdev))
> > > + return PTR_ERR(vdev);
> > > + ret = hcall_destroy_vdev(vm->vmid, virt_to_phys(vdev));
> > > + if (ret < 0)
> > > + dev_dbg(acrn_dev.this_device,
> > > + "Failed to destroy virtual device!\n");
> > > + kfree(vdev);
> > > + break;
> > > case ACRN_IOCTL_SET_PTDEV_INTR:
> > > irq_info = memdup_user((void __user *)ioctl_param,
> > > sizeof(struct acrn_ptdev_irq));
> > > diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
> > > index f0c78e52cebb..71d300821a18 100644
> > > --- a/drivers/virt/acrn/hypercall.h
> > > +++ b/drivers/virt/acrn/hypercall.h
> > > @@ -43,6 +43,8 @@
> > > #define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
> > > #define HC_ASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
> > > #define HC_DEASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
> > > +#define HC_CREATE_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x09)
> > > +#define HC_DESTROY_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x0A)
> > >
> > > #define HC_ID_PM_BASE 0x80UL
> > > #define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
> > > @@ -196,6 +198,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
> > > return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
> > > }
> > >
> > > +/**
> > > + * hcall_create_vdev() - Create a virtual device for a User VM
> > > + * @vmid: User VM ID
> > > + * @addr: Service VM GPA of the &struct acrn_vdev
> > > + *
> > > + * Return: 0 on success, <0 on failure
> > > + */
> > > +static inline long hcall_create_vdev(u64 vmid, u64 addr)
> > > +{
> > > + return acrn_hypercall2(HC_CREATE_VDEV, vmid, addr);
> > > +}
> > > +
> > > +/**
> > > + * hcall_destroy_vdev() - Destroy a virtual device of a User VM
> > > + * @vmid: User VM ID
> > > + * @addr: Service VM GPA of the &struct acrn_vdev
> > > + *
> > > + * Return: 0 on success, <0 on failure
> > > + */
> > > +static inline long hcall_destroy_vdev(u64 vmid, u64 addr)
> > > +{
> > > + return acrn_hypercall2(HC_DESTROY_VDEV, vmid, addr);
> > > +}
> > > +
> > > /**
> > > * hcall_assign_mmiodev() - Assign a MMIO device to a User VM
> > > * @vmid: User VM ID
> > > diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
> > > index 470036d6b1ac..ccf47ed92500 100644
> > > --- a/include/uapi/linux/acrn.h
> > > +++ b/include/uapi/linux/acrn.h
> > > @@ -441,6 +441,44 @@ struct acrn_mmiodev {
> > > } res[ACRN_MMIODEV_RES_NUM];
> > > };
> > >
> > > +/**
> > > + * struct acrn_vdev - Info for creating or destroying a virtual device
> > > + * @id: Union of identifier of the virtual device
> > > + * @id.value: Raw data of the identifier
> > > + * @id.fields.vendor: Vendor id of the virtual PCI device
> > > + * @id.fields.device: Device id of the virtual PCI device
> > > + * @id.fields.legacy_id: ID of the virtual device if not a PCI device
> > > + * @slot: Virtual Bus/Device/Function of the virtual
> > > + * device
> > > + * @io_base: IO resource base address of the virtual device
> > > + * @io_size: IO resource size of the virtual device
> > > + * @args: Arguments for the virtual device creation
> > > + *
> > > + * The created virtual device can be a PCI device or a legacy device (e.g.
> > > + * a virtual UART controller) and it is emulated by the hypervisor. This
> > > + * structure will be passed to hypervisor directly.
> > > + */
> > > +struct acrn_vdev {
> > > + /*
> > > + * the identifier of the device, the low 32 bits represent the vendor
> > > + * id and device id of PCI device and the high 32 bits represent the
> > > + * device number of the legacy device
> > > + */
> > > + union {
> > > + __u64 value;
> > > + struct {
> > > + __le16 vendor;
> > > + __le16 device;
> > > + __le32 legacy_id;
> > > + } fields;
> > > + } id;
> > > +
> > > + __u64 slot;
> > > + __u32 io_addr[ACRN_PCI_NUM_BARS];
> >
>
> Hi Greg
>
> > Why is an io address only 32 bits?
> >
>
> A PCI device could have six (ACRN_PCI_NUM_BARS) Base Address Registers,
> Base Address registers that map into Memory Space can be 32 bits or 64
> bits wide. Here doesn't mean this io address only is 32 bits.
> Two io_addr could be a 64 bits io_addr which depends on the
> Base Address Register Bits 3:0 Encoding.
Where does that encoding show up and how is that expressed that you need
to merge multiple 32bit values into one 64bit value?
> > And what endian is this?
>
> It's just an array which would be initialzied for index 0 to (ACRN_PCI_NUM_BARS - 1).
> So I think what's the endian of it doesn't matter.
It's a 32bit number in some endian format :)
I know you all are dealing with "little endian only", but this is a
user/kernel api that should be defined properly, right?
> > > + __u32 io_size[ACRN_PCI_NUM_BARS];
> >
> > Again, why only 32 bits?
>
> Here also doesn't mean the io_size is 32 bits. a 64 bits PCI BAR (Base Address Register)
> could use two io_size element.
How?
> > > + __u8 args[128];
> >
> > Where are args defined?
>
> For different kinds of vdevs, it represents differently.
> For current usages, it may be:
> a) a vdev's name of a virtual PCI device which used to communicate between VMs
> b) an index of virtual Uart
> c) a structure to represent a virtual Root Port.
So you are multiplexing this single structure into multiple ones
somehow? Why not break these up and be explicit about the individual
commands happening here? Is userspace supposed to create these bit
fields and somehow just pass them to the hypervisor properly?
I know you all are just treating the kernel as a dumb pipe here, and
that's fine, but you are adding new functions that have specific
formats, so why not break this up into the individual formats as well?
Otherwise, why break any of them up? :)
thanks,
greg k-h
On Thu, Sep 23, 2021 at 03:07:36PM +0200, Greg KH wrote:
> On Thu, Sep 23, 2021 at 05:16:37PM +0800, Li Fei1 wrote:
> > On Thu, Sep 23, 2021 at 10:51:42AM +0200, Greg KH wrote:
> > > On Thu, Sep 23, 2021 at 04:41:28PM +0800, Fei Li wrote:
> > > > From: Shuo Liu <[email protected]>
> > > >
> > > > The ACRN hypervisor can emulate a virtual device within hypervisor for a
> > > > Guest VM. The emulated virtual device can work without the ACRN
> > > > userspace after creation. The hypervisor do the emulation of that device.
> > > >
> > > > To support the virtual device creating/destroying, HSM provides the
> > > > following ioctls:
> > > > - ACRN_IOCTL_CREATE_VDEV
> > > > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > > > the hypervisor to create a virtual device for a User VM.
> > > > - ACRN_IOCTL_DESTROY_VDEV
> > > > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > > > the hypervisor to destroy a virtual device of a User VM.
> > > >
> > > > These new APIs will be used by user space code vm_add_hv_vdev and
> > > > vm_remove_hv_vdev in
> > > > https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
> > > >
> > > > Signed-off-by: Shuo Liu <[email protected]>
> > > > Signed-off-by: Fei Li <[email protected]>
> > > > ---
> > > > drivers/virt/acrn/hsm.c | 24 ++++++++++++++++++++
> > > > drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++
> > > > include/uapi/linux/acrn.h | 42 +++++++++++++++++++++++++++++++++++
> > > > 3 files changed, 92 insertions(+)
> > > >
> > > > diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> > > > index f567ca59d7c2..5419794fccf1 100644
> > > > --- a/drivers/virt/acrn/hsm.c
> > > > +++ b/drivers/virt/acrn/hsm.c
> > > > @@ -118,6 +118,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > > > struct acrn_msi_entry *msi;
> > > > struct acrn_pcidev *pcidev;
> > > > struct acrn_irqfd irqfd;
> > > > + struct acrn_vdev *vdev;
> > > > struct page *page;
> > > > u64 cstate_cmd;
> > > > int i, ret = 0;
> > > > @@ -266,6 +267,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > > > "Failed to deassign pci device!\n");
> > > > kfree(pcidev);
> > > > break;
> > > > + case ACRN_IOCTL_CREATE_VDEV:
> > > > + vdev = memdup_user((void __user *)ioctl_param,
> > > > + sizeof(struct acrn_vdev));
> > > > + if (IS_ERR(vdev))
> > > > + return PTR_ERR(vdev);
> > > > +
> > > > + ret = hcall_create_vdev(vm->vmid, virt_to_phys(vdev));
> > > > + if (ret < 0)
> > > > + dev_dbg(acrn_dev.this_device,
> > > > + "Failed to create virtual device!\n");
> > > > + kfree(vdev);
> > > > + break;
> > > > + case ACRN_IOCTL_DESTROY_VDEV:
> > > > + vdev = memdup_user((void __user *)ioctl_param,
> > > > + sizeof(struct acrn_vdev));
> > > > + if (IS_ERR(vdev))
> > > > + return PTR_ERR(vdev);
> > > > + ret = hcall_destroy_vdev(vm->vmid, virt_to_phys(vdev));
> > > > + if (ret < 0)
> > > > + dev_dbg(acrn_dev.this_device,
> > > > + "Failed to destroy virtual device!\n");
> > > > + kfree(vdev);
> > > > + break;
> > > > case ACRN_IOCTL_SET_PTDEV_INTR:
> > > > irq_info = memdup_user((void __user *)ioctl_param,
> > > > sizeof(struct acrn_ptdev_irq));
> > > > diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
> > > > index f0c78e52cebb..71d300821a18 100644
> > > > --- a/drivers/virt/acrn/hypercall.h
> > > > +++ b/drivers/virt/acrn/hypercall.h
> > > > @@ -43,6 +43,8 @@
> > > > #define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
> > > > #define HC_ASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
> > > > #define HC_DEASSIGN_MMIODEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
> > > > +#define HC_CREATE_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x09)
> > > > +#define HC_DESTROY_VDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x0A)
> > > >
> > > > #define HC_ID_PM_BASE 0x80UL
> > > > #define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
> > > > @@ -196,6 +198,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
> > > > return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
> > > > }
> > > >
> > > > +/**
> > > > + * hcall_create_vdev() - Create a virtual device for a User VM
> > > > + * @vmid: User VM ID
> > > > + * @addr: Service VM GPA of the &struct acrn_vdev
> > > > + *
> > > > + * Return: 0 on success, <0 on failure
> > > > + */
> > > > +static inline long hcall_create_vdev(u64 vmid, u64 addr)
> > > > +{
> > > > + return acrn_hypercall2(HC_CREATE_VDEV, vmid, addr);
> > > > +}
> > > > +
> > > > +/**
> > > > + * hcall_destroy_vdev() - Destroy a virtual device of a User VM
> > > > + * @vmid: User VM ID
> > > > + * @addr: Service VM GPA of the &struct acrn_vdev
> > > > + *
> > > > + * Return: 0 on success, <0 on failure
> > > > + */
> > > > +static inline long hcall_destroy_vdev(u64 vmid, u64 addr)
> > > > +{
> > > > + return acrn_hypercall2(HC_DESTROY_VDEV, vmid, addr);
> > > > +}
> > > > +
> > > > /**
> > > > * hcall_assign_mmiodev() - Assign a MMIO device to a User VM
> > > > * @vmid: User VM ID
> > > > diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
> > > > index 470036d6b1ac..ccf47ed92500 100644
> > > > --- a/include/uapi/linux/acrn.h
> > > > +++ b/include/uapi/linux/acrn.h
> > > > @@ -441,6 +441,44 @@ struct acrn_mmiodev {
> > > > } res[ACRN_MMIODEV_RES_NUM];
> > > > };
> > > >
> > > > +/**
> > > > + * struct acrn_vdev - Info for creating or destroying a virtual device
> > > > + * @id: Union of identifier of the virtual device
> > > > + * @id.value: Raw data of the identifier
> > > > + * @id.fields.vendor: Vendor id of the virtual PCI device
> > > > + * @id.fields.device: Device id of the virtual PCI device
> > > > + * @id.fields.legacy_id: ID of the virtual device if not a PCI device
> > > > + * @slot: Virtual Bus/Device/Function of the virtual
> > > > + * device
> > > > + * @io_base: IO resource base address of the virtual device
> > > > + * @io_size: IO resource size of the virtual device
> > > > + * @args: Arguments for the virtual device creation
> > > > + *
> > > > + * The created virtual device can be a PCI device or a legacy device (e.g.
> > > > + * a virtual UART controller) and it is emulated by the hypervisor. This
> > > > + * structure will be passed to hypervisor directly.
> > > > + */
> > > > +struct acrn_vdev {
> > > > + /*
> > > > + * the identifier of the device, the low 32 bits represent the vendor
> > > > + * id and device id of PCI device and the high 32 bits represent the
> > > > + * device number of the legacy device
> > > > + */
> > > > + union {
> > > > + __u64 value;
> > > > + struct {
> > > > + __le16 vendor;
> > > > + __le16 device;
> > > > + __le32 legacy_id;
> > > > + } fields;
> > > > + } id;
> > > > +
> > > > + __u64 slot;
> > > > + __u32 io_addr[ACRN_PCI_NUM_BARS];
> > >
> >
> > Hi Greg
> >
> > > Why is an io address only 32 bits?
> > >
> >
> > A PCI device could have six (ACRN_PCI_NUM_BARS) Base Address Registers,
> > Base Address registers that map into Memory Space can be 32 bits or 64
> > bits wide. Here doesn't mean this io address only is 32 bits.
> > Two io_addr could be a 64 bits io_addr which depends on the
> > Base Address Register Bits 3:0 Encoding.
>
> Where does that encoding show up and how is that expressed that you need
> to merge multiple 32bit values into one 64bit value?
Hi Greg
For a virtual PCI device which used to communicate between VMs, you could refer to
init_ivshmem_bar in
https://github.com/lifeix/acrn-hypervisor/blob/master/hypervisor/dm/vpci/ivshmem.c#L287
For a PCI device, if the bit 0 of BAR is zero, it means this BAR is a MMIO BAR.
And in this case, if the bit[2-1] is 10b, it means this BAR is a 64 bits MMIO BAR.
This current BAR (assume its index is X) and the next BAR (which index is X+1) form
a 64 bits MMIO BAR. You may refer to Chap 7.5.1.2.1 Base Address Registers, PCI Express? Base
Specification Revision 5.0 Version 1.0 for detail.
>
> > > And what endian is this?
> >
> > It's just an array which would be initialzied for index 0 to (ACRN_PCI_NUM_BARS - 1).
> > So I think what's the endian of it doesn't matter.
>
> It's a 32bit number in some endian format :)
>
> I know you all are dealing with "little endian only", but this is a
> user/kernel api that should be defined properly, right?
Yes, but I'm confused when should I add the endian. IMHO, if I add the endian for this field,
I need to add endian for each field of each data structure, right ?
>
> > > > + __u32 io_size[ACRN_PCI_NUM_BARS];
> > >
> > > Again, why only 32 bits?
> >
> > Here also doesn't mean the io_size is 32 bits. a 64 bits PCI BAR (Base Address Register)
> > could use two io_size element.
>
> How?
If the current BAR is a 64 bits MMIO BAR, we need to combine two io_size into one io_size.
Also, you may refer to Chap 7.5.1.2.1 Base Address Registers, PCI Express? Base Specification
Revision 5.0 Version 1.0 for detail.
>
> > > > + __u8 args[128];
> > >
> > > Where are args defined?
> >
> > For different kinds of vdevs, it represents differently.
> > For current usages, it may be:
> > a) a vdev's name of a virtual PCI device which used to communicate between VMs
> > b) an index of virtual Uart
> > c) a structure to represent a virtual Root Port.
>
> So you are multiplexing this single structure into multiple ones
> somehow? Why not break these up and be explicit about the individual
yes
> commands happening here? Is userspace supposed to create these bit
just as you said, the linux kernel doesn't need to handle this data.
it just needs to pass this data to hypervisor and the hypervisor to
check whether this data is valid according to the id field in this data structure.
> fields and somehow just pass them to the hypervisor properly?
the userspace code only needs to copy this kind of data into args fields.
Here is an example,
https://github.com/lifeix/acrn-hypervisor/blob/master/devicemodel/hw/pci/ivshmem.c#L169
>
> I know you all are just treating the kernel as a dumb pipe here, and
> that's fine, but you are adding new functions that have specific
> formats, so why not break this up into the individual formats as well?
ACRN hypervisor would do this work. The Linux kernel doesn't need to know
what the data is and what does this data use for. And it doesn't need to
know how to check this data. This also reduces the Linux kernel's workload
and saves a lot of code. :-)
thanks.
> Otherwise, why break any of them up? :)
>
> thanks,
>
> greg k-h
On Thu, Sep 23, 2021 at 11:26:36PM +0800, Li, Fei1 wrote:
> On Thu, Sep 23, 2021 at 03:07:36PM +0200, Greg KH wrote:
> > On Thu, Sep 23, 2021 at 05:16:37PM +0800, Li Fei1 wrote:
> > > On Thu, Sep 23, 2021 at 10:51:42AM +0200, Greg KH wrote:
> > > > On Thu, Sep 23, 2021 at 04:41:28PM +0800, Fei Li wrote:
> > > > > From: Shuo Liu <[email protected]>
> > > > >
> > > > > The ACRN hypervisor can emulate a virtual device within hypervisor for a
> > > > > Guest VM. The emulated virtual device can work without the ACRN
> > > > > userspace after creation. The hypervisor do the emulation of that device.
> > > > >
> > > > > To support the virtual device creating/destroying, HSM provides the
> > > > > following ioctls:
> > > > > - ACRN_IOCTL_CREATE_VDEV
> > > > > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > > > > the hypervisor to create a virtual device for a User VM.
> > > > > - ACRN_IOCTL_DESTROY_VDEV
> > > > > Pass data struct acrn_vdev from userspace to the hypervisor, and inform
> > > > > the hypervisor to destroy a virtual device of a User VM.
> > > > >
> > > > > These new APIs will be used by user space code vm_add_hv_vdev and
> > > > > vm_remove_hv_vdev in
> > > > > https://github.com/projectacrn/acrn-hypervisor/blob/master/devicemodel/core/vmmapi.c
> > > > >
> > > > > Signed-off-by: Shuo Liu <[email protected]>
> > > > > Signed-off-by: Fei Li <[email protected]>
> > > > > ---
> > > > > drivers/virt/acrn/hsm.c | 24 ++++++++++++++++++++
> > > > > drivers/virt/acrn/hypercall.h | 26 ++++++++++++++++++++++
> > > > > include/uapi/linux/acrn.h | 42 +++++++++++++++++++++++++++++++++++
> > > > > 3 files changed, 92 insertions(+)
> > > > >
Hi Greg
Any comments about my explanation ?
thanks a lot.
> > > > > diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> > > > > index f567ca59d7c2..5419794fccf1 100644
> > > > > --- a/drivers/virt/acrn/hsm.c
> > > > > +++ b/drivers/virt/acrn/hsm.c
> > > > > @@ -118,6 +118,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > > > > struct acrn_msi_entry *msi;
> > > > > struct acrn_pcidev *pcidev;
> > > > > struct acrn_irqfd irqfd;
> > > > > +struct acrn_vdev *vdev;
> > > > > struct page *page;
> > > > > u64 cstate_cmd;
> > > > > int i, ret = 0;
> > > > > @@ -266,6 +267,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
> > > > > "Failed to deassign pci device!\n");
> > > > > kfree(pcidev);
> > > > > break;
> > > > > +case ACRN_IOCTL_CREATE_VDEV:
> > > > > +vdev = memdup_user((void __user *)ioctl_param,
> > > > > + sizeof(struct acrn_vdev));
> > > > > +if (IS_ERR(vdev))
> > > > > +return PTR_ERR(vdev);
> > > > > +
> > > > > +ret = hcall_create_vdev(vm->vmid, virt_to_phys(vdev));
> > > > > +if (ret < 0)
> > > > > +dev_dbg(acrn_dev.this_device,
> > > > > +"Failed to create virtual device!\n");
> > > > > +kfree(vdev);
> > > > > +break;
> > > > > +case ACRN_IOCTL_DESTROY_VDEV:
> > > > > +vdev = memdup_user((void __user *)ioctl_param,
> > > > > + sizeof(struct acrn_vdev));
> > > > > +if (IS_ERR(vdev))
> > > > > +return PTR_ERR(vdev);
> > > > > +ret = hcall_destroy_vdev(vm->vmid, virt_to_phys(vdev));
> > > > > +if (ret < 0)
> > > > > +dev_dbg(acrn_dev.this_device,
> > > > > +"Failed to destroy virtual device!\n");
> > > > > +kfree(vdev);
> > > > > +break;
> > > > > case ACRN_IOCTL_SET_PTDEV_INTR:
> > > > > irq_info = memdup_user((void __user *)ioctl_param,
> > > > > sizeof(struct acrn_ptdev_irq));
> > > > > diff --git a/drivers/virt/acrn/hypercall.h b/drivers/virt/acrn/hypercall.h
> > > > > index f0c78e52cebb..71d300821a18 100644
> > > > > --- a/drivers/virt/acrn/hypercall.h
> > > > > +++ b/drivers/virt/acrn/hypercall.h
> > > > > @@ -43,6 +43,8 @@
> > > > > #define HC_DEASSIGN_PCIDEV_HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06)
> > > > > #define HC_ASSIGN_MMIODEV_HC_ID(HC_ID, HC_ID_PCI_BASE + 0x07)
> > > > > #define HC_DEASSIGN_MMIODEV_HC_ID(HC_ID, HC_ID_PCI_BASE + 0x08)
> > > > > +#define HC_CREATE_VDEV_HC_ID(HC_ID, HC_ID_PCI_BASE + 0x09)
> > > > > +#define HC_DESTROY_VDEV_HC_ID(HC_ID, HC_ID_PCI_BASE + 0x0A)
> > > > >
> > > > > #define HC_ID_PM_BASE0x80UL
> > > > > #define HC_PM_GET_CPU_STATE_HC_ID(HC_ID, HC_ID_PM_BASE + 0x00)
> > > > > @@ -196,6 +198,30 @@ static inline long hcall_set_memory_regions(u64 regions_pa)
> > > > > return acrn_hypercall1(HC_VM_SET_MEMORY_REGIONS, regions_pa);
> > > > > }
> > > > >
> > > > > +/**
> > > > > + * hcall_create_vdev() - Create a virtual device for a User VM
> > > > > + * @vmid:User VM ID
> > > > > + * @addr:Service VM GPA of the &struct acrn_vdev
> > > > > + *
> > > > > + * Return: 0 on success, <0 on failure
> > > > > + */
> > > > > +static inline long hcall_create_vdev(u64 vmid, u64 addr)
> > > > > +{
> > > > > +return acrn_hypercall2(HC_CREATE_VDEV, vmid, addr);
> > > > > +}
> > > > > +
> > > > > +/**
> > > > > + * hcall_destroy_vdev() - Destroy a virtual device of a User VM
> > > > > + * @vmid:User VM ID
> > > > > + * @addr:Service VM GPA of the &struct acrn_vdev
> > > > > + *
> > > > > + * Return: 0 on success, <0 on failure
> > > > > + */
> > > > > +static inline long hcall_destroy_vdev(u64 vmid, u64 addr)
> > > > > +{
> > > > > +return acrn_hypercall2(HC_DESTROY_VDEV, vmid, addr);
> > > > > +}
> > > > > +
> > > > > /**
> > > > > * hcall_assign_mmiodev() - Assign a MMIO device to a User VM
> > > > > * @vmid:User VM ID
> > > > > diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h
> > > > > index 470036d6b1ac..ccf47ed92500 100644
> > > > > --- a/include/uapi/linux/acrn.h
> > > > > +++ b/include/uapi/linux/acrn.h
> > > > > @@ -441,6 +441,44 @@ struct acrn_mmiodev {
> > > > > } res[ACRN_MMIODEV_RES_NUM];
> > > > > };
> > > > >
> > > > > +/**
> > > > > + * struct acrn_vdev - Info for creating or destroying a virtual device
> > > > > + * @id:Union of identifier of the virtual device
> > > > > + * @id.value:Raw data of the identifier
> > > > > + * @id.fields.vendor:Vendor id of the virtual PCI device
> > > > > + * @id.fields.device:Device id of the virtual PCI device
> > > > > + * @id.fields.legacy_id:ID of the virtual device if not a PCI device
> > > > > + * @slot:Virtual Bus/Device/Function of the virtual
> > > > > + *device
> > > > > + * @io_base:IO resource base address of the virtual device
> > > > > + * @io_size:IO resource size of the virtual device
> > > > > + * @args:Arguments for the virtual device creation
> > > > > + *
> > > > > + * The created virtual device can be a PCI device or a legacy device (e.g.
> > > > > + * a virtual UART controller) and it is emulated by the hypervisor. This
> > > > > + * structure will be passed to hypervisor directly.
> > > > > + */
> > > > > +struct acrn_vdev {
> > > > > +/*
> > > > > + * the identifier of the device, the low 32 bits represent the vendor
> > > > > + * id and device id of PCI device and the high 32 bits represent the
> > > > > + * device number of the legacy device
> > > > > + */
> > > > > +union {
> > > > > +__u64 value;
> > > > > +struct {
> > > > > +__le16 vendor;
> > > > > +__le16 device;
> > > > > +__le32 legacy_id;
> > > > > +} fields;
> > > > > +} id;
> > > > > +
> > > > > +__u64slot;
> > > > > +__u32io_addr[ACRN_PCI_NUM_BARS];
> > > >
> > >
> > > Hi Greg
> > >
> > > > Why is an io address only 32 bits?
> > > >
> > >
> > > A PCI device could have six (ACRN_PCI_NUM_BARS) Base Address Registers,
> > > Base Address registers that map into Memory Space can be 32 bits or 64
> > > bits wide. Here doesn't mean this io address only is 32 bits.
> > > Two io_addr could be a 64 bits io_addr which depends on the
> > > Base Address Register Bits 3:0 Encoding.
> >
> > Where does that encoding show up and how is that expressed that you need
> > to merge multiple 32bit values into one 64bit value?
>
> Hi Greg
>
> For a virtual PCI device which used to communicate between VMs, you could refer to
> init_ivshmem_bar in
> https://github.com/lifeix/acrn-hypervisor/blob/master/hypervisor/dm/vpci/ivshmem.c#L287
>
> For a PCI device, if the bit 0 of BAR is zero, it means this BAR is a MMIO BAR.
> And in this case, if the bit[2-1] is 10b, it means this BAR is a 64 bits MMIO BAR.
> This current BAR (assume its index is X) and the next BAR (which index is X+1) form
> a 64 bits MMIO BAR. You may refer to Chap 7.5.1.2.1 Base Address Registers, PCI Express? Base
> Specification Revision 5.0 Version 1.0 for detail.
>
> >
> > > > And what endian is this?
> > >
> > > It's just an array which would be initialzied for index 0 to (ACRN_PCI_NUM_BARS - 1).
> > > So I think what's the endian of it doesn't matter.
> >
> > It's a 32bit number in some endian format :)
> >
> > I know you all are dealing with "little endian only", but this is a
> > user/kernel api that should be defined properly, right?
> Yes, but I'm confused when should I add the endian. IMHO, if I add the endian for this field,
> I need to add endian for each field of each data structure, right ?
>
> >
> > > > > +__u32io_size[ACRN_PCI_NUM_BARS];
> > > >
> > > > Again, why only 32 bits?
> > >
> > > Here also doesn't mean the io_size is 32 bits. a 64 bits PCI BAR (Base Address Register)
> > > could use two io_size element.
> >
> > How?
>
> If the current BAR is a 64 bits MMIO BAR, we need to combine two io_size into one io_size.
> Also, you may refer to Chap 7.5.1.2.1 Base Address Registers, PCI Express? Base Specification
> Revision 5.0 Version 1.0 for detail.
>
> >
> > > > > +__u8args[128];
> > > >
> > > > Where are args defined?
> > >
> > > For different kinds of vdevs, it represents differently.
> > > For current usages, it may be:
> > > a) a vdev's name of a virtual PCI device which used to communicate between VMs
> > > b) an index of virtual Uart
> > > c) a structure to represent a virtual Root Port.
> >
> > So you are multiplexing this single structure into multiple ones
> > somehow? Why not break these up and be explicit about the individual
> yes
> > commands happening here? Is userspace supposed to create these bit
> just as you said, the linux kernel doesn't need to handle this data.
> it just needs to pass this data to hypervisor and the hypervisor to
> check whether this data is valid according to the id field in this data structure.
> > fields and somehow just pass them to the hypervisor properly?
> the userspace code only needs to copy this kind of data into args fields.
> Here is an example,
> https://github.com/lifeix/acrn-hypervisor/blob/master/devicemodel/hw/pci/ivshmem.c#L169
> >
> > I know you all are just treating the kernel as a dumb pipe here, and
> > that's fine, but you are adding new functions that have specific
> > formats, so why not break this up into the individual formats as well?
> ACRN hypervisor would do this work. The Linux kernel doesn't need to know
> what the data is and what does this data use for. And it doesn't need to
> know how to check this data. This also reduces the Linux kernel's workload
> and saves a lot of code. :-)
>
> thanks.
> > Otherwise, why break any of them up? :)
> >
> > thanks,
> >
> > greg k-h