| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1565922356-4488-10-git-send-email-yakui.zhao@intel.com>
Date: Fri, 16 Aug 2019 10:25:50 +0800
From: Zhao Yakui <yakui.zhao@...el.com>
To: x86@...nel.org, linux-kernel@...r.kernel.org,
devel@...verdev.osuosl.org
Cc: Zhao Yakui <yakui.zhao@...el.com>, Gao@...r.kernel.org,
Shiqing <shiqing.gao@...el.com>,
Jason Chen CJ <jason.cj.chen@...el.com>
Subject: [RFC PATCH 09/15] drivers/acrn: add passthrough device support
Pass-through device plays an important role for guest OS when it is
accessed exclusively by guest OS. This is critical for the performance
scenario. After one PCI device is assigned to guest OS, it can be
accessed exclusively by guest system. It can avoid the device emulation
and provide the better performance.
It provides the following operations for supporting pass-through device.
- assign, pass-through device
ACRN_ASSIGN_PTDEV: Assign one PCI device to one guest OS
- deassign pass-through device
ACRN_DEASSIGN_PTDEV: Return the assigned PCI device from
the guest OS so that it can be assigned to another guest OS.
- set, reset pass-through device intr info
ACRN_SET_PTDEV_INTR_INFO
ACRN_RESET_PTDEV_INTR_INFO : This is used to configure
the interrupt info for the assigned pass-through device so that
ACRN hypervisor can inject the interrupt into guest system after
the device interrupt is triggered.
Co-developed-by: Gao, Shiqing <shiqing.gao@...el.com>
Signed-off-by: Gao, Shiqing <shiqing.gao@...el.com>
Co-developed-by: Jason Chen CJ <jason.cj.chen@...el.com>
Signed-off-by: Jason Chen CJ <jason.cj.chen@...el.com>
Signed-off-by: Zhao Yakui <yakui.zhao@...el.com>
---
drivers/staging/acrn/acrn_dev.c | 77 +++++++++++++++++++++++++++++++
drivers/staging/acrn/acrn_drv_internal.h | 25 ++++++++++
include/uapi/linux/acrn/acrn_ioctl_defs.h | 47 +++++++++++++++++++
3 files changed, 149 insertions(+)
diff --git a/drivers/staging/acrn/acrn_dev.c b/drivers/staging/acrn/acrn_dev.c
index cb62819..28bbd78 100644
--- a/drivers/staging/acrn/acrn_dev.c
+++ b/drivers/staging/acrn/acrn_dev.c
@@ -239,6 +239,83 @@ long acrn_dev_ioctl(struct file *filep,
break;
}
+ case IC_ASSIGN_PTDEV: {
+ unsigned short bdf;
+
+ if (copy_from_user(&bdf, (void *)ioctl_param,
+ sizeof(unsigned short)))
+ return -EFAULT;
+
+ ret = hcall_assign_ptdev(vm->vmid, bdf);
+ if (ret < 0) {
+ pr_err("acrn: failed to assign ptdev!\n");
+ return -EFAULT;
+ }
+ break;
+ }
+ case IC_DEASSIGN_PTDEV: {
+ unsigned short bdf;
+
+ if (copy_from_user(&bdf, (void *)ioctl_param,
+ sizeof(unsigned short)))
+ return -EFAULT;
+
+ ret = hcall_deassign_ptdev(vm->vmid, bdf);
+ if (ret < 0) {
+ pr_err("acrn: failed to deassign ptdev!\n");
+ return -EFAULT;
+ }
+ break;
+ }
+
+ case IC_SET_PTDEV_INTR_INFO: {
+ struct ic_ptdev_irq ic_pt_irq;
+ struct hc_ptdev_irq *hc_pt_irq;
+
+ if (copy_from_user(&ic_pt_irq, (void *)ioctl_param,
+ sizeof(ic_pt_irq)))
+ return -EFAULT;
+
+ hc_pt_irq = kmalloc(sizeof(*hc_pt_irq), GFP_KERNEL);
+ if (!hc_pt_irq)
+ return -ENOMEM;
+
+ memcpy(hc_pt_irq, &ic_pt_irq, sizeof(*hc_pt_irq));
+
+ ret = hcall_set_ptdev_intr_info(vm->vmid,
+ virt_to_phys(hc_pt_irq));
+ kfree(hc_pt_irq);
+ if (ret < 0) {
+ pr_err("acrn: failed to set intr info for ptdev!\n");
+ return -EFAULT;
+ }
+
+ break;
+ }
+ case IC_RESET_PTDEV_INTR_INFO: {
+ struct ic_ptdev_irq ic_pt_irq;
+ struct hc_ptdev_irq *hc_pt_irq;
+
+ if (copy_from_user(&ic_pt_irq, (void *)ioctl_param,
+ sizeof(ic_pt_irq)))
+ return -EFAULT;
+
+ hc_pt_irq = kmalloc(sizeof(*hc_pt_irq), GFP_KERNEL);
+ if (!hc_pt_irq)
+ return -ENOMEM;
+
+ memcpy(hc_pt_irq, &ic_pt_irq, sizeof(*hc_pt_irq));
+
+ ret = hcall_reset_ptdev_intr_info(vm->vmid,
+ virt_to_phys(hc_pt_irq));
+ kfree(hc_pt_irq);
+ if (ret < 0) {
+ pr_err("acrn: failed to reset intr info for ptdev!\n");
+ return -EFAULT;
+ }
+ break;
+ }
+
default:
pr_warn("Unknown IOCTL 0x%x\n", ioctl_num);
ret = -EFAULT;
diff --git a/drivers/staging/acrn/acrn_drv_internal.h b/drivers/staging/acrn/acrn_drv_internal.h
index 5098765..3e633cd 100644
--- a/drivers/staging/acrn/acrn_drv_internal.h
+++ b/drivers/staging/acrn/acrn_drv_internal.h
@@ -115,4 +115,29 @@ void hugepage_free_guest(struct acrn_vm *vm);
void *hugepage_map_guest_phys(struct acrn_vm *vm, u64 guest_phys, size_t size);
int hugepage_unmap_guest_phys(struct acrn_vm *vm, u64 guest_phys);
int set_memory_regions(struct set_regions *regions);
+
+struct hc_ptdev_irq {
+#define IRQ_INTX 0
+#define IRQ_MSI 1
+#define IRQ_MSIX 2
+ u32 type;
+ u16 virt_bdf; /* IN: Device virtual BDF# */
+ u16 phys_bdf; /* IN: Device physical BDF# */
+ union {
+ struct {
+ u8 virt_pin; /* IN: virtual IOAPIC pin */
+ u8 reserved0[3]; /* Reserved */
+ u8 phys_pin; /* IN: physical IOAPIC pin */
+ u8 reserved1[3]; /* Reserved */
+ bool pic_pin; /* IN: pin from PIC? */
+ u8 reserved2[3]; /* Reserved */
+ } intx;
+ struct {
+ /* IN: vector count of MSI/MSIX */
+ u32 vector_cnt;
+ u32 reserved0[3]; /* Reserved */
+ } msix;
+ };
+};
+
#endif
diff --git a/include/uapi/linux/acrn/acrn_ioctl_defs.h b/include/uapi/linux/acrn/acrn_ioctl_defs.h
index 76e358f..ee259c2 100644
--- a/include/uapi/linux/acrn/acrn_ioctl_defs.h
+++ b/include/uapi/linux/acrn/acrn_ioctl_defs.h
@@ -137,6 +137,46 @@ struct acrn_set_vcpu_regs {
struct acrn_vcpu_regs vcpu_regs;
};
+/**
+ * struct ic_ptdev_irq - pass thru device irq data structure
+ */
+struct ic_ptdev_irq {
+#define IRQ_INTX 0
+#define IRQ_MSI 1
+#define IRQ_MSIX 2
+ /** @type: irq type */
+ uint32_t type;
+ /** @virt_bdf: virtual bdf description of pass thru device */
+ uint16_t virt_bdf; /* IN: Device virtual BDF# */
+ /** @phys_bdf: physical bdf description of pass thru device */
+ uint16_t phys_bdf; /* IN: Device physical BDF# */
+ /** union */
+ union {
+ /** struct intx - info of IOAPIC/PIC interrupt */
+ struct {
+ /** @virt_pin: virtual IOAPIC pin */
+ uint32_t virt_pin;
+ /** @phys_pin: physical IOAPIC pin */
+ uint32_t phys_pin;
+ /** @is_pic_pin: PIC pin */
+ uint32_t is_pic_pin;
+ } intx;
+
+ /** struct msix - info of MSI/MSIX interrupt */
+ struct {
+ /* Keep this filed on top of msix */
+ /** @vector_cnt: vector count of MSI/MSIX */
+ uint32_t vector_cnt;
+
+ /** @table_size: size of MSIX table(round up to 4K) */
+ uint32_t table_size;
+
+ /** @table_paddr: physical address of MSIX table */
+ uint64_t table_paddr;
+ } msix;
+ };
+};
+
#define VM_MEMMAP_SYSMEM 0
#define VM_MEMMAP_MMIO 1
@@ -196,4 +236,11 @@ struct vm_memmap {
#define IC_SET_MEMSEG _IC_ID(IC_ID, IC_ID_MEM_BASE + 0x01)
#define IC_UNSET_MEMSEG _IC_ID(IC_ID, IC_ID_MEM_BASE + 0x02)
+/* PCI assignment*/
+#define IC_ID_PCI_BASE 0x50UL
+#define IC_ASSIGN_PTDEV _IC_ID(IC_ID, IC_ID_PCI_BASE + 0x00)
+#define IC_DEASSIGN_PTDEV _IC_ID(IC_ID, IC_ID_PCI_BASE + 0x01)
+#define IC_SET_PTDEV_INTR_INFO _IC_ID(IC_ID, IC_ID_PCI_BASE + 0x03)
+#define IC_RESET_PTDEV_INTR_INFO _IC_ID(IC_ID, IC_ID_PCI_BASE + 0x04)
+
#endif /* __ACRN_IOCTL_DEFS_H__ */
--
2.7.4
Powered by blists - more mailing lists