From patchwork Fri Dec 11 09:05:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongji Xie X-Patchwork-Id: 555759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 422D51402D8 for ; Sat, 12 Dec 2015 00:25:26 +1100 (AEDT) Received: from localhost ([::1]:47618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7NhM-0004aF-1i for incoming@patchwork.ozlabs.org; Fri, 11 Dec 2015 08:25:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7JeM-0002Ab-Ir for qemu-devel@nongnu.org; Fri, 11 Dec 2015 04:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7JeJ-0004BH-CJ for qemu-devel@nongnu.org; Fri, 11 Dec 2015 04:06:02 -0500 Received: from e28smtp02.in.ibm.com ([125.16.236.2]:44121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7JeI-0004Af-MK for qemu-devel@nongnu.org; Fri, 11 Dec 2015 04:05:59 -0500 Received: from localhost by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 11 Dec 2015 14:35:56 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 11 Dec 2015 14:35:53 +0530 X-IBM-Helo: d28dlp03.in.ibm.com X-IBM-MailFrom: xyjxie@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 1771D125805E for ; Fri, 11 Dec 2015 14:36:18 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tBB95qCQ917824 for ; Fri, 11 Dec 2015 14:35:52 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tBB95qSO014172 for ; Fri, 11 Dec 2015 14:35:52 +0530 Received: from localhost (commit.cn.ibm.com [9.123.229.41]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tBB95p2Y014115; Fri, 11 Dec 2015 14:35:51 +0530 From: Yongji Xie To: qemu-devel@nongnu.org, alex.williamson@redhat.com Date: Fri, 11 Dec 2015 17:05:18 +0800 Message-Id: <1449824719-3407-4-git-send-email-xyjxie@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1449824719-3407-1-git-send-email-xyjxie@linux.vnet.ibm.com> References: <1449824719-3407-1-git-send-email-xyjxie@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15121109-0005-0000-0000-00000944AB16 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 125.16.236.2 X-Mailman-Approved-At: Fri, 11 Dec 2015 08:21:11 -0500 Cc: nikunj@linux.vnet.ibm.com, zhong@linux.vnet.ibm.com, aik@ozlabs.ru, paulus@samba.org, mpe@ellerman.id.au, warrier@linux.vnet.ibm.com, Yongji Xie Subject: [Qemu-devel] [RFC PATCH 3/3] vfio/pci: Add support for mmapping MSI-X table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The VFIO-PCI ioctl VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP flag indicate that platform support mmapping MSI-X table. With this flag set, we skip some MSI-X table check so that QEMU can mmap MSI-X table successfully. And we also raise the priority of mmap memory region in case of overlap with MSI-X/PBA memory region which is added in msix_init(). Signed-off-by: Yongji Xie --- hw/vfio/pci.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index a7c6171..bec301c 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1339,7 +1339,8 @@ static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled) } memory_region_set_enabled(&bar->region.mmap_mem, enabled); - if (vdev->msix && vdev->msix->table_bar == i) { + if (vdev->msix && vdev->msix->table_bar == i && + !(vdev->vbasedev.flags & VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP)) { memory_region_set_enabled(&vdev->msix->mmap_mem, enabled); } } @@ -1357,7 +1358,8 @@ static void vfio_unregister_bar(VFIOPCIDevice *vdev, int nr) memory_region_del_subregion(&bar->region.mem, &bar->region.mmap_mem); - if (vdev->msix && vdev->msix->table_bar == nr) { + if (vdev->msix && vdev->msix->table_bar == nr && + !(vdev->vbasedev.flags & VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP)) { memory_region_del_subregion(&bar->region.mem, &vdev->msix->mmap_mem); } } @@ -1374,7 +1376,8 @@ static void vfio_unmap_bar(VFIOPCIDevice *vdev, int nr) munmap(bar->region.mmap, memory_region_size(&bar->region.mmap_mem)); - if (vdev->msix && vdev->msix->table_bar == nr) { + if (vdev->msix && vdev->msix->table_bar == nr && + !(vdev->vbasedev.flags & VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP)) { munmap(vdev->msix->mmap, memory_region_size(&vdev->msix->mmap_mem)); } } @@ -1420,7 +1423,8 @@ static void vfio_map_bar(VFIOPCIDevice *vdev, int nr) * We can't mmap areas overlapping the MSIX vector table, so we * potentially insert a direct-mapped subregion before and after it. */ - if (vdev->msix && vdev->msix->table_bar == nr) { + if (vdev->msix && vdev->msix->table_bar == nr && + !(vdev->vbasedev.flags & VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP)) { size = vdev->msix->table_offset & qemu_real_host_page_mask; } @@ -1429,9 +1433,14 @@ static void vfio_map_bar(VFIOPCIDevice *vdev, int nr) &bar->region.mmap_mem, &bar->region.mmap, size, 0, name)) { error_report("%s unsupported. Performance may be slow", name); + } else if (vdev->vbasedev.flags & VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP) { + memory_region_del_subregion(&bar->region.mem, &bar->region.mmap_mem); + memory_region_add_subregion_overlap(&bar->region.mem, 0, + &bar->region.mmap_mem, 1); } - if (vdev->msix && vdev->msix->table_bar == nr) { + if (vdev->msix && vdev->msix->table_bar == nr && + !(vdev->vbasedev.flags & VFIO_DEVICE_FLAGS_PCI_MSIX_MMAP)) { uint64_t start; start = REAL_HOST_PAGE_ALIGN((uint64_t)vdev->msix->table_offset +