Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp376808ybl; Thu, 15 Aug 2019 19:35:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuomfESO6zUpfjXrONB/QE2hS3GpNWV+qdVznEtwp2MSshIH1kh0Du7LpjnrVfmrQ2Mg6x X-Received: by 2002:a17:902:8f90:: with SMTP id z16mr7092643plo.138.1565922902343; Thu, 15 Aug 2019 19:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565922902; cv=none; d=google.com; s=arc-20160816; b=SJr0xsvKor8ZeT4ycw/wW8pAPYHLdu05GDgXilBG2YDCn8rWjOLphrl1RPtTxpuFSf vzJCUO+kcJhq59Ny7OjC4wOVYwL1msZr7ugoIeRjkIAuiLJxua0gieu8PlmMQXqWoTcK lEd3MaN4Ty/NTAIcA5TjQrE2Plr7LsAEbSfyHC7QYrW34GI2pYHLeuLYlA96UV2SxZpF 7CHlw2x5LKDd/BworLYoZLBQwao4DOxe3sGU2W4dVj8UIUJr8p/FnCN2ddZkbyU9DHYx +BmMc4HgVOms/3o1cNXgQ3Q6GmmpYOxgcL2xI4M9doA/6kvIsIt5l4qZnf+FjpSSXqrD 1M3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=osn6fv83Yh9bETBe8vIJNi2/m/7WRLrh7IFQ57i/Xpc=; b=MHKKlseavaxluQTnA+SA0YXEAyoLHlKQ14fW9Ny0q94bFMK5jTB/bEPdp6wOvGZAQu lM8aHY8Oq72eEk/U/7BgaFmrzlFlk5DoQg61mrRMrRoq2xgwIgrqtQjo7p4t4jd24d21 9Lg6jmzp1+uyvNkREjv3S0pP2X3O21xMkYsjuyYhJHFdtT9cuQm0UWUOA5DeamkWo2N8 Kt4JWp1Q1FnzefM+N2YxsH7fBhYLxe9IvWzlZbSM5nHXrUPU+j0g9kBWxeGCVVVBctiG 7lgX3NSJ0SBTppDZOae0frUvWZBJ6hkZ+uFvEGMmMj91/xwNssMDll/Vgk55pNtmh6l1 rYOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id 44si3107653plb.39.2019.08.15.19.34.47; Thu, 15 Aug 2019 19:35:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726816AbfHPCdo (ORCPT + 99 others); Thu, 15 Aug 2019 22:33:44 -0400 Received: from mga09.intel.com ([134.134.136.24]:24701 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726654AbfHPCdQ (ORCPT ); Thu, 15 Aug 2019 22:33:16 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Aug 2019 19:33:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,391,1559545200"; d="scan'208";a="194894529" Received: from genxtest-ykzhao.sh.intel.com ([10.239.143.71]) by fmsmga001.fm.intel.com with ESMTP; 15 Aug 2019 19:33:14 -0700 From: Zhao Yakui To: x86@kernel.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Cc: Zhao Yakui , Jason Chen CJ , Mingqiang Chi Subject: [RFC PATCH 10/15] drivers/acrn: add interrupt injection support Date: Fri, 16 Aug 2019 10:25:51 +0800 Message-Id: <1565922356-4488-11-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565922356-4488-1-git-send-email-yakui.zhao@intel.com> References: <1565922356-4488-1-git-send-email-yakui.zhao@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After ACRN devicemodel finishes the emulation of trapped MMIO/IO/PCICFG access, it needs to inject one interrupt to notify that the guest can be resumed. IC_SET_IRQLINE: This is used to inject virtual IOAPIC gsi interrupt IC_INJECT_MSI: Inject virtual MSI interrupt to guest OS IC_VM_INTR_MONITOR: monitor the interrupt info for one guest OS Co-developed-by: Jason Chen CJ Signed-off-by: Jason Chen CJ Co-developed-by: Mingqiang Chi Signed-off-by: Mingqiang Chi Signed-off-by: Zhao Yakui --- drivers/staging/acrn/acrn_dev.c | 48 +++++++++++++++++++++++++++++++ drivers/staging/acrn/acrn_vm_mngt.c | 28 ++++++++++++++++++ include/linux/acrn/acrn_drv.h | 12 ++++++++ include/uapi/linux/acrn/acrn_ioctl_defs.h | 18 ++++++++++++ 4 files changed, 106 insertions(+) diff --git a/drivers/staging/acrn/acrn_dev.c b/drivers/staging/acrn/acrn_dev.c index 28bbd78..1476817 100644 --- a/drivers/staging/acrn/acrn_dev.c +++ b/drivers/staging/acrn/acrn_dev.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -316,6 +317,53 @@ long acrn_dev_ioctl(struct file *filep, break; } + case IC_SET_IRQLINE: { + ret = hcall_set_irqline(vm->vmid, ioctl_param); + if (ret < 0) { + pr_err("acrn: failed to set irqline!\n"); + return -EFAULT; + } + break; + } + + case IC_INJECT_MSI: { + struct acrn_msi_entry *msi; + + msi = kmalloc(sizeof(*msi), GFP_KERNEL); + if (!msi) + return -ENOMEM; + + if (copy_from_user(msi, (void *)ioctl_param, sizeof(*msi))) { + kfree(msi); + return -EFAULT; + } + + ret = hcall_inject_msi(vm->vmid, virt_to_phys(msi)); + kfree(msi); + if (ret < 0) { + pr_err("acrn: failed to inject!\n"); + return -EFAULT; + } + break; + } + + case IC_VM_INTR_MONITOR: { + struct page *page; + + ret = get_user_pages_fast(ioctl_param, 1, 1, &page); + if (unlikely(ret != 1) || !page) { + pr_err("acrn-dev: failed to pin intr hdr buffer!\n"); + return -ENOMEM; + } + + ret = hcall_vm_intr_monitor(vm->vmid, page_to_phys(page)); + if (ret < 0) { + pr_err("acrn-dev: monitor intr data err=%ld\n", ret); + return -EFAULT; + } + break; + } + default: pr_warn("Unknown IOCTL 0x%x\n", ioctl_num); ret = -EFAULT; diff --git a/drivers/staging/acrn/acrn_vm_mngt.c b/drivers/staging/acrn/acrn_vm_mngt.c index 9c6dd6d..4287595 100644 --- a/drivers/staging/acrn/acrn_vm_mngt.c +++ b/drivers/staging/acrn/acrn_vm_mngt.c @@ -11,8 +11,10 @@ #include #include #include +#include #include #include +#include #include "acrn_hypercall.h" #include "acrn_drv_internal.h" @@ -72,3 +74,29 @@ int acrn_vm_destroy(struct acrn_vm *vm) vm->vmid = ACRN_INVALID_VMID; return 0; } + +int acrn_inject_msi(unsigned short vmid, unsigned long msi_addr, + unsigned long msi_data) +{ + struct acrn_msi_entry *msi; + int ret; + + msi = kzalloc(sizeof(*msi), GFP_KERNEL); + + if (!msi) + return -ENOMEM; + + /* msi_addr: addr[19:12] with dest vcpu id */ + /* msi_data: data[7:0] with vector */ + msi->msi_addr = msi_addr; + msi->msi_data = msi_data; + ret = hcall_inject_msi(vmid, virt_to_phys(msi)); + kfree(msi); + if (ret < 0) { + pr_err("acrn: failed to inject MSI for vmid %d, msi_addr %lx msi_data%lx!\n", + vmid, msi_addr, msi_data); + return -EFAULT; + } + return 0; +} +EXPORT_SYMBOL_GPL(acrn_inject_msi); diff --git a/include/linux/acrn/acrn_drv.h b/include/linux/acrn/acrn_drv.h index 62b03f0..bcdfcaf 100644 --- a/include/linux/acrn/acrn_drv.h +++ b/include/linux/acrn/acrn_drv.h @@ -83,4 +83,16 @@ extern int acrn_del_memory_region(unsigned short vmid, unsigned long gpa, extern int acrn_write_protect_page(unsigned short vmid, unsigned long gpa, unsigned char set); +/** + * acrn_inject_msi() - inject MSI interrupt to guest + * + * @vmid: guest vmid + * @msi_addr: MSI addr matches MSI spec + * @msi_data: MSI data matches MSI spec + * + * Return: 0 on success, <0 on error + */ +extern int acrn_inject_msi(unsigned short vmid, unsigned long msi_addr, + unsigned long msi_data); + #endif diff --git a/include/uapi/linux/acrn/acrn_ioctl_defs.h b/include/uapi/linux/acrn/acrn_ioctl_defs.h index ee259c2..371904c 100644 --- a/include/uapi/linux/acrn/acrn_ioctl_defs.h +++ b/include/uapi/linux/acrn/acrn_ioctl_defs.h @@ -210,6 +210,19 @@ struct vm_memmap { uint32_t prot; /* RWX */ }; +/** + * @brief Info to inject a MSI interrupt to VM + * + * the parameter for HC_INJECT_MSI hypercall + */ +struct acrn_msi_entry { + /** MSI addr[19:12] with dest VCPU ID */ + uint64_t msi_addr; + + /** MSI data[7:0] with vector */ + uint64_t msi_data; +}; + /* * Common IOCTL ID definition for DM */ @@ -230,6 +243,11 @@ struct vm_memmap { #define IC_RESET_VM _IC_ID(IC_ID, IC_ID_VM_BASE + 0x05) #define IC_SET_VCPU_REGS _IC_ID(IC_ID, IC_ID_VM_BASE + 0x06) +/* IRQ and Interrupts */ +#define IC_ID_IRQ_BASE 0x20UL +#define IC_INJECT_MSI _IC_ID(IC_ID, IC_ID_IRQ_BASE + 0x03) +#define IC_VM_INTR_MONITOR _IC_ID(IC_ID, IC_ID_IRQ_BASE + 0x04) +#define IC_SET_IRQLINE _IC_ID(IC_ID, IC_ID_IRQ_BASE + 0x05) /* Guest memory management */ #define IC_ID_MEM_BASE 0x40UL -- 2.7.4