Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp368260pxb; Thu, 23 Sep 2021 01:42:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLqHeanFt1UgoAPu4OJ5s4V0Df9y8XEteXNRvDSV+l2MkhyHrFj2aZvPW9VKW6QeTHAoVN X-Received: by 2002:a05:6638:d89:: with SMTP id l9mr3018104jaj.46.1632386538610; Thu, 23 Sep 2021 01:42:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632386538; cv=none; d=google.com; s=arc-20160816; b=TwpKxDQ4WJvMQHKsb1fRNTFdJ+tYv9hFkOTMEtIc21VSJB2V26Dewdp5GN0xCfAn5C hEfK/7GKSk5lzIw17cYAZEYTYWOGpqjwcmROmVvQP0eUr+vlW1Tlqw5bnBIto+ikfhEZ e0ko65lXelhc5T5bJyHviXTGPmQO/i0l9W+DcoKSUjkc14iWFklnVdTwKQSdet0Unnfa JDtbm5Qpkv6FsKHmjGRbpbEgCEsHDErGHr78dG0/VFb5q1pVoEeCOGHnXmP2vEJ/+17c kHMTFdlFoosf3Kf6Cxsv5oIrQDUmy5+fMUZneVdt53QV4UG1JiR/V35Fe3qJLEl0D6gG 0ETw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=im1BRWZpY6kR012W542R+5NNVtGQCyP889qAAKVrMIo=; b=VekTeEI7dd2mld+zsKkyHPQF6h40kP9XJivzoeR7EkOb58tyIpQoG+VT0BH5sk6XOC ybPvw0eQGzfw37dVD2KdqN7pNlmz7sH+tQ6snkUYPX8MaKWaJdz+E+iP80zDVCWHJ4j1 fT0bsgkLHkm1nuouEXxC/J+2c5oSPCAR3LiXqrBnpvEgGtYnwdHvtnFPazchrxWIOTwG HGm3/Df/iYFTw1nSkzAN/11TKV+gyaMensTSBHyLnYZW/c1TVJT8hmhc5+7vOR6e3Szl YLUOHwKADOZ9c3eiA35UbrDqiWYqaRNPM80XPS3/uB3p3eiZoruAM7Kwjtrg73X20PzS D29g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j26si5884587ila.62.2021.09.23.01.42.08; Thu, 23 Sep 2021 01:42:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240019AbhIWIm1 (ORCPT + 99 others); Thu, 23 Sep 2021 04:42:27 -0400 Received: from mga06.intel.com ([134.134.136.31]:24992 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240010AbhIWImV (ORCPT ); Thu, 23 Sep 2021 04:42:21 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="284806427" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="284806427" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 01:40:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="558226855" Received: from louislifei-optiplex-7050.sh.intel.com ([10.239.154.151]) by fmsmga002.fm.intel.com with ESMTP; 23 Sep 2021 01:40:48 -0700 From: Fei Li To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, yu1.wang@intel.com, shuox.liu@gmail.com, fei1.li@intel.com Subject: [PATCH v5 2/2] virt: acrn: Introduce interfaces for virtual device creating/destroying Date: Thu, 23 Sep 2021 16:41:28 +0800 Message-Id: <20210923084128.18902-3-fei1.li@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210923084128.18902-1-fei1.li@intel.com> References: <20210923084128.18902-1-fei1.li@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuo Liu 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 Signed-off-by: Fei Li --- 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